SolarNetwork/Swarm
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

♻️ Refactor OpenID: Phase 3: Async Flow Modernization

Browse Source 
- Added async GetAuthorizationUrlAsync() methods to all OIDC providers
- Updated base OidcService with abstract async contract and backward-compatible sync wrapper
- Modified OidcController to use async authorization URL generation
- Removed sync blocks using .GetAwaiter().GetResult() in Google provider
- Maintained backward compatibility with existing sync method calls
- Eliminated thread blocking and improved async flow throughout auth pipeline
- Enhanced scalability by allowing non-blocking async authorization URL generation
This commit is contained in:
LittleSheep
2025-11-02 14:58:23 +08:00
parent 74a9ca98ad
commit b9edf51f05
8 changed files with 81 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DysonNetwork.Pass/Auth/OpenId/AfdianOidcService.cs
View File

@@ -17,6 +17,11 @@ public class AfdianOidcService(
protected override string DiscoveryEndpoint => ""; // Afdian doesn't have a standard OIDC discovery endpoint
protected override string ConfigSectionName => "Afdian";
public override Task<string> GetAuthorizationUrlAsync(string state, string nonce)
{
return Task.FromResult(GetAuthorizationUrl(state, nonce));
}
public override string GetAuthorizationUrl(string state, string nonce)
{
var config = GetProviderConfig();
@@ -90,4 +95,4 @@ public class AfdianOidcService(
throw;
}
}
}
}

26
DysonNetwork.Pass/Auth/OpenId/AppleOidcService.cs
View File

@@ -27,6 +27,30 @@ public class AppleOidcService(
protected override string DiscoveryEndpoint => "https://appleid.apple.com/.well-known/openid-configuration";
protected override string ConfigSectionName => "Apple";
public override async Task<string> GetAuthorizationUrlAsync(string state, string nonce)
{
var config = GetProviderConfig();
var discoveryDocument = await GetDiscoveryDocumentAsync();
if (discoveryDocument?.AuthorizationEndpoint == null)
{
throw new InvalidOperationException("Authorization endpoint not found in discovery document");
}
var queryParams = BuildAuthorizationParameters(
config.ClientId,
config.RedirectUri,
"name email",
"code id_token",
state,
nonce,
"form_post"
);
var queryString = string.Join("&", queryParams.Select(p => $"{p.Key}={Uri.EscapeDataString(p.Value)}"));
return $"{discoveryDocument.AuthorizationEndpoint}?{queryString}";
}
public override string GetAuthorizationUrl(string state, string nonce)
{
var config = GetProviderConfig();
@@ -276,4 +300,4 @@ public class AppleKey
return Convert.FromBase64String(output);
}
}
}

7
DysonNetwork.Pass/Auth/OpenId/DiscordOidcService.cs
View File

@@ -16,6 +16,11 @@ public class DiscordOidcService(
protected override string DiscoveryEndpoint => ""; // Discord doesn't have a standard OIDC discovery endpoint
protected override string ConfigSectionName => "Discord";
public override Task<string> GetAuthorizationUrlAsync(string state, string nonce)
{
return Task.FromResult(GetAuthorizationUrl(state, nonce));
}
public override string GetAuthorizationUrl(string state, string nonce)
{
var config = GetProviderConfig();
@@ -111,4 +116,4 @@ public class DiscordOidcService(
Provider = ProviderName
};
}
}
}

7
DysonNetwork.Pass/Auth/OpenId/GitHubOidcService.cs
View File

@@ -16,6 +16,11 @@ public class GitHubOidcService(
protected override string DiscoveryEndpoint => ""; // GitHub doesn't have a standard OIDC discovery endpoint
protected override string ConfigSectionName => "GitHub";
public override Task<string> GetAuthorizationUrlAsync(string state, string nonce)
{
return Task.FromResult(GetAuthorizationUrl(state, nonce));
}
public override string GetAuthorizationUrl(string state, string nonce)
{
var config = GetProviderConfig();
@@ -123,4 +128,4 @@ public class GitHubOidcService(
public bool Primary { get; set; }
public bool Verified { get; set; }
}
}
}

6
DysonNetwork.Pass/Auth/OpenId/GoogleOidcService.cs
View File

@@ -19,10 +19,10 @@ public class GoogleOidcService(
protected override string DiscoveryEndpoint => "https://accounts.google.com/.well-known/openid-configuration";
protected override string ConfigSectionName => "Google";
public override string GetAuthorizationUrl(string state, string nonce)
public override async Task<string> GetAuthorizationUrlAsync(string state, string nonce)
{
var config = GetProviderConfig();
var discoveryDocument = GetDiscoveryDocumentAsync().GetAwaiter().GetResult();
var discoveryDocument = await GetDiscoveryDocumentAsync();
if (discoveryDocument?.AuthorizationEndpoint == null)
{
@@ -48,7 +48,7 @@ public class GoogleOidcService(
// Store code verifier in cache for later token exchange
var codeVerifierKey = $"pkce:{state}";
cache.SetAsync(codeVerifierKey, codeVerifier, TimeSpan.FromMinutes(15)).GetAwaiter().GetResult();
await cache.SetAsync(codeVerifierKey, codeVerifier, TimeSpan.FromMinutes(15));
var queryString = string.Join("&", queryParams.Select(p => $"{p.Key}={Uri.EscapeDataString(p.Value)}"));
return $"{discoveryDocument.AuthorizationEndpoint}?{queryString}";

23
DysonNetwork.Pass/Auth/OpenId/MicrosoftOidcService.cs
View File

@@ -20,6 +20,27 @@ public class MicrosoftOidcService(
protected override string ConfigSectionName => "Microsoft";
public override async Task<string> GetAuthorizationUrlAsync(string state, string nonce)
{
var config = GetProviderConfig();
var discoveryDocument = await GetDiscoveryDocumentAsync();
if (discoveryDocument?.AuthorizationEndpoint == null)
throw new InvalidOperationException("Authorization endpoint not found in discovery document.");
var queryParams = BuildAuthorizationParameters(
config.ClientId,
config.RedirectUri,
"openid profile email",
"code",
state,
nonce
);
var queryString = string.Join("&", queryParams.Select(p => $"{p.Key}={Uri.EscapeDataString(p.Value)}"));
return $"{discoveryDocument.AuthorizationEndpoint}?{queryString}";
}
public override string GetAuthorizationUrl(string state, string nonce)
{
var config = GetProviderConfig();
@@ -120,4 +141,4 @@ public class MicrosoftOidcService(
Provider = ProviderName
};
}
}
}

6
DysonNetwork.Pass/Auth/OpenId/OidcController.cs
View File

@@ -43,7 +43,7 @@ public class OidcController(
await cache.SetAsync($"{StateCachePrefix}{state}", oidcState, StateExpiration);
// The state parameter sent to the provider is the GUID key for the cache.
var authUrl = oidcService.GetAuthorizationUrl(state, nonce);
var authUrl = await oidcService.GetAuthorizationUrlAsync(state, nonce);
return Redirect(authUrl);
}
else // Otherwise, proceed with the login / registration flow
@@ -54,7 +54,7 @@ public class OidcController(
// Create login state with return URL and device ID
var oidcState = OidcState.ForLogin(returnUrl ?? "/", deviceId);
await cache.SetAsync($"{StateCachePrefix}{state}", oidcState, StateExpiration);
var authUrl = oidcService.GetAuthorizationUrl(state, nonce);
var authUrl = await oidcService.GetAuthorizationUrlAsync(state, nonce);
return Redirect(authUrl);
}
}
@@ -194,4 +194,4 @@ public class OidcController(
return newAccount;
}
}
}

12
DysonNetwork.Pass/Auth/OpenId/OidcService.cs
View File

@@ -42,9 +42,17 @@ public abstract class OidcService(
protected abstract string ConfigSectionName { get; }
/// <summary>
/// Gets the authorization URL for initiating the authentication flow
/// Gets the authorization URL for initiating the authentication flow (async)
/// </summary>
public abstract string GetAuthorizationUrl(string state, string nonce);
public abstract Task<string> GetAuthorizationUrlAsync(string state, string nonce);
/// <summary>
/// Gets the authorization URL for initiating the authentication flow (sync for backward compatibility)
/// </summary>
public virtual string GetAuthorizationUrl(string state, string nonce)
{
return GetAuthorizationUrlAsync(state, nonce).GetAwaiter().GetResult();
}
/// <summary>
/// Builds common authorization URL query parameters