Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

refactor(oauth): use oauth2 to generate login url

Browse source
This commit is contained in:
Chaim Lev Ari 2019-01-18 10:13:33 +02:00
parent 0a439b3893
commit c28274667d
5 changed files with 63 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/extensions/oauth/services/oauth-service.js
View file

@ -1,28 +1,16 @@
angular.module('portainer.extensions.oauth').service('OAuthService', [
'SettingsService', 'OAuth', 'urlHelper',
function OAuthService(SettingsService, OAuth, urlHelper) {
'API_ENDPOINT_OAUTH', 'OAuth', 'urlHelper', 'Notifications',
function OAuthService(API_ENDPOINT_OAUTH, OAuth, urlHelper, Notifications) {
this.login = login;
function login() {
return getLoginURI()
.then(function openPopup(loginUrl) {
var popup = window.open(loginUrl, 'login-popup', 'width=800, height=600');
if (!popup) {
throw new Error('Please enable popups for this page');
}
return waitForCode(popup);
})
.then(function onCodeReady(code) {
return OAuth.login({ code: code }).$promise;
});
}
function getLoginURI() {
return SettingsService.publicSettings().then(function onLoadSettings(settings) {
if (settings.AuthenticationMethod !== 3) {
throw new Error('OAuth is disabled');
}
return settings.OAuthLoginURI;
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;
});
}
@ -49,5 +37,5 @@ angular.module('portainer.extensions.oauth').service('OAuthService', [
}, interval);
});
}
}
},
]);

10
app/extensions/oauth/services/rest/oauth.js
View file

@ -1,9 +1,13 @@
angular.module('portainer.extensions.oauth')
.factory('OAuth', ['$resource', 'API_ENDPOINT_OAUTH', function OAuthFactory($resource, API_ENDPOINT_OAUTH) {
'use strict';
return $resource(API_ENDPOINT_OAUTH, {}, {
login: {
method: 'POST', ignoreLoadingBar: true
return $resource(API_ENDPOINT_OAUTH + '/:action', {}, {
validate: {
method: 'POST',
ignoreLoadingBar: true,
params: {
action: 'validate'
}
}
});
}]);