From 024739f9f1a2e375975f0c3b347b8b45c2f4370d Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sat, 28 Jul 2018 16:38:26 +0200 Subject: [PATCH] fix(authentication): fix an issue with the --no-auth flag (#2090) --- app/portainer/views/auth/authController.js | 2 +- .../views/sidebar/sidebarController.js | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/portainer/views/auth/authController.js b/app/portainer/views/auth/authController.js index 3642bbf26..90d5e85a2 100644 --- a/app/portainer/views/auth/authController.js +++ b/app/portainer/views/auth/authController.js @@ -15,7 +15,7 @@ function ($scope, $state, $transition$, $sanitize, Authentication, UserService, function unauthenticatedFlow() { EndpointService.endpoints() - .then(function success(data) { + .then(function success(endpoints) { if (endpoints.length === 0) { $state.go('portainer.init.endpoint'); } else { diff --git a/app/portainer/views/sidebar/sidebarController.js b/app/portainer/views/sidebar/sidebarController.js index e1a14b02d..7d685ac29 100644 --- a/app/portainer/views/sidebar/sidebarController.js +++ b/app/portainer/views/sidebar/sidebarController.js @@ -16,17 +16,20 @@ function ($q, $scope, StateManager, Notifications, Authentication, UserService) $scope.uiVersion = StateManager.getState().application.version; $scope.logo = StateManager.getState().application.logo; - var userDetails = Authentication.getUserDetails(); - var isAdmin = userDetails.role === 1; - $scope.isAdmin = isAdmin; + var authenticationEnabled = $scope.applicationState.application.authentication; + if (authenticationEnabled) { + var userDetails = Authentication.getUserDetails(); + var isAdmin = userDetails.role === 1; + $scope.isAdmin = isAdmin; - $q.when(!isAdmin ? UserService.userMemberships(userDetails.ID) : []) - .then(function success(data) { - checkPermissions(data); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to retrieve user memberships'); - }); + $q.when(!isAdmin ? UserService.userMemberships(userDetails.ID) : []) + .then(function success(data) { + checkPermissions(data); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve user memberships'); + }); + } } initView();