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

Merge branch 'oath-poc' of github.com:portainer/pportainer into oath-poc

pull/2749/head
Chaim Lev Ari 2019-01-16 17:26:29 +02:00
parent 24f066716b c650fe56c2
commit 317bd53e43
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/portainer/services/authentication.js
View File

@ -8,7 +8,7 @@ function AuthenticationFactory(Auth, OAuth, jwtHelper, LocalStorage, StateManage
var user = {}; var user = {};
service.init = init; service.init = init;
service.oAuthLogin = oAuthLogin; service.OAuthLogin = OAuthLogin;
service.login = login; service.login = login;
service.logout = logout; service.logout = logout;
service.isAuthenticated = isAuthenticated; service.isAuthenticated = isAuthenticated;
@ -22,7 +22,7 @@ function AuthenticationFactory(Auth, OAuth, jwtHelper, LocalStorage, StateManage
} }
} }
function oAuthLogin(code) { function OAuthLogin(code) {
return OAuth.login({ code: code }).$promise return OAuth.login({ code: code }).$promise
.then(function onLoginSuccess(response) { .then(function onLoginSuccess(response) {
return setUser(response.jwt); return setUser(response.jwt);