Skip to content

Add a policy scheme to allow switching between cookie / bearer auth #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrew-propelauth merged 1 commit into from
Mar 4, 2025
Merged

Add a policy scheme to allow switching between cookie / bearer auth #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions PropelAuth/PropelAuthExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,17 @@ private static void ConfigureAuthentication(IServiceCollection services, PropelA
{
var authBuilder = services.AddAuthentication(authOptions =>
{
if (options.OAuthOptions != null)
if (options.OAuthOptions is {AllowBearerTokenAuth: true})
{
authOptions.DefaultAuthenticateScheme = "OAuthOrBearer";
authOptions.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
authOptions.DefaultChallengeScheme = "OAuthOrBearer";
}
else if (options.OAuthOptions != null)
{
authOptions.DefaultAuthenticateScheme = CookieAuthenticationDefaults.AuthenticationScheme;
authOptions.DefaultSignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
authOptions.DefaultChallengeScheme = "PropelAuth";
authOptions.DefaultChallengeScheme = "OAuth";
}
else
{
Expand All @@ -90,6 +96,23 @@ private static void ConfigureAuthentication(IServiceCollection services, PropelA
}
});

if (options.OAuthOptions is {AllowBearerTokenAuth: true})
{
authBuilder.AddPolicyScheme("OAuthOrBearer", "OAuth or Bearer", policyOptions =>
{
policyOptions.ForwardDefaultSelector = context =>
{
if (context.Request.Headers.ContainsKey("Authorization"))
{
return JwtBearerDefaults.AuthenticationScheme;
}

return "OAuth";
};
});
}


if (options.OAuthOptions == null || options.OAuthOptions.AllowBearerTokenAuth == true)
{
authBuilder.AddJwtBearer(jwtOptions =>
Expand All @@ -104,7 +127,8 @@ private static void ConfigureAuthentication(IServiceCollection services, PropelA
};
});
}
else

if (options.OAuthOptions != null)
{
authBuilder
.AddCookie(cookieOptions =>
Expand All @@ -114,7 +138,7 @@ private static void ConfigureAuthentication(IServiceCollection services, PropelA
cookieOptions.Cookie.SecurePolicy = CookieSecurePolicy.Always;
cookieOptions.SlidingExpiration = true;
})
.AddOAuth("PropelAuth", configOptions =>
.AddOAuth("OAuth", configOptions =>
{
configOptions.AuthorizationEndpoint = $"{options.AuthUrl}/propelauth/oauth/authorize";
configOptions.TokenEndpoint = $"{options.AuthUrl}/propelauth/oauth/token";
Expand All @@ -134,6 +158,7 @@ private static void ConfigureAuthentication(IServiceCollection services, PropelA
{
context.Identity?.AddClaim(claim);
}

return Task.CompletedTask;
}
};
Expand Down
Loading