Tweak the device identifier attachment logic

t1moH1ch · Feb 10, 2025 · da82d11 · da82d11
1 parent f937100
commit da82d11
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs b/src/OpenIddict.Client.WebIntegration/OpenIddictClientWebIntegrationHandlers.cs
@@ -660,17 +660,20 @@ public ValueTask HandleAsync(ProcessAuthenticationContext context)
             }
 
             // VK ID requires attaching a non-standard "device_id" parameter to all token requests.
+            //
             // This parameter is either resolved from the authorization response (for the authorization
             // code or hybrid grants) or manually provided by the application for other grant types.
             else if (context.Registration.ProviderType is ProviderTypes.VkId)
             {
-                if (!context.Properties.TryGetValue(VkId.Properties.DeviceId, out string? identifier) ||
-                    string.IsNullOrEmpty(identifier))
+                context.TokenRequest["device_id"] = context.GrantType switch
                 {
-                    throw new InvalidOperationException(SR.GetResourceString(SR.ID0467));
-                }
+                    GrantTypes.AuthorizationCode or GrantTypes.Implicit => context.Request["device_id"],
+
+                    _ when context.Properties.TryGetValue(VkId.Properties.DeviceId, out string? identifier) &&
+                        !string.IsNullOrEmpty(identifier) => identifier,
 
-                context.TokenRequest["device_id"] = identifier;
+                    _ => throw new InvalidOperationException(SR.GetResourceString(SR.ID0467))
+                };
             }
 
             return default;