From 430967ce03a3123639aa888d04a4d3d53b313c53 Mon Sep 17 00:00:00 2001 From: Aaron Dalton Date: Tue, 6 Feb 2024 20:52:24 -0500 Subject: [PATCH] Make group parsing more flexible --- src/utils/auth/auth-helpers.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/utils/auth/auth-helpers.js b/src/utils/auth/auth-helpers.js index aeb046dc..3f0b94f5 100644 --- a/src/utils/auth/auth-helpers.js +++ b/src/utils/auth/auth-helpers.js @@ -37,11 +37,17 @@ export function readAuthSettings({ provider, groups } = {}) { return { provider: provider ? getProviderByKey(provider.type).create(provider) : NullAuthProvider.create(), groups: groups - ? groups.map((group) => ({ - name: Object.keys(group)[0], - allowUsers: group[Object.keys(group)[0]].allowUsers, - allowGroups: group[Object.keys(group)[0]].allowGroups, - })) + ? Array.isArray(groups) + ? groups.map((group) => ({ + name: Object.keys(group)[0], + allowUsers: group.allowUsers, + allowGroups: group.allowGroups, + })) + : Object.keys(groups).map((group) => ({ + name: group, + allowUsers: groups[group].allowUsers, + allowGroups: groups[group].allowGroups, + })) : [], }; }