@oneuptime/common 7.0.5043 → 7.0.5045
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/UI/Utils/API/API.ts
CHANGED
|
@@ -91,6 +91,10 @@ class BaseAPI extends API {
|
|
|
91
91
|
return defaultHeaders;
|
|
92
92
|
}
|
|
93
93
|
|
|
94
|
+
protected static logoutUser(){
|
|
95
|
+
return User.logout();
|
|
96
|
+
}
|
|
97
|
+
|
|
94
98
|
protected static override handleError(
|
|
95
99
|
error: HTTPErrorResponse | APIException,
|
|
96
100
|
): HTTPErrorResponse | APIException {
|
|
@@ -103,7 +107,7 @@ class BaseAPI extends API {
|
|
|
103
107
|
) {
|
|
104
108
|
const loginRoute: Route = this.getLoginRoute();
|
|
105
109
|
|
|
106
|
-
|
|
110
|
+
this.logoutUser();
|
|
107
111
|
|
|
108
112
|
if (Navigation.getQueryStringByName("token")) {
|
|
109
113
|
Navigation.navigate(loginRoute.addRouteParam("sso", "true"), {
|
|
@@ -42,6 +42,9 @@ class BaseAPI extends API {
|
|
|
42
42
|
defaultHeaders = Object.assign(Object.assign({}, defaultHeaders), headers);
|
|
43
43
|
return defaultHeaders;
|
|
44
44
|
}
|
|
45
|
+
static logoutUser() {
|
|
46
|
+
return User.logout();
|
|
47
|
+
}
|
|
45
48
|
static handleError(error) {
|
|
46
49
|
// 405 Status - Tenant not found. If Project was deleted.
|
|
47
50
|
// 401 Status - User is not logged in.
|
|
@@ -49,7 +52,7 @@ class BaseAPI extends API {
|
|
|
49
52
|
if (error instanceof HTTPErrorResponse &&
|
|
50
53
|
(error.statusCode === 401 || error.statusCode === 405)) {
|
|
51
54
|
const loginRoute = this.getLoginRoute();
|
|
52
|
-
|
|
55
|
+
this.logoutUser();
|
|
53
56
|
if (Navigation.getQueryStringByName("token")) {
|
|
54
57
|
Navigation.navigate(loginRoute.addRouteParam("sso", "true"), {
|
|
55
58
|
forceNavigate: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"API.js","sourceRoot":"","sources":["../../../../../UI/Utils/API/API.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,cAAc,MAAM,eAAe,CAAC;AAC3C,OAAO,IAAI,MAAM,SAAS,CAAC;AAC3B,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAIrE,OAAO,KAAK,MAAM,0BAA0B,CAAC;AAK7C,OAAO,aAAa,MAAM,8BAA8B,CAAC;AAKzD,OAAO,GAAG,MAAM,oBAAoB,CAAC;AAErC,MAAM,OAAQ,SAAQ,GAAG;IACvB,YAAmB,QAAkB,EAAE,QAAkB,EAAE,KAAa;QACtE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,GAAQ;QAC5B,OAAO,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC;IAES,MAAM,CAAU,KAAK,CAAC,wBAAwB,CACtD,OAA2B;QAE3B,IAAI,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC7C,cAAc,CAAC,oBAAoB,CACjC,aAAa,CAAC,WAAW,CACvB,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAC/B,CAChC,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,IAAI,OAAO,CAAC,yBAAyB,CAAC,EAAE,CAAC;YAClD,YAAY,CAAC,OAAO,CAClB,yBAAyB,EACzB,OAAO,CAAC,yBAAyB,CAAC,CACnC,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,IAAI,OAAO,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAC9C,cAAc,CAAC,qBAAqB,CAClC,aAAa,CAAC,WAAW,CACvB,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAChC,CAChC,CAAC;QACJ,CAAC;QAED,IAAI,OAAO,IAAI,OAAO,CAAC,0BAA0B,CAAC,EAAE,CAAC;YACnD,YAAY,CAAC,OAAO,CAClB,0BAA0B,EAC1B,OAAO,CAAC,0BAA0B,CAAC,CACpC,CAAC;QACJ,CAAC;QAED,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAES,MAAM,CAAU,UAAU;QAClC,IAAI,cAAc,GAAY,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAEvD,MAAM,OAAO,GAAY,EAAE,CAAC;QAE5B,MAAM,qBAAqB,GAAW,YAAY,CAAC,OAAO,CACxD,yBAAyB,CAChB,CAAC;QACZ,IAAI,qBAAqB,EAAE,CAAC;YAC1B,OAAO,CAAC,yBAAyB,CAAC,GAAG,qBAAqB,CAAC;QAC7D,CAAC;QAED,MAAM,sBAAsB,GAAW,YAAY,CAAC,OAAO,CACzD,0BAA0B,CACjB,CAAC;QAEZ,IAAI,sBAAsB,EAAE,CAAC;YAC3B,OAAO,CAAC,0BAA0B,CAAC,GAAG,sBAAsB,CAAC;QAC/D,CAAC;QAED,cAAc,mCACT,cAAc,GACd,OAAO,CACX,CAAC;QAEF,OAAO,cAAc,CAAC;IACxB,CAAC;IAES,MAAM,CAAU,WAAW,CACnC,KAAuC;QAEvC,yDAAyD;QACzD,sCAAsC;QACtC,8EAA8E;QAC9E,IACE,KAAK,YAAY,iBAAiB;YAClC,CAAC,KAAK,CAAC,UAAU,KAAK,GAAG,IAAI,KAAK,CAAC,UAAU,KAAK,GAAG,CAAC,EACtD,CAAC;YACD,MAAM,UAAU,GAAU,IAAI,CAAC,aAAa,EAAE,CAAC;YAE/C,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"API.js","sourceRoot":"","sources":["../../../../../UI/Utils/API/API.ts"],"names":[],"mappings":"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"}
|