Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,10 @@ qx.Class.define("osparc.FlashMessenger", {
supportId,
timestamp: new Date().toString(),
url: window.location.href,
releaseTag: osparc.utils.Utils.getReleaseTag(),
studyId: osparc.store.Store.getInstance().getCurrentStudy() || "",
}
osparc.utils.Utils.copyTextToClipboard(JSON.stringify(dataToClipboard));
osparc.utils.Utils.copyTextToClipboard(osparc.utils.Utils.prettifyJson(JSON.stringify(dataToClipboard)));
});
return errorLabel;
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@ qx.Class.define("osparc.auth.Manager", {
const url = osparc.data.Resources.resources["auth"].endpoints["postLogin"].url;
const xhr = new XMLHttpRequest();
xhr.onload = () => {
const resp = JSON.parse(xhr.responseText);
if (xhr.status === 202) {
const resp = JSON.parse(xhr.responseText);
const data = resp.data;
const message = osparc.auth.core.Utils.extractMessage(data);
const retryAfter = osparc.auth.core.Utils.extractRetryAfter(data)
Expand All @@ -161,8 +161,7 @@ qx.Class.define("osparc.auth.Manager", {
nextStep: data["name"]
});
} else if (xhr.status === 200) {
const resp = JSON.parse(xhr.responseText);
osparc.data.Resources.getOne("profile", {}, null, false)
osparc.data.Resources.fetch("profile", "getOne")
.then(profile => {
this.__loginUser(profile);
const data = resp.data;
Expand All @@ -172,17 +171,14 @@ qx.Class.define("osparc.auth.Manager", {
message
});
})
.catch(err => reject(err.message));
.catch(err => reject(err));
} else if (resp.error == null) {
reject({message: this.tr("Unsuccessful Login")});
} else {
const resp = JSON.parse(xhr.responseText);
if (resp.error == null) {
reject(this.tr("Unsuccessful Login"));
} else {
reject(resp.error.message);
}
reject(resp.error);
}
};
xhr.onerror = () => reject(this.tr("Unsuccessful Login"));
xhr.onerror = err => reject(err);
xhr.open("POST", url, true);
xhr.setRequestHeader("Content-Type", "application/json");
xhr.send(JSON.stringify(params));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ qx.Class.define("osparc.auth.ui.LoginView", {
const email = this._form.getItems().email;
const pass = this._form.getItems().password;

const loginFun = msg => {
const loginSuccessful = msg => {
this.__loginBtn.setFetching(false);
this.fireDataEvent("done", msg);
// we don't need the form any more, so remove it and mock-navigate-away
Expand Down Expand Up @@ -248,18 +248,18 @@ qx.Class.define("osparc.auth.ui.LoginView", {
window.history.replaceState(null, window.document.title, window.location.pathname);
};

const failFun = msg => {
const loginFailed = err => {
this.__loginBtn.setFetching(false);
// TODO: can get field info from response here
msg = String(msg) || this.tr("email or password don't look correct");
const message = String(err.message) || this.tr("email or password don't look correct");
[email, pass].forEach(item => {
item.set({
invalidMessage: msg,
invalidMessage: message,
valid: false
});
});

osparc.FlashMessenger.logError(msg);
osparc.FlashMessenger.logError(err);
};

const manager = osparc.auth.Manager.getInstance();
Expand All @@ -272,10 +272,10 @@ qx.Class.define("osparc.auth.ui.LoginView", {
twoFactorAuthCbk(resp.nextStep, resp.message, resp.retryAfter);
}
} else if (resp.status === 200) {
loginFun(resp.message);
loginSuccessful(resp.message);
}
})
.catch(err => failFun(err));
.catch(err => loginFailed(err));
},

resetValues: function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1441,6 +1441,7 @@ qx.Class.define("osparc.data.Resources", {

let message = null;
let status = null;
let supportId = null;
if (e.getData().error) {
const errorData = e.getData().error;
if (errorData.message) {
Expand All @@ -1455,6 +1456,9 @@ qx.Class.define("osparc.data.Resources", {
message = errors[0].message;
}
status = errorData.status;
if (errorData["support_id"]) {
supportId = errorData["support_id"];
}
} else {
const req = e.getRequest();
message = req.getResponse();
Expand Down Expand Up @@ -1486,6 +1490,9 @@ qx.Class.define("osparc.data.Resources", {
if (status) {
err.status = status;
}
if (supportId) {
err.supportId = supportId;
}
reject(err);
};

Expand Down
Loading