From 6faebaf9dfcac67401802bdd743af9a8fe78bb2e Mon Sep 17 00:00:00 2001 From: Aine Date: Thu, 7 Nov 2024 10:34:06 +0200 Subject: [PATCH] properly handle `restrictBaseUrl` config option, fixes #128 --- src/components/config.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/config.ts b/src/components/config.ts index 1056f4f..96c3171 100644 --- a/src/components/config.ts +++ b/src/components/config.ts @@ -43,6 +43,13 @@ export const LoadConfig = (context: Config): Config => { // below we try to calculate "final" config, which will contain values from context and already set values in storage // because LoadConfig could be called multiple times to get config from different sources + let finalRestrictBaseUrl: string | string[] = ""; + try { + finalRestrictBaseUrl = JSON.parse(storage.getItem("restrict_base_url") || ""); + if (Array.isArray(finalRestrictBaseUrl) && finalRestrictBaseUrl.length == 1) { + finalRestrictBaseUrl = finalRestrictBaseUrl[0]; + } + } catch (e) {} let finalAsManagedUsers: string[] = []; try { finalAsManagedUsers = JSON.parse(storage.getItem("as_managed_users") || ""); @@ -54,7 +61,7 @@ export const LoadConfig = (context: Config): Config => { } catch (e) {} return { - restrictBaseUrl: storage.getItem("restrict_base_url") || "", + restrictBaseUrl: finalRestrictBaseUrl, asManagedUsers: finalAsManagedUsers, supportURL: storage.getItem("support_url") || "", menu: finalMenu,