Merge branch 'develop' into issue_3145

SolidProgramming · web-flow · commit d0445339ebd7 · 2025-04-09T20:19:01.000+02:00
diff --git a/roles/lib/files/FWO.Api.Client/APIcalls/config/subscribeImportAppDataConfigChanges.graphql b/roles/lib/files/FWO.Api.Client/APIcalls/config/subscribeImportAppDataConfigChanges.graphql
@@ -1,4 +1,4 @@
-﻿subscription subscribeImportAppDataConfigChanges {
+subscription subscribeImportAppDataConfigChanges {
   config (where: { _or: [
     {config_key: {_eq: "importAppDataSleepTime"}}, 
     {config_key: {_eq: "importAppDataStartAt"}}, 
@@ -8,7 +8,8 @@
     {config_key: {_eq: "ownerLdapId"}},
     {config_key: {_eq: "modNamingConvention"}},
     {config_key: {_eq: "dnsLookup"}},
-    {config_key: {_eq: "overwriteExistingNames"}}
+    {config_key: {_eq: "overwriteExistingNames"}},
+    {config_key: {_eq: "autoReplaceAppServer"}}
     ]}){
       config_key
       config_value
diff --git a/roles/middleware/files/FWO.Middleware.Server/AppDataImport.cs b/roles/middleware/files/FWO.Middleware.Server/AppDataImport.cs
@@ -53,6 +53,7 @@ public async Task<bool> Run()
 				List<string> importfilePathAndNames = JsonSerializer.Deserialize<List<string>>(globalConfig.ImportAppDataPath) ?? throw new Exception("Config Data could not be deserialized.");
 				userConfig = new(globalConfig);
 				userConfig.User.Name = Roles.MiddlewareServer;
+                userConfig.AutoReplaceAppServer = globalConfig.AutoReplaceAppServer;
 				await InitLdap();
 				foreach (var importfilePathAndName in importfilePathAndNames)
 				{

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public async Task<bool> Run()`
`53`	`53`	`List<string> importfilePathAndNames = JsonSerializer.Deserialize<List<string>>(globalConfig.ImportAppDataPath) ?? throw new Exception("Config Data could not be deserialized.");`
`54`	`54`	`userConfig = new(globalConfig);`
`55`	`55`	`userConfig.User.Name = Roles.MiddlewareServer;`
	`56`	`+ userConfig.AutoReplaceAppServer = globalConfig.AutoReplaceAppServer;`
`56`	`57`	`await InitLdap();`
`57`	`58`	`foreach (var importfilePathAndName in importfilePathAndNames)`
`58`	`59`	`{`