Merge pull request #12780 from abpframework/CLI-AuthServer

CLI Compatible `AuthServer` project name.

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AngularEnvironmentFilePortChangeForSeparatedIdentityServersStep.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AngularEnvironmentFilePortChangeForSeparatedAuthServersStep.cs

@@ -4,7 +4,7 @@ using Volo.Abp.Cli.ProjectBuilding.Building;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Templates.App;
 
-public class AngularEnvironmentFilePortChangeForSeparatedIdentityServersStep : ProjectBuildPipelineStep
+public class AngularEnvironmentFilePortChangeForSeparatedAuthServersStep : ProjectBuildPipelineStep
 {
     public override void Execute(ProjectBuildContext context)
     {

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

@@ -283,7 +283,7 @@ public abstract class AppTemplateBase : TemplateInfo
             context.BuildArgs.ExtraProperties.ContainsKey("separate-auth-server"))
         {
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds"));
-            steps.Add(new BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep());
+            steps.Add(new BlazorAppsettingsFilePortChangeForSeparatedAuthServersStep());
             steps.Add(new AppTemplateChangeDbMigratorPortSettingsStep("44300"));
         }
         else
@@ -368,12 +368,12 @@ public abstract class AppTemplateBase : TemplateInfo
             context.BuildArgs.ExtraProperties.ContainsKey("separate-auth-server"))
         {
             steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.HostWithIds"));
-            steps.Add(new AngularEnvironmentFilePortChangeForSeparatedIdentityServersStep());
+            steps.Add(new AngularEnvironmentFilePortChangeForSeparatedAuthServersStep());
             steps.Add(new AppTemplateChangeDbMigratorPortSettingsStep("44300"));
 
             if (context.BuildArgs.MobileApp == MobileApp.ReactNative)
             {
-                steps.Add(new ReactEnvironmentFilePortChangeForSeparatedIdentityServersStep());
+                steps.Add(new ReactEnvironmentFilePortChangeForSeparatedAuthServersStep());
             }
         }
         else

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

@@ -6,16 +6,16 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App;
 public class AppTemplateChangeConsoleTestClientPortSettingsStep : ProjectBuildPipelineStep
 {
     public string RemoteServicePort { get; }
-    public string IdentityServerPort { get; }
+    public string AuthServerPort { get; }
 
     /// <param name="remoteServicePort"></param>
-    /// <param name="identityServerPort">Assumed same as the <paramref name="remoteServicePort"/> if leaved as null.</param>
+    /// <param name="authServerPort">Assumed same as the <paramref name="remoteServicePort"/> if leaved as null.</param>
     public AppTemplateChangeConsoleTestClientPortSettingsStep(
         string remoteServicePort,
-        string identityServerPort = null)
+        string authServerPort = null)
     {
         RemoteServicePort = remoteServicePort;
-        IdentityServerPort = identityServerPort ?? remoteServicePort;
+        AuthServerPort = authServerPort ?? remoteServicePort;
     }
 
     public override void Execute(ProjectBuildContext context)
@@ -23,6 +23,6 @@ public class AppTemplateChangeConsoleTestClientPortSettingsStep : ProjectBuildPi
         context
             .GetFile("/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json")
             .ReplaceText("44300", RemoteServicePort)
-            .ReplaceText("44301", IdentityServerPort);
+            .ReplaceText("44301", AuthServerPort);
     }
 }

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

@@ -5,19 +5,19 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.App;
 
 public class AppTemplateChangeDbMigratorPortSettingsStep : ProjectBuildPipelineStep
 {
-    public string IdentityServerPort { get; }
+    public string AuthServerPort { get; }
 
-    /// <param name="identityServerPort"></param>
+    /// <param name="authServerPort"></param>
     public AppTemplateChangeDbMigratorPortSettingsStep(
-        string identityServerPort)
+        string authServerPort)
     {
-        IdentityServerPort = identityServerPort;
+        AuthServerPort = authServerPort;
     }
 
     public override void Execute(ProjectBuildContext context)
     {
         context
             .GetFile("/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json")
-            .ReplaceText("44305", IdentityServerPort);
+            .ReplaceText("44305", AuthServerPort);
     }
 }

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

@@ -55,6 +55,15 @@ public class AppTemplateSwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPip
             "MyProjectNameMongoDbModule"
         );
 
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs",
+            "MyCompanyName.MyProjectName.EntityFrameworkCore",
+            "MyCompanyName.MyProjectName.MongoDB",
+            _hasDbMigrations ? "MyProjectNameEntityFrameworkCoreDbMigrationsModule" : "MyProjectNameEntityFrameworkCoreModule",
+            "MyProjectNameMongoDbModule"
+        );
+
         ChangeConnectionStringToMongoDb(
             context,
             "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/appsettings.json"

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/BlazorAppsettingsFilePortChangeForSeparatedAuthServersStep.cs

@@ -4,7 +4,7 @@ using Volo.Abp.Cli.ProjectBuilding.Building;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Templates.App;
 
-public class BlazorAppsettingsFilePortChangeForSeparatedIdentityServersStep : ProjectBuildPipelineStep
+public class BlazorAppsettingsFilePortChangeForSeparatedAuthServersStep : ProjectBuildPipelineStep
 {
     public override void Execute(ProjectBuildContext context)
     {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/ReactEnvironmentFilePortChangeForSeparatedIdentityServersStep.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/ReactEnvironmentFilePortChangeForSeparatedAuthServersStep.cs

@@ -4,7 +4,7 @@ using Volo.Abp.Cli.ProjectBuilding.Building;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Templates.App;
 
-public class ReactEnvironmentFilePortChangeForSeparatedIdentityServersStep : ProjectBuildPipelineStep
+public class ReactEnvironmentFilePortChangeForSeparatedAuthServersStep : ProjectBuildPipelineStep
 {
     public override void Execute(ProjectBuildContext context)
     {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/RemoveUnnecessaryPortsStep.cs

@@ -58,8 +58,8 @@ public class RemoveUnnecessaryPortsStep : ProjectBuildPipelineStep
                 f.Name.Contains("MyCompanyName.MyProjectName.DbMigrator") && f.Name.EndsWith("appsettings.json"));
 
         var appSettingsJsonObject = JObject.Parse(dbMigratorAppSettings.Content);
-        var identityServerJsonObject = (JObject)appSettingsJsonObject["IdentityServer"];
+        var authServerJsonObject = (JObject)appSettingsJsonObject["IdentityServer"] ?? (JObject)appSettingsJsonObject["OpenIddict"];
-        var clientsJsonObject = (JObject)identityServerJsonObject["Clients"];
+        var clientsJsonObject = (JObject)authServerJsonObject["Clients"] ?? (JObject)authServerJsonObject["Applications"];
 
         if (context.BuildArgs.UiFramework != UiFramework.Blazor)
         {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NuGetPackageTarget.cs

@@ -14,7 +14,7 @@ public enum NuGetPackageTarget : byte
     MongoDB = 9,
     SignalR = 10,
     Blazor = 11,
-    IdentityServer = 12,
+    IdentityServer = 12, //todo: Rename to AuthServer
     BlazorServer = 13,
     BlazorWebAssembly = 14
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectFinder.cs

@@ -23,7 +23,8 @@ public static class ProjectFinder
             case NuGetPackageTarget.Web:
                 return FindProjectEndsWith(projectFiles, assemblyNames, ".Web");
             case NuGetPackageTarget.IdentityServer:
-                return FindProjectEndsWith(projectFiles, assemblyNames, ".IdentityServer");
+                return FindProjectEndsWith(projectFiles, assemblyNames, ".IdentityServer") ??
+                       FindProjectEndsWith(projectFiles, assemblyNames, ".AuthServer");
             case NuGetPackageTarget.EntityFrameworkCore:
                 return FindProjectEndsWith(projectFiles, assemblyNames, ".EntityFrameworkCore");
             case NuGetPackageTarget.MongoDB:

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ProjectNugetPackageAdder.cs

@@ -396,6 +396,6 @@ public class ProjectNugetPackageAdder : ITransientDependency
         return projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath)
                    .Any(p => p.EndsWith(".HttpApi.Host"))
                && projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath)
-                   .Any(p => p.EndsWith(".IdentityServer"));
+                   .Any(p => p.EndsWith(".IdentityServer") || p.EndsWith(".AuthServer"));
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@@ -804,6 +804,6 @@ public class SolutionModuleAdder : ITransientDependency
         return projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath)
             .Any(p => p.EndsWith(".HttpApi.Host"))
             && projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath)
-            .Any(p => p.EndsWith(".IdentityServer"));
+            .Any(p => p.EndsWith(".IdentityServer") || p.EndsWith(".AuthServer"));
     }
 }