@ohioepa/oepa-ui-lib 1.3.10 → 2.0.0
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.
|
@@ -30,26 +30,21 @@ export class OepaHttpInterceptor {
|
|
|
30
30
|
const params = {
|
|
31
31
|
oepats: new Date().getTime().toString()
|
|
32
32
|
};
|
|
33
|
+
const headers = req.headers;
|
|
33
34
|
if (this.userID) {
|
|
34
35
|
params['userid'] = this.userID;
|
|
36
|
+
headers.set('X-User-ID', this.userID);
|
|
35
37
|
}
|
|
36
38
|
if (this.sessionID) {
|
|
37
39
|
params['sessionid'] = this.sessionID;
|
|
38
40
|
}
|
|
39
|
-
let changedReq = undefined;
|
|
40
41
|
if (authToken) {
|
|
41
|
-
|
|
42
|
-
setHeaders: {
|
|
43
|
-
Authorization: `Bearer ${authToken}`
|
|
44
|
-
},
|
|
45
|
-
setParams: params
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
changedReq = req.clone({
|
|
50
|
-
setParams: params
|
|
51
|
-
});
|
|
42
|
+
headers.set('Authorization', `Bearer ${authToken}`);
|
|
52
43
|
}
|
|
44
|
+
let changedReq = req.clone({
|
|
45
|
+
headers: headers,
|
|
46
|
+
setParams: params
|
|
47
|
+
});
|
|
53
48
|
const timeoutValue = req.headers.get('timeout') || this.defaultTimeout;
|
|
54
49
|
const timeoutValueNumeric = Number(timeoutValue);
|
|
55
50
|
return next.handle(changedReq).pipe(timeout(timeoutValueNumeric), catchError((error) => {
|
|
@@ -86,4 +81,4 @@ export class OepaHttpInterceptor {
|
|
|
86
81
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: OepaHttpInterceptor, decorators: [{
|
|
87
82
|
type: Injectable
|
|
88
83
|
}], ctorParameters: () => [{ type: i1.OepaUserAccountService }] });
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oepa-http-interceptor.js","sourceRoot":"","sources":["../../../../../projects/oepa-ui-lib/src/lib/util/oepa-http-interceptor.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { Observable, throwError } from 'rxjs';\nimport { catchError, timeout } from 'rxjs/operators';\nimport { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpErrorResponse } from '@angular/common/http';\nimport { OepaUserAccountService } from '../oepa-user-account/oepa-user-account.service';\n\n@Injectable()\nexport class OepaHttpInterceptor implements HttpInterceptor {\n    readonly defaultTimeout = 5*60*1000;\n    private userID: string = '';\n    private sessionID: string = '';\n\n    constructor(private userAccountService: OepaUserAccountService) {\n        this.userAccountService.userAccount$.subscribe(account => {\n            if (account) {\n                this.userID = account.loginName || '';\n            }\n        });\n        this.userAccountService.sessionID$.subscribe(sessionID => {\n            this.sessionID = sessionID;\n        });\n    }\n\n    /**\n     * Add a timestamp as a query parameter to all http requests\n     * @param req\n     * @param next\n     */\n    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {\n        this.userAccountService.resetIdleTime();\n        const authToken = this.userAccountService.getAuthToken();\n        const params: any = {\n            oepats: new Date().getTime().toString()\n        }\n        const headers = req.headers;\n        if (this.userID) {\n            params['userid'] = this.userID;\n            headers.set('X-User-ID', this.userID);\n        }\n        if (this.sessionID) {\n            params['sessionid'] = this.sessionID;\n        }\n        if (authToken) {\n            headers.set('Authorization', `Bearer ${authToken}`);\n        }\n        let changedReq: any = req.clone({\n            headers: headers,\n            setParams: params\n        });\n        const timeoutValue = req.headers.get('timeout') || this.defaultTimeout;\n        const timeoutValueNumeric = Number(timeoutValue);\n        return next.handle(changedReq).pipe(\n            timeout(timeoutValueNumeric),\n            catchError((error: HttpErrorResponse) => {\n                let msg = error.headers ? error.headers.get('OEPA_ERROR') : '';\n                console.log('msg from header = ' + msg);\n                console.log('ERROR: [' + req.url + ']: ' + JSON.stringify(error));\n                msg = msg || error.error.message || error.error.errorMessage || 'Server error.';\n                if (msg) {\n                    if (msg.indexOf('User account is required') > -1\n                        || msg.toUpperCase().indexOf('USERID IS MISSING') > -1) {\n                        alert(msg);\n                        this.userAccountService.redirectToLogout();\n                    }\n                    msg = this.shortenErrorMessage(msg);\n                }\n                return throwError(() => msg);\n            })\n        );\n    }\n\n    /**\n     * Shorten error message in the event of a JSON parse error\n     */\n    private shortenErrorMessage(msg: string): string {\n        const JSONParseMsg = 'JSON parse error:';\n        const JSONParseIdx = msg.indexOf(JSONParseMsg);\n        if (JSONParseIdx > -1) {\n            const semicolonIdx = msg.indexOf(';');\n            msg = msg.substring(JSONParseMsg.length, semicolonIdx);\n        }\n        return msg;\n    }\n}\n"]}
|
|
@@ -9377,26 +9377,21 @@ class OepaHttpInterceptor {
|
|
|
9377
9377
|
const params = {
|
|
9378
9378
|
oepats: new Date().getTime().toString()
|
|
9379
9379
|
};
|
|
9380
|
+
const headers = req.headers;
|
|
9380
9381
|
if (this.userID) {
|
|
9381
9382
|
params['userid'] = this.userID;
|
|
9383
|
+
headers.set('X-User-ID', this.userID);
|
|
9382
9384
|
}
|
|
9383
9385
|
if (this.sessionID) {
|
|
9384
9386
|
params['sessionid'] = this.sessionID;
|
|
9385
9387
|
}
|
|
9386
|
-
let changedReq = undefined;
|
|
9387
9388
|
if (authToken) {
|
|
9388
|
-
|
|
9389
|
-
setHeaders: {
|
|
9390
|
-
Authorization: `Bearer ${authToken}`
|
|
9391
|
-
},
|
|
9392
|
-
setParams: params
|
|
9393
|
-
});
|
|
9394
|
-
}
|
|
9395
|
-
else {
|
|
9396
|
-
changedReq = req.clone({
|
|
9397
|
-
setParams: params
|
|
9398
|
-
});
|
|
9389
|
+
headers.set('Authorization', `Bearer ${authToken}`);
|
|
9399
9390
|
}
|
|
9391
|
+
let changedReq = req.clone({
|
|
9392
|
+
headers: headers,
|
|
9393
|
+
setParams: params
|
|
9394
|
+
});
|
|
9400
9395
|
const timeoutValue = req.headers.get('timeout') || this.defaultTimeout;
|
|
9401
9396
|
const timeoutValueNumeric = Number(timeoutValue);
|
|
9402
9397
|
return next.handle(changedReq).pipe(timeout(timeoutValueNumeric), catchError((error) => {
|