diff --git a/www/LoginView.js b/www/LoginView.js
index 38295c59..164e4b4f 100644
--- a/www/LoginView.js
+++ b/www/LoginView.js
@@ -35,7 +35,7 @@ Ext.define('PBS.LoginView', {
if (this.getViewModel().data.openid === true) {
const redirectURL = location.origin;
try {
- let resp = await PBS.Async.api2({
+ let resp = await Proxmox.Async.api2({
url: '/api2/extjs/access/openid/auth-url',
params: {
realm: creds.realm,
@@ -44,12 +44,12 @@ Ext.define('PBS.LoginView', {
method: 'POST',
});
window.location = resp.result.data;
- } catch (error) {
+ } catch (response) {
Proxmox.Utils.authClear();
loginForm.unmask();
Ext.MessageBox.alert(
gettext('Error'),
- gettext('OpenID redirect failed, please try again') + `
${error}`,
+ gettext('OpenID redirect failed, please try again') + `
${response.result.message}`,
);
}
return;
@@ -72,7 +72,7 @@ Ext.define('PBS.LoginView', {
sp.set(saveunField.getStateId(), saveunField.getValue());
try {
- let resp = await PBS.Async.api2({
+ let resp = await Proxmox.Async.api2({
url: '/api2/extjs/access/ticket',
params: creds,
method: 'POST',
@@ -566,7 +566,7 @@ Ext.define('PBS.login.TfaWindow', {
let reject = view.onReject;
view.close();
- return PBS.Async.api2({
+ return Proxmox.Async.api2({
url: '/api2/extjs/access/ticket',
method: 'POST',
params,
diff --git a/www/Utils.js b/www/Utils.js
index a95e57b9..36a94211 100644
--- a/www/Utils.js
+++ b/www/Utils.js
@@ -641,28 +641,3 @@ Ext.define('PBS.Utils', {
},
});
-
-Ext.define('PBS.Async', {
- singleton: true,
-
- // Returns a Promise resolving to the result of an `API2Request`.
- api2: function(reqOpts) {
- return new Promise((resolve, reject) => {
- delete reqOpts.callback; // not allowed in this api
- reqOpts.success = response => resolve(response);
- reqOpts.failure = response => {
- if (response.result && response.result.message) {
- reject(response.result.message);
- } else {
- reject("api call failed");
- }
- };
- Proxmox.Utils.API2Request(reqOpts);
- });
- },
-
- // Delay for a number of milliseconds.
- sleep: function(millis) {
- return new Promise((resolve, _reject) => setTimeout(resolve, millis));
- },
-});
diff --git a/www/config/TfaView.js b/www/config/TfaView.js
index 26f0e7b2..b2480a7a 100644
--- a/www/config/TfaView.js
+++ b/www/config/TfaView.js
@@ -161,14 +161,14 @@ Ext.define('PBS.config.TfaView', {
try {
me.getView().mask(gettext('Please wait...'), 'x-mask-loading');
- await PBS.Async.api2({
+ await Proxmox.Async.api2({
url: `/api2/extjs/access/tfa/${record.id}`,
method: 'DELETE',
params,
});
me.reload();
- } catch (error) {
- Ext.Msg.alert(gettext('Error'), error);
+ } catch (response) {
+ Ext.Msg.alert(gettext('Error'), response.result.message);
} finally {
me.getView().unmask();
}
diff --git a/www/tape/BackupOverview.js b/www/tape/BackupOverview.js
index ecdbf255..4ba53157 100644
--- a/www/tape/BackupOverview.js
+++ b/www/tape/BackupOverview.js
@@ -37,7 +37,7 @@ Ext.define('PBS.TapeManagement.BackupOverview', {
loadContent: async function() {
let me = this;
- let content_response = await PBS.Async.api2({
+ let content_response = await Proxmox.Async.api2({
url: '/api2/extjs/tape/media/list?update-status=false',
});
let data = {};
@@ -122,7 +122,7 @@ Ext.define('PBS.TapeManagement.BackupOverview', {
const media_set = node.data.text;
try {
- let list = await PBS.Async.api2({
+ let list = await Proxmox.Async.api2({
method: 'GET',
url: `/api2/extjs/tape/media/content`,
params: {
@@ -224,9 +224,9 @@ Ext.define('PBS.TapeManagement.BackupOverview', {
node.set('datastores', storeNameList);
Proxmox.Utils.setErrorMask(view, false);
node.expand();
- } catch (error) {
+ } catch (response) {
Proxmox.Utils.setErrorMask(view, false);
- Ext.Msg.alert('Error', error.toString());
+ Ext.Msg.alert('Error', response.result.message.toString());
}
},
diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js
index ef9f5732..97b8f78e 100644
--- a/www/tape/ChangerStatus.js
+++ b/www/tape/ChangerStatus.js
@@ -257,13 +257,13 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
let me = this;
let drive = record.data.name;
try {
- await PBS.Async.api2({
+ await Proxmox.Async.api2({
method: 'POST',
timeout: 5*60*1000,
url: `/api2/extjs/tape/drive/${encodeURIComponent(drive)}/unload`,
});
- } catch (error) {
- Ext.Msg.alert(gettext('Error'), error);
+ } catch (response) {
+ Ext.Msg.alert(gettext('Error'), response.result.message);
}
me.reload();
},
@@ -478,7 +478,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
Proxmox.Utils.setErrorMask(view, true);
Proxmox.Utils.setErrorMask(me.lookup('content'));
}
- let status_fut = PBS.Async.api2({
+ let status_fut = Proxmox.Async.api2({
timeout: 5*60*1000,
method: 'GET',
url: `/api2/extjs/tape/changer/${encodeURIComponent(changer)}/status`,
@@ -486,12 +486,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
cache: use_cache,
},
});
- let drives_fut = PBS.Async.api2({
+ let drives_fut = Proxmox.Async.api2({
timeout: 5*60*1000,
url: `/api2/extjs/tape/drive?changer=${encodeURIComponent(changer)}`,
});
- let tapes_fut = PBS.Async.api2({
+ let tapes_fut = Proxmox.Async.api2({
timeout: 5*60*1000,
url: '/api2/extjs/tape/media/list',
method: 'GET',
@@ -589,7 +589,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
Proxmox.Utils.setErrorMask(view);
}
Proxmox.Utils.setErrorMask(me.lookup('content'));
- } catch (err) {
+ } catch (response) {
if (!view || view.isDestroyed) {
return;
}
@@ -597,7 +597,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', {
if (!use_cache) {
Proxmox.Utils.setErrorMask(view);
}
- Proxmox.Utils.setErrorMask(me.lookup('content'), err.toString());
+ Proxmox.Utils.setErrorMask(me.lookup('content'), response.result.message.toString());
}
me.scheduleReload(5000);
diff --git a/www/window/AddTfaRecovery.js b/www/window/AddTfaRecovery.js
index 381ffb5b..c98deddf 100644
--- a/www/window/AddTfaRecovery.js
+++ b/www/window/AddTfaRecovery.js
@@ -51,12 +51,12 @@ Ext.define('PBS.window.AddTfaRecovery', {
let view = me.getView();
try {
- await PBS.Async.api2({
+ await Proxmox.Async.api2({
url: `${view.url}/${userid}/recovery`,
method: 'GET',
});
return true;
- } catch (_ex) {
+ } catch (_response) {
return false;
}
},
diff --git a/www/window/AddWebauthn.js b/www/window/AddWebauthn.js
index 8b1e1c5d..6117ebcc 100644
--- a/www/window/AddWebauthn.js
+++ b/www/window/AddWebauthn.js
@@ -62,7 +62,7 @@ Ext.define('PBS.window.AddWebauthn', {
me.getView().mask(gettext('Please wait...'), 'x-mask-loading');
try {
- let register_response = await PBS.Async.api2({
+ let register_response = await Proxmox.Async.api2({
url: `/api2/extjs/access/tfa/${userid}`,
method: 'POST',
params: values,
@@ -135,12 +135,13 @@ Ext.define('PBS.window.AddWebauthn', {
params.password = values.password;
}
- await PBS.Async.api2({
+ await Proxmox.Async.api2({
url: `/api2/extjs/access/tfa/${userid}`,
method: 'POST',
params,
});
- } catch (error) {
+ } catch (response) {
+ let error = response.result.message;
console.error(error); // for debugging if it's not displayable...
Ext.Msg.alert(gettext('Error'), error);
}