mirror of https://github.com/portainer/portainer
refactor(auth): refactor get url params
parent
9bebe9dee7
commit
25620c5008
|
@ -1,21 +1,24 @@
|
||||||
angular.module('portainer.app').service('urlHelper', function urlHelper($location) {
|
angular.module('portainer.app').service('urlHelper', function urlHelper($window) {
|
||||||
|
|
||||||
this.getParameter = getParameter;
|
this.getParameter = getParameter;
|
||||||
|
this.cleanParameters = cleanParameters;
|
||||||
|
|
||||||
function getParameter(param) {
|
function getParameter(param) {
|
||||||
var url = $location.absUrl();
|
var parameters = extractParameters();
|
||||||
var index = url.indexOf('?');
|
return parameters[param];
|
||||||
if (index < 0) {
|
}
|
||||||
return;
|
|
||||||
}
|
function extractParameters() {
|
||||||
var params = url.substring(index + 1);
|
var queryString = $window.location.search.replace(/.*?\?/,'').split('&');
|
||||||
params = params.split('&');
|
return queryString.reduce(function(acc, keyValStr) {
|
||||||
for (var i = 0; i < params.length; i++) {
|
var keyVal = keyValStr.split('=');
|
||||||
var parameter = params[i].split('=');
|
var key = keyVal[0];
|
||||||
if (parameter[0] === param) {
|
var val = keyVal[1];
|
||||||
return parameter[1].split('#')[0];
|
acc[key] = val;
|
||||||
}
|
return acc;
|
||||||
}
|
}, {});
|
||||||
return;
|
}
|
||||||
|
|
||||||
|
function cleanParameters() {
|
||||||
|
$window.location.search = '';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -114,8 +114,9 @@ function (urlHelper, $q, $scope, $state, $stateParams, $sanitize, Authentication
|
||||||
}
|
}
|
||||||
|
|
||||||
function oAuthLogin(code) {
|
function oAuthLogin(code) {
|
||||||
Authentication.oAuthLogin(code)
|
return Authentication.oAuthLogin(code)
|
||||||
.then(function success() {
|
.then(function success() {
|
||||||
|
urlHelper.cleanParameters();
|
||||||
$state.go('portainer.home');
|
$state.go('portainer.home');
|
||||||
})
|
})
|
||||||
.catch(function error() {
|
.catch(function error() {
|
||||||
|
|
Loading…
Reference in New Issue