Fixed error handling

Author: LyricTian

README.md

@@ -65,24 +65,23 @@ func main() {
 	// client test store
 	manager.MapClientStorage(store.NewTestClientStore())
 
-	srv := server.NewServer(server.NewConfig(), manager)
-	srv.SetUserAuthorizationHandler(func(w http.ResponseWriter, r *http.Request) (userID string, err error) {
-		// validation and to get the user id
-		userID = "000000"
-		return
-	})
+	srv := server.NewDefaultServer(manager)
+	srv.SetAllowGetAccessRequest(true)
+
 	http.HandleFunc("/authorize", func(w http.ResponseWriter, r *http.Request) {
 		err := srv.HandleAuthorizeRequest(w, r)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 		}
 	})
+
 	http.HandleFunc("/token", func(w http.ResponseWriter, r *http.Request) {
 		err := srv.HandleTokenRequest(w, r)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusBadRequest)
 		}
 	})
+
 	http.ListenAndServe(":9096", nil)
 }
 ```
@@ -97,7 +96,16 @@ $ ./server
 ### Open in your web browser
 
 ```
-http://localhost:9096/authorize?response_type=code&client_id=1&redirect_uri=http%253A%252F%252Flocalhost&scope=all&state=xyz
+http://localhost:9096/token?grant_type=clientcredentials&client_id=1&client_secret=11&scope=all
+```
+
+```
+{
+    "access_token": "ZGF4ARHJPT2Y_QAIOJVL-Q",
+    "expires_in": 7200,
+    "scope": "all",
+    "token_type": "Bearer"
+}
 ```
 
 ## Features

example/README.md

@@ -1,35 +1,25 @@
-Authorization code simulation
-=============================
+# Authorization Code Grant
 
-Run Server
----------
+![login](https://raw.githubusercontent.com/go-oauth2/oauth2/master/example/server/static/login.png)
+![auth](https://raw.githubusercontent.com/go-oauth2/oauth2/master/example/server/static/auth.png)
+![token](https://raw.githubusercontent.com/go-oauth2/oauth2/master/example/server/static/token.png)
+
+## Run Server
 
 ``` bash
 $ cd example/server
 $ go build server.go
 $ ./server
 ```
 
-Run Client
-----------
+## Run Client
 
 ```
 $ cd example/client
 $ go build client.go
 $ ./client
 ```
 
-Open the browser
-----------------
-
-[http://localhost:9094](http://localhost:9094)
+## Open the browser
 
-``` json
-{
-    "access_token": "BIX-RYRPMHYY4L7O4QTP3Q",
-    "expires_in": 7200,
-    "refresh_token": "JRITD106WU6YNRE4UUEV_A",
-    "scope": "all",
-    "token_type": "Bearer"
-}
-```
+[http://localhost:9094](http://localhost:9094)

example/server/server.go

@@ -37,8 +37,8 @@ func main() {
 
 	srv := server.NewServer(server.NewConfig(), manager)
 	srv.SetUserAuthorizationHandler(userAuthorizeHandler)
-	srv.SetInternalErrorHandler(func(r *http.Request, err error) {
-		fmt.Println("OAuth2 Error:", r.RequestURI, err.Error())
+	srv.SetInternalErrorHandler(func(err error) {
+		fmt.Println("internal error:", err.Error())
 	})
 
 	http.HandleFunc("/login", loginHandler)

example/server/static/auth.png

@@ -10,16 +10,16 @@ import (
 	"gopkg.in/oauth2.v3"
 )
 
-// NewAccessGenerate Create to generate the access token instance
+// NewAccessGenerate create to generate the access token instance
 func NewAccessGenerate() *AccessGenerate {
 	return &AccessGenerate{}
 }
 
-// AccessGenerate Generate the access token
+// AccessGenerate generate the access token
 type AccessGenerate struct {
 }
 
-// Token Based on the UUID generated token
+// Token based on the UUID generated token
 func (ag *AccessGenerate) Token(data *oauth2.GenerateBasic, isGenRefresh bool) (access, refresh string, err error) {
 	buf := bytes.NewBufferString(data.Client.GetID())
 	buf.WriteString(data.UserID)

example/server/static/login.png

@@ -9,15 +9,15 @@ import (
 	"gopkg.in/oauth2.v3"
 )
 
-// NewAuthorizeGenerate Create to generate the authorize code instance
+// NewAuthorizeGenerate create to generate the authorize code instance
 func NewAuthorizeGenerate() *AuthorizeGenerate {
 	return &AuthorizeGenerate{}
 }
 
-// AuthorizeGenerate Generate the authorize code
+// AuthorizeGenerate generate the authorize code
 type AuthorizeGenerate struct{}
 
-// Token Based on the UUID generated token
+// Token based on the UUID generated token
 func (ag *AuthorizeGenerate) Token(data *oauth2.GenerateBasic) (code string, err error) {
 	buf := bytes.NewBufferString(data.Client.GetID())
 	buf.WriteString(data.UserID)

example/server/static/token.png

@@ -8,11 +8,11 @@ import (
 )
 
 type (
-	// ValidateURIHandler Validates that RedirectURI is contained in baseURI
+	// ValidateURIHandler validates that redirectURI is contained in baseURI
 	ValidateURIHandler func(baseURI, redirectURI string) (err error)
 )
 
-// DefaultValidateURI Validates that RedirectURI is contained in baseURI
+// DefaultValidateURI validates that redirectURI is contained in baseURI
 func DefaultValidateURI(baseURI string, redirectURI string) (err error) {
 	base, err := url.Parse(baseURI)
 	if err != nil {

generates/access.go

@@ -7,22 +7,22 @@ type Client struct {
 	Domain string
 }
 
-// GetID The client id
+// GetID client id
 func (c *Client) GetID() string {
 	return c.ID
 }
 
-// GetSecret The client domain
+// GetSecret client domain
 func (c *Client) GetSecret() string {
 	return c.Secret
 }
 
-// GetDomain The client domain
+// GetDomain client domain
 func (c *Client) GetDomain() string {
 	return c.Domain
 }
 
-// GetExtraData The extension data related to the client
+// GetExtraData extension data related to the client
 func (c *Client) GetExtraData() interface{} {
 	return nil
 }

generates/authorize.go

@@ -1,12 +1,17 @@
 package server
 
-import "gopkg.in/oauth2.v3"
+import (
+	"time"
+
+	"gopkg.in/oauth2.v3"
+)
 
 // Config configuration parameters
 type Config struct {
-	TokenType            string                // TokenType token type（Default is Bearer）
-	AllowedResponseTypes []oauth2.ResponseType // Allow the authorization type(Default is all)
-	AllowedGrantTypes    []oauth2.GrantType    // Allow the grant type(Default is all)
+	TokenType             string                // token type
+	AllowGetAccessRequest bool                  // to allow GET requests for the token
+	AllowedResponseTypes  []oauth2.ResponseType // allow the authorization type
+	AllowedGrantTypes     []oauth2.GrantType    // allow the grant type
 }
 
 // NewConfig create to configuration instance
@@ -22,3 +27,14 @@ func NewConfig() *Config {
 		},
 	}
 }
+
+// AuthorizeRequest authorization request
+type AuthorizeRequest struct {
+	ResponseType   oauth2.ResponseType
+	ClientID       string
+	Scope          string
+	RedirectURI    string
+	State          string
+	UserID         string
+	AccessTokenExp time.Duration
+}

manage/util.go

@@ -11,24 +11,34 @@ import (
 type (
 	// ClientInfoHandler get client info from request
 	ClientInfoHandler func(r *http.Request) (clientID, clientSecret string, err error)
+
 	// ClientAuthorizedHandler check the client allows to use this authorization grant type
 	ClientAuthorizedHandler func(clientID string, grant oauth2.GrantType) (allowed bool, err error)
+
 	// ClientScopeHandler check the client allows to use scope
 	ClientScopeHandler func(clientID, scope string) (allowed bool, err error)
+
 	// UserAuthorizationHandler get user id from request authorization
 	UserAuthorizationHandler func(w http.ResponseWriter, r *http.Request) (userID string, err error)
+
 	// PasswordAuthorizationHandler get user id from username and password
 	PasswordAuthorizationHandler func(username, password string) (userID string, err error)
+
 	// RefreshingScopeHandler check the scope of the refreshing token
 	RefreshingScopeHandler func(newScope, oldScope string) (allowed bool, err error)
+
 	// ResponseErrorHandler response error handing
-	ResponseErrorHandler func(re *errors.Response)
+	ResponseErrorHandler func(err error) (re *errors.Response)
+
 	// InternalErrorHandler internal error handing
-	InternalErrorHandler func(r *http.Request, err error)
+	InternalErrorHandler func(err error)
+
 	// AuthorizeScopeHandler set the authorized scope
 	AuthorizeScopeHandler func(w http.ResponseWriter, r *http.Request) (scope string, err error)
+
 	// AccessTokenExpHandler set expiration date for the access token
 	AccessTokenExpHandler func(w http.ResponseWriter, r *http.Request) (exp time.Duration, err error)
+
 	// ExtensionFieldsHandler in response to the access token with the extension of the field
 	ExtensionFieldsHandler func(ti oauth2.TokenInfo) (fieldsValue map[string]interface{})
 )
@@ -38,7 +48,7 @@ func ClientFormHandler(r *http.Request) (clientID, clientSecret string, err erro
 	clientID = r.Form.Get("client_id")
 	clientSecret = r.Form.Get("client_secret")
 	if clientID == "" || clientSecret == "" {
-		err = errors.ErrInvalidRequest
+		err = errors.ErrInvalidClient
 	}
 	return
 }