tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: login: cleanups, mostly openID related 

similar to what was done in PVE.

 - factor out openid_login_param to widget-toolkit as
   getOpenIDRedirectionAuthorization and use it
 - use camel case to match our JS style guide and our framework (and
   basically the rest of the JS world)
 - minor cleanups like moving variable definition into the single if
   branch their used

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-07-03 01:46:20 +02:00
parent 1ce1a5e5cc
commit e1d85f1840
2 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
www/LoginView.js
View File

@ -30,18 +30,16 @@ Ext.define('PBS.LoginView', {
return;
}
let redirect_url = location.origin;
let params = loginForm.getValues();
let creds = loginForm.getValues();
if (this.getViewModel().data.openid === true) {
let realm = params.realm;
const redirectURL = location.origin;
try {
let resp = await PBS.Async.api2({
url: '/api2/extjs/access/openid/auth-url',
params: {
realm: realm,
"redirect-url": redirect_url,
realm: creds.realm,
"redirect-url": redirectURL,
},
method: 'POST',
});
@ -57,8 +55,8 @@ Ext.define('PBS.LoginView', {
return;
}
params.username = params.username + '@' + params.realm;
delete params.realm;
creds.username = `${creds.username}@${creds.realm}`;
delete creds.realm;
if (loginForm.isVisible()) {
loginForm.mask(gettext('Please wait...'), 'x-mask-loading');
@ -76,7 +74,7 @@ Ext.define('PBS.LoginView', {
try {
let resp = await PBS.Async.api2({
url: '/api2/extjs/access/ticket',
params: params,
params: creds,
method: 'POST',
});
@ -165,21 +163,22 @@ Ext.define('PBS.LoginView', {
pwField.focus();
}
let param = PBS.Utils.openid_login_param();
if (param !== undefined) {
let auth = Proxmox.Utils.getOpenIDRedirectionAuthorization();
if (auth !== undefined) {
Proxmox.Utils.authClear();
let loginForm = this.lookupReference('loginForm');
loginForm.mask(gettext('OpenID login - please wait...'), 'x-mask-loading');
let redirect_url = location.origin;
// openID checks the original redirection URL we used, so pass that too
const redirectURL = location.origin;
Proxmox.Utils.API2Request({
url: '/api2/extjs/access/openid/login',
params: {
state: param.state,
code: param.code,
"redirect-url": redirect_url,
state: auth.state,
code: auth.code,
"redirect-url": redirectURL,
},
method: 'POST',
failure: function(response) {
@ -193,10 +192,10 @@ Ext.define('PBS.LoginView', {
},
success: function(response, options) {
loginForm.unmask();
let data = response.result.data;
PBS.Utils.updateLoginData(data);
let creds = response.result.data;
PBS.Utils.updateLoginData(creds);
PBS.app.changeView('mainview');
history.replaceState(null, '', redirect_url + '#pbsDashboard');
history.replaceState(null, '', `${redirectURL}#pbsDashboard`);
},
});
}

8
www/Utils.js
View File

@ -326,14 +326,6 @@ Ext.define('PBS.Utils', {
};
},
openid_login_param: function() {
let param = Ext.Object.fromQueryString(window.location.search);
if (param.state !== undefined && param.code !== undefined) {
return param;
}
return undefined;
},
calculate_dedup_factor: function(gcstatus) {
let dedup = 1.0;
if (gcstatus['disk-bytes'] > 0) {