Fix saving granted resource scopes in AuthorizationContext

Abblix · Jul 5, 2024 · 38016c2 · 38016c2
1 parent e06354e
commit 38016c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Abblix.Oidc.Server/Endpoints/Authorization/AuthorizationRequestProcessor.cs b/Abblix.Oidc.Server/Endpoints/Authorization/AuthorizationRequestProcessor.cs
@@ -149,7 +149,11 @@ public async Task<AuthorizationResponse> ProcessAsync(ValidAuthorizationRequest
 
 		var clientId = request.ClientInfo.ClientId;
 		var grantedConsents = userConsents.Granted;
-		var scopes = Array.ConvertAll(grantedConsents.Scopes, scope => scope.Scope);
+		var scopes = grantedConsents.Scopes
+			.Concat(grantedConsents.Resources.SelectMany(rd => rd.Scopes))
+			.Select(sd => sd.Scope)
+			.Distinct()
+			.ToArray();
 		var resources = Array.ConvertAll(grantedConsents.Resources, resource => resource.Resource);
 		var authContext = new AuthorizationContext(clientId, scopes, model.Claims)
 		{

diff --git a/Abblix.Oidc.Server/Endpoints/Token/TokenAuthorizationContextEvaluator.cs b/Abblix.Oidc.Server/Endpoints/Token/TokenAuthorizationContextEvaluator.cs
@@ -55,7 +55,9 @@ public AuthorizationContext EvaluateAuthorizationContext(ValidTokenRequest reque
         var resources = authContext.Resources;
         if (resources is { Length: > 0 } && request.Resources is { Length: > 0 })
         {
-            resources = resources.Intersect(from rd in request.Resources select rd.Resource).ToArray();
+            resources = resources
+                .Intersect(from rd in request.Resources select rd.Resource)
+                .ToArray();
         }
 
         // Return a new authorization context updated with the determined scopes and resources.