fix: enforcement

authelia · Dec 8, 2024 · 7060abd · 7060abd
1 parent d697229
commit 7060abd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/handler/oauth2/strategy_jwt_profile.go b/handler/oauth2/strategy_jwt_profile.go
@@ -45,11 +45,12 @@ func (s *JWTProfileCoreStrategy) GenerateAccessToken(ctx context.Context, reques
 	)
 
 	if s.Config.GetEnforceJWTProfileAccessTokens(ctx) {
-		return s.GenerateJWT(ctx, oauth2.AccessToken, requester, nil)
-	}
+	enforce := s.Config.GetEnforceJWTProfileAccessTokens(ctx)
 
-	if client, ok = requester.GetClient().(oauth2.JWTProfileClient); ok && client.GetEnableJWTProfileOAuthAccessTokens() {
+	if client, ok = requester.GetClient().(oauth2.JWTProfileClient); ok && (enforce || client.GetEnableJWTProfileOAuthAccessTokens()) {
 		return s.GenerateJWT(ctx, oauth2.AccessToken, requester, client)
+	} else if enforce {
+		return s.GenerateJWT(ctx, oauth2.AccessToken, requester, nil)
 	}
 
 	return s.HMACCoreStrategy.GenerateAccessToken(ctx, requester)