Merge pull request #6177 from abpframework/maliming/patch-ng

Rename MyProjectName_ConsoleTestApp to MyProjectName_App.

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',
   },

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',
   },

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs

@@ -162,15 +162,20 @@ namespace MyCompanyName.MyProjectName.IdentityServer
                 );
             }
 
-            //Console Test Client
+            //Console Test / Angular Client
-            var consoleClientId = configurationSection["MyProjectName_ConsoleTestApp:ClientId"];
+            var consoleAndAngularClientId = configurationSection["MyProjectName_App:ClientId"];
-            if (!consoleClientId.IsNullOrWhiteSpace())
+            if (!consoleAndAngularClientId.IsNullOrWhiteSpace())
             {
+                var webClientRootUrl = configurationSection["MyProjectName_App:RootUrl"]?.TrimEnd('/');
+
                 await CreateClientAsync(
-                    name: consoleClientId,
+                    name: consoleAndAngularClientId,
                     scopes: commonScopes,
-                    grantTypes: new[] {"password", "client_credentials"},
+                    grantTypes: new[] { "password", "client_credentials", "authorization_code" },
-                    secret: (configurationSection["MyProjectName_ConsoleTestApp:ClientSecret"] ?? "1q2w3e*").Sha256()
+                    secret: (configurationSection["MyProjectName_App:ClientSecret"] ?? "1q2w3e*").Sha256(),
+                    requireClientSecret: false,
+                    redirectUri: webClientRootUrl,
+                    postLogoutRedirectUri: webClientRootUrl
                 );
             }
 

templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/appsettings.json

@@ -25,8 +25,10 @@
         "ClientId": "MyProjectName_Blazor",
         "RootUrl": "https://localhost:44307/"
       },
-      "MyProjectName_ConsoleTestApp": {
+      "MyProjectName_App": {
-        "ClientId": "MyProjectName_ConsoleTestApp"
+        "ClientId": "MyProjectName_App",
+        "ClientSecret": "1q2w3e*",
+        "RootUrl": "http://localhost:4200"
       },
       "MyProjectName_Swagger": {
         "ClientId": "MyProjectName_Swagger",

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"
     }
   }
-}
+}