Revert "refactor(auth): extract oauth login mechanism to service"

This reverts commit 0a439b3893.
pull/2749/head
Chaim Lev Ari 2019-01-25 10:37:23 +02:00
parent 3699b794eb
commit 41ded64037
5 changed files with 32 additions and 71 deletions

View File

@ -1,41 +0,0 @@
angular.module('portainer.extensions.oauth').service('OAuthService', [
'API_ENDPOINT_OAUTH', 'OAuth', 'urlHelper', 'Notifications',
function OAuthService(API_ENDPOINT_OAUTH, OAuth, urlHelper, Notifications) {
this.login = login;
function login() {
var loginUrl = API_ENDPOINT_OAUTH + '/login';
var popup = window.open(loginUrl, 'login-popup', 'width=800, height=600');
if (!popup) {
Notifications.warn('Please enable popups for this page');
}
return waitForCode(popup).then(function onCodeReady(code) {
return OAuth.validate({ code: code }).$promise;
});
}
function waitForCode(popup) {
return waitFor(function checkIfCodeIsAvailable() {
if (popup.document.URL.indexOf('code') !== -1) {
var queryParams = popup.location.search;
popup.close();
return urlHelper.getParameter(queryParams, 'code');
}
});
}
function waitFor(clbk, interval) {
interval = interval || 100;
var intervalId;
return new Promise(function executor(resolve) {
intervalId = setInterval(function intervalFunction() {
var callbackReturn = clbk();
if (callbackReturn) {
clearInterval(intervalId);
resolve(callbackReturn);
}
}, interval);
});
}
},
]);

View File

@ -2,13 +2,13 @@ angular.module('portainer.app').service('urlHelper', function urlHelper($window)
this.getParameter = getParameter; this.getParameter = getParameter;
this.cleanParameters = cleanParameters; this.cleanParameters = cleanParameters;
function getParameter(queryParams, param) { function getParameter(param) {
var parameters = extractParameters(queryParams); var parameters = extractParameters();
return parameters[param]; return parameters[param];
} }
function extractParameters(queryParams) { function extractParameters() {
var queryString = queryParams.replace(/.*?\?/,'').split('&'); var queryString = $window.location.search.replace(/.*?\?/,'').split('&');
return queryString.reduce(function(acc, keyValStr) { return queryString.reduce(function(acc, keyValStr) {
var keyVal = keyValStr.split('='); var keyVal = keyValStr.split('=');
var key = keyVal[0]; var key = keyVal[0];

View File

@ -1,7 +1,7 @@
angular.module('portainer.app') angular.module('portainer.app')
.factory('Authentication', [ .factory('Authentication', [
'Auth', 'OAuthService', 'jwtHelper', 'LocalStorage', 'StateManager', 'EndpointProvider', 'Auth', 'OAuth', 'jwtHelper', 'LocalStorage', 'StateManager', 'EndpointProvider',
function AuthenticationFactory(Auth, OAuthService, jwtHelper, LocalStorage, StateManager, EndpointProvider) { function AuthenticationFactory(Auth, OAuth, jwtHelper, LocalStorage, StateManager, EndpointProvider) {
'use strict'; 'use strict';
var service = {}; var service = {};
@ -13,8 +13,6 @@ function AuthenticationFactory(Auth, OAuthService, jwtHelper, LocalStorage, Stat
service.logout = logout; service.logout = logout;
service.isAuthenticated = isAuthenticated; service.isAuthenticated = isAuthenticated;
service.getUserDetails = getUserDetails; service.getUserDetails = getUserDetails;
function init() { function init() {
var jwt = LocalStorage.getJWT(); var jwt = LocalStorage.getJWT();
@ -24,10 +22,10 @@ function AuthenticationFactory(Auth, OAuthService, jwtHelper, LocalStorage, Stat
} }
} }
function OAuthLogin() { function OAuthLogin(code) {
return OAuthService.login() return OAuth.login({ code: code }).$promise
.then(function onLoginSuccess(loginResponse) { .then(function onLoginSuccess(response) {
setUser(loginResponse.jwt); return setUser(response.jwt);
}); });
} }

View File

@ -28,9 +28,11 @@
<!-- login button --> <!-- login button -->
<div class="form-group"> <div class="form-group">
<div class="col-sm-12" > <div class="col-sm-12" >
<button class="btn btn-primary btn-sm pull-left" ng-click="oauthLogin()" style="margin-left:2px" ng-if="AuthenticationMethod === 3"> <a ng-href="{{OAuthLoginURI}}" ng-if="AuthenticationMethod === 3">
<i class="fa fa-sign-in-alt" aria-hidden="true"></i> Login with OAuth <div class="btn btn-primary btn-sm pull-left" style="margin-left:2px">
</button> <i class="fa fa-sign-in-alt" aria-hidden="true"></i> Login with OAuth
</div>
</a>
<button type="submit" class="btn btn-primary btn-sm pull-right" ng-click="authenticateUser()"><i class="fa fa-sign-in-alt" aria-hidden="true"></i> Login</button> <button type="submit" class="btn btn-primary btn-sm pull-right" ng-click="authenticateUser()"><i class="fa fa-sign-in-alt" aria-hidden="true"></i> Login</button>

View File

@ -1,6 +1,6 @@
angular.module('portainer.app') angular.module('portainer.app')
.controller('AuthenticationController', ['$q', '$scope', '$state', '$stateParams', '$sanitize', 'Authentication', 'UserService', 'EndpointService', 'StateManager', 'Notifications', 'SettingsService', .controller('AuthenticationController', ['urlHelper','$q', '$scope', '$state', '$stateParams', '$sanitize', 'Authentication', 'UserService', 'EndpointService', 'StateManager', 'Notifications', 'SettingsService',
function ($q, $scope, $state, $stateParams, $sanitize, 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 = {
@ -37,17 +37,6 @@ function ($q, $scope, $state, $stateParams, $sanitize, Authentication, UserServi
}); });
}; };
$scope.oauthLogin = function oauthLogin() {
return Authentication.OAuthLogin()
.then(function onLoginSuccess() {
return $state.go('portainer.home');
})
.catch(function onError(error) {
$scope.state.AuthenticationError = error.message;
});
};
function unauthenticatedFlow() { function unauthenticatedFlow() {
EndpointService.endpoints() EndpointService.endpoints()
.then(function success(endpoints) { .then(function success(endpoints) {
@ -115,10 +104,23 @@ function ($q, $scope, $state, $stateParams, $sanitize, Authentication, UserServi
authenticatedFlow(); authenticatedFlow();
} }
var code = urlHelper.getParameter('code');
if (code) {
oAuthLogin(code);
}
}
function oAuthLogin(code) {
return Authentication.OAuthLogin(code)
.then(function success() {
urlHelper.cleanParameters();
$state.go('portainer.home');
})
.catch(function error() {
$scope.state.AuthenticationError = 'Failed to authenticate with OAuth2 Provider';
});
} }
initView(); initView();
}]); }]);