Skip to content

Fix OidcTests on Mac #3372

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

Open
gunndabad wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −5
Open

Fix OidcTests on Mac #3372

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
26 changes: 21 additions & 5 deletions TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/TestAppConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,22 @@ public static WebApplicationBuilder AddTestApp(this WebApplicationBuilder builde

authBuilder.AddOpenIdConnect(TestAppConfiguration.AuthenticationSchemeName, options =>
{
ConfigureOpenIdConnectOptions(options, TestAppConfiguration.ClientId, TestAppConfiguration.ClientSecret,
TestAppConfiguration.RedirectUriPath, TestAppConfiguration.PostLogoutRedirectUriPath);
ConfigureOpenIdConnectOptions(
options,
TestAppConfiguration.ClientId,
TestAppConfiguration.ClientSecret,
TestAppConfiguration.RedirectUriPath,
TestAppConfiguration.PostLogoutRedirectUriPath);
});

authBuilder.AddOpenIdConnect(DeferredTestAppConfiguration.AuthenticationSchemeName, options =>
{
ConfigureOpenIdConnectOptions(options, DeferredTestAppConfiguration.ClientId, DeferredTestAppConfiguration.ClientSecret,
DeferredTestAppConfiguration.RedirectUriPath, DeferredTestAppConfiguration.PostLogoutRedirectUriPath);
ConfigureOpenIdConnectOptions(
options,
DeferredTestAppConfiguration.ClientId,
DeferredTestAppConfiguration.ClientSecret,
DeferredTestAppConfiguration.RedirectUriPath,
DeferredTestAppConfiguration.PostLogoutRedirectUriPath);
});
}
else
Expand All @@ -59,7 +67,12 @@ public static WebApplicationBuilder AddTestApp(this WebApplicationBuilder builde
return builder;
}

private static void ConfigureOpenIdConnectOptions(OpenIdConnectOptions options, string clientId, string clientSecret, string callbackPath, string signedOutCallbackPath)
private static void ConfigureOpenIdConnectOptions(
OpenIdConnectOptions options,
string clientId,
string clientSecret,
string callbackPath,
string signedOutCallbackPath)
{
options.Authority = "https://localhost:7236";
options.SignInScheme = CookieAuthenticationDefaults.AuthenticationScheme;
Expand All @@ -83,6 +96,9 @@ private static void ConfigureOpenIdConnectOptions(OpenIdConnectOptions options,
options.ClaimActions.Add(new MapJsonClaimAction(AuthorizeAccessClaimTypes.VerifiedName));
options.ClaimActions.Add(new MapJsonClaimAction(AuthorizeAccessClaimTypes.VerifiedDateOfBirth));

options.CorrelationCookie.SecurePolicy = CookieSecurePolicy.None;
options.NonceCookie.SecurePolicy = CookieSecurePolicy.None;

options.Events.OnRedirectToIdentityProvider = ctx =>
{
if (ctx.Properties.Parameters.TryGetValue("TrnToken", out var trnTokenObj) && trnTokenObj is string trnToken)
Expand Down
Loading