ngx-scandoc 1.2.1 → 1.2.3
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/core/components/scan/scan.component.d.ts +2 -0
- package/core/helpers/object-utils.d.ts +16 -0
- package/core/interfaces/config.d.ts +2 -0
- package/esm2020/core/components/camera-switch/camera-switch.component.mjs +4 -3
- package/esm2020/core/components/scan/scan.component.mjs +8 -6
- package/esm2020/core/components/scan-results/scan-results.component.mjs +4 -3
- package/esm2020/core/components/webcam/webcam/webcam.component.mjs +4 -2
- package/esm2020/core/helpers/object-utils.mjs +100 -0
- package/esm2020/core/interfaces/config.mjs +1 -1
- package/esm2020/dialogs/components/scan-profile/scan-profile.component.mjs +4 -3
- package/esm2020/dialogs/components/turn-document/turn-document.component.mjs +4 -3
- package/esm2020/providers/auth.provider.mjs +68 -17
- package/esm2020/providers/interceptor.provider.mjs +11 -5
- package/esm2020/providers/scan.form.mjs +32 -32
- package/esm2020/providers/translate-loader.provider.mjs +126 -0
- package/esm2020/providers/translation.provider.mjs +83 -8
- package/esm2020/public-api.mjs +3 -2
- package/fesm2015/ngx-scandoc.mjs +439 -84
- package/fesm2015/ngx-scandoc.mjs.map +1 -1
- package/fesm2020/ngx-scandoc.mjs +437 -84
- package/fesm2020/ngx-scandoc.mjs.map +1 -1
- package/package.json +1 -1
- package/providers/auth.provider.d.ts +9 -4
- package/providers/scan.form.d.ts +2 -2
- package/providers/translate-loader.provider.d.ts +28 -0
- package/providers/translation.provider.d.ts +21 -4
- package/public-api.d.ts +2 -1
- package/src/assets/i18n/de.json +110 -0
- package/src/assets/i18n/en.json +105 -0
- package/src/assets/i18n/hr.json +115 -0
- package/src/assets/i18n/it.json +115 -0
|
@@ -5,6 +5,7 @@ import * as i1 from "@angular/material/dialog";
|
|
|
5
5
|
import * as i2 from "@angular/common";
|
|
6
6
|
import * as i3 from "@angular/material/icon";
|
|
7
7
|
import * as i4 from "@angular/material/button";
|
|
8
|
+
import * as i5 from "@ngx-translate/core";
|
|
8
9
|
export class TurnDocumentComponent {
|
|
9
10
|
constructor(dialogRef, data) {
|
|
10
11
|
this.dialogRef = dialogRef;
|
|
@@ -19,12 +20,12 @@ export class TurnDocumentComponent {
|
|
|
19
20
|
}
|
|
20
21
|
}
|
|
21
22
|
TurnDocumentComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TurnDocumentComponent, deps: [{ token: i1.MatDialogRef }, { token: MAT_DIALOG_DATA }], target: i0.ɵɵFactoryTarget.Component });
|
|
22
|
-
TurnDocumentComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.3.0", type: TurnDocumentComponent, selector: "app-turndocuments", ngImport: i0, template: "<div class=\"inner\" fxLayout=\"column\" fxLayoutAlign=\"center center\">\n <!-- <img\n style=\"height: 240px; margin: 34px 0px;display: none;\"\n [src]=\"'/assets/images/illustrations/' + images[type]\"\n /> -->\n <!-- <img style=\"width:60px;\" src=\"/assets/images/illustrations/door-lock.png\"> -->\n\n <mat-icon>360</mat-icon>\n <div class=\"text\">\n <ng-container *ngIf=\"data.idScan === 'BACK'\">\n
|
|
23
|
+
TurnDocumentComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.3.0", type: TurnDocumentComponent, selector: "app-turndocuments", ngImport: i0, template: "<div class=\"inner\" fxLayout=\"column\" fxLayoutAlign=\"center center\">\n <!-- <img\n style=\"height: 240px; margin: 34px 0px;display: none;\"\n [src]=\"'/assets/images/illustrations/' + images[type]\"\n /> -->\n <!-- <img style=\"width:60px;\" src=\"/assets/images/illustrations/door-lock.png\"> -->\n\n <mat-icon>360</mat-icon>\n <div class=\"text\">\n <ng-container *ngIf=\"data.idScan === 'BACK'\">\n {{ \"scandoc.turnAndCapture.back\" | translate }}\n </ng-container>\n <ng-container *ngIf=\"data.idScan === 'FRONT'\">\n {{ \"scandoc.turnAndCapture.front\" | translate }}\n </ng-container>\n </div>\n</div>\n\n<!-- -->\n\n<footer>\n <button (click)=\"close()\" mat-raised-button>Ok</button>\n</footer>\n", styles: [":host{display:flex;flex-direction:column;flex:1;height:100%;width:100%}.inner{display:flex;flex-direction:column;align-items:center;justify-content:center;padding:30px 20px 0}.inner mat-icon{width:60px;height:60px;font-size:60px}.inner .text{margin:20px 0}footer{display:flex;flex-direction:row;align-items:center;justify-content:center;padding-bottom:20px}footer button{min-width:200px;box-shadow:none;border:1px solid #ccc}\n"], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i3.MatIcon, selector: "mat-icon", inputs: ["color", "inline", "svgIcon", "fontSet", "fontIcon"], exportAs: ["matIcon"] }, { kind: "component", type: i4.MatButton, selector: "button[mat-button], button[mat-raised-button], button[mat-icon-button], button[mat-fab], button[mat-mini-fab], button[mat-stroked-button], button[mat-flat-button]", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "pipe", type: i5.TranslatePipe, name: "translate" }] });
|
|
23
24
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: TurnDocumentComponent, decorators: [{
|
|
24
25
|
type: Component,
|
|
25
|
-
args: [{ selector: 'app-turndocuments', template: "<div class=\"inner\" fxLayout=\"column\" fxLayoutAlign=\"center center\">\n <!-- <img\n style=\"height: 240px; margin: 34px 0px;display: none;\"\n [src]=\"'/assets/images/illustrations/' + images[type]\"\n /> -->\n <!-- <img style=\"width:60px;\" src=\"/assets/images/illustrations/door-lock.png\"> -->\n\n <mat-icon>360</mat-icon>\n <div class=\"text\">\n <ng-container *ngIf=\"data.idScan === 'BACK'\">\n
|
|
26
|
+
args: [{ selector: 'app-turndocuments', template: "<div class=\"inner\" fxLayout=\"column\" fxLayoutAlign=\"center center\">\n <!-- <img\n style=\"height: 240px; margin: 34px 0px;display: none;\"\n [src]=\"'/assets/images/illustrations/' + images[type]\"\n /> -->\n <!-- <img style=\"width:60px;\" src=\"/assets/images/illustrations/door-lock.png\"> -->\n\n <mat-icon>360</mat-icon>\n <div class=\"text\">\n <ng-container *ngIf=\"data.idScan === 'BACK'\">\n {{ \"scandoc.turnAndCapture.back\" | translate }}\n </ng-container>\n <ng-container *ngIf=\"data.idScan === 'FRONT'\">\n {{ \"scandoc.turnAndCapture.front\" | translate }}\n </ng-container>\n </div>\n</div>\n\n<!-- -->\n\n<footer>\n <button (click)=\"close()\" mat-raised-button>Ok</button>\n</footer>\n", styles: [":host{display:flex;flex-direction:column;flex:1;height:100%;width:100%}.inner{display:flex;flex-direction:column;align-items:center;justify-content:center;padding:30px 20px 0}.inner mat-icon{width:60px;height:60px;font-size:60px}.inner .text{margin:20px 0}footer{display:flex;flex-direction:row;align-items:center;justify-content:center;padding-bottom:20px}footer button{min-width:200px;box-shadow:none;border:1px solid #ccc}\n"] }]
|
|
26
27
|
}], ctorParameters: function () { return [{ type: i1.MatDialogRef }, { type: undefined, decorators: [{
|
|
27
28
|
type: Inject,
|
|
28
29
|
args: [MAT_DIALOG_DATA]
|
|
29
30
|
}] }]; } });
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHVybi1kb2N1bWVudC5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZ3gtc2NhbmRvYy9zcmMvZGlhbG9ncy9jb21wb25lbnRzL3R1cm4tZG9jdW1lbnQvdHVybi1kb2N1bWVudC5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9uZ3gtc2NhbmRvYy9zcmMvZGlhbG9ncy9jb21wb25lbnRzL3R1cm4tZG9jdW1lbnQvdHVybi1kb2N1bWVudC5jb21wb25lbnQuaHRtbCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFVLE1BQU0sRUFBZ0IsTUFBTSxlQUFlLENBQUM7QUFDeEUsT0FBTyxFQUFnQixlQUFlLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQzs7Ozs7OztBQU96RSxNQUFNLE9BQU8scUJBQXFCO0lBR2hDLFlBQ1MsU0FBOEMsRUFDckIsSUFBUztRQURsQyxjQUFTLEdBQVQsU0FBUyxDQUFxQztRQUNyQixTQUFJLEdBQUosSUFBSSxDQUFLO0lBQ3hDLENBQUM7SUFFSixRQUFRO1FBQ04sT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDeEIsQ0FBQztJQUVELEtBQUs7UUFDSCxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQztRQUM1QixJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQ3pCLENBQUM7O2tIQWZVLHFCQUFxQiw4Q0FLdEIsZUFBZTtzR0FMZCxxQkFBcUIseURDUmxDLDR1QkF1QkE7MkZEZmEscUJBQXFCO2tCQUxqQyxTQUFTOytCQUNFLG1CQUFtQjs7MEJBUzFCLE1BQU07MkJBQUMsZUFBZSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbXBvbmVudCwgT25Jbml0LCBJbmplY3QsIEhvc3RMaXN0ZW5lciB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgTWF0RGlhbG9nUmVmLCBNQVRfRElBTE9HX0RBVEEgfSBmcm9tICdAYW5ndWxhci9tYXRlcmlhbC9kaWFsb2cnO1xuXG5AQ29tcG9uZW50KHtcbiAgc2VsZWN0b3I6ICdhcHAtdHVybmRvY3VtZW50cycsXG4gIHRlbXBsYXRlVXJsOiAnLi90dXJuLWRvY3VtZW50LmNvbXBvbmVudC5odG1sJyxcbiAgc3R5bGVVcmxzOiBbJy4vdHVybi1kb2N1bWVudC5jb21wb25lbnQuc2NzcyddLFxufSlcbmV4cG9ydCBjbGFzcyBUdXJuRG9jdW1lbnRDb21wb25lbnQgaW1wbGVtZW50cyBPbkluaXQge1xuXG5cbiAgY29uc3RydWN0b3IoXG4gICAgcHVibGljIGRpYWxvZ1JlZjogTWF0RGlhbG9nUmVmPFR1cm5Eb2N1bWVudENvbXBvbmVudD4sXG4gICAgQEluamVjdChNQVRfRElBTE9HX0RBVEEpIHB1YmxpYyBkYXRhOiBhbnlcbiAgKSB7fVxuXG4gIG5nT25Jbml0KCkge1xuICAgIGNvbnNvbGUubG9nKHRoaXMuZGF0YSlcbiAgfVxuXG4gIGNsb3NlKCkge1xuICAgIGNvbnNvbGUubG9nKHRoaXMuZGlhbG9nUmVmKTtcbiAgICB0aGlzLmRpYWxvZ1JlZi5jbG9zZSgpO1xuICB9XG59XG4iLCI8ZGl2IGNsYXNzPVwiaW5uZXJcIiBmeExheW91dD1cImNvbHVtblwiIGZ4TGF5b3V0QWxpZ249XCJjZW50ZXIgY2VudGVyXCI+XG4gIDwhLS0gPGltZ1xuICAgIHN0eWxlPVwiaGVpZ2h0OiAyNDBweDsgbWFyZ2luOiAzNHB4IDBweDtkaXNwbGF5OiBub25lO1wiXG4gICAgW3NyY109XCInL2Fzc2V0cy9pbWFnZXMvaWxsdXN0cmF0aW9ucy8nICsgaW1hZ2VzW3R5cGVdXCJcbiAgLz4gLS0+XG4gIDwhLS0gPGltZyBzdHlsZT1cIndpZHRoOjYwcHg7XCIgc3JjPVwiL2Fzc2V0cy9pbWFnZXMvaWxsdXN0cmF0aW9ucy9kb29yLWxvY2sucG5nXCI+IC0tPlxuXG4gIDxtYXQtaWNvbj4zNjA8L21hdC1pY29uPlxuICA8ZGl2IGNsYXNzPVwidGV4dFwiPlxuICAgIDxuZy1jb250YWluZXIgKm5nSWY9XCJkYXRhLmlkU2NhbiA9PT0gJ0JBQ0snXCI+XG4gICAgICB7eyBcInNjYW5kb2MudHVybkFuZENhcHR1cmUuYmFja1wiIHwgdHJhbnNsYXRlIH19XG4gICAgPC9uZy1jb250YWluZXI+XG4gICAgPG5nLWNvbnRhaW5lciAqbmdJZj1cImRhdGEuaWRTY2FuID09PSAnRlJPTlQnXCI+XG4gICAgICB7eyBcInNjYW5kb2MudHVybkFuZENhcHR1cmUuZnJvbnRcIiB8IHRyYW5zbGF0ZSB9fVxuICAgIDwvbmctY29udGFpbmVyPlxuICA8L2Rpdj5cbjwvZGl2PlxuXG48IS0tICAtLT5cblxuPGZvb3Rlcj5cbiAgPGJ1dHRvbiAoY2xpY2spPVwiY2xvc2UoKVwiIG1hdC1yYWlzZWQtYnV0dG9uPk9rPC9idXR0b24+XG48L2Zvb3Rlcj5cbiJdfQ==
|
|
@@ -2,6 +2,7 @@ import { Inject, Injectable } from '@angular/core';
|
|
|
2
2
|
import jwt_decode from 'jwt-decode';
|
|
3
3
|
import { of } from 'rxjs';
|
|
4
4
|
import { map, tap } from 'rxjs/operators';
|
|
5
|
+
import moment from 'moment';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
import * as i1 from "@angular/common/http";
|
|
7
8
|
export class AuthProvider {
|
|
@@ -9,38 +10,88 @@ export class AuthProvider {
|
|
|
9
10
|
this.http = http;
|
|
10
11
|
this.config = config;
|
|
11
12
|
this.token = '';
|
|
13
|
+
this.refresh_token = '';
|
|
12
14
|
this.tokenTimestamps = {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
+
Time: 0,
|
|
16
|
+
Client: 0,
|
|
17
|
+
SubClient: 0,
|
|
15
18
|
};
|
|
16
19
|
}
|
|
20
|
+
setSubClient(name) {
|
|
21
|
+
this.subClient = name;
|
|
22
|
+
}
|
|
17
23
|
setConfig() { }
|
|
18
24
|
get tokenExpired() {
|
|
19
|
-
|
|
25
|
+
console.log(this.tokenTimestamps, this.token);
|
|
26
|
+
if (this.token == '' || this.tokenTimestamps.Time === 0) {
|
|
20
27
|
console.log('EXPIRED');
|
|
21
28
|
return true;
|
|
22
29
|
}
|
|
23
|
-
const {
|
|
24
|
-
|
|
30
|
+
const { Time } = this.tokenTimestamps;
|
|
31
|
+
const tokenDate = moment(Time);
|
|
32
|
+
const isValid = moment(tokenDate).isBefore(moment().add(5, 'minutes'));
|
|
33
|
+
console.log('VALID', isValid);
|
|
34
|
+
return !isValid;
|
|
25
35
|
}
|
|
26
36
|
resetToken() {
|
|
27
|
-
this.token = '';
|
|
37
|
+
// this.token = '';
|
|
28
38
|
}
|
|
29
39
|
get accesToken() {
|
|
30
|
-
|
|
40
|
+
console.log('AT');
|
|
41
|
+
return this.tokenExpired ? this.fetchToken() : of(this.token);
|
|
42
|
+
}
|
|
43
|
+
fetchToken() {
|
|
44
|
+
if (this.token && this.refresh_token) {
|
|
45
|
+
return this.refreshToken();
|
|
46
|
+
}
|
|
47
|
+
return this.getToken();
|
|
48
|
+
}
|
|
49
|
+
refreshToken() {
|
|
50
|
+
const { path, refresh } = this.config;
|
|
51
|
+
return this.http
|
|
52
|
+
.post(`${path}${refresh}`, {
|
|
53
|
+
refresh_token: this.refresh_token,
|
|
54
|
+
})
|
|
55
|
+
.pipe(tap((token) => {
|
|
56
|
+
// console.log(this.token);
|
|
57
|
+
this.token = token.access_token;
|
|
58
|
+
this.updateToken();
|
|
59
|
+
// this.token = token.access_token;
|
|
60
|
+
// console.log('TOKEN', this.token);
|
|
61
|
+
// this.refresh_token = token.refresh_token;
|
|
62
|
+
// const decoded: any = jwt_decode(this.token);
|
|
63
|
+
// console.log(decoded);
|
|
64
|
+
// const { Time, Client, SubClient } = decoded;
|
|
65
|
+
// this.tokenTimestamps = { Time, Client, SubClient };
|
|
66
|
+
}), map((data) => data.access_token));
|
|
67
|
+
}
|
|
68
|
+
get user_key() {
|
|
69
|
+
return this.config.clientId;
|
|
70
|
+
}
|
|
71
|
+
get sub_client() {
|
|
72
|
+
return this.config.tokenName ? this.config.tokenName : this.subClient;
|
|
73
|
+
}
|
|
74
|
+
updateToken() {
|
|
75
|
+
const decoded = jwt_decode(this.token);
|
|
76
|
+
console.log(decoded);
|
|
77
|
+
const { Time, Client, SubClient } = decoded;
|
|
78
|
+
this.tokenTimestamps = { Time, Client, SubClient };
|
|
31
79
|
}
|
|
32
80
|
getToken() {
|
|
81
|
+
console.log('GET');
|
|
82
|
+
const { path, login } = this.config;
|
|
33
83
|
return this.http
|
|
34
|
-
.post(
|
|
35
|
-
|
|
36
|
-
|
|
84
|
+
.post(`${path}${login}`, {
|
|
85
|
+
user_key: this.user_key,
|
|
86
|
+
sub_client: this.sub_client,
|
|
37
87
|
})
|
|
38
|
-
.pipe(
|
|
39
|
-
this.token
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
this.
|
|
43
|
-
|
|
88
|
+
.pipe(tap((token) => {
|
|
89
|
+
console.log(this.token);
|
|
90
|
+
this.token = token.access_token;
|
|
91
|
+
console.log('TOKEN', this.token);
|
|
92
|
+
this.refresh_token = token.refresh_token;
|
|
93
|
+
this.updateToken();
|
|
94
|
+
}), map((data) => data.access_token));
|
|
44
95
|
}
|
|
45
96
|
}
|
|
46
97
|
AuthProvider.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: AuthProvider, deps: [{ token: i1.HttpClient }, { token: 'configAuth' }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -54,4 +105,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImpor
|
|
|
54
105
|
type: Inject,
|
|
55
106
|
args: ['configAuth']
|
|
56
107
|
}] }]; } });
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"auth.provider.js","sourceRoot":"","sources":["../../../../projects/ngx-scandoc/src/providers/auth.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport jwt_decode from 'jwt-decode';\nimport { Observable, of } from 'rxjs';\nimport { map, switchMap, tap } from 'rxjs/operators';\nimport moment from 'moment';\nimport { HttpClient, HttpHeaders } from '@angular/common/http';\nimport { AuthConfig } from '../core/interfaces/config';\nimport { Buffer } from 'buffer';\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class AuthProvider {\n  subClient!: string;\n  constructor(\n    private http: HttpClient,\n    @Inject('configAuth') public config: AuthConfig\n  ) {}\n\n  setSubClient(name: string) {\n    this.subClient = name;\n  }\n  setConfig() {}\n\n  token: string = '';\n\n  refresh_token: string = '';\n\n  tokenTimestamps: any = {\n    Time: 0,\n    Client: 0,\n    SubClient: 0,\n  };\n\n  private get tokenExpired(): boolean {\n    console.log(this.tokenTimestamps, this.token);\n    if (this.token == '' || this.tokenTimestamps.Time === 0) {\n      console.log('EXPIRED');\n      return true;\n    }\n\n    const { Time } = this.tokenTimestamps;\n    const tokenDate = moment(Time);\n    const isValid = moment(tokenDate).isBefore(moment().add(5, 'minutes'));\n    console.log('VALID', isValid);\n    return !isValid;\n  }\n\n  resetToken() {\n    // this.token = '';\n  }\n  get accesToken(): Observable<any> {\n    console.log('AT');\n    return this.tokenExpired ? this.fetchToken() : of(this.token);\n  }\n\n  fetchToken() {\n    if (this.token && this.refresh_token) {\n      return this.refreshToken();\n    }\n    return this.getToken();\n  }\n\n  refreshToken(): Observable<any> {\n    const { path, refresh } = this.config;\n    return this.http\n      .post(`${path}${refresh}`, {\n        refresh_token: this.refresh_token,\n      })\n      .pipe(\n        tap((token: any) => {\n          // console.log(this.token);\n          this.token = token.access_token;\n          this.updateToken();\n          // this.token = token.access_token;\n          // console.log('TOKEN', this.token);\n          // this.refresh_token = token.refresh_token;\n          // const decoded: any = jwt_decode(this.token);\n          // console.log(decoded);\n          // const { Time, Client, SubClient } = decoded;\n          // this.tokenTimestamps = { Time, Client, SubClient };\n        }),\n        map((data: any) => data.access_token)\n      );\n  }\n\n  private get user_key() {\n    return this.config.clientId;\n  }\n  private get sub_client() {\n    return this.config.tokenName ? this.config.tokenName : this.subClient;\n  }\n  private updateToken() {\n    const decoded: any = jwt_decode(this.token);\n    console.log(decoded);\n    const { Time, Client, SubClient } = decoded;\n    this.tokenTimestamps = { Time, Client, SubClient };\n  }\n  private getToken(): Observable<any> {\n    console.log('GET');\n\n    const { path, login } = this.config;\n\n    return this.http\n      .post(`${path}${login}`, {\n        user_key: this.user_key,\n        sub_client: this.sub_client,\n      })\n      .pipe(\n        tap((token: any) => {\n          console.log(this.token);\n          this.token = token.access_token;\n          console.log('TOKEN', this.token);\n          this.refresh_token = token.refresh_token;\n          this.updateToken();\n        }),\n        map((data: any) => data.access_token)\n      );\n  }\n}\n"]}
|
|
@@ -10,7 +10,7 @@ export class HttpErrorInterceptor {
|
|
|
10
10
|
}
|
|
11
11
|
intercept(req, next) {
|
|
12
12
|
//console.log(req.url);
|
|
13
|
-
if (req.url.indexOf('
|
|
13
|
+
if (req.url.indexOf('/ks/') >= 0 || req.url.indexOf('/assets/') >= 0) {
|
|
14
14
|
return next.handle(req);
|
|
15
15
|
}
|
|
16
16
|
const authProvider = this.injector.get(AuthProvider);
|
|
@@ -24,6 +24,7 @@ export class HttpErrorInterceptor {
|
|
|
24
24
|
return next.handle(req);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
+
console.log('AUTH II');
|
|
27
28
|
this.inflightAuthRequest = authProvider.accesToken;
|
|
28
29
|
return this.inflightAuthRequest.pipe(share(), switchMap((token) => {
|
|
29
30
|
// unset request inflight
|
|
@@ -40,9 +41,14 @@ export class HttpErrorInterceptor {
|
|
|
40
41
|
tokenExpired = find ? true : false;
|
|
41
42
|
}
|
|
42
43
|
console.log(err);
|
|
43
|
-
if (err.status === 401 || tokenExpired) {
|
|
44
|
-
authProvider.
|
|
45
|
-
|
|
44
|
+
if (err.status === 401 || err.status === 403 || tokenExpired) {
|
|
45
|
+
return authProvider.refreshToken().pipe(switchMap((token) => {
|
|
46
|
+
const transaction = req.headers.get('TransactionID');
|
|
47
|
+
const authReq = req.clone({
|
|
48
|
+
headers: this.getHeaders(token, transaction || ''),
|
|
49
|
+
});
|
|
50
|
+
return next.handle(authReq);
|
|
51
|
+
}));
|
|
46
52
|
}
|
|
47
53
|
else {
|
|
48
54
|
return throwError(() => new Error('' + (err && err.status ? ':' + err.status : '')));
|
|
@@ -68,4 +74,4 @@ HttpErrorInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0",
|
|
|
68
74
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.3.0", ngImport: i0, type: HttpErrorInterceptor, decorators: [{
|
|
69
75
|
type: Injectable
|
|
70
76
|
}], ctorParameters: function () { return [{ type: i0.Injector }]; } });
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
77
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJjZXB0b3IucHJvdmlkZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9uZ3gtc2NhbmRvYy9zcmMvcHJvdmlkZXJzL2ludGVyY2VwdG9yLnByb3ZpZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFHTCxXQUFXLEdBR1osTUFBTSxzQkFBc0IsQ0FBQztBQUM5QixPQUFPLEVBQUUsVUFBVSxFQUFZLE1BQU0sZUFBZSxDQUFDO0FBQ3JELE9BQU8sRUFBYyxVQUFVLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDOUMsT0FBTyxFQUFFLFVBQVUsRUFBRSxLQUFLLEVBQUUsU0FBUyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDOUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDOztBQUcvQyxNQUFNLE9BQU8sb0JBQW9CO0lBRy9CLFlBQW9CLFFBQWtCO1FBQWxCLGFBQVEsR0FBUixRQUFRLENBQVU7SUFBRyxDQUFDO0lBRTFDLFNBQVMsQ0FDUCxHQUFxQixFQUNyQixJQUFpQjtRQUVqQix1QkFBdUI7UUFDdkIsSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFO1lBQ3BFLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUN6QjtRQUVELE1BQU0sWUFBWSxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBRXJELElBQUksWUFBWSxDQUFDLE1BQU0sQ0FBQyxZQUFZLEVBQUU7WUFDcEMsTUFBTSxLQUFLLEdBQ1QsWUFBWSxDQUFDLE1BQU0sQ0FBQyxZQUFZO2lCQUM3QixHQUFHLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtnQkFDZCxPQUFPLEdB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QkFDbEMsYUFBYSxFQUFFLEtBQUs7Z0JBQ3BCLGFBQWE7YUFDZCxDQUFDLENBQUM7U0FDSjtRQUNELE9BQU8sSUFBSSxXQUFXLENBQUM7WUFDckIsY0FBYyxFQUFFLGtCQUFrQjtZQUNsQyxhQUFhLEVBQUUsS0FBSztTQUNyQixDQUFDLENBQUM7SUFDTCxDQUFDOztpSEF0RlUsb0JBQW9CO3FIQUFwQixvQkFBb0I7MkZBQXBCLG9CQUFvQjtrQkFEaEMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7XG4gIEh0dHBFdmVudCxcbiAgSHR0cEhhbmRsZXIsXG4gIEh0dHBIZWFkZXJzLFxuICBIdHRwSW50ZXJjZXB0b3IsXG4gIEh0dHBSZXF1ZXN0LFxufSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQgeyBJbmplY3RhYmxlLCBJbmplY3RvciB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSwgdGhyb3dFcnJvciB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgY2F0Y2hFcnJvciwgc2hhcmUsIHN3aXRjaE1hcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7IEF1dGhQcm92aWRlciB9IGZyb20gJy4vYXV0aC5wcm92aWRlcic7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBIdHRwRXJyb3JJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvciB7XG4gIGluZmxpZ2h0QXV0aFJlcXVlc3QhOiBPYnNlcnZhYmxlPGFueT4gfCBudWxsO1xuXG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgaW5qZWN0b3I6IEluamVjdG9yKSB7fVxuXG4gIGludGVyY2VwdChcbiAgICByZXE6IEh0dHBSZXF1ZXN0PGFueT4sXG4gICAgbmV4dDogSHR0cEhhbmRsZXJcbiAgKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj4ge1xuICAgIC8vY29uc29sZS5sb2cocmVxLnVybCk7XG4gICAgaWYgKHJlcS51cmwuaW5kZXhPZignL2tzLycpID49IDAgfHwgcmVxLnVybC5pbmRleE9mKCcvYXNzZXRzLycpID49IDApIHtcbiAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXEpO1xuICAgIH1cblxuICAgIGNvbnN0IGF1dGhQcm92aWRlciA9IHRoaXMuaW5qZWN0b3IuZ2V0KEF1dGhQcm92aWRlcik7XG5cbiAgICBpZiAoYXV0aFByb3ZpZGVyLmNvbmZpZy52YWxpZERvbWFpbnMpIHtcbiAgICAgIGNvbnN0IHZhbGlkID1cbiAgICAgICAgYXV0aFByb3ZpZGVyLmNvbmZpZy52YWxpZERvbWFpbnNcbiAgICAgICAgICAubWFwKChkb21haW4pID0+IHtcbiAgICAgICAgICAgIHJldHVybiByZXEudXJsLmluZGV4T2YoZG9tYWluKSA+PSAwO1xuICAgICAgICAgIH0pXG4gICAgICAgICAgLmZpbHRlcigobSkgPT4gbSkubGVuZ3RoID4gMDtcbiAgICAgIGlmICghdmFsaWQpIHtcbiAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcSk7XG4gICAgICB9XG4gICAgfVxuXG4gICAgY29uc29sZS5sb2coJ0FVVEggSUknKTtcbiAgICB0aGlzLmluZmxpZ2h0QXV0aFJlcXVlc3QgPSBhdXRoUHJvdmlkZXIuYWNjZXNUb2tlbjtcblxuICAgIHJldHVybiB0aGlzLmluZmxpZ2h0QXV0aFJlcXVlc3QucGlwZShcbiAgICAgIHNoYXJlKCksXG4gICAgICBzd2l0Y2hNYXAoKHRva2VuOiBzdHJpbmcpID0+IHtcbiAgICAgICAgLy8gdW5zZXQgcmVxdWVzdCBpbmZsaWdodFxuICAgICAgICB0aGlzLmluZmxpZ2h0QXV0aFJlcXVlc3QgPSBudWxsO1xuXG4gICAgICAgIGNvbnN0IHRyYW5zYWN0aW9uID0gcmVxLmhlYWRlcnMuZ2V0KCdUcmFuc2FjdGlvbklEJyk7XG4gICAgICAgIGNvbnN0IGF1dGhSZXEgPSByZXEuY2xvbmUoe1xuICAgICAgICAgIGhlYWRlcnM6IHRoaXMuZ2V0SGVhZGVycyh0b2tlbiwgdHJhbnNhY3Rpb24gfHwgJycpLFxuICAgICAgICB9KTtcblxuICAgICAgICByZXR1cm4gbmV4dC5oYW5kbGUoYXV0aFJlcSk7XG4gICAgICB9KSxcbiAgICAgIGNhdGNoRXJyb3IoKGVycjogYW55KSA9PiB7XG4gICAgICAgIGxldCB0b2tlbkV4cGlyZWQgPSBmYWxzZTtcbiAgICAgICAgaWYgKGVyci5lcnJvcnMpIHtcbiAgICAgICAgICBjb25zdCBmaW5kID0gZXJyLmVycm9zLmZpbmQoXG4gICAgICAgICAgICAoZXM6IHN0cmluZykgPT4gZXMuaW5kZXhPZignSW52YWxpZCB0b2tlbicpID4gLTFcbiAgICAgICAgICApO1xuICAgICAgICAgIHRva2VuRXhwaXJlZCA9IGZpbmQgPyB0cnVlIDogZmFsc2U7XG4gICAgICAgIH1cbiAgICAgICAgY29uc29sZS5sb2coZXJyKTtcblxuICAgICAgICBpZiAoZXJyLnN0YXR1cyA9PT0gNDAxIHx8IGVyci5zdGF0dXMgPT09IDQwMyB8fCB0b2tlbkV4cGlyZWQpIHtcbiAgICAgICAgICByZXR1cm4gYXV0aFByb3ZpZGVyLnJlZnJlc2hUb2tlbigpLnBpcGUoXG4gICAgICAgICAgICBzd2l0Y2hNYXAoKHRva2VuKSA9PiB7XG4gICAgICAgICAgICAgIGNvbnN0IHRyYW5zYWN0aW9uID0gcmVxLmhlYWRlcnMuZ2V0KCdUcmFuc2FjdGlvbklEJyk7XG4gICAgICAgICAgICAgIGNvbnN0IGF1dGhSZXEgPSByZXEuY2xvbmUoe1xuICAgICAgICAgICAgICAgIGhlYWRlcnM6IHRoaXMuZ2V0SGVhZGVycyh0b2tlbiwgdHJhbnNhY3Rpb24gfHwgJycpLFxuICAgICAgICAgICAgICB9KTtcblxuICAgICAgICAgICAgICByZXR1cm4gbmV4dC5oYW5kbGUoYXV0aFJlcSk7XG4gICAgICAgICAgICB9KVxuICAgICAgICAgICk7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoXG4gICAgICAgICAgICAoKSA9PiBuZXcgRXJyb3IoJycgKyAoZXJyICYmIGVyci5zdGF0dXMgPyAnOicgKyBlcnIuc3RhdHVzIDogJycpKVxuICAgICAgICAgICk7XG4gICAgICAgIH1cbiAgICAgIH0pXG4gICAgKTtcbiAgfVxuXG4gIHByaXZhdGUgZ2V0SGVhZGVycyh0b2tlbjogc3RyaW5nLCBUcmFuc2FjdGlvbklEOiBzdHJpbmcpIHtcbiAgICBpZiAoVHJhbnNhY3Rpb25JRCkge1xuICAgICAgcmV0dXJuIG5ldyBIdHRwSGVhZGVycyh7XG4gICAgICAgICdDb250ZW50LVR5cGUnOiAnYXBwbGljYXRpb24vanNvbicsXG4gICAgICAgIEF1dGhvcml6YXRpb246IHRva2VuLFxuICAgICAgICBUcmFuc2FjdGlvbklELFxuICAgICAgfSk7XG4gICAgfVxuICAgIHJldHVybiBuZXcgSHR0cEhlYWRlcnMoe1xuICAgICAgJ0NvbnRlbnQtVHlwZSc6ICdhcHBsaWNhdGlvbi9qc29uJyxcbiAgICAgIEF1dGhvcml6YXRpb246IHRva2VuLFxuICAgIH0pO1xuICB9XG59XG4iXX0=
|