Skip to content
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

Jump to bottom

Fix/admin logout redirect #374

Merged
merged 5 commits into from
Oct 20, 2019
Merged

Fix/admin logout redirect #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3729ca3
Merge pull request #300 from skoruba/dev
skoruba Jun 19, 2019
40f1a1a
Merge branch 'dev' of https://github.com/skoruba/IdentityServer4.Admi…
aiscrim Oct 2, 2019
7c3b476
Merge remote-tracking branch 'upstream/dev' into dev
aiscrim Oct 7, 2019
3a3c8f9
Removed wrong RedirectUri in SignOutResult
aiscrim Oct 9, 2019
c4fff44
Added AdminApi base url setting: when the AdminApi is hosted in a sub…
aiscrim Oct 9, 2019
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
2 changes: 2 additions & 0 deletions src/Skoruba.IdentityServer4.Admin.Api/Configuration/AdminApiConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ public class AdminApiConfiguration

public string IdentityServerBaseUrl { get; set; }

public string ApiBaseUrl { get; set; }

public string OidcSwaggerUIClientId { get; set; }

public string OidcApiName { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion src/Skoruba.IdentityServer4.Admin.Api/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, AdminApi
app.UseSwagger();
app.UseSwaggerUI(c =>
{
c.SwaggerEndpoint("/swagger/v1/swagger.json", adminApiConfiguration.ApiName);
c.SwaggerEndpoint($"{adminApiConfiguration.ApiBaseUrl}/swagger/v1/swagger.json", adminApiConfiguration.ApiName);

c.OAuthClientId(adminApiConfiguration.OidcSwaggerUIClientId);
c.OAuthAppName(adminApiConfiguration.ApiName);
Expand Down
17 changes: 9 additions & 8 deletions src/Skoruba.IdentityServer4.Admin.Api/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
"IdentityDbConnection": "Server=(localdb)\\mssqllocaldb;Database=IdentityServer4Admin;Trusted_Connection=True;MultipleActiveResultSets=true",
"AdminLogDbConnection": "Server=(localdb)\\mssqllocaldb;Database=IdentityServer4Admin;Trusted_Connection=True;MultipleActiveResultSets=true"
},
"AdminApiConfiguration": {
"ApiName": "Skoruba IdentityServer4 Admin Api",
"ApiVersion": "v1",
"IdentityServerBaseUrl": "http://localhost:5000",
"OidcSwaggerUIClientId": "skoruba_identity_admin_api_swaggerui",
"OidcApiName": "skoruba_identity_admin_api",
"AdministrationRole": "SkorubaIdentityAdminAdministrator"
}
"AdminApiConfiguration": {
"ApiName": "Skoruba IdentityServer4 Admin Api",
"ApiVersion": "v1",
"ApiBaseUrl": "http://localhost:5001",
"IdentityServerBaseUrl": "http://localhost:5000",
"OidcSwaggerUIClientId": "skoruba_identity_admin_api_swaggerui",
"OidcApiName": "skoruba_identity_admin_api",
"AdministrationRole": "SkorubaIdentityAdminAdministrator"
}
}
3 changes: 1 addition & 2 deletions src/Skoruba.IdentityServer4.Admin/Controllers/AccountController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ public IActionResult AccessDenied()

public IActionResult Logout()
{
return new SignOutResult(new List<string> { AuthenticationConsts.SignInScheme, AuthenticationConsts.OidcAuthenticationScheme },
new AuthenticationProperties { RedirectUri = "/" });
return new SignOutResult(new List<string> { AuthenticationConsts.SignInScheme, AuthenticationConsts.OidcAuthenticationScheme });
}
}
}