Refactoring server package

Author: LyricTian

README.md

@@ -3,14 +3,14 @@
 
 > 完全模块化、支持http/fasthttp的服务端处理、令牌存储支持redis/mongodb
 
-[![GoDoc](https://godoc.org/gopkg.in/oauth2.v2?status.svg)](https://godoc.org/gopkg.in/oauth2.v2)
-[![Go Report Card](https://goreportcard.com/badge/gopkg.in/oauth2.v2)](https://goreportcard.com/report/gopkg.in/oauth2.v2)
+[![GoDoc](https://godoc.org/gopkg.in/oauth2.v3?status.svg)](https://godoc.org/gopkg.in/oauth2.v3)
+[![Go Report Card](https://goreportcard.com/badge/gopkg.in/oauth2.v3)](https://goreportcard.com/report/gopkg.in/oauth2.v3)
 
 获取
 ----
 
 ``` bash
-$ go get -u gopkg.in/oauth2.v2/...
+$ go get -u gopkg.in/oauth2.v3/...
 ```
 
 HTTP服务端
@@ -23,10 +23,10 @@ import (
 	"log"
 	"net/http"
 
-	"gopkg.in/oauth2.v2/manage"
-	"gopkg.in/oauth2.v2/server"
-	"gopkg.in/oauth2.v2/store/client"
-	"gopkg.in/oauth2.v2/store/token"
+	"gopkg.in/oauth2.v3/manage"
+	"gopkg.in/oauth2.v3/server"
+	"gopkg.in/oauth2.v3/store/client"
+	"gopkg.in/oauth2.v3/store/token"
 )
 
 func main() {

errors/error.go

@@ -0,0 +1,55 @@
+package errors
+
+import "errors"
+
+var (
+	// ErrUnauthorizedClient unauthorized client
+	ErrUnauthorizedClient = errors.New("unauthorized_client")
+
+	// ErrAccessDenied access denied
+	ErrAccessDenied = errors.New("access_denied")
+
+	// ErrUnsupportedResponseType unsupported response type
+	ErrUnsupportedResponseType = errors.New("unsupported_response_type")
+
+	// ErrInvalidScope invalid scope
+	ErrInvalidScope = errors.New("invalid_scope")
+
+	// ErrInvalidRequest invalid request
+	ErrInvalidRequest = errors.New("invalid_request")
+
+	// ErrInvalidClient invalid client
+	ErrInvalidClient = errors.New("invalid_client")
+
+	// ErrInvalidGrant invalid grant
+	ErrInvalidGrant = errors.New("invalid_grant")
+
+	// ErrUnsupportedGrantType unsupported grant type
+	ErrUnsupportedGrantType = errors.New("unsupported_grant_type")
+
+	// ErrServerError server error
+	ErrServerError = errors.New("server_error")
+)
+
+var (
+	// ErrNilValue Nil Value
+	ErrNilValue = errors.New("nil value")
+
+	// ErrInvalidRedirectURI invalid redirect uri
+	ErrInvalidRedirectURI = errors.New("invalid redirect uri")
+
+	// ErrInvalidAuthorizeCode invalid authorize code
+	ErrInvalidAuthorizeCode = errors.New("invalid authorize code")
+
+	// ErrInvalidAccessToken invalid access token
+	ErrInvalidAccessToken = errors.New("invalid access token")
+
+	// ErrInvalidRefreshToken  invalid refresh token
+	ErrInvalidRefreshToken = errors.New("invalid refresh token")
+
+	// ErrExpiredAccessToken expired access token
+	ErrExpiredAccessToken = errors.New("expired access token")
+
+	// ErrExpiredRefreshToken expired refresh token
+	ErrExpiredRefreshToken = errors.New("expired refresh token")
+)

example/README.md

@@ -3,7 +3,6 @@ Authorization code simulation
 
 Run Server
 ---------
-> Run fasthttp server(`cd example/fastserver`)
 
 ``` bash
 $ cd example/server

example/server/main.go

@@ -4,11 +4,14 @@ import (
 	"log"
 	"net/http"
 
-	"gopkg.in/oauth2.v2/manage"
-	"gopkg.in/oauth2.v2/models"
-	"gopkg.in/oauth2.v2/server"
-	"gopkg.in/oauth2.v2/store/client"
-	"gopkg.in/oauth2.v2/store/token"
+	"fmt"
+
+	"gopkg.in/oauth2.v3"
+	"gopkg.in/oauth2.v3/manage"
+	"gopkg.in/oauth2.v3/models"
+	"gopkg.in/oauth2.v3/server"
+	"gopkg.in/oauth2.v3/store/client"
+	"gopkg.in/oauth2.v3/store/token"
 )
 
 func main() {
@@ -23,16 +26,18 @@ func main() {
 	}))
 
 	srv := server.NewServer(server.NewConfig(), manager)
+	srv.SetAllowedResponseType(oauth2.Code)
+	srv.SetAllowedGrantType(oauth2.AuthorizationCode)
+	srv.SetErrorHandler(func(err error) {
+		fmt.Println("OAuth2 Error:", err.Error())
+	})
+	srv.SetUserAuthorizationHandler(func(w http.ResponseWriter, r *http.Request) (userID string, err error) {
+		userID = "000000"
+		return
+	})
 
 	http.HandleFunc("/authorize", func(w http.ResponseWriter, r *http.Request) {
-		authReq, err := srv.GetAuthorizeRequest(r)
-		if err != nil {
-			http.Error(w, err.Error(), http.StatusBadRequest)
-			return
-		}
-		// TODO: User authentication...
-		authReq.UserID = "000000"
-		err = srv.HandleAuthorizeRequest(w, authReq)
+		err := srv.HandleAuthorizeRequest(w, r)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 		}

generates/access.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/LyricTian/go.uuid"
-	"gopkg.in/oauth2.v2"
+	"gopkg.in/oauth2.v3"
 )
 
 // NewAccessGenerate Create to generate the access token instance

generates/access_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/oauth2.v2"
-	"gopkg.in/oauth2.v2/models"
+	"gopkg.in/oauth2.v3"
+	"gopkg.in/oauth2.v3/models"
 
 	. "github.com/smartystreets/goconvey/convey"
 )

generates/authorize.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/LyricTian/go.uuid"
-	"gopkg.in/oauth2.v2"
+	"gopkg.in/oauth2.v3"
 )
 
 // NewAuthorizeGenerate Create to generate the authorize code instance

generates/authorize_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"gopkg.in/oauth2.v2"
-	"gopkg.in/oauth2.v2/models"
+	"gopkg.in/oauth2.v3"
+	"gopkg.in/oauth2.v3/models"
 
 	. "github.com/smartystreets/goconvey/convey"
 )

manage.go

@@ -2,14 +2,13 @@ package oauth2
 
 // TokenGenerateRequest Provide to generate the token request parameters
 type TokenGenerateRequest struct {
-	ClientID          string // The client information
-	ClientSecret      string // The client secret
-	UserID            string // The user id
-	RedirectURI       string // Redirect URI
-	Scope             string // Scope of authorization
-	Code              string // Authorization code
-	Refresh           string // Refresh token
-	IsGenerateRefresh bool   // Whether to generate refresh token
+	ClientID     string // The client information
+	ClientSecret string // The client secret
+	UserID       string // The user id
+	RedirectURI  string // Redirect URI
+	Scope        string // Scope of authorization
+	Code         string // Authorization code
+	Refresh      string // Refreshing token
 }
 
 // Manager Authorization management interface