From 5ce7241514496ba126d8d2905883e1cab0ce814e Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 12 Nov 2020 17:47:11 +0800 Subject: [PATCH] Rename MyProjectName_ConsoleTestApp to MyProjectName_App. Resolve #6172 --- .../src/environments/environment.prod.ts | 2 +- .../dev-app/src/environments/environment.ts | 2 +- .../IdentityServerDataSeedContributor.cs | 17 +++++++++++------ .../appsettings.json | 6 ++++-- .../appsettings.json | 4 ++-- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/templates/module/angular/projects/dev-app/src/environments/environment.prod.ts b/templates/module/angular/projects/dev-app/src/environments/environment.prod.ts index 25bda95867..c510ffc21f 100644 --- a/templates/module/angular/projects/dev-app/src/environments/environment.prod.ts +++ b/templates/module/angular/projects/dev-app/src/environments/environment.prod.ts @@ -12,7 +12,7 @@ export const environment = { oAuthConfig: { issuer: 'https://localhost:44301', redirectUri: baseUrl, - clientId: 'MyProjectName_ConsoleTestApp', + clientId: 'MyProjectName_App', responseType: 'code', scope: 'offline_access MyProjectName', }, diff --git a/templates/module/angular/projects/dev-app/src/environments/environment.ts b/templates/module/angular/projects/dev-app/src/environments/environment.ts index e231e47b0e..06981b5f87 100644 --- a/templates/module/angular/projects/dev-app/src/environments/environment.ts +++ b/templates/module/angular/projects/dev-app/src/environments/environment.ts @@ -12,7 +12,7 @@ export const environment = { oAuthConfig: { issuer: 'https://localhost:44301', redirectUri: baseUrl, - clientId: 'MyProjectName_ConsoleTestApp', + clientId: 'MyProjectName_App', responseType: 'code', scope: 'offline_access MyProjectName', }, diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs index 52fd5c688b..39cd540f46 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs @@ -162,15 +162,20 @@ namespace MyCompanyName.MyProjectName.IdentityServer ); } - //Console Test Client - var consoleClientId = configurationSection["MyProjectName_ConsoleTestApp:ClientId"]; - if (!consoleClientId.IsNullOrWhiteSpace()) + //Console Test / Angular Client + var consoleAndAngularClientId = configurationSection["MyProjectName_App:ClientId"]; + if (!consoleAndAngularClientId.IsNullOrWhiteSpace()) { + var webClientRootUrl = configurationSection["MyProjectName_App:RootUrl"]?.TrimEnd('/'); + await CreateClientAsync( - name: consoleClientId, + name: consoleAndAngularClientId, scopes: commonScopes, - grantTypes: new[] {"password", "client_credentials"}, - secret: (configurationSection["MyProjectName_ConsoleTestApp:ClientSecret"] ?? "1q2w3e*").Sha256() + grantTypes: new[] { "password", "client_credentials", "authorization_code" }, + secret: (configurationSection["MyProjectName_App:ClientSecret"] ?? "1q2w3e*").Sha256(), + requireClientSecret: false, + redirectUri: webClientRootUrl, + postLogoutRedirectUri: webClientRootUrl ); } diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json index c3439a2d00..dd966995a3 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json @@ -25,8 +25,10 @@ "ClientId": "MyProjectName_Blazor", "RootUrl": "https://localhost:44307/" }, - "MyProjectName_ConsoleTestApp": { - "ClientId": "MyProjectName_ConsoleTestApp" + "MyProjectName_App": { + "ClientId": "MyProjectName_App", + "ClientSecret": "1q2w3e*", + "RootUrl": "http://localhost:4200" }, "MyProjectName_Swagger": { "ClientId": "MyProjectName_Swagger", diff --git a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json index db70a74230..910a7d211e 100644 --- a/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json +++ b/templates/module/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json @@ -10,7 +10,7 @@ "IdentityClients": { "Default": { "GrantType": "password", - "ClientId": "MyProjectName_ConsoleTestApp", + "ClientId": "MyProjectName_App", "ClientSecret": "1q2w3e*", "UserName": "admin", "UserPassword": "1q2w3E*", @@ -18,4 +18,4 @@ "Scope": "MyProjectName" } } -} \ No newline at end of file +}