diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 89f254e58b1..612dc51bd22 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -174,6 +174,7 @@ protected void DeleteUnrelatedProjects(ProjectBuildContext context, List() .AddBaseTypes( - typeof(AbpUiResource) + typeof(AbpUiResource), + typeof(AccountResource) ); }); diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml index 55b17f34532..fb4d0ba9ced 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/Pages/Index.cshtml @@ -16,6 +16,14 @@ Layout = Theme.GetEmptyLayout(); } +@section styles { + +} +
@@ -30,37 +38,30 @@

@BrandingProvider.AppName

}
+
- - -
-
- -
-
- @if (CurrentUser.IsAuthenticated) - { - - @L["Welcome"] @CurrentUser.UserName - - @CurrentUser.Email - - } - else - { - @L["Login"] - } -
- + +
+
+ @if (CurrentUser.IsAuthenticated) + { + + } + else + { + @L["Login"] + } +
- + +
@@ -78,16 +79,17 @@
-
- - @if (Model.Applications != null) - { - foreach (var application in Model.Applications) + + @if (Model.Applications != null) + { +
+ + + @foreach (var application in Model.Applications) { - @if (!application.LogoUri.IsNullOrEmpty()) {
@@ -96,16 +98,13 @@ }

@application.DisplayName

- @application.ClientUri - + @application.ClientUri } - } - + + }
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json index 5332ea7677b..1797992d04b 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json @@ -9,24 +9,32 @@ // "OpenIddict": { "Applications": { + // "MyProjectName_Web": { "ClientId": "MyProjectName_Web", "ClientSecret": "1q2w3e*", "RootUrl": "https://localhost:44302" }, + // + // "MyProjectName_Blazor": { "ClientId": "MyProjectName_Blazor", "RootUrl": "https://localhost:44307" }, + // + // "MyProjectName_App": { "ClientId": "MyProjectName_App", "RootUrl": "http://localhost:4200" }, + // + // "MyProjectName_BlazorServerTiered": { "ClientId": "MyProjectName_BlazorServerTiered", "ClientSecret": "1q2w3e*", "RootUrl": "https://localhost:44309" }, + // "MyProjectName_Swagger": { "ClientId": "MyProjectName_Swagger", "RootUrl": "https://localhost:44305" diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs index ccf35ec0269..a1af7f6b6af 100644 --- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs +++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs @@ -79,6 +79,7 @@ private async Task CreateApplicationsAsync() var configurationSection = _configuration.GetSection("OpenIddict:Applications"); + // //Web Client var webClientId = configurationSection["MyProjectName_Web:ClientId"]; if (!webClientId.IsNullOrWhiteSpace()) @@ -103,7 +104,9 @@ await CreateApplicationAsync( postLogoutRedirectUri: $"{webClientRootUrl}signout-callback-oidc" ); } + // + // //Console Test / Angular Client var consoleAndAngularClientId = configurationSection["MyProjectName_App:ClientId"]; if (!consoleAndAngularClientId.IsNullOrWhiteSpace()) @@ -127,7 +130,9 @@ await CreateApplicationAsync( postLogoutRedirectUri: consoleAndAngularClientRootUrl ); } + // + // // Blazor Client var blazorClientId = configurationSection["MyProjectName_Blazor:ClientId"]; if (!blazorClientId.IsNullOrWhiteSpace()) @@ -147,7 +152,9 @@ await CreateApplicationAsync( postLogoutRedirectUri: $"{blazorRootUrl}/authentication/logout-callback" ); } + // + // // Blazor Server Tiered Client var blazorServerTieredClientId = configurationSection["MyProjectName_BlazorServerTiered:ClientId"]; if (!blazorServerTieredClientId.IsNullOrWhiteSpace()) @@ -170,7 +177,9 @@ await CreateApplicationAsync( postLogoutRedirectUri: $"{blazorServerTieredRootUrl}signout-callback-oidc" ); } + // + // // Swagger Client var swaggerClientId = configurationSection["MyProjectName_Swagger:ClientId"]; if (!swaggerClientId.IsNullOrWhiteSpace()) @@ -189,6 +198,7 @@ await CreateApplicationAsync( clientUri: swaggerRootUrl ); } + // } private async Task CreateApplicationAsync(