chore: resolve comments

canonical · Mar 12, 2024 · f930a81 · f930a81
1 parent 15d0e22
commit f930a81
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 24 deletions.
diff --git a/handler/oauth2/flow_authorize_code_token.go b/handler/oauth2/flow_authorize_code_token.go
@@ -17,7 +17,7 @@ type AuthorizeCodeHandler struct {
 	AuthorizeCodeStrategy AuthorizeCodeStrategy
 }
 
-func (c AuthorizeCodeHandler) Code(ctx context.Context, requester fosite.AccessRequester) (code string, signature string, err error) {
+func (c AuthorizeCodeHandler) Code(ctx context.Context, requester fosite.AccessRequester) (code string, signature string, _ error) {
 	code = requester.GetRequestForm().Get("code")
 	signature = c.AuthorizeCodeStrategy.AuthorizeCodeSignature(ctx, code)
 	return code, signature, nil
@@ -35,13 +35,13 @@ func (s AuthorizeExplicitGrantSessionHandler) Session(ctx context.Context, reque
 	req, err := s.AuthorizeCodeStorage.GetAuthorizeCodeSession(ctx, codeSignature, requester.GetSession())
 
 	if err != nil && errors.Is(err, fosite.ErrInvalidatedAuthorizeCode) {
-		if req == nil {
-			return req, fosite.ErrServerError.
-				WithHint("Misconfigured code lead to an error that prohibited the OAuth 2.0 Framework from processing this request.").
-				WithDebug("\"GetAuthorizeCodeSession\" must return a value for \"fosite.Requester\" when returning \"ErrInvalidatedAuthorizeCode\".")
+		if req != nil {
+			return req, err
 		}
 
-		return req, err
+		return req, fosite.ErrServerError.
+			WithHint("Misconfigured code lead to an error that prohibited the OAuth 2.0 Framework from processing this request.").
+			WithDebug("\"GetAuthorizeCodeSession\" must return a value for \"fosite.Requester\" when returning \"ErrInvalidatedAuthorizeCode\".")
 	}
 
 	if err != nil && errors.Is(err, fosite.ErrNotFound) {

diff --git a/handler/oauth2/flow_generic_code_token.go b/handler/oauth2/flow_generic_code_token.go
@@ -75,13 +75,14 @@ func (c *GenericCodeTokenEndpointHandler) PopulateTokenEndpointResponse(ctx cont
 		return errorsx.WithStack(fosite.ErrUnknownRequest)
 	}
 
-	code, signature, err := c.Code(ctx, requester)
-	if err != nil {
+	var code, signature string
+	var err error
+	if code, signature, err = c.Code(ctx, requester); err != nil {
 		return err
 	}
 
-	ar, err := c.Session(ctx, requester, signature)
-	if err != nil {
+	var ar fosite.Requester
+	if ar, err = c.Session(ctx, requester, signature); err != nil {
 		return errorsx.WithStack(fosite.ErrServerError.WithWrap(err).WithDebug(err.Error()))
 	}
 
@@ -97,7 +98,8 @@ func (c *GenericCodeTokenEndpointHandler) PopulateTokenEndpointResponse(ctx cont
 		requester.GrantAudience(audience)
 	}
 
-	accessToken, accessTokenSignature, err := c.AccessTokenStrategy.GenerateAccessToken(ctx, requester)
+	var accessToken, accessTokenSignature string
+	accessToken, accessTokenSignature, err = c.AccessTokenStrategy.GenerateAccessToken(ctx, requester)
 	if err != nil {
 		return errorsx.WithStack(fosite.ErrServerError.WithWrap(err).WithDebug(err.Error()))
 	}
@@ -157,20 +159,22 @@ func (c *GenericCodeTokenEndpointHandler) HandleTokenEndpointRequest(ctx context
 		return errorsx.WithStack(errorsx.WithStack(fosite.ErrUnknownRequest))
 	}
 
-	if err := c.ValidateGrantTypes(requester); err != nil {
+	var err error
+	if err = c.ValidateGrantTypes(requester); err != nil {
 		return err
 	}
 
-	code, signature, err := c.Code(ctx, requester)
-	if err != nil {
+	var code, signature string
+	if code, signature, err = c.Code(ctx, requester); err != nil {
 		return err
 	}
 
-	ar, err := c.Session(ctx, requester, signature)
-	if ar != nil && err != nil && (errors.Is(err, fosite.ErrInvalidatedAuthorizeCode) || errors.Is(err, fosite.ErrInvalidatedDeviceCode)) {
-		return c.revokeTokens(ctx, requester.GetID())
-	}
-	if err != nil {
+	var ar fosite.Requester
+	if ar, err = c.Session(ctx, requester, signature); err != nil {
+		if ar != nil && (errors.Is(err, fosite.ErrInvalidatedAuthorizeCode) || errors.Is(err, fosite.ErrInvalidatedDeviceCode)) {
+			return c.revokeTokens(ctx, requester.GetID())
+		}
+
 		return err
 	}
 

diff --git a/handler/rfc8628/token_handler.go b/handler/rfc8628/token_handler.go
@@ -46,13 +46,13 @@ func (s DeviceSessionHandler) Session(ctx context.Context, requester fosite.Acce
 	req, err := s.DeviceCodeStorage.GetDeviceCodeSession(ctx, codeSignature, requester.GetSession())
 
 	if err != nil && errors.Is(err, fosite.ErrInvalidatedDeviceCode) {
-		if req == nil {
-			return req, fosite.ErrServerError.
-				WithHint("Misconfigured code lead to an error that prohibited the OAuth 2.0 Framework from processing this request.").
-				WithDebug("\"GetDeviceCodeSession\" must return a value for \"fosite.Requester\" when returning \"ErrInvalidatedDeviceCode\".")
+		if req != nil {
+			return req, err
 		}
 
-		return req, nil
+		return req, fosite.ErrServerError.
+			WithHint("Misconfigured code lead to an error that prohibited the OAuth 2.0 Framework from processing this request.").
+			WithDebug("\"GetDeviceCodeSession\" must return a value for \"fosite.Requester\" when returning \"ErrInvalidatedDeviceCode\".")
 	}
 
 	if err != nil && errors.Is(err, fosite.ErrNotFound) {