github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor(auth): refactor auth controller

pull/2749/head
Chaim Lev Ari 2019-01-02 15:56:08 +02:00
parent 996319d299
commit 7494101a4d
2 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/portainer/helpers/urlHelper.js Normal file
View File

@ -0,0 +1,21 @@
angular.module('portainer.app').service('urlHelper', function urlHelper($location) {
this.getParameter = getParameter;
function getParameter(param) {
var url = $location.absUrl();
var index = url.indexOf('?');
if (index < 0) {
return;
}
var params = url.substring(index + 1);
params = params.split('&');
for (var i = 0; i < params.length; i++) {
var parameter = params[i].split('=');
if (parameter[0] === param) {
return parameter[1].split('#')[0];
}
}
return;
}
});

52
app/portainer/views/auth/authController.js
View File

@ -1,7 +1,6 @@
angular.module('portainer.app') angular.module('portainer.app')
.controller('AuthenticationController', ['$q', '$scope', '$state', '$transition$', '$sanitize', '$location', '$window', 'Authentication', 'UserService', 'EndpointService', 'StateManager', 'Notifications', 'SettingsService', .controller('AuthenticationController', ['urlHelper','$q', '$scope', '$state', '$stateParams', '$sanitize', 'Authentication', 'UserService', 'EndpointService', 'StateManager', 'Notifications', 'SettingsService',
function ($q, $scope, $state, $transition$, $sanitize, $location, $window, Authentication, UserService, EndpointService, StateManager, Notifications, SettingsService) { function (urlHelper, $q, $scope, $state, $stateParams, $sanitize, Authentication, UserService, EndpointService, StateManager, Notifications, SettingsService) {
$scope.logo = StateManager.getState().application.logo; $scope.logo = StateManager.getState().application.logo;
$scope.formValues = { $scope.formValues = {
@ -13,14 +12,7 @@ function ($q, $scope, $state, $transition$, $sanitize, $location, $window, Authe
AuthenticationError: '' AuthenticationError: ''
}; };
SettingsService.publicSettings()
.then(function success(settings) {
$scope.AuthenticationMethod = settings.AuthenticationMethod;
$scope.ClientID = settings.ClientID;
$scope.RedirectURI = settings.RedirectURI;
$scope.Scopes = settings.Scopes;
$scope.AuthorizationURI = settings.AuthorizationURI;
});
$scope.authenticateUser = function() { $scope.authenticateUser = function() {
@ -84,7 +76,6 @@ function ($q, $scope, $state, $transition$, $sanitize, $location, $window, Authe
$state.go('portainer.init.endpoint'); $state.go('portainer.init.endpoint');
} else { } else {
$state.go('portainer.home'); $state.go('portainer.home');
$window.location.search = '';
} }
}) })
.catch(function error(err) { .catch(function error(err) {
@ -93,9 +84,18 @@ function ($q, $scope, $state, $transition$, $sanitize, $location, $window, Authe
} }
function initView() { function initView() {
if ($transition$.params().logout || $transition$.params().error) { SettingsService.publicSettings()
.then(function success(settings) {
$scope.AuthenticationMethod = settings.AuthenticationMethod;
$scope.ClientID = settings.ClientID;
$scope.RedirectURI = settings.RedirectURI;
$scope.Scopes = settings.Scopes;
$scope.AuthorizationURI = settings.AuthorizationURI;
});
if ($stateParams.logout || $stateParams.error) {
Authentication.logout(); Authentication.logout();
$scope.state.AuthenticationError = $transition$.params().error; $scope.state.AuthenticationError = $stateParams.error;
return; return;
} }
@ -109,37 +109,23 @@ function ($q, $scope, $state, $transition$, $sanitize, $location, $window, Authe
} else { } else {
authenticatedFlow(); authenticatedFlow();
} }
var code = urlHelper.getParameter('code');
if (code) {
oAuthLogin(code);
}
} }
function oAuthLogin(code) { function oAuthLogin(code) {
Authentication.oAuthLogin(code) Authentication.oAuthLogin(code)
.then(function success() { .then(function success() {
$state.go('portainer.home'); $state.go('portainer.home');
$window.location.search = '';
}) })
.catch(function error() { .catch(function error() {
$scope.state.AuthenticationError = 'Failed to authenticate with OAuth2 Provider'; $scope.state.AuthenticationError = 'Failed to authenticate with OAuth2 Provider';
}); });
} }
function getParameter(param) {
var URL = $location.absUrl();
var params = URL.split('?')[1];
if (params === undefined) {
return null;
}
params = params.split('&');
for (var i = 0; i < params.length; i++) {
var parameter = params[i].split('=');
if (parameter[0] === param) {
return parameter[1].split('#')[0];
}
}
return null;
}
initView(); initView();
if (getParameter('code') !== null) {
oAuthLogin(getParameter('code'));
}
}]); }]);