monkey-front-core 0.0.593 → 0.0.595
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/esm2020/lib/core/services/error/monkeyecx-http-error-handling.service.mjs +12 -4
- package/fesm2015/monkey-front-core.mjs +11 -3
- package/fesm2015/monkey-front-core.mjs.map +1 -1
- package/fesm2020/monkey-front-core.mjs +11 -3
- package/fesm2020/monkey-front-core.mjs.map +1 -1
- package/monkey-front-core-0.0.595.tgz +0 -0
- package/package.json +1 -1
- package/monkey-front-core-0.0.593.tgz +0 -0
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
1
|
+
import { Injectable, NgZone } from '@angular/core';
|
|
2
2
|
import { MonkeyEcxUtils } from '../../utils/utils';
|
|
3
3
|
import { MonkeyEcxCommonsService } from '../commons';
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
@@ -40,8 +40,11 @@ export class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
40
40
|
}
|
|
41
41
|
showMessage(message, error, mkc) {
|
|
42
42
|
const { snackbarService } = this;
|
|
43
|
+
console.log('#########');
|
|
44
|
+
console.log(error.status);
|
|
43
45
|
if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {
|
|
44
46
|
const keepOnUrlChange = error.status === 401;
|
|
47
|
+
console.log('keepOnUrlChange', keepOnUrlChange);
|
|
45
48
|
snackbarService.show({
|
|
46
49
|
title: this.__i18n?.TITLE,
|
|
47
50
|
message,
|
|
@@ -72,6 +75,9 @@ export class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
72
75
|
if (notifications) {
|
|
73
76
|
customMessage = notifications;
|
|
74
77
|
}
|
|
78
|
+
console.log('@@@@@');
|
|
79
|
+
console.log(error);
|
|
80
|
+
console.log('@@@@@');
|
|
75
81
|
if (!customMessage) {
|
|
76
82
|
if (error.error instanceof Blob) {
|
|
77
83
|
const blob = new Blob([error.error], {
|
|
@@ -128,8 +134,10 @@ export class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
128
134
|
handleErrorRefreshToken(error, mkc) {
|
|
129
135
|
const hasToRefresh = this.monkeyecxAuthenticationService.refreshShouldHappen(error);
|
|
130
136
|
if ((error.status === 401 || error.status === 400) && hasToRefresh) {
|
|
131
|
-
|
|
132
|
-
|
|
137
|
+
NgZone.call(this.monkeyecxAuthenticationService.redirectLoginWelcomeBack(), {});
|
|
138
|
+
setTimeout(() => {
|
|
139
|
+
this.handleMessage(error, mkc);
|
|
140
|
+
}, 1200);
|
|
133
141
|
}
|
|
134
142
|
else if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {
|
|
135
143
|
this.handleMessage(error, mkc);
|
|
@@ -144,4 +152,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
|
|
|
144
152
|
providedIn: 'root'
|
|
145
153
|
}]
|
|
146
154
|
}], ctorParameters: function () { return [{ type: i1.MonkeyEcxService }, { type: i2.MonkeyEcxTokenStorageService }, { type: i3.MonkeyEcxAuthenticationService }, { type: i4.Router }, { type: i5.MonkeyStyleGuideSnackbarService }, { type: i6.TranslateService }]; } });
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monkeyecx-http-error-handling.service.js","sourceRoot":"","sources":["../../../../../../../projects/monkey-front-core/src/lib/core/services/error/monkeyecx-http-error-handling.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAK3C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;;;;;;;;AAOrD,MAAM,OAAO,iCAAkC,SAAQ,uBAAuB;IAC5E,YACE,gBAAkC,EAClC,YAA0C,EAClC,8BAA8D,EAC9D,MAAc,EACd,eAAgD,EAChD,gBAAkC;QAE1C,KAAK,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;QAL9B,mCAA8B,GAA9B,8BAA8B,CAAgC;QAC9D,WAAM,GAAN,MAAM,CAAQ;QACd,oBAAe,GAAf,eAAe,CAAiC;QAChD,qBAAgB,GAAhB,gBAAgB,CAAkB;QAI1C,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,CAAC;IAC1D,CAAC;IAEO,uBAAuB,CAAC,EAA+B,EAAE,QAAgB;QAC/E,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE;YACtE,OAAO,KAAK,CAAC;SACd;QAED,MAAM,KAAK,GAAG,CAAC,EAAE,EAAE,YAAY,EAAE,cAAc,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAE/E,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,wBAAwB,CAAC,EAA+B,EAAE,QAAgB;QAChF,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE;YACtE,OAAO,KAAK,CAAC;SACd;QAED,MAAM,KAAK,GAAG,CAAC,EAAE,EAAE,YAAY,EAAE,sBAAsB,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAEvF,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,cAAc,CAAC,MAAc;QACnC,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,EAAE;YACxE,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,WAAW,CAAC,OAAe,EAAE,KAAwB,EAAE,GAAgC;QAC7F,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE;YACpD,MAAM,eAAe,GAAG,KAAK,CAAC,MAAM,KAAK,GAAG,CAAC;YAE7C,eAAe,CAAC,IAAI,CAAC;gBACnB,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK;gBACzB,OAAO;gBACP,IAAI,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC;gBACvC,QAAQ,EAAE,IAAI;gBACd,kBAAkB,EAAE,QAAQ;gBAC5B,gBAAgB,EAAE,KAAK;gBACvB,eAAe;aAChB,CAAC,CAAC;SACJ;IACH,CAAC;IAEO,aAAa,CAAC,KAAwB,EAAE,GAAgC;QAC9E,qCAAqC;QACrC,MAAM,EAAE,aAAa,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,KAAK,EAAE,KAAK,IAAI;YACpE,aAAa,EAAE,EAAE;YACjB,iBAAiB,EAAE,EAAE;YACrB,OAAO,EAAE,EAAE;SACZ,CAAC;QAEF,IAAI,aAAa,GAAG,EAAE,CAAC;QAEvB,IAAI,OAAO,EAAE;YACX,aAAa,GAAG,OAAO,CAAC;SACzB;QAED,qCAAqC;QACrC,IAAI,iBAAiB,EAAE;YACrB,qCAAqC;YACrC,aAAa,GAAG,iBAAiB,CAAC;SACnC;QAED,IAAI,aAAa,EAAE;YACjB,aAAa,GAAG,aAAa,CAAC;SAC/B;QAED,IAAI,CAAC,aAAa,EAAE;YAClB,IAAI,KAAK,CAAC,KAAK,YAAY,IAAI,EAAE;gBAC/B,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;oBACnC,IAAI,EAAE,kBAAkB;iBACzB,CAAC,CAAC;gBACH,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;gBAChC,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;oBACvC,MAAM,IAAI,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC;oBAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC;oBAC5C,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;oBACvC,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;gBAC9C,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;aACzB;iBAAM,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE;gBACjD,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;gBACxD,MAAM,GAAG,GACP,KAAK,CAAC,MAAM,KAAK,GAAG;oBAClB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,kBAAkB,CAAC,IAAI,UAAU;oBACnE,CAAC,CAAC,UAAU,CAAC;gBAEjB,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;aACnC;SACF;aAAM;YACL,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;SAC7C;IACH,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,KAAwB,EAAE,GAAgC;QACjF,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;QACtC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QACzB,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,MAAM,YAAY,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;QAEhF,MAAM,MAAM,GAAQ;YAClB,GAAG,EAAE,WAAW;YAChB,GAAG,EAAE,kBAAkB;YACvB,GAAG,EAAE,kBAAkB;SACxB,CAAC;QAEF,IAAI,KAAK,GAAG,MAAM,CAAC;QACnB,IAAI,WAAW,EAAE;YACf,KAAK,GAAG,GAAG,KAAK,IAAI,WAAW,QAAQ,CAAC;SACzC;aAAM;YACL,KAAK,GAAG,GAAG,KAAK,QAAQ,CAAC;SAC1B;QAED,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;QAC7B,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE;YAC/D,KAAK,GAAG,GAAG,KAAK,IAAI,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC;YAC1C,OAAO,GAAG,GAAG,CAAC;YACd,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;SAC1B;QAED,UAAU,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC,EAAE,OAAO,CAAC,CAAC;IACd,CAAC;IAEM,uBAAuB,CAAC,KAAwB,EAAE,GAAgC;QACvF,MAAM,YAAY,GAAG,IAAI,CAAC,8BAA8B,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACpF,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,CAAC,IAAI,YAAY,EAAE;YAClE,mFAAmF;YACnF,kCAAkC;SACnC;aAAM,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE;YAC3D,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;SAChC;IACH,CAAC;;8HAxJU,iCAAiC;kIAAjC,iCAAiC,cAFhC,MAAM;2FAEP,iCAAiC;kBAH7C,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\nimport { Injectable } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { TranslateService } from '@ngx-translate/core';\nimport { MonkeyStyleGuideSnackbarService } from 'monkey-style-guide';\nimport { MonkeyEcxServiceCredentials } from '../../interfaces';\nimport { MonkeyEcxUtils } from '../../utils/utils';\nimport { MonkeyEcxAuthenticationService } from '../auth';\nimport { MonkeyEcxCommonsService } from '../commons';\nimport { MonkeyEcxService } from '../monkeyecx-service.service';\nimport { MonkeyEcxTokenStorageService } from '../storage';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {\n  constructor(\n    monkeyecxService: MonkeyEcxService,\n    tokenStorage: MonkeyEcxTokenStorageService,\n    private monkeyecxAuthenticationService: MonkeyEcxAuthenticationService,\n    private router: Router,\n    private snackbarService: MonkeyStyleGuideSnackbarService,\n    private translateService: TranslateService\n  ) {\n    super(monkeyecxService, tokenStorage);\n\n    super.resolve(null, null);\n\n    this.geti18n(this.translateService, 'SERVICES.WARNING');\n  }\n\n  private isHttpCodeIgnoreMessage(tp: MonkeyEcxServiceCredentials, httpCode: number): boolean {\n    if (!MonkeyEcxUtils.persistNullEmptyUndefined(tp) && !tp?.httpResponse) {\n      return false;\n    }\n\n    const found = (tp?.httpResponse?.httpCodeIgnore || [])?.indexOf(httpCode) > -1;\n\n    return found;\n  }\n\n  private isHttpCodeIgnoreRedirect(tp: MonkeyEcxServiceCredentials, httpCode: number): boolean {\n    if (!MonkeyEcxUtils.persistNullEmptyUndefined(tp) && !tp?.httpResponse) {\n      return false;\n    }\n\n    const found = (tp?.httpResponse?.httpCodeIgnoreRedirect || [])?.indexOf(httpCode) > -1;\n\n    return found;\n  }\n\n  private getMessageType(status: number): 'theme' | 'warning' | 'success' | 'error' | 'question' {\n    if (status === 409 || status === 400 || status === 401 || status === 429) {\n      return 'warning';\n    }\n\n    return 'error';\n  }\n\n  private showMessage(message: string, error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    const { snackbarService } = this;\n    if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {\n      const keepOnUrlChange = error.status === 401;\n\n      snackbarService.show({\n        title: this.__i18n?.TITLE,\n        message,\n        type: this.getMessageType(error.status),\n        duration: 4000,\n        horizontalPosition: 'center',\n        verticalPosition: 'top',\n        keepOnUrlChange\n      });\n    }\n  }\n\n  private handleMessage(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    // eslint-disable-next-line camelcase\n    const { notifications, error_description, message } = error?.error || {\n      notifications: '',\n      error_description: '',\n      message: ''\n    };\n\n    let customMessage = '';\n\n    if (message) {\n      customMessage = message;\n    }\n\n    // eslint-disable-next-line camelcase\n    if (error_description) {\n      // eslint-disable-next-line camelcase\n      customMessage = error_description;\n    }\n\n    if (notifications) {\n      customMessage = notifications;\n    }\n\n    if (!customMessage) {\n      if (error.error instanceof Blob) {\n        const blob = new Blob([error.error], {\n          type: 'application/json'\n        });\n        const reader = new FileReader();\n        reader.addEventListener('loadend', (e) => {\n          const text = e?.target?.result;\n          const jsonResp = JSON.parse(text as string);\n          customMessage = jsonResp.notifications;\n          this.showMessage(customMessage, error, mkc);\n        });\n        reader.readAsText(blob);\n      } else if (!error?.url?.includes('assets.monkey')) {\n        const defaultMsg = this.__i18n['ERROR-HANDLING']?.ERROR;\n        const msg =\n          error.status === 429\n            ? this.__i18n['ERROR-HANDLING']?.['TOO-MANY-REQUEST'] ?? defaultMsg\n            : defaultMsg;\n\n        this.showMessage(msg, error, mkc);\n      }\n    } else {\n      this.showMessage(customMessage, error, mkc);\n    }\n  }\n\n  public async handleError(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    const { router, tokenStorage } = this;\n    const { status } = error;\n    const { companyType } = (await tokenStorage?.getToken()) || { companyType: '' };\n\n    const routes: any = {\n      403: 'forbidden',\n      500: 'service-problems',\n      503: 'service-problems'\n    };\n\n    let route = '/app';\n    if (companyType) {\n      route = `${route}/${companyType}/pages`;\n    } else {\n      route = `${route}/pages`;\n    }\n\n    const found = routes[status];\n    let timeout = 0;\n\n    if (found && !this.isHttpCodeIgnoreRedirect(mkc, error?.status)) {\n      route = `${route}/${found}`.toLowerCase();\n      timeout = 800;\n      router.navigate([route]);\n    }\n\n    setTimeout(() => {\n      this.handleMessage(error, mkc);\n    }, timeout);\n  }\n\n  public handleErrorRefreshToken(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    const hasToRefresh = this.monkeyecxAuthenticationService.refreshShouldHappen(error);\n    if ((error.status === 401 || error.status === 400) && hasToRefresh) {\n      // NgZone.call(this.monkeyecxAuthenticationService.redirectLoginWelcomeBack(), {});\n      // this.handleMessage(error, mkc);\n    } else if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {\n      this.handleMessage(error, mkc);\n    }\n  }\n}\n"]}
|
|
155
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"monkeyecx-http-error-handling.service.js","sourceRoot":"","sources":["../../../../../../../projects/monkey-front-core/src/lib/core/services/error/monkeyecx-http-error-handling.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpErrorResponse } from '@angular/common/http';\nimport { Injectable, NgZone } from '@angular/core';\nimport { Router } from '@angular/router';\nimport { TranslateService } from '@ngx-translate/core';\nimport { MonkeyStyleGuideSnackbarService } from 'monkey-style-guide';\nimport { MonkeyEcxServiceCredentials } from '../../interfaces';\nimport { MonkeyEcxUtils } from '../../utils/utils';\nimport { MonkeyEcxAuthenticationService } from '../auth';\nimport { MonkeyEcxCommonsService } from '../commons';\nimport { MonkeyEcxService } from '../monkeyecx-service.service';\nimport { MonkeyEcxTokenStorageService } from '../storage';\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {\n  constructor(\n    monkeyecxService: MonkeyEcxService,\n    tokenStorage: MonkeyEcxTokenStorageService,\n    private monkeyecxAuthenticationService: MonkeyEcxAuthenticationService,\n    private router: Router,\n    private snackbarService: MonkeyStyleGuideSnackbarService,\n    private translateService: TranslateService\n  ) {\n    super(monkeyecxService, tokenStorage);\n\n    super.resolve(null, null);\n\n    this.geti18n(this.translateService, 'SERVICES.WARNING');\n  }\n\n  private isHttpCodeIgnoreMessage(tp: MonkeyEcxServiceCredentials, httpCode: number): boolean {\n    if (!MonkeyEcxUtils.persistNullEmptyUndefined(tp) && !tp?.httpResponse) {\n      return false;\n    }\n\n    const found = (tp?.httpResponse?.httpCodeIgnore || [])?.indexOf(httpCode) > -1;\n\n    return found;\n  }\n\n  private isHttpCodeIgnoreRedirect(tp: MonkeyEcxServiceCredentials, httpCode: number): boolean {\n    if (!MonkeyEcxUtils.persistNullEmptyUndefined(tp) && !tp?.httpResponse) {\n      return false;\n    }\n\n    const found = (tp?.httpResponse?.httpCodeIgnoreRedirect || [])?.indexOf(httpCode) > -1;\n\n    return found;\n  }\n\n  private getMessageType(status: number): 'theme' | 'warning' | 'success' | 'error' | 'question' {\n    if (status === 409 || status === 400 || status === 401 || status === 429) {\n      return 'warning';\n    }\n\n    return 'error';\n  }\n\n  private showMessage(message: string, error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    const { snackbarService } = this;\n    console.log('#########');\n    console.log(error.status);\n    if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {\n      const keepOnUrlChange = error.status === 401;\n      console.log('keepOnUrlChange', keepOnUrlChange);\n\n      snackbarService.show({\n        title: this.__i18n?.TITLE,\n        message,\n        type: this.getMessageType(error.status),\n        duration: 4000,\n        horizontalPosition: 'center',\n        verticalPosition: 'top',\n        keepOnUrlChange\n      });\n    }\n  }\n\n  private handleMessage(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    // eslint-disable-next-line camelcase\n    const { notifications, error_description, message } = error?.error || {\n      notifications: '',\n      error_description: '',\n      message: ''\n    };\n\n    let customMessage = '';\n\n    if (message) {\n      customMessage = message;\n    }\n\n    // eslint-disable-next-line camelcase\n    if (error_description) {\n      // eslint-disable-next-line camelcase\n      customMessage = error_description;\n    }\n\n    if (notifications) {\n      customMessage = notifications;\n    }\n\n    console.log('@@@@@');\n    console.log(error);\n    console.log('@@@@@');\n\n    if (!customMessage) {\n      if (error.error instanceof Blob) {\n        const blob = new Blob([error.error], {\n          type: 'application/json'\n        });\n        const reader = new FileReader();\n        reader.addEventListener('loadend', (e) => {\n          const text = e?.target?.result;\n          const jsonResp = JSON.parse(text as string);\n          customMessage = jsonResp.notifications;\n          this.showMessage(customMessage, error, mkc);\n        });\n        reader.readAsText(blob);\n      } else if (!error?.url?.includes('assets.monkey')) {\n        const defaultMsg = this.__i18n['ERROR-HANDLING']?.ERROR;\n        const msg =\n          error.status === 429\n            ? this.__i18n['ERROR-HANDLING']?.['TOO-MANY-REQUEST'] ?? defaultMsg\n            : defaultMsg;\n\n        this.showMessage(msg, error, mkc);\n      }\n    } else {\n      this.showMessage(customMessage, error, mkc);\n    }\n  }\n\n  public async handleError(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    const { router, tokenStorage } = this;\n    const { status } = error;\n    const { companyType } = (await tokenStorage?.getToken()) || { companyType: '' };\n\n    const routes: any = {\n      403: 'forbidden',\n      500: 'service-problems',\n      503: 'service-problems'\n    };\n\n    let route = '/app';\n    if (companyType) {\n      route = `${route}/${companyType}/pages`;\n    } else {\n      route = `${route}/pages`;\n    }\n\n    const found = routes[status];\n    let timeout = 0;\n\n    if (found && !this.isHttpCodeIgnoreRedirect(mkc, error?.status)) {\n      route = `${route}/${found}`.toLowerCase();\n      timeout = 800;\n      router.navigate([route]);\n    }\n\n    setTimeout(() => {\n      this.handleMessage(error, mkc);\n    }, timeout);\n  }\n\n  public handleErrorRefreshToken(error: HttpErrorResponse, mkc: MonkeyEcxServiceCredentials) {\n    const hasToRefresh = this.monkeyecxAuthenticationService.refreshShouldHappen(error);\n    if ((error.status === 401 || error.status === 400) && hasToRefresh) {\n      NgZone.call(this.monkeyecxAuthenticationService.redirectLoginWelcomeBack(), {});\n      setTimeout(() => {\n        this.handleMessage(error, mkc);\n      }, 1200);\n    } else if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {\n      this.handleMessage(error, mkc);\n    }\n  }\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
|
-
import { Component, Input, NgModule, Pipe, ViewEncapsulation, Injectable, InjectionToken, DEFAULT_CURRENCY_CODE, Inject, EventEmitter, Directive, Output, HostBinding, HostListener, forwardRef, Self, Optional, inject, SkipSelf, ErrorHandler } from '@angular/core';
|
|
2
|
+
import { Component, Input, NgModule, Pipe, ViewEncapsulation, Injectable, InjectionToken, DEFAULT_CURRENCY_CODE, Inject, EventEmitter, Directive, Output, HostBinding, HostListener, forwardRef, Self, Optional, inject, SkipSelf, NgZone, ErrorHandler } from '@angular/core';
|
|
3
3
|
import * as i1 from 'monkey-style-guide';
|
|
4
4
|
import { MonkeyButtonModule, MonkeyModalModule, MonkeyIconModule, MonkeyInputModule, MonkeyRadioButtonModule, MonkeyOptionModule, MonkeyUtils, MonkeyStyleGuideModule, MonkeyStyleGuideModalService, MonkeyStyleGuideSettingsService, MonkeyStyleGuideSnackbarService } from 'monkey-style-guide';
|
|
5
5
|
import * as i2 from '@angular/common';
|
|
@@ -5261,8 +5261,11 @@ class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
5261
5261
|
showMessage(message, error, mkc) {
|
|
5262
5262
|
var _a;
|
|
5263
5263
|
const { snackbarService } = this;
|
|
5264
|
+
console.log('#########');
|
|
5265
|
+
console.log(error.status);
|
|
5264
5266
|
if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {
|
|
5265
5267
|
const keepOnUrlChange = error.status === 401;
|
|
5268
|
+
console.log('keepOnUrlChange', keepOnUrlChange);
|
|
5266
5269
|
snackbarService.show({
|
|
5267
5270
|
title: (_a = this.__i18n) === null || _a === void 0 ? void 0 : _a.TITLE,
|
|
5268
5271
|
message,
|
|
@@ -5294,6 +5297,9 @@ class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
5294
5297
|
if (notifications) {
|
|
5295
5298
|
customMessage = notifications;
|
|
5296
5299
|
}
|
|
5300
|
+
console.log('@@@@@');
|
|
5301
|
+
console.log(error);
|
|
5302
|
+
console.log('@@@@@');
|
|
5297
5303
|
if (!customMessage) {
|
|
5298
5304
|
if (error.error instanceof Blob) {
|
|
5299
5305
|
const blob = new Blob([error.error], {
|
|
@@ -5353,8 +5359,10 @@ class MonkeyEcxHttpErrorHandlingService extends MonkeyEcxCommonsService {
|
|
|
5353
5359
|
handleErrorRefreshToken(error, mkc) {
|
|
5354
5360
|
const hasToRefresh = this.monkeyecxAuthenticationService.refreshShouldHappen(error);
|
|
5355
5361
|
if ((error.status === 401 || error.status === 400) && hasToRefresh) {
|
|
5356
|
-
|
|
5357
|
-
|
|
5362
|
+
NgZone.call(this.monkeyecxAuthenticationService.redirectLoginWelcomeBack(), {});
|
|
5363
|
+
setTimeout(() => {
|
|
5364
|
+
this.handleMessage(error, mkc);
|
|
5365
|
+
}, 1200);
|
|
5358
5366
|
}
|
|
5359
5367
|
else if (!this.isHttpCodeIgnoreMessage(mkc, error.status)) {
|
|
5360
5368
|
this.handleMessage(error, mkc);
|