Remove duplicate IDPs from full export

rockcarver · Dec 10, 2024 · abd87e4 · abd87e4
1 parent 5860f44
commit abd87e4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 764 deletions.
diff --git a/src/ops/ConfigOps.ts b/src/ops/ConfigOps.ts
@@ -454,7 +454,7 @@ export async function exportFullConfiguration({
     ...config.global,
   };
 
-  //Clean up duplicates
+  //Clean up global duplicates
   if (globalConfig.idm) {
     Object.keys(globalConfig.idm)
       .filter(
@@ -613,6 +613,14 @@ export async function exportFullConfiguration({
       )?.trustedJwtIssuer,
       ...config.realm[realm],
     };
+    //Clean up realm duplicates
+    if (
+      realmConfig[realm].service &&
+      realmConfig[realm].service['SocialIdentityProviders']
+    ) {
+      delete realmConfig[realm].service['SocialIdentityProviders']
+        .nextDescendents;
+    }
   }
   state.setRealm(currentRealm);
 

diff --git a/src/ops/ServiceOps.ts b/src/ops/ServiceOps.ts
@@ -405,7 +405,7 @@ export async function putFullService({
     });
 
     // return fast if no next descendents supplied
-    if (nextDescendents.length === 0) {
+    if (!nextDescendents || nextDescendents.length === 0) {
       debugMessage({
         message: `ServiceOps.putFullService: end (w/o descendents)`,
         state,