From 4d9e81bba069772801122b73f0809c3befe1fcb6 Mon Sep 17 00:00:00 2001 From: Philipp Pracht Date: Fri, 17 Jun 2022 14:16:01 +0200 Subject: [PATCH 1/2] check url feature toggles earlier --- core/src/services/routing.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/src/services/routing.js b/core/src/services/routing.js index 8497f370b7..a8552ab29b 100644 --- a/core/src/services/routing.js +++ b/core/src/services/routing.js @@ -157,6 +157,13 @@ class RoutingClass { } async handleRouteChange(path, component, iframeElement, config, withoutSync) { + const featureToggleProperty = LuigiConfig.getConfigValue('settings.featureToggles.queryStringParam') + ? LuigiConfig.getConfigValue('settings.featureToggles.queryStringParam') + : undefined; + if (featureToggleProperty) { + RoutingHelpers.setFeatureToggles(featureToggleProperty, path); + } + const defaultPattern = [/access_token=/, /id_token=/]; const patterns = LuigiConfig.getConfigValue('routing.skipRoutingForUrlPatterns') || defaultPattern; const hasSkipMatches = patterns.filter(p => window.location.href.match(p)).length !== 0; @@ -184,12 +191,6 @@ class RoutingClass { return; } - const featureToggleProperty = LuigiConfig.getConfigValue('settings.featureToggles.queryStringParam') - ? LuigiConfig.getConfigValue('settings.featureToggles.queryStringParam') - : undefined; - if (featureToggleProperty) { - RoutingHelpers.setFeatureToggles(featureToggleProperty, path); - } const isShowModalPathInUrl = LuigiConfig.getConfigValue('routing.showModalPathInUrl'); if (isShowModalPathInUrl) { await this.handleBookmarkableModalPath(); From 249791f4d13a861d8e10375b2f94f59c5b933054 Mon Sep 17 00:00:00 2001 From: Philipp Pracht Date: Fri, 17 Jun 2022 14:18:38 +0200 Subject: [PATCH 2/2] simplify --- core/src/services/routing.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/services/routing.js b/core/src/services/routing.js index a8552ab29b..5ab693a0d6 100644 --- a/core/src/services/routing.js +++ b/core/src/services/routing.js @@ -157,9 +157,7 @@ class RoutingClass { } async handleRouteChange(path, component, iframeElement, config, withoutSync) { - const featureToggleProperty = LuigiConfig.getConfigValue('settings.featureToggles.queryStringParam') - ? LuigiConfig.getConfigValue('settings.featureToggles.queryStringParam') - : undefined; + const featureToggleProperty = LuigiConfig.getConfigValue('settings.featureToggles.queryStringParam'); if (featureToggleProperty) { RoutingHelpers.setFeatureToggles(featureToggleProperty, path); }