diff --git a/global.json b/global.json new file mode 100644 index 0000000..f49d7df --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "5.0.201", + "rollForward": "latestFeature" + } +} diff --git a/src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj b/src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj index 03800d6..9293877 100644 --- a/src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj +++ b/src/EventHub.BackgroundServices/EventHub.BackgroundServices.csproj @@ -35,4 +35,11 @@ + + + + + + + diff --git a/src/EventHub.IdentityServer/EventHubIdentityServerModule.cs b/src/EventHub.IdentityServer/EventHubIdentityServerModule.cs index 99959f8..2f91909 100644 --- a/src/EventHub.IdentityServer/EventHubIdentityServerModule.cs +++ b/src/EventHub.IdentityServer/EventHubIdentityServerModule.cs @@ -9,13 +9,16 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using EventHub.EntityFrameworkCore; using EventHub.Localization; +using EventHub.Web; using EventHub.Web.Theme; using EventHub.Web.Theme.Bundling; +using IdentityServer4.Configuration; using StackExchange.Redis; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Components.LayoutHook; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AspNetCore.Serilog; using Volo.Abp.Auditing; @@ -76,6 +79,17 @@ namespace EventHub options.ApplicationName = "AuthServer"; }); + Configure(options => + { + options.Applications["MVC"].RootUrl = EventHubExternalUrls.EhAccount; + }); + + Configure(options => + { + options.IssuerUri = EventHubExternalUrls.EhAccount; + }); + + if (hostingEnvironment.IsDevelopment()) { Configure(options => diff --git a/src/EventHub.IdentityServer/Pages/Index.cshtml b/src/EventHub.IdentityServer/Pages/Index.cshtml index e8033bc..282e062 100644 --- a/src/EventHub.IdentityServer/Pages/Index.cshtml +++ b/src/EventHub.IdentityServer/Pages/Index.cshtml @@ -15,10 +15,8 @@

@CurrentUser.UserName

@CurrentUser.Email
- Roles: @CurrentUser.Roles.JoinAsString(", ") -
- Claims:
- @Html.Raw(CurrentUser.GetAllClaims().Select(c => $"{c.Type}={c.Value}").JoinAsString("
")) +

Roles

@CurrentUser.Roles.JoinAsString(", ") +

Claims

@Html.Raw(CurrentUser.GetAllClaims().Select(c => $"{c.Type}={c.Value}").JoinAsString("
"))
diff --git a/src/EventHub.IdentityServer/wwwroot/assets/eventhub-logo.svg b/src/EventHub.IdentityServer/wwwroot/assets/eventhub-logo.svg new file mode 100644 index 0000000..eebde5b --- /dev/null +++ b/src/EventHub.IdentityServer/wwwroot/assets/eventhub-logo.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml index fe935b1..665c529 100644 --- a/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml +++ b/src/EventHub.Web.Theme/Themes/EventHub/Components/MainNavbar/Default.cshtml @@ -17,7 +17,9 @@ }