Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/ops/ConfigOps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/ops/ServiceOps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading
Loading