Browse Source

Update data seeder for app-template

pull/17660/head
Engincan VESKE 3 years ago
parent
commit
91cd731042
  1. 4
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
  2. 10
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json
  3. 10
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs

4
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@ -399,6 +399,7 @@ public abstract class AppTemplateBase : TemplateInfo
steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host")); steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
context.Symbols.Add("HostWithIds");
steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305")); steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
} }
} }
@ -424,6 +425,7 @@ public abstract class AppTemplateBase : TemplateInfo
steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host")); steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
context.Symbols.Add("HostWithIds");
steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305")); steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
} }
@ -517,6 +519,7 @@ public abstract class AppTemplateBase : TemplateInfo
steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host")); steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
context.Symbols.Add("HostWithIds");
steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305")); steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
} }
@ -554,6 +557,7 @@ public abstract class AppTemplateBase : TemplateInfo
steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.AuthServer"));
steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host")); steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds", "MyCompanyName.MyProjectName.HttpApi.Host"));
context.Symbols.Add("HostWithIds");
steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305")); steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep("44305"));
} }
} }

10
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json

@ -9,28 +9,38 @@
//</TEMPLATE-REMOVE> //</TEMPLATE-REMOVE>
"OpenIddict": { "OpenIddict": {
"Applications": { "Applications": {
//<TEMPLATE-REMOVE IF-NOT='ui:mvc'>
"MyProjectName_Web": { "MyProjectName_Web": {
"ClientId": "MyProjectName_Web", "ClientId": "MyProjectName_Web",
"ClientSecret": "1q2w3e*", "ClientSecret": "1q2w3e*",
"RootUrl": "https://localhost:44302" "RootUrl": "https://localhost:44302"
}, },
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='ui:blazor'>
"MyProjectName_Blazor": { "MyProjectName_Blazor": {
"ClientId": "MyProjectName_Blazor", "ClientId": "MyProjectName_Blazor",
"RootUrl": "https://localhost:44307" "RootUrl": "https://localhost:44307"
}, },
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='ui:angular'>
"MyProjectName_App": { "MyProjectName_App": {
"ClientId": "MyProjectName_App", "ClientId": "MyProjectName_App",
"RootUrl": "http://localhost:4200" "RootUrl": "http://localhost:4200"
}, },
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='ui:blazor-server&&TIERED'>
"MyProjectName_BlazorServerTiered": { "MyProjectName_BlazorServerTiered": {
"ClientId": "MyProjectName_BlazorServerTiered", "ClientId": "MyProjectName_BlazorServerTiered",
"ClientSecret": "1q2w3e*", "ClientSecret": "1q2w3e*",
"RootUrl": "https://localhost:44309" "RootUrl": "https://localhost:44309"
}, },
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='HostWithIds'>
"MyProjectName_Swagger": { "MyProjectName_Swagger": {
"ClientId": "MyProjectName_Swagger", "ClientId": "MyProjectName_Swagger",
"RootUrl": "https://localhost:44305" "RootUrl": "https://localhost:44305"
} }
//</TEMPLATE-REMOVE>
} }
} }
} }

10
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/OpenIddict/OpenIddictDataSeedContributor.cs

@ -79,6 +79,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
var configurationSection = _configuration.GetSection("OpenIddict:Applications"); var configurationSection = _configuration.GetSection("OpenIddict:Applications");
//<TEMPLATE-REMOVE IF-NOT='ui:mvc'>
//Web Client //Web Client
var webClientId = configurationSection["MyProjectName_Web:ClientId"]; var webClientId = configurationSection["MyProjectName_Web:ClientId"];
if (!webClientId.IsNullOrWhiteSpace()) if (!webClientId.IsNullOrWhiteSpace())
@ -103,7 +104,9 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
postLogoutRedirectUri: $"{webClientRootUrl}signout-callback-oidc" postLogoutRedirectUri: $"{webClientRootUrl}signout-callback-oidc"
); );
} }
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='ui:angular'>
//Console Test / Angular Client //Console Test / Angular Client
var consoleAndAngularClientId = configurationSection["MyProjectName_App:ClientId"]; var consoleAndAngularClientId = configurationSection["MyProjectName_App:ClientId"];
if (!consoleAndAngularClientId.IsNullOrWhiteSpace()) if (!consoleAndAngularClientId.IsNullOrWhiteSpace())
@ -127,7 +130,9 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
postLogoutRedirectUri: consoleAndAngularClientRootUrl postLogoutRedirectUri: consoleAndAngularClientRootUrl
); );
} }
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='ui:blazor'>
// Blazor Client // Blazor Client
var blazorClientId = configurationSection["MyProjectName_Blazor:ClientId"]; var blazorClientId = configurationSection["MyProjectName_Blazor:ClientId"];
if (!blazorClientId.IsNullOrWhiteSpace()) if (!blazorClientId.IsNullOrWhiteSpace())
@ -147,7 +152,9 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
postLogoutRedirectUri: $"{blazorRootUrl}/authentication/logout-callback" postLogoutRedirectUri: $"{blazorRootUrl}/authentication/logout-callback"
); );
} }
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='ui:blazor-server&&TIERED'>
// Blazor Server Tiered Client // Blazor Server Tiered Client
var blazorServerTieredClientId = configurationSection["MyProjectName_BlazorServerTiered:ClientId"]; var blazorServerTieredClientId = configurationSection["MyProjectName_BlazorServerTiered:ClientId"];
if (!blazorServerTieredClientId.IsNullOrWhiteSpace()) if (!blazorServerTieredClientId.IsNullOrWhiteSpace())
@ -170,7 +177,9 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
postLogoutRedirectUri: $"{blazorServerTieredRootUrl}signout-callback-oidc" postLogoutRedirectUri: $"{blazorServerTieredRootUrl}signout-callback-oidc"
); );
} }
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='HostWithIds'>
// Swagger Client // Swagger Client
var swaggerClientId = configurationSection["MyProjectName_Swagger:ClientId"]; var swaggerClientId = configurationSection["MyProjectName_Swagger:ClientId"];
if (!swaggerClientId.IsNullOrWhiteSpace()) if (!swaggerClientId.IsNullOrWhiteSpace())
@ -189,6 +198,7 @@ public class OpenIddictDataSeedContributor : IDataSeedContributor, ITransientDep
clientUri: swaggerRootUrl clientUri: swaggerRootUrl
); );
} }
//</TEMPLATE-REMOVE>
} }
private async Task CreateApplicationAsync( private async Task CreateApplicationAsync(

Loading…
Cancel
Save