Merge branch 'develop' of https://github.com/CactuseSecurity/firewall-orchestrator into develop

Author: SolidProgramming

roles/finalize/tasks/main.yml

@@ -124,6 +124,7 @@
   command: "a2dissite {{ product_name }}-maintenance"
   ignore_errors: true
   become: true
+  when: "installation_mode == 'upgrade' and 'frontends' in group_names"
 
 - name: restart apache without maintenance site
   service:

roles/lib/files/FWO.Api.Client/APIcalls/owner/updateOwner.graphql

@@ -5,7 +5,7 @@ mutation updateOwner(
   $groupDn: String!
   $tenantId: Int
   $recertInterval: Int
-  $appIdExternal: String!
+  $appIdExternal: String
   $recertCheckParams: String
   $criticality: String
   $commSvcPossible: Boolean

roles/middleware/files/FWO.Middleware.Server/AppDataImport.cs

@@ -277,7 +277,7 @@ private async Task<string> UpdateApp(ModellingImportAppData incomingApp, FwoOwne
 				name = incomingApp.Name,
 				dn = incomingApp.MainUser ?? "",
 				groupDn = userGroupDn,
-				appIdExternal = incomingApp.ExtAppId,
+			    appIdExternal = string.IsNullOrEmpty(incomingApp.ExtAppId) ? null : incomingApp.ExtAppId,
 				criticality = incomingApp.Criticality,
 				commSvcPossible = existingApp.CommSvcPossible
 			};

roles/ui/files/FWO.UI/Pages/Settings/SettingsOwner.razor

@@ -484,14 +484,15 @@ else
 
     private async Task AddOwnerInDb()
     {
+        // make sure we do not add multiple owners with empty string external app id
         var variables = new
         {
             name = actOwner.Name,
             dn = actOwner.Dn,
             groupDn = actOwner.GroupDn,
             tenantId = actOwner.TenantId,
             recertInterval = actOwner.RecertInterval,
-            appIdExternal = actOwner.ExtAppId,
+            appIdExternal = string.IsNullOrEmpty(actOwner.ExtAppId) ? null : actOwner.ExtAppId,
             recertCheckParams = actOwner.RecertCheckParamString,
             commSvcPossible = actOwner.CommSvcPossible
         };
@@ -511,6 +512,7 @@ else
 
     private async Task UpdateOwnerInDb()
     {
+        // make sure we do not add multiple owners with empty string external app id
         var Variables = new
         {
             id = actOwner.Id,
@@ -519,7 +521,7 @@ else
             groupDn = actOwner.GroupDn,
             tenantId = actOwner.TenantId,
             recertInterval = actOwner.RecertInterval,
-            appIdExternal = actOwner.ExtAppId,
+            appIdExternal = string.IsNullOrEmpty(actOwner.ExtAppId) ? null : actOwner.ExtAppId,
             recertCheckParams = actOwner.RecertCheckParamString,
             commSvcPossible = actOwner.CommSvcPossible
         };