refactor(auth): refactor get url params

pull/2749/head
Chaim Lev Ari 2019-01-02 20:49:25 +02:00
parent 9bebe9dee7
commit 25620c5008
2 changed files with 21 additions and 17 deletions

View File

@ -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.cleanParameters = cleanParameters;
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;
var parameters = extractParameters();
return parameters[param];
}
function extractParameters() {
var queryString = $window.location.search.replace(/.*?\?/,'').split('&');
return queryString.reduce(function(acc, keyValStr) {
var keyVal = keyValStr.split('=');
var key = keyVal[0];
var val = keyVal[1];
acc[key] = val;
return acc;
}, {});
}
function cleanParameters() {
$window.location.search = '';
}
});

View File

@ -114,8 +114,9 @@ function (urlHelper, $q, $scope, $state, $stateParams, $sanitize, Authentication
}
function oAuthLogin(code) {
Authentication.oAuthLogin(code)
return Authentication.oAuthLogin(code)
.then(function success() {
urlHelper.cleanParameters();
$state.go('portainer.home');
})
.catch(function error() {