handler/oauth2: grant scopes before the access token is generated (#177)

Signed-off-by: Nikita Vorobey <nikita@vorobey.by>
ory · Jun 8, 2017 · 3497260 · 3497260
1 parent 82944aa
commit 3497260
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/handler/oauth2/flow_authorize_code_token.go b/handler/oauth2/flow_authorize_code_token.go
@@ -81,15 +81,15 @@ func (c *AuthorizeExplicitGrantHandler) PopulateTokenEndpointResponse(ctx contex
 		return errors.Wrap(fosite.ErrInvalidRequest, err.Error())
 	}
 
+	for _, scope := range authorizeRequest.GetGrantedScopes() {
+		requester.GrantScope(scope)
+	}
+
 	access, accessSignature, err := c.AccessTokenStrategy.GenerateAccessToken(ctx, requester)
 	if err != nil {
 		return errors.Wrap(fosite.ErrServerError, err.Error())
 	}
 
-	for _, scope := range authorizeRequest.GetGrantedScopes() {
-		requester.GrantScope(scope)
-	}
-
 	var refresh, refreshSignature string
 	if authorizeRequest.GetGrantedScopes().Has("offline") {
 		refresh, refreshSignature, err = c.RefreshTokenStrategy.GenerateRefreshToken(ctx, requester)