Skip to content

Commit 3a0f830

Browse files
committed
sendRequest
1 parent 1b65c53 commit 3a0f830

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

services/static-webserver/client/source/class/osparc/auth/Manager.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,9 +217,10 @@ qx.Class.define("osparc.auth.Manager", {
217217
timeoutRetries: 5
218218
};
219219
return osparc.data.Resources.fetch("auth", "postLogout", params, options)
220-
.then(() => this.fireEvent("loggedOut"))
221-
.catch(() => console.log("already logged out"))
222-
.finally(this.__logoutUser());
220+
.finally(() => {
221+
this.__logoutUser();
222+
this.fireEvent("loggedOut");
223+
});
223224
},
224225

225226
resetPasswordRequest: function(email, successCbk, failCbk, context) {

services/static-webserver/client/source/class/osparc/data/Resources.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1267,6 +1267,10 @@ qx.Class.define("osparc.data.Resources", {
12671267
});
12681268
}
12691269

1270+
const sendRequest = () => {
1271+
res[endpoint](params.url || null, params.data || null);
1272+
}
1273+
12701274
res.addListenerOnce(endpoint + "Success", e => {
12711275
const response = e.getRequest().getResponse();
12721276
const endpointDef = resourceDefinition.endpoints[endpoint];
@@ -1305,11 +1309,11 @@ qx.Class.define("osparc.data.Resources", {
13051309
}
13061310
}, this);
13071311

1308-
res.addListenerOnce(endpoint + "Error", e => {
1312+
res.addListener(endpoint + "Error", e => {
13091313
if (e.getPhase() === "timeout") {
13101314
if (options.timeout && options.timeoutRetries) {
13111315
options.timeoutRetries--;
1312-
this.fetch(resource, endpoint, params, options);
1316+
sendRequest();
13131317
return;
13141318
}
13151319
}
@@ -1361,7 +1365,7 @@ qx.Class.define("osparc.data.Resources", {
13611365
reject(err);
13621366
});
13631367

1364-
res[endpoint](params.url || null, params.data || null);
1368+
sendRequest();
13651369
});
13661370
},
13671371

0 commit comments

Comments
 (0)