Login fix (#222)

fixed problem with node visibility w/o auth enabled
SAP · Nov 20, 2018 · c6acf88 · c6acf88
1 parent 2d10512
commit c6acf88
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/core/src/Authorization.html b/core/src/Authorization.html
@@ -52,10 +52,7 @@
 
   export default {
     oncreate() {
-      const idpProviderName = LuigiConfig.getConfigValue('auth.use');
-      const idpProviderSettings = LuigiConfig.getConfigValue(`auth.${idpProviderName}`);
-      const authorizationEnabled = !!idpProviderSettings;
-      if (!authorizationEnabled) {
+      if (!LuigiConfig.isAuthorizationEnabled()) {
         return;
       }
 
@@ -82,6 +79,8 @@
         }
       };
 
+      const idpProviderName = LuigiConfig.getConfigValue('auth.use');
+      const idpProviderSettings = LuigiConfig.getConfigValue(`auth.${idpProviderName}`);
       idpProviderInstance = getIdpProviderInstance(idpProviderName, idpProviderSettings);
       if (isPromise(idpProviderInstance)) {
         return idpProviderInstance.then((resolved) => {

diff --git a/core/src/navigation/TopNav.html b/core/src/navigation/TopNav.html
@@ -72,12 +72,8 @@
 
   export default {
     oncreate() {
-      // Authentication detection
-      const idpProviderName = LuigiConfig.getConfigValue('auth.use');
-      const idpProviderSettings = LuigiConfig.getConfigValue(`auth.${idpProviderName}`);
-
       this.set({
-        authorizationEnabled: !!idpProviderSettings,
+        authorizationEnabled: LuigiConfig.isAuthorizationEnabled(),
         hideNavComponent: LuigiConfig.getConfigBooleanValue('settings.hideNavigation')
       });
     },

diff --git a/core/src/navigation/services/navigation.js b/core/src/navigation/services/navigation.js
@@ -6,7 +6,7 @@ const isNodeAccessPermitted = (
   parentNode,
   currentContext
 ) => {
-  if (!isLoggedIn()) return false;
+  if (LuigiConfig.isAuthorizationEnabled() && !isLoggedIn()) return false;
   const permissionCheckerFn = LuigiConfig.getConfigValue(
     'navigation.nodeAccessibilityResolver'
   );

diff --git a/core/src/services/config.js b/core/src/services/config.js
@@ -85,6 +85,16 @@ class LuigiConfigManager {
       parameters
     );
   }
+
+  /*
+   * Detects if authorization is enabled via configuration.
+   * @returns {boolean} returns true if authorization is enabled. Otherwise returns false.
+   */
+  isAuthorizationEnabled() {
+    const idpProviderName = this.getConfigValue('auth.use');
+    const idpProviderSettings = this.getConfigValue(`auth.${idpProviderName}`);
+    return !!idpProviderSettings;
+  }
 }
 const LuigiInstance = new LuigiConfigManager();