Merge pull request #491 from rockcarver/pr/482

Pr/482
rockcarver · Jan 22, 2025 · 619ae16 · 619ae16
2 parents 3223601 + 42790f6
commit 619ae16
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3,004 deletions.
diff --git a/src/ops/ConfigOps.ts b/src/ops/ConfigOps.ts
@@ -663,6 +663,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(activeRealm);
   }

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,