@dontdrinkandroot/ngx-extensions 0.2.0 → 0.2.1
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/public-api.mjs +4 -1
- package/esm2020/src/cookie/cookie.service.mjs +3 -3
- package/esm2020/src/ddr-extensions.module.mjs +4 -4
- package/esm2020/src/http/redirect-to-login-interceptor.service.mjs +3 -3
- package/esm2020/src/http/with-credentials-interceptor.service.mjs +3 -3
- package/esm2020/src/image/lazy-image.directive.mjs +3 -3
- package/esm2020/src/jwt/jwt-interceptor.service.mjs +3 -3
- package/esm2020/src/jwt/jwt-refresh-token-interceptor.service.mjs +3 -3
- package/esm2020/src/jwt/jwt.service.mjs +3 -3
- package/esm2020/src/oauth/json-web-token.mjs +2 -0
- package/esm2020/src/oauth/oauth2-access-token-interceptor.service.mjs +26 -0
- package/esm2020/src/oauth/oauth2-config.mjs +11 -0
- package/esm2020/src/oauth/oauth2-error.mjs +8 -0
- package/esm2020/src/oauth/oauth2-refresh-token-interceptor.service.mjs +24 -0
- package/esm2020/src/oauth/oauth2.module.mjs +44 -0
- package/esm2020/src/oauth/oauth2.service.mjs +119 -0
- package/esm2020/src/oauth/redirect-to-oauth2-login-interceptor.service.mjs +41 -0
- package/esm2020/src/oauth/token-response.mjs +2 -0
- package/esm2020/src/scroll/bottom-hit.directive.mjs +3 -3
- package/esm2020/src/scroll/scroll.service.mjs +3 -3
- package/esm2020/src/visibility/visibility.service.mjs +3 -3
- package/fesm2015/dontdrinkandroot-ngx-extensions.mjs +276 -36
- package/fesm2015/dontdrinkandroot-ngx-extensions.mjs.map +1 -1
- package/fesm2020/dontdrinkandroot-ngx-extensions.mjs +272 -36
- package/fesm2020/dontdrinkandroot-ngx-extensions.mjs.map +1 -1
- package/package.json +1 -1
- package/public-api.d.ts +3 -0
- package/src/oauth/json-web-token.d.ts +30 -0
- package/src/oauth/oauth2-access-token-interceptor.service.d.ts +14 -0
- package/src/oauth/oauth2-config.d.ts +9 -0
- package/src/oauth/oauth2-error.d.ts +5 -0
- package/src/oauth/oauth2-refresh-token-interceptor.service.d.ts +14 -0
- package/src/oauth/oauth2.module.d.ts +9 -0
- package/src/oauth/oauth2.service.d.ts +33 -0
- package/src/oauth/redirect-to-oauth2-login-interceptor.service.d.ts +18 -0
- package/src/oauth/token-response.d.ts +6 -0
package/esm2020/public-api.mjs
CHANGED
|
@@ -17,8 +17,11 @@ export * from './src/visibility/visibility.service';
|
|
|
17
17
|
export * from './src/http/with-credentials-interceptor.service';
|
|
18
18
|
export * from './src/http/url-info';
|
|
19
19
|
export * from './src/http/redirect-to-login-interceptor.service';
|
|
20
|
+
export * from './src/oauth/oauth2.module';
|
|
21
|
+
export * from './src/oauth/oauth2.service';
|
|
22
|
+
export * from './src/oauth/oauth2-error';
|
|
20
23
|
export * from './src/jwt/jwt-interceptor.service';
|
|
21
24
|
export * from './src/jwt/jwt.service';
|
|
22
25
|
export * from './src/jwt/jwt-refresh-token-interceptor.service';
|
|
23
26
|
export * from './src/jwt/jwt-token-response';
|
|
24
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
27
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHVibGljLWFwaS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3B1YmxpYy1hcGkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFFSCxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyw2QkFBNkIsQ0FBQztBQUM1QyxjQUFjLHlCQUF5QixDQUFDO0FBQ3hDLGNBQWMseUJBQXlCLENBQUM7QUFDeEMsY0FBYyx5QkFBeUIsQ0FBQztBQUN4QyxjQUFjLHVCQUF1QixDQUFDO0FBQ3RDLGNBQWMsNkJBQTZCLENBQUM7QUFDNUMsY0FBYyxnQ0FBZ0MsQ0FBQztBQUMvQyxjQUFjLDZCQUE2QixDQUFDO0FBQzVDLGNBQWMsa0NBQWtDLENBQUM7QUFDakQsY0FBYyxtQ0FBbUMsQ0FBQztBQUNsRCxjQUFjLHFDQUFxQyxDQUFDO0FBRXBELGNBQWMsaURBQWlELENBQUM7QUFDaEUsY0FBYyxxQkFBcUIsQ0FBQztBQUNwQyxjQUFjLGtEQUFrRCxDQUFDO0FBRWpFLGNBQWMsMkJBQTJCLENBQUM7QUFDMUMsY0FBYyw0QkFBNEIsQ0FBQztBQUMzQyxjQUFjLDBCQUEwQixDQUFDO0FBRXpDLGNBQWMsbUNBQW1DLENBQUM7QUFDbEQsY0FBYyx1QkFBdUIsQ0FBQztBQUN0QyxjQUFjLGlEQUFpRCxDQUFDO0FBQ2hFLGNBQWMsOEJBQThCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxuICogUHVibGljIEFQSSBTdXJmYWNlIG9mIG5neC1leHRlbnNpb25zXG4gKi9cblxuZXhwb3J0ICogZnJvbSAnLi9zcmMvZGRyLWV4dGVuc2lvbnMubW9kdWxlJztcbmV4cG9ydCAqIGZyb20gJy4vc3JjL2Nvb2tpZS9jb29raWUuc2VydmljZSc7XG5leHBvcnQgKiBmcm9tICcuL3NyYy91dGlsL2NvbGxlY3Rpb24tdXRpbHMnO1xuZXhwb3J0ICogZnJvbSAnLi9zcmMvdXRpbC9zdHJpbmctdXRpbHMnO1xuZXhwb3J0ICogZnJvbSAnLi9zcmMvdXRpbC9vYmplY3QtdXRpbHMnO1xuZXhwb3J0ICogZnJvbSAnLi9zcmMvdXRpbC9udW1iZXItdXRpbHMnO1xuZXhwb3J0ICogZnJvbSAnLi9zcmMvdXRpbC90eXBlLXV0aWxzJztcbmV4cG9ydCAqIGZyb20gJy4vc3JjL3Njcm9sbC9zY3JvbGwuc2VydmljZSc7XG5leHBvcnQgKiBmcm9tICcuL3NyYy9tZXRob2RkZWNvcmF0b3IvZGVib3VuY2UnO1xuZXhwb3J0ICogZnJvbSAnLi9zcmMvbWV0aG9kZGVjb3JhdG9yL2xpbWl0JztcbmV4cG9ydCAqIGZyb20gJy4vc3JjL2ltYWdlL2xhenktaW1hZ2UuZGlyZWN0aXZlJztcbmV4cG9ydCAqIGZyb20gJy4vc3JjL3Njcm9sbC9ib3R0b20taGl0LmRpcmVjdGl2ZSc7XG5leHBvcnQgKiBmcm9tICcuL3NyYy92aXNpYmlsaXR5L3Zpc2liaWxpdHkuc2VydmljZSc7XG5cbmV4cG9ydCAqIGZyb20gJy4vc3JjL2h0dHAvd2l0aC1jcmVkZW50aWFscy1pbnRlcmNlcHRvci5zZXJ2aWNlJztcbmV4cG9ydCAqIGZyb20gJy4vc3JjL2h0dHAvdXJsLWluZm8nO1xuZXhwb3J0ICogZnJvbSAnLi9zcmMvaHR0cC9yZWRpcmVjdC10by1sb2dpbi1pbnRlcmNlcHRvci5zZXJ2aWNlJztcblxuZXhwb3J0ICogZnJvbSAnLi9zcmMvb2F1dGgvb2F1dGgyLm1vZHVsZSc7XG5leHBvcnQgKiBmcm9tICcuL3NyYy9vYXV0aC9vYXV0aDIuc2VydmljZSc7XG5leHBvcnQgKiBmcm9tICcuL3NyYy9vYXV0aC9vYXV0aDItZXJyb3InO1xuXG5leHBvcnQgKiBmcm9tICcuL3NyYy9qd3Qvand0LWludGVyY2VwdG9yLnNlcnZpY2UnO1xuZXhwb3J0ICogZnJvbSAnLi9zcmMvand0L2p3dC5zZXJ2aWNlJztcbmV4cG9ydCAqIGZyb20gJy4vc3JjL2p3dC9qd3QtcmVmcmVzaC10b2tlbi1pbnRlcmNlcHRvci5zZXJ2aWNlJztcbmV4cG9ydCAqIGZyb20gJy4vc3JjL2p3dC9qd3QtdG9rZW4tcmVzcG9uc2UnO1xuIl19
|
|
@@ -121,9 +121,9 @@ export class CookieService {
|
|
|
121
121
|
return new RegExp('(?:^' + escapedName + '|;\\s*' + escapedName + ')=(.*?)(?:;|$)', 'g');
|
|
122
122
|
}
|
|
123
123
|
}
|
|
124
|
-
CookieService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
125
|
-
CookieService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.
|
|
126
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
124
|
+
CookieService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: CookieService, deps: [{ token: DOCUMENT }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
125
|
+
CookieService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: CookieService, providedIn: 'root' });
|
|
126
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: CookieService, decorators: [{
|
|
127
127
|
type: Injectable,
|
|
128
128
|
args: [{
|
|
129
129
|
providedIn: 'root'
|
|
@@ -7,17 +7,17 @@ export const DDR_JWT_REFRESH_TOKEN_URL = new InjectionToken('DDR_JWT_REFRESH_TOK
|
|
|
7
7
|
export const DDR_LOGIN_PATH = new InjectionToken('DDR_LOGIN_PATH');
|
|
8
8
|
export class DdrExtensionsModule {
|
|
9
9
|
}
|
|
10
|
-
DdrExtensionsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
11
|
-
DdrExtensionsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.
|
|
10
|
+
DdrExtensionsModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: DdrExtensionsModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
11
|
+
DdrExtensionsModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.3", ngImport: i0, type: DdrExtensionsModule, declarations: [LazyImageDirective,
|
|
12
12
|
BottomHitDirective], exports: [LazyImageDirective,
|
|
13
13
|
BottomHitDirective] });
|
|
14
|
-
DdrExtensionsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.
|
|
14
|
+
DdrExtensionsModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: DdrExtensionsModule, providers: [
|
|
15
15
|
{
|
|
16
16
|
provide: DDR_LOGIN_PATH,
|
|
17
17
|
useValue: '/login'
|
|
18
18
|
}
|
|
19
19
|
] });
|
|
20
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
20
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: DdrExtensionsModule, decorators: [{
|
|
21
21
|
type: NgModule,
|
|
22
22
|
args: [{
|
|
23
23
|
declarations: [
|
|
@@ -24,9 +24,9 @@ export class RedirectToLoginInterceptor {
|
|
|
24
24
|
}));
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
RedirectToLoginInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
28
|
-
RedirectToLoginInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.
|
|
29
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
27
|
+
RedirectToLoginInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: RedirectToLoginInterceptor, deps: [{ token: i1.Router }, { token: DDR_LOGIN_PATH }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
28
|
+
RedirectToLoginInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: RedirectToLoginInterceptor });
|
|
29
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: RedirectToLoginInterceptor, decorators: [{
|
|
30
30
|
type: Injectable
|
|
31
31
|
}], ctorParameters: function () { return [{ type: i1.Router }, { type: undefined, decorators: [{
|
|
32
32
|
type: Inject,
|
|
@@ -11,9 +11,9 @@ export class WithCredentialsInterceptor {
|
|
|
11
11
|
return next.handle(cloned);
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
|
-
WithCredentialsInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
15
|
-
WithCredentialsInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.
|
|
16
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
14
|
+
WithCredentialsInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: WithCredentialsInterceptor, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
15
|
+
WithCredentialsInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: WithCredentialsInterceptor });
|
|
16
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: WithCredentialsInterceptor, decorators: [{
|
|
17
17
|
type: Injectable
|
|
18
18
|
}] });
|
|
19
19
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aC1jcmVkZW50aWFscy1pbnRlcmNlcHRvci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2h0dHAvd2l0aC1jcmVkZW50aWFscy1pbnRlcmNlcHRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBQyxVQUFVLEVBQUMsTUFBTSxlQUFlLENBQUM7O0FBS3pDLE1BQU0sT0FBTywwQkFBMEI7SUFFbkM7O09BRUc7SUFDSSxTQUFTLENBQUMsR0FBcUIsRUFBRSxJQUFpQjtRQUVyRCxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsS0FBSyxDQUFDO1lBQ3JCLGVBQWUsRUFBRSxJQUFJO1NBQ3hCLENBQUMsQ0FBQztRQUVILE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUMvQixDQUFDOzt1SEFaUSwwQkFBMEI7MkhBQTFCLDBCQUEwQjsyRkFBMUIsMEJBQTBCO2tCQUR0QyxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7SHR0cEV2ZW50LCBIdHRwSGFuZGxlciwgSHR0cEludGVyY2VwdG9yLCBIdHRwUmVxdWVzdH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHtPYnNlcnZhYmxlfSBmcm9tICdyeGpzJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIFdpdGhDcmVkZW50aWFsc0ludGVyY2VwdG9yIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yXG57XG4gICAgLyoqXG4gICAgICogQG92ZXJyaWRlXG4gICAgICovXG4gICAgcHVibGljIGludGVyY2VwdChyZXE6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj5cbiAgICB7XG4gICAgICAgIGNvbnN0IGNsb25lZCA9IHJlcS5jbG9uZSh7XG4gICAgICAgICAgICB3aXRoQ3JlZGVudGlhbHM6IHRydWVcbiAgICAgICAgfSk7XG5cbiAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKGNsb25lZCk7XG4gICAgfVxufVxuIl19
|
|
@@ -92,15 +92,15 @@ export class LazyImageDirective {
|
|
|
92
92
|
return window.getComputedStyle(element).display === 'none';
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
|
-
LazyImageDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
96
|
-
LazyImageDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.
|
|
95
|
+
LazyImageDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: LazyImageDirective, deps: [{ token: i0.ElementRef }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
|
|
96
|
+
LazyImageDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.3", type: LazyImageDirective, selector: "[ddrLazyImage]", inputs: { src: ["ddrLazyImage", "src"], objectFit: "objectFit", offset: "offset" }, host: { listeners: { "window:resize": "windowResized($event)", "window:scroll": "windowScroll($event)" }, properties: { "src": "this.hostSrc", "style.width.px": "this.hostStyleWidthPx", "style.height.px": "this.hostStyleHeightPx", "style.object-fit": "this.hostStyleObjectFit" } }, usesOnChanges: true, ngImport: i0 });
|
|
97
97
|
__decorate([
|
|
98
98
|
Debounce()
|
|
99
99
|
], LazyImageDirective.prototype, "windowResized", null);
|
|
100
100
|
__decorate([
|
|
101
101
|
Limit()
|
|
102
102
|
], LazyImageDirective.prototype, "windowScroll", null);
|
|
103
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
103
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: LazyImageDirective, decorators: [{
|
|
104
104
|
type: Directive,
|
|
105
105
|
args: [{ selector: '[ddrLazyImage]' }]
|
|
106
106
|
}], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: i0.ChangeDetectorRef }]; }, propDecorators: { src: [{
|
|
@@ -18,9 +18,9 @@ export class JwtInterceptor {
|
|
|
18
18
|
return next.handle(req);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
JwtInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
22
|
-
JwtInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.
|
|
23
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
21
|
+
JwtInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: JwtInterceptor, deps: [{ token: i1.JwtService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
22
|
+
JwtInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: JwtInterceptor });
|
|
23
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: JwtInterceptor, decorators: [{
|
|
24
24
|
type: Injectable
|
|
25
25
|
}], ctorParameters: function () { return [{ type: i1.JwtService }]; } });
|
|
26
26
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0LWludGVyY2VwdG9yLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvand0L2p3dC1pbnRlcmNlcHRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBQyxVQUFVLEVBQUMsTUFBTSxlQUFlLENBQUM7OztBQUt6QyxNQUFNLE9BQU8sY0FBYztJQUV2QixZQUFvQixVQUFzQjtRQUF0QixlQUFVLEdBQVYsVUFBVSxDQUFZO0lBRTFDLENBQUM7SUFFRDs7T0FFRztJQUNJLFNBQVMsQ0FBQyxHQUFxQixFQUFFLElBQWlCO1FBRXJELE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUM7UUFFekMsSUFBSSxJQUFJLEtBQUssS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLEVBQUUsRUFBRTtZQUNoRCxHQUFHLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQztnQkFDWixPQUFPLEVBQUUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxFQUFFLFNBQVMsR0FBRyxLQUFLLENBQUM7YUFDL0QsQ0FBQyxDQUFDO1NBQ047UUFFRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDNUIsQ0FBQzs7MkdBcEJRLGNBQWM7K0dBQWQsY0FBYzsyRkFBZCxjQUFjO2tCQUQxQixVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtIdHRwRXZlbnQsIEh0dHBIYW5kbGVyLCBIdHRwSW50ZXJjZXB0b3IsIEh0dHBSZXF1ZXN0fSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQge0luamVjdGFibGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtPYnNlcnZhYmxlfSBmcm9tICdyeGpzJztcbmltcG9ydCB7Snd0U2VydmljZX0gZnJvbSAnLi9qd3Quc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBKd3RJbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvclxue1xuICAgIGNvbnN0cnVjdG9yKHByaXZhdGUgand0U2VydmljZTogSnd0U2VydmljZSlcbiAgICB7XG4gICAgfVxuXG4gICAgLyoqXG4gICAgICogQG92ZXJyaWRlXG4gICAgICovXG4gICAgcHVibGljIGludGVyY2VwdChyZXE6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj5cbiAgICB7XG4gICAgICAgIGNvbnN0IHRva2VuID0gdGhpcy5qd3RTZXJ2aWNlLmdldFRva2VuKCk7XG5cbiAgICAgICAgaWYgKG51bGwgIT09IHRva2VuICYmICF0aGlzLmp3dFNlcnZpY2UuaXNFeHBpcmVkKCkpIHtcbiAgICAgICAgICAgIHJlcSA9IHJlcS5jbG9uZSh7XG4gICAgICAgICAgICAgICAgaGVhZGVyczogcmVxLmhlYWRlcnMuc2V0KCdBdXRob3JpemF0aW9uJywgJ0JlYXJlciAnICsgdG9rZW4pXG4gICAgICAgICAgICB9KTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXEpO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -39,9 +39,9 @@ export class JwtRefreshTokenInterceptor {
|
|
|
39
39
|
return this.refreshTokenRequest$;
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
JwtRefreshTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
43
|
-
JwtRefreshTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.
|
|
44
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
42
|
+
JwtRefreshTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: JwtRefreshTokenInterceptor, deps: [{ token: i1.JwtService }, { token: i2.HttpClient }, { token: DDR_JWT_REFRESH_TOKEN_URL }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
43
|
+
JwtRefreshTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: JwtRefreshTokenInterceptor });
|
|
44
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: JwtRefreshTokenInterceptor, decorators: [{
|
|
45
45
|
type: Injectable
|
|
46
46
|
}], ctorParameters: function () { return [{ type: i1.JwtService }, { type: i2.HttpClient }, { type: undefined, decorators: [{
|
|
47
47
|
type: Inject,
|
|
@@ -68,9 +68,9 @@ export class JwtService {
|
|
|
68
68
|
return this.storagePrefix + '.jwt.refresh_token';
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
-
JwtService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
72
|
-
JwtService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.
|
|
73
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
71
|
+
JwtService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: JwtService, deps: [{ token: DDR_STORAGE_PREFIX }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
72
|
+
JwtService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: JwtService, providedIn: 'root' });
|
|
73
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: JwtService, decorators: [{
|
|
74
74
|
type: Injectable,
|
|
75
75
|
args: [{
|
|
76
76
|
providedIn: 'root'
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export {};
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoianNvbi13ZWItdG9rZW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvb2F1dGgvanNvbi13ZWItdG9rZW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgSnNvbldlYlRva2VuXG57XG4gICAgLyoqXG4gICAgICogQXVkaWVuY2VcbiAgICAgKi9cbiAgICBhdWQ6IHN0cmluZztcblxuICAgIC8qKlxuICAgICAqIEV4cGlyYXRpb24gVGltZVxuICAgICAqL1xuICAgIGV4cDogbnVtYmVyO1xuXG4gICAgLyoqXG4gICAgICogSXNzdWVkIEF0XG4gICAgICovXG4gICAgaWF0OiBudW1iZXI7XG5cbiAgICAvKipcbiAgICAgKiBKV1QgSURcbiAgICAgKi9cbiAgICBqdGk6IHN0cmluZztcblxuICAgIC8qKlxuICAgICAqIE5vdCBCZWZvcmVcbiAgICAgKi9cbiAgICBuYmY6IG51bWJlcjtcblxuICAgIC8qKlxuICAgICAqIFNjb3Blc1xuICAgICAqL1xuICAgIHNjb3Blczogc3RyaW5nW107XG5cbiAgICAvKipcbiAgICAgKiBTdWJqZWN0XG4gICAgICovXG4gICAgc3ViOiBzdHJpbmc7XG59XG4iXX0=
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import * as i0 from "@angular/core";
|
|
3
|
+
import * as i1 from "./oauth2.service";
|
|
4
|
+
export class OAuth2AccessTokenInterceptor {
|
|
5
|
+
constructor(oAuth2Service) {
|
|
6
|
+
this.oAuth2Service = oAuth2Service;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* @override
|
|
10
|
+
*/
|
|
11
|
+
intercept(req, next) {
|
|
12
|
+
const accessTokenString = this.oAuth2Service.getAccessTokenString();
|
|
13
|
+
if (null !== accessTokenString && !this.oAuth2Service.isAccessTokenExpired()) {
|
|
14
|
+
req = req.clone({
|
|
15
|
+
headers: req.headers.set('Authorization', 'Bearer ' + accessTokenString)
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
return next.handle(req);
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
OAuth2AccessTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2AccessTokenInterceptor, deps: [{ token: i1.OAuth2Service }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
22
|
+
OAuth2AccessTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2AccessTokenInterceptor });
|
|
23
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2AccessTokenInterceptor, decorators: [{
|
|
24
|
+
type: Injectable
|
|
25
|
+
}], ctorParameters: function () { return [{ type: i1.OAuth2Service }]; } });
|
|
26
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2F1dGgyLWFjY2Vzcy10b2tlbi1pbnRlcmNlcHRvci5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL29hdXRoL29hdXRoMi1hY2Nlc3MtdG9rZW4taW50ZXJjZXB0b3Iuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUMsVUFBVSxFQUFDLE1BQU0sZUFBZSxDQUFDOzs7QUFLekMsTUFBTSxPQUFPLDRCQUE0QjtJQUVyQyxZQUFvQixhQUE0QjtRQUE1QixrQkFBYSxHQUFiLGFBQWEsQ0FBZTtJQUVoRCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxTQUFTLENBQUMsR0FBcUIsRUFBRSxJQUFpQjtRQUVyRCxNQUFNLGlCQUFpQixHQUFHLElBQUksQ0FBQyxhQUFhLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztRQUVwRSxJQUFJLElBQUksS0FBSyxpQkFBaUIsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsb0JBQW9CLEVBQUUsRUFBRTtZQUMxRSxHQUFHLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQztnQkFDWixPQUFPLEVBQUUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxFQUFFLFNBQVMsR0FBRyxpQkFBaUIsQ0FBQzthQUMzRSxDQUFDLENBQUM7U0FDTjtRQUVELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUM1QixDQUFDOzt5SEFwQlEsNEJBQTRCOzZIQUE1Qiw0QkFBNEI7MkZBQTVCLDRCQUE0QjtrQkFEeEMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7SHR0cEV2ZW50LCBIdHRwSGFuZGxlciwgSHR0cEludGVyY2VwdG9yLCBIdHRwUmVxdWVzdH0gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuaW1wb3J0IHtJbmplY3RhYmxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7T2JzZXJ2YWJsZX0gZnJvbSAncnhqcyc7XG5pbXBvcnQge09BdXRoMlNlcnZpY2V9IGZyb20gJy4vb2F1dGgyLnNlcnZpY2UnO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgT0F1dGgyQWNjZXNzVG9rZW5JbnRlcmNlcHRvciBpbXBsZW1lbnRzIEh0dHBJbnRlcmNlcHRvclxue1xuICAgIGNvbnN0cnVjdG9yKHByaXZhdGUgb0F1dGgyU2VydmljZTogT0F1dGgyU2VydmljZSlcbiAgICB7XG4gICAgfVxuXG4gICAgLyoqXG4gICAgICogQG92ZXJyaWRlXG4gICAgICovXG4gICAgcHVibGljIGludGVyY2VwdChyZXE6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj5cbiAgICB7XG4gICAgICAgIGNvbnN0IGFjY2Vzc1Rva2VuU3RyaW5nID0gdGhpcy5vQXV0aDJTZXJ2aWNlLmdldEFjY2Vzc1Rva2VuU3RyaW5nKCk7XG5cbiAgICAgICAgaWYgKG51bGwgIT09IGFjY2Vzc1Rva2VuU3RyaW5nICYmICF0aGlzLm9BdXRoMlNlcnZpY2UuaXNBY2Nlc3NUb2tlbkV4cGlyZWQoKSkge1xuICAgICAgICAgICAgcmVxID0gcmVxLmNsb25lKHtcbiAgICAgICAgICAgICAgICBoZWFkZXJzOiByZXEuaGVhZGVycy5zZXQoJ0F1dGhvcml6YXRpb24nLCAnQmVhcmVyICcgKyBhY2Nlc3NUb2tlblN0cmluZylcbiAgICAgICAgICAgIH0pO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcSk7XG4gICAgfVxufVxuIl19
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { InjectionToken } from '@angular/core';
|
|
2
|
+
export const DDR_OAUTH2_CONFIG = new InjectionToken('DDR_OAUTH2_CONFIG');
|
|
3
|
+
export class OAuth2Config {
|
|
4
|
+
constructor(clientId, redirectUri, authorizeUri, tokenUri) {
|
|
5
|
+
this.clientId = clientId;
|
|
6
|
+
this.redirectUri = redirectUri;
|
|
7
|
+
this.authorizeUri = authorizeUri;
|
|
8
|
+
this.tokenUri = tokenUri;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2F1dGgyLWNvbmZpZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9vYXV0aC9vYXV0aDItY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBQyxjQUFjLEVBQUMsTUFBTSxlQUFlLENBQUM7QUFFN0MsTUFBTSxDQUFDLE1BQU0saUJBQWlCLEdBQUcsSUFBSSxjQUFjLENBQWUsbUJBQW1CLENBQUMsQ0FBQztBQUV2RixNQUFNLE9BQU8sWUFBWTtJQUVyQixZQUNvQixRQUFnQixFQUNoQixXQUFtQixFQUNuQixZQUFvQixFQUNwQixRQUFnQjtRQUhoQixhQUFRLEdBQVIsUUFBUSxDQUFRO1FBQ2hCLGdCQUFXLEdBQVgsV0FBVyxDQUFRO1FBQ25CLGlCQUFZLEdBQVosWUFBWSxDQUFRO1FBQ3BCLGFBQVEsR0FBUixRQUFRLENBQVE7SUFHcEMsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtJbmplY3Rpb25Ub2tlbn0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5cbmV4cG9ydCBjb25zdCBERFJfT0FVVEgyX0NPTkZJRyA9IG5ldyBJbmplY3Rpb25Ub2tlbjxPQXV0aDJDb25maWc+KCdERFJfT0FVVEgyX0NPTkZJRycpO1xuXG5leHBvcnQgY2xhc3MgT0F1dGgyQ29uZmlnXG57XG4gICAgY29uc3RydWN0b3IoXG4gICAgICAgIHB1YmxpYyByZWFkb25seSBjbGllbnRJZDogc3RyaW5nLFxuICAgICAgICBwdWJsaWMgcmVhZG9ubHkgcmVkaXJlY3RVcmk6IHN0cmluZyxcbiAgICAgICAgcHVibGljIHJlYWRvbmx5IGF1dGhvcml6ZVVyaTogc3RyaW5nLFxuICAgICAgICBwdWJsaWMgcmVhZG9ubHkgdG9rZW5Vcmk6IHN0cmluZ1xuICAgIClcbiAgICB7XG4gICAgfVxufVxuIl19
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export class OAuth2Error extends Error {
|
|
2
|
+
constructor(error) {
|
|
3
|
+
super(error);
|
|
4
|
+
}
|
|
5
|
+
}
|
|
6
|
+
OAuth2Error.CODE_NOT_FOUND = 'code_not_found';
|
|
7
|
+
OAuth2Error.ACCESS_DENIED = 'access_denied';
|
|
8
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2F1dGgyLWVycm9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL29hdXRoL29hdXRoMi1lcnJvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLE9BQU8sV0FBWSxTQUFRLEtBQUs7SUFNbEMsWUFBWSxLQUFhO1FBRXJCLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNqQixDQUFDOztBQVBzQiwwQkFBYyxHQUFHLGdCQUFnQixDQUFDO0FBRWxDLHlCQUFhLEdBQUcsZUFBZSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNsYXNzIE9BdXRoMkVycm9yIGV4dGVuZHMgRXJyb3JcbntcbiAgICBwdWJsaWMgc3RhdGljIHJlYWRvbmx5IENPREVfTk9UX0ZPVU5EID0gJ2NvZGVfbm90X2ZvdW5kJztcblxuICAgIHB1YmxpYyBzdGF0aWMgcmVhZG9ubHkgQUNDRVNTX0RFTklFRCA9ICdhY2Nlc3NfZGVuaWVkJztcblxuICAgIGNvbnN0cnVjdG9yKGVycm9yOiBzdHJpbmcpXG4gICAge1xuICAgICAgICBzdXBlcihlcnJvcik7XG4gICAgfVxufVxuIl19
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Injectable } from '@angular/core';
|
|
2
|
+
import { switchMap } from 'rxjs/operators';
|
|
3
|
+
import * as i0 from "@angular/core";
|
|
4
|
+
import * as i1 from "./oauth2.service";
|
|
5
|
+
export class OAuth2RefreshTokenInterceptor {
|
|
6
|
+
constructor(oAuth2Service) {
|
|
7
|
+
this.oAuth2Service = oAuth2Service;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* @override
|
|
11
|
+
*/
|
|
12
|
+
intercept(req, next) {
|
|
13
|
+
if (this.oAuth2Service.isRefreshPossibleAndRequired(req)) {
|
|
14
|
+
return this.oAuth2Service.performRefresh().pipe(switchMap(() => next.handle(req)));
|
|
15
|
+
}
|
|
16
|
+
return next.handle(req);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
OAuth2RefreshTokenInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2RefreshTokenInterceptor, deps: [{ token: i1.OAuth2Service }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
20
|
+
OAuth2RefreshTokenInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2RefreshTokenInterceptor });
|
|
21
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2RefreshTokenInterceptor, decorators: [{
|
|
22
|
+
type: Injectable
|
|
23
|
+
}], ctorParameters: function () { return [{ type: i1.OAuth2Service }]; } });
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2F1dGgyLXJlZnJlc2gtdG9rZW4taW50ZXJjZXB0b3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9vYXV0aC9vYXV0aDItcmVmcmVzaC10b2tlbi1pbnRlcmNlcHRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUNBLE9BQU8sRUFBQyxVQUFVLEVBQUMsTUFBTSxlQUFlLENBQUM7QUFFekMsT0FBTyxFQUFDLFNBQVMsRUFBQyxNQUFNLGdCQUFnQixDQUFDOzs7QUFJekMsTUFBTSxPQUFPLDZCQUE2QjtJQUV0QyxZQUFvQixhQUE0QjtRQUE1QixrQkFBYSxHQUFiLGFBQWEsQ0FBZTtJQUVoRCxDQUFDO0lBRUQ7O09BRUc7SUFDSSxTQUFTLENBQUMsR0FBcUIsRUFBRSxJQUFpQjtRQUVyRCxJQUFJLElBQUksQ0FBQyxhQUFhLENBQUMsNEJBQTRCLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDdEQsT0FBTyxJQUFJLENBQUMsYUFBYSxDQUFDLGNBQWMsRUFBRSxDQUFDLElBQUksQ0FDM0MsU0FBUyxDQUFDLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FDcEMsQ0FBQztTQUNMO1FBRUQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzVCLENBQUM7OzBIQWxCUSw2QkFBNkI7OEhBQTdCLDZCQUE2QjsyRkFBN0IsNkJBQTZCO2tCQUR6QyxVQUFVIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtIdHRwRXZlbnQsIEh0dHBIYW5kbGVyLCBIdHRwSW50ZXJjZXB0b3IsIEh0dHBSZXF1ZXN0fSBmcm9tICdAYW5ndWxhci9jb21tb24vaHR0cCc7XG5pbXBvcnQge0luamVjdGFibGV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtPYnNlcnZhYmxlfSBmcm9tICdyeGpzJztcbmltcG9ydCB7c3dpdGNoTWFwfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XG5pbXBvcnQge09BdXRoMlNlcnZpY2V9IGZyb20gJy4vb2F1dGgyLnNlcnZpY2UnO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgT0F1dGgyUmVmcmVzaFRva2VuSW50ZXJjZXB0b3IgaW1wbGVtZW50cyBIdHRwSW50ZXJjZXB0b3JcbntcbiAgICBjb25zdHJ1Y3Rvcihwcml2YXRlIG9BdXRoMlNlcnZpY2U6IE9BdXRoMlNlcnZpY2UpXG4gICAge1xuICAgIH1cblxuICAgIC8qKlxuICAgICAqIEBvdmVycmlkZVxuICAgICAqL1xuICAgIHB1YmxpYyBpbnRlcmNlcHQocmVxOiBIdHRwUmVxdWVzdDxhbnk+LCBuZXh0OiBIdHRwSGFuZGxlcik6IE9ic2VydmFibGU8SHR0cEV2ZW50PGFueT4+XG4gICAge1xuICAgICAgICBpZiAodGhpcy5vQXV0aDJTZXJ2aWNlLmlzUmVmcmVzaFBvc3NpYmxlQW5kUmVxdWlyZWQocmVxKSkge1xuICAgICAgICAgICAgcmV0dXJuIHRoaXMub0F1dGgyU2VydmljZS5wZXJmb3JtUmVmcmVzaCgpLnBpcGUoXG4gICAgICAgICAgICAgICAgc3dpdGNoTWFwKCgpID0+IG5leHQuaGFuZGxlKHJlcSkpXG4gICAgICAgICAgICApO1xuICAgICAgICB9XG5cbiAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKHJlcSk7XG4gICAgfVxufVxuIl19
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { NgModule } from '@angular/core';
|
|
2
|
+
import { DDR_OAUTH2_CONFIG } from './oauth2-config';
|
|
3
|
+
import { HTTP_INTERCEPTORS } from '@angular/common/http';
|
|
4
|
+
import { OAuth2RefreshTokenInterceptor } from './oauth2-refresh-token-interceptor.service';
|
|
5
|
+
import { RedirectToOAuth2LoginInterceptor } from './redirect-to-oauth2-login-interceptor.service';
|
|
6
|
+
import { OAuth2AccessTokenInterceptor } from './oauth2-access-token-interceptor.service';
|
|
7
|
+
import { OAuth2Service } from './oauth2.service';
|
|
8
|
+
import * as i0 from "@angular/core";
|
|
9
|
+
export class OAuth2Module {
|
|
10
|
+
static forRoot(config) {
|
|
11
|
+
return {
|
|
12
|
+
ngModule: OAuth2Module,
|
|
13
|
+
providers: [
|
|
14
|
+
OAuth2Service,
|
|
15
|
+
{
|
|
16
|
+
provide: DDR_OAUTH2_CONFIG,
|
|
17
|
+
useValue: config
|
|
18
|
+
},
|
|
19
|
+
{
|
|
20
|
+
provide: HTTP_INTERCEPTORS,
|
|
21
|
+
useClass: OAuth2RefreshTokenInterceptor,
|
|
22
|
+
multi: true
|
|
23
|
+
},
|
|
24
|
+
{
|
|
25
|
+
provide: HTTP_INTERCEPTORS,
|
|
26
|
+
useClass: RedirectToOAuth2LoginInterceptor,
|
|
27
|
+
multi: true
|
|
28
|
+
},
|
|
29
|
+
{
|
|
30
|
+
provide: HTTP_INTERCEPTORS,
|
|
31
|
+
useClass: OAuth2AccessTokenInterceptor,
|
|
32
|
+
multi: true
|
|
33
|
+
}
|
|
34
|
+
],
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
OAuth2Module.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2Module, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
39
|
+
OAuth2Module.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.3", ngImport: i0, type: OAuth2Module });
|
|
40
|
+
OAuth2Module.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2Module });
|
|
41
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2Module, decorators: [{
|
|
42
|
+
type: NgModule
|
|
43
|
+
}] });
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2F1dGgyLm1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9vYXV0aC9vYXV0aDIubW9kdWxlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBc0IsUUFBUSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBQzVELE9BQU8sRUFBQyxpQkFBaUIsRUFBZSxNQUFNLGlCQUFpQixDQUFDO0FBQ2hFLE9BQU8sRUFBQyxpQkFBaUIsRUFBQyxNQUFNLHNCQUFzQixDQUFDO0FBQ3ZELE9BQU8sRUFBQyw2QkFBNkIsRUFBQyxNQUFNLDRDQUE0QyxDQUFDO0FBQ3pGLE9BQU8sRUFBQyxnQ0FBZ0MsRUFBQyxNQUFNLGdEQUFnRCxDQUFDO0FBQ2hHLE9BQU8sRUFBQyw0QkFBNEIsRUFBQyxNQUFNLDJDQUEyQyxDQUFDO0FBQ3ZGLE9BQU8sRUFBQyxhQUFhLEVBQUMsTUFBTSxrQkFBa0IsQ0FBQzs7QUFHL0MsTUFBTSxPQUFPLFlBQVk7SUFFckIsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFvQjtRQUUvQixPQUFPO1lBQ0gsUUFBUSxFQUFFLFlBQVk7WUFDdEIsU0FBUyxFQUFFO2dCQUNQLGFBQWE7Z0JBQ2I7b0JBQ0ksT0FBTyxFQUFFLGlCQUFpQjtvQkFDMUIsUUFBUSxFQUFFLE1BQU07aUJBQ25CO2dCQUNEO29CQUNJLE9BQU8sRUFBRSxpQkFBaUI7b0JBQzFCLFFBQVEsRUFBRSw2QkFBNkI7b0JBQ3ZDLEtBQUssRUFBRSxJQUFJO2lCQUNkO2dCQUNEO29CQUNJLE9BQU8sRUFBRSxpQkFBaUI7b0JBQzFCLFFBQVEsRUFBRSxnQ0FBZ0M7b0JBQzFDLEtBQUssRUFBRSxJQUFJO2lCQUNkO2dCQUNEO29CQUNJLE9BQU8sRUFBRSxpQkFBaUI7b0JBQzFCLFFBQVEsRUFBRSw0QkFBNEI7b0JBQ3RDLEtBQUssRUFBRSxJQUFJO2lCQUNkO2FBQ0o7U0FDSixDQUFDO0lBQ04sQ0FBQzs7eUdBN0JRLFlBQVk7MEdBQVosWUFBWTswR0FBWixZQUFZOzJGQUFaLFlBQVk7a0JBRHhCLFFBQVEiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQge01vZHVsZVdpdGhQcm92aWRlcnMsIE5nTW9kdWxlfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7RERSX09BVVRIMl9DT05GSUcsIE9BdXRoMkNvbmZpZ30gZnJvbSAnLi9vYXV0aDItY29uZmlnJztcbmltcG9ydCB7SFRUUF9JTlRFUkNFUFRPUlN9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7T0F1dGgyUmVmcmVzaFRva2VuSW50ZXJjZXB0b3J9IGZyb20gJy4vb2F1dGgyLXJlZnJlc2gtdG9rZW4taW50ZXJjZXB0b3Iuc2VydmljZSc7XG5pbXBvcnQge1JlZGlyZWN0VG9PQXV0aDJMb2dpbkludGVyY2VwdG9yfSBmcm9tICcuL3JlZGlyZWN0LXRvLW9hdXRoMi1sb2dpbi1pbnRlcmNlcHRvci5zZXJ2aWNlJztcbmltcG9ydCB7T0F1dGgyQWNjZXNzVG9rZW5JbnRlcmNlcHRvcn0gZnJvbSAnLi9vYXV0aDItYWNjZXNzLXRva2VuLWludGVyY2VwdG9yLnNlcnZpY2UnO1xuaW1wb3J0IHtPQXV0aDJTZXJ2aWNlfSBmcm9tICcuL29hdXRoMi5zZXJ2aWNlJztcblxuQE5nTW9kdWxlKClcbmV4cG9ydCBjbGFzcyBPQXV0aDJNb2R1bGVcbntcbiAgICBzdGF0aWMgZm9yUm9vdChjb25maWc6IE9BdXRoMkNvbmZpZyk6IE1vZHVsZVdpdGhQcm92aWRlcnM8T0F1dGgyTW9kdWxlPlxuICAgIHtcbiAgICAgICAgcmV0dXJuIHtcbiAgICAgICAgICAgIG5nTW9kdWxlOiBPQXV0aDJNb2R1bGUsXG4gICAgICAgICAgICBwcm92aWRlcnM6IFtcbiAgICAgICAgICAgICAgICBPQXV0aDJTZXJ2aWNlLFxuICAgICAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAgICAgICAgcHJvdmlkZTogRERSX09BVVRIMl9DT05GSUcsXG4gICAgICAgICAgICAgICAgICAgIHVzZVZhbHVlOiBjb25maWdcbiAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAgICAgICAgcHJvdmlkZTogSFRUUF9JTlRFUkNFUFRPUlMsXG4gICAgICAgICAgICAgICAgICAgIHVzZUNsYXNzOiBPQXV0aDJSZWZyZXNoVG9rZW5JbnRlcmNlcHRvcixcbiAgICAgICAgICAgICAgICAgICAgbXVsdGk6IHRydWVcbiAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAgICAgICAgcHJvdmlkZTogSFRUUF9JTlRFUkNFUFRPUlMsXG4gICAgICAgICAgICAgICAgICAgIHVzZUNsYXNzOiBSZWRpcmVjdFRvT0F1dGgyTG9naW5JbnRlcmNlcHRvcixcbiAgICAgICAgICAgICAgICAgICAgbXVsdGk6IHRydWVcbiAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAgICAgICAgcHJvdmlkZTogSFRUUF9JTlRFUkNFUFRPUlMsXG4gICAgICAgICAgICAgICAgICAgIHVzZUNsYXNzOiBPQXV0aDJBY2Nlc3NUb2tlbkludGVyY2VwdG9yLFxuICAgICAgICAgICAgICAgICAgICBtdWx0aTogdHJ1ZVxuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgIF0sXG4gICAgICAgIH07XG4gICAgfVxufVxuIl19
|
|
@@ -0,0 +1,119 @@
|
|
|
1
|
+
import { Inject, Injectable } from '@angular/core';
|
|
2
|
+
import { throwError } from 'rxjs';
|
|
3
|
+
import { HttpParams } from '@angular/common/http';
|
|
4
|
+
import { catchError, map, shareReplay } from 'rxjs/operators';
|
|
5
|
+
import { DDR_OAUTH2_CONFIG } from './oauth2-config';
|
|
6
|
+
import { OAuth2Error } from './oauth2-error';
|
|
7
|
+
import { TypeUtils } from '../util/type-utils';
|
|
8
|
+
import { StringUtils } from '../util/string-utils';
|
|
9
|
+
import * as i0 from "@angular/core";
|
|
10
|
+
import * as i1 from "@angular/router";
|
|
11
|
+
import * as i2 from "@angular/common/http";
|
|
12
|
+
import * as i3 from "./oauth2-config";
|
|
13
|
+
export class OAuth2Service {
|
|
14
|
+
constructor(route, httpClient, config) {
|
|
15
|
+
this.route = route;
|
|
16
|
+
this.httpClient = httpClient;
|
|
17
|
+
this.config = config;
|
|
18
|
+
this.accessTokenString = null;
|
|
19
|
+
this.accessToken = null;
|
|
20
|
+
this.REFRESH_MARGIN_SECONDS = 60 * 10;
|
|
21
|
+
this.refreshTokenRequest$ = null;
|
|
22
|
+
}
|
|
23
|
+
redirectToLogin() {
|
|
24
|
+
const challenge = this.createChallenge();
|
|
25
|
+
localStorage.setItem(OAuth2Service.STORAGE_KEY_CHALLENGE, challenge);
|
|
26
|
+
const params = new HttpParams()
|
|
27
|
+
.set('client_id', this.config.clientId)
|
|
28
|
+
.set('response_type', 'code')
|
|
29
|
+
.set('redirect_uri', this.config.redirectUri)
|
|
30
|
+
.set('code_challenge', challenge)
|
|
31
|
+
.set('code_challenge_method', 'plain');
|
|
32
|
+
window.location.href = this.config.authorizeUri + '?' + params.toString();
|
|
33
|
+
}
|
|
34
|
+
handleCode() {
|
|
35
|
+
if (this.route.snapshot.queryParamMap.has('error')) {
|
|
36
|
+
const error = this.route.snapshot.queryParamMap.get('error');
|
|
37
|
+
return throwError(() => new OAuth2Error(error ?? 'Unknown error'));
|
|
38
|
+
}
|
|
39
|
+
if (!this.route.snapshot.queryParamMap.has('code')) {
|
|
40
|
+
return throwError(() => new OAuth2Error(OAuth2Error.CODE_NOT_FOUND));
|
|
41
|
+
}
|
|
42
|
+
const code = TypeUtils.notNull(this.route.snapshot.queryParamMap.get('code'));
|
|
43
|
+
const params = new HttpParams()
|
|
44
|
+
.set('grant_type', 'authorization_code')
|
|
45
|
+
.set('code', code)
|
|
46
|
+
.set('redirect_uri', this.config.redirectUri)
|
|
47
|
+
.set('code_verifier', TypeUtils.notNull(localStorage.getItem(OAuth2Service.STORAGE_KEY_CHALLENGE)))
|
|
48
|
+
.set('client_id', this.config.clientId);
|
|
49
|
+
return this.httpClient.post(this.config.tokenUri, params).pipe(map(tokenResponse => this.processTokenResponse(tokenResponse)));
|
|
50
|
+
}
|
|
51
|
+
createChallenge() {
|
|
52
|
+
return StringUtils.createRandomString(64, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-._~');
|
|
53
|
+
}
|
|
54
|
+
getRefreshToken() {
|
|
55
|
+
return localStorage.getItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);
|
|
56
|
+
}
|
|
57
|
+
getAccessTokenString() {
|
|
58
|
+
return this.accessTokenString;
|
|
59
|
+
}
|
|
60
|
+
isAccessTokenExpired() {
|
|
61
|
+
return (null == this.accessToken
|
|
62
|
+
|| this.accessToken.exp * 1000 < Date.now());
|
|
63
|
+
}
|
|
64
|
+
isRefreshPossibleAndRequired(req = null) {
|
|
65
|
+
return ((null == req || !req.url.endsWith(this.config.tokenUri))
|
|
66
|
+
&& null != this.getRefreshToken()
|
|
67
|
+
&& (null == this.accessToken
|
|
68
|
+
|| (this.accessToken.exp - this.REFRESH_MARGIN_SECONDS) * 1000 < Date.now()));
|
|
69
|
+
}
|
|
70
|
+
performRefresh() {
|
|
71
|
+
if (null == this.refreshTokenRequest$) {
|
|
72
|
+
console.log('Performing token refesh');
|
|
73
|
+
const params = new HttpParams()
|
|
74
|
+
.set('grant_type', 'refresh_token')
|
|
75
|
+
.set('refresh_token', TypeUtils.notNull(this.getRefreshToken()))
|
|
76
|
+
.set('client_id', this.config.clientId);
|
|
77
|
+
this.refreshTokenRequest$ = this.httpClient.post(this.config.tokenUri, params).pipe(map(tokenResponse => this.processTokenResponse(tokenResponse)), catchError(error => {
|
|
78
|
+
this.accessTokenString = null;
|
|
79
|
+
this.accessToken = null;
|
|
80
|
+
localStorage.removeItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);
|
|
81
|
+
this.refreshTokenRequest$ = null;
|
|
82
|
+
return throwError(error);
|
|
83
|
+
}), shareReplay(1));
|
|
84
|
+
}
|
|
85
|
+
return this.refreshTokenRequest$;
|
|
86
|
+
}
|
|
87
|
+
processTokenResponse(tokenResponse) {
|
|
88
|
+
localStorage.removeItem(OAuth2Service.STORAGE_KEY_CHALLENGE);
|
|
89
|
+
this.accessTokenString = tokenResponse.access_token;
|
|
90
|
+
this.accessToken = JSON.parse(atob(tokenResponse.access_token.split('.')[1]));
|
|
91
|
+
console.log('Access Token Expiry', new Date(this.accessToken.exp * 1000));
|
|
92
|
+
localStorage.setItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN, tokenResponse.refresh_token);
|
|
93
|
+
return this.accessToken;
|
|
94
|
+
}
|
|
95
|
+
clear() {
|
|
96
|
+
this.accessToken = null;
|
|
97
|
+
this.accessTokenString = null;
|
|
98
|
+
localStorage.removeItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);
|
|
99
|
+
localStorage.removeItem(OAuth2Service.STORAGE_KEY_RETURN_URL);
|
|
100
|
+
}
|
|
101
|
+
setReturnUrl(url) {
|
|
102
|
+
localStorage.setItem(OAuth2Service.STORAGE_KEY_RETURN_URL, url);
|
|
103
|
+
}
|
|
104
|
+
getReturnUrl() {
|
|
105
|
+
return localStorage.getItem(OAuth2Service.STORAGE_KEY_RETURN_URL);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
OAuth2Service.STORAGE_KEY_CHALLENGE = 'ddr_oauth2_challenge';
|
|
109
|
+
OAuth2Service.STORAGE_KEY_REFRESH_TOKEN = 'ddr_oauth2_refresh_token';
|
|
110
|
+
OAuth2Service.STORAGE_KEY_RETURN_URL = 'ddr_oauth2_return_url';
|
|
111
|
+
OAuth2Service.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2Service, deps: [{ token: i1.ActivatedRoute }, { token: i2.HttpClient }, { token: DDR_OAUTH2_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
112
|
+
OAuth2Service.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2Service });
|
|
113
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: OAuth2Service, decorators: [{
|
|
114
|
+
type: Injectable
|
|
115
|
+
}], ctorParameters: function () { return [{ type: i1.ActivatedRoute }, { type: i2.HttpClient }, { type: i3.OAuth2Config, decorators: [{
|
|
116
|
+
type: Inject,
|
|
117
|
+
args: [DDR_OAUTH2_CONFIG]
|
|
118
|
+
}] }]; } });
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oauth2.service.js","sourceRoot":"","sources":["../../../../src/oauth/oauth2.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, Injectable} from '@angular/core';\nimport {ActivatedRoute} from '@angular/router';\nimport {Observable, throwError} from 'rxjs';\nimport {HttpClient, HttpParams, HttpRequest} from '@angular/common/http';\nimport {catchError, map, shareReplay} from 'rxjs/operators';\nimport {TokenResponse} from './token-response';\nimport {JsonWebToken} from './json-web-token';\nimport {DDR_OAUTH2_CONFIG, OAuth2Config} from './oauth2-config';\nimport {OAuth2Error} from './oauth2-error';\nimport {TypeUtils} from '../util/type-utils';\nimport {StringUtils} from '../util/string-utils';\n\n@Injectable()\nexport class OAuth2Service\n{\n    private static STORAGE_KEY_CHALLENGE = 'ddr_oauth2_challenge';\n\n    private static STORAGE_KEY_REFRESH_TOKEN = 'ddr_oauth2_refresh_token';\n\n    public static STORAGE_KEY_RETURN_URL = 'ddr_oauth2_return_url';\n\n    private accessTokenString: string | null = null;\n\n    private accessToken: JsonWebToken | null = null;\n\n    private readonly REFRESH_MARGIN_SECONDS = 60 * 10;\n\n    private refreshTokenRequest$: Observable<JsonWebToken> | null = null;\n\n    constructor(\n        private route: ActivatedRoute,\n        private httpClient: HttpClient,\n        @Inject(DDR_OAUTH2_CONFIG) private config: OAuth2Config\n    )\n    {\n    }\n\n    public redirectToLogin()\n    {\n        const challenge = this.createChallenge();\n        localStorage.setItem(OAuth2Service.STORAGE_KEY_CHALLENGE, challenge);\n\n        const params = new HttpParams()\n            .set('client_id', this.config.clientId)\n            .set('response_type', 'code')\n            .set('redirect_uri', this.config.redirectUri)\n            .set('code_challenge', challenge)\n            .set('code_challenge_method', 'plain');\n\n        window.location.href = this.config.authorizeUri + '?' + params.toString();\n    }\n\n    public handleCode(): Observable<JsonWebToken>\n    {\n        if (this.route.snapshot.queryParamMap.has('error')) {\n            const error = this.route.snapshot.queryParamMap.get('error');\n            return throwError(() => new OAuth2Error(error ?? 'Unknown error'));\n        }\n\n        if (!this.route.snapshot.queryParamMap.has('code')) {\n            return throwError(() => new OAuth2Error(OAuth2Error.CODE_NOT_FOUND));\n        }\n\n        const code = TypeUtils.notNull(this.route.snapshot.queryParamMap.get('code'));\n        const params = new HttpParams()\n            .set('grant_type', 'authorization_code')\n            .set('code', code)\n            .set('redirect_uri', this.config.redirectUri)\n            .set('code_verifier', TypeUtils.notNull(localStorage.getItem(OAuth2Service.STORAGE_KEY_CHALLENGE)))\n            .set('client_id', this.config.clientId);\n        return this.httpClient.post<TokenResponse>(this.config.tokenUri, params).pipe(\n            map(tokenResponse => this.processTokenResponse(tokenResponse))\n        );\n    }\n\n    private createChallenge()\n    {\n        return StringUtils.createRandomString(64, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-._~');\n    }\n\n    private getRefreshToken(): string | null\n    {\n        return localStorage.getItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);\n    }\n\n    public getAccessTokenString(): string | null\n    {\n        return this.accessTokenString;\n    }\n\n    public isAccessTokenExpired(): boolean\n    {\n        return (\n            null == this.accessToken\n            || this.accessToken.exp * 1000 < Date.now()\n        );\n    }\n\n    public isRefreshPossibleAndRequired(req: HttpRequest<any> | null = null): boolean\n    {\n        return (\n            (null == req || !req.url.endsWith(this.config.tokenUri))\n            && null != this.getRefreshToken()\n            && (\n                null == this.accessToken\n                || (this.accessToken.exp - this.REFRESH_MARGIN_SECONDS) * 1000 < Date.now()\n            )\n        );\n    }\n\n    public performRefresh(): Observable<JsonWebToken>\n    {\n        if (null == this.refreshTokenRequest$) {\n\n            console.log('Performing token refesh');\n\n            const params = new HttpParams()\n                .set('grant_type', 'refresh_token')\n                .set('refresh_token', TypeUtils.notNull(this.getRefreshToken()))\n                .set('client_id', this.config.clientId);\n\n            this.refreshTokenRequest$ = this.httpClient.post<TokenResponse>(this.config.tokenUri, params).pipe(\n                map(tokenResponse => this.processTokenResponse(tokenResponse)),\n                catchError(error => {\n                    this.accessTokenString = null;\n                    this.accessToken = null;\n                    localStorage.removeItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);\n                    this.refreshTokenRequest$ = null;\n                    return throwError(error);\n                }),\n                shareReplay(1)\n            );\n        }\n\n        return this.refreshTokenRequest$;\n    }\n\n    private processTokenResponse(tokenResponse: TokenResponse): JsonWebToken\n    {\n        localStorage.removeItem(OAuth2Service.STORAGE_KEY_CHALLENGE);\n        this.accessTokenString = tokenResponse.access_token;\n        this.accessToken = JSON.parse(atob(tokenResponse.access_token.split('.')[1]));\n        console.log('Access Token Expiry', new Date(this.accessToken!.exp * 1000));\n        localStorage.setItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN, tokenResponse.refresh_token);\n\n        return this.accessToken!;\n    }\n\n    public clear()\n    {\n        this.accessToken = null;\n        this.accessTokenString = null;\n        localStorage.removeItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);\n        localStorage.removeItem(OAuth2Service.STORAGE_KEY_RETURN_URL);\n    }\n\n    public setReturnUrl(url: string)\n    {\n        localStorage.setItem(OAuth2Service.STORAGE_KEY_RETURN_URL, url);\n    }\n\n    public getReturnUrl(): string | null\n    {\n        return localStorage.getItem(OAuth2Service.STORAGE_KEY_RETURN_URL);\n    }\n}\n"]}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { HttpErrorResponse } from '@angular/common/http';
|
|
2
|
+
import { throwError } from 'rxjs';
|
|
3
|
+
import { Inject, Injectable } from '@angular/core';
|
|
4
|
+
import { catchError } from 'rxjs/operators';
|
|
5
|
+
import { DDR_OAUTH2_CONFIG } from './oauth2-config';
|
|
6
|
+
import * as i0 from "@angular/core";
|
|
7
|
+
import * as i1 from "./oauth2.service";
|
|
8
|
+
import * as i2 from "@angular/router";
|
|
9
|
+
import * as i3 from "./oauth2-config";
|
|
10
|
+
export class RedirectToOAuth2LoginInterceptor {
|
|
11
|
+
constructor(oAuth2Service, router, oAuth2Config) {
|
|
12
|
+
this.oAuth2Service = oAuth2Service;
|
|
13
|
+
this.router = router;
|
|
14
|
+
this.oAuth2Config = oAuth2Config;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* @override
|
|
18
|
+
*/
|
|
19
|
+
intercept(req, next) {
|
|
20
|
+
return next.handle(req).pipe(catchError((err) => {
|
|
21
|
+
if (err instanceof HttpErrorResponse) {
|
|
22
|
+
if (err.status === 401) {
|
|
23
|
+
if (!window.location.href.startsWith(this.oAuth2Config.redirectUri)) {
|
|
24
|
+
this.oAuth2Service.setReturnUrl(this.router.routerState.snapshot.url);
|
|
25
|
+
this.oAuth2Service.redirectToLogin();
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return throwError(err);
|
|
30
|
+
}));
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
RedirectToOAuth2LoginInterceptor.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: RedirectToOAuth2LoginInterceptor, deps: [{ token: i1.OAuth2Service }, { token: i2.Router }, { token: DDR_OAUTH2_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
34
|
+
RedirectToOAuth2LoginInterceptor.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: RedirectToOAuth2LoginInterceptor });
|
|
35
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: RedirectToOAuth2LoginInterceptor, decorators: [{
|
|
36
|
+
type: Injectable
|
|
37
|
+
}], ctorParameters: function () { return [{ type: i1.OAuth2Service }, { type: i2.Router }, { type: i3.OAuth2Config, decorators: [{
|
|
38
|
+
type: Inject,
|
|
39
|
+
args: [DDR_OAUTH2_CONFIG]
|
|
40
|
+
}] }]; } });
|
|
41
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXJlY3QtdG8tb2F1dGgyLWxvZ2luLWludGVyY2VwdG9yLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvb2F1dGgvcmVkaXJlY3QtdG8tb2F1dGgyLWxvZ2luLWludGVyY2VwdG9yLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLGlCQUFpQixFQUF1RCxNQUFNLHNCQUFzQixDQUFDO0FBQzdHLE9BQU8sRUFBYSxVQUFVLEVBQUMsTUFBTSxNQUFNLENBQUM7QUFDNUMsT0FBTyxFQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUMsTUFBTSxlQUFlLENBQUM7QUFDakQsT0FBTyxFQUFDLFVBQVUsRUFBQyxNQUFNLGdCQUFnQixDQUFDO0FBRzFDLE9BQU8sRUFBQyxpQkFBaUIsRUFBZSxNQUFNLGlCQUFpQixDQUFDOzs7OztBQUdoRSxNQUFNLE9BQU8sZ0NBQWdDO0lBRXpDLFlBQ1ksYUFBNEIsRUFDNUIsTUFBYyxFQUNhLFlBQTBCO1FBRnJELGtCQUFhLEdBQWIsYUFBYSxDQUFlO1FBQzVCLFdBQU0sR0FBTixNQUFNLENBQVE7UUFDYSxpQkFBWSxHQUFaLFlBQVksQ0FBYztJQUdqRSxDQUFDO0lBRUQ7O09BRUc7SUFDSSxTQUFTLENBQUMsR0FBcUIsRUFBRSxJQUFpQjtRQUVyRCxPQUFPLElBQUksQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLEdBQUcsRUFBRSxFQUFFO1lBRTVDLElBQUksR0FBRyxZQUFZLGlCQUFpQixFQUFFO2dCQUNsQyxJQUFJLEdBQUcsQ0FBQyxNQUFNLEtBQUssR0FBRyxFQUFFO29CQUNwQixJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsV0FBVyxDQUFDLEVBQUU7d0JBQ2pFLElBQUksQ0FBQyxhQUFhLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQzt3QkFDdEUsSUFBSSxDQUFDLGFBQWEsQ0FBQyxlQUFlLEVBQUUsQ0FBQztxQkFDeEM7aUJBQ0o7YUFDSjtZQUVELE9BQU8sVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDUixDQUFDOzs2SEE1QlEsZ0NBQWdDLHFFQUs3QixpQkFBaUI7aUlBTHBCLGdDQUFnQzsyRkFBaEMsZ0NBQWdDO2tCQUQ1QyxVQUFVOzswQkFNRixNQUFNOzJCQUFDLGlCQUFpQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7SHR0cEVycm9yUmVzcG9uc2UsIEh0dHBFdmVudCwgSHR0cEhhbmRsZXIsIEh0dHBJbnRlcmNlcHRvciwgSHR0cFJlcXVlc3R9IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcbmltcG9ydCB7T2JzZXJ2YWJsZSwgdGhyb3dFcnJvcn0gZnJvbSAncnhqcyc7XG5pbXBvcnQge0luamVjdCwgSW5qZWN0YWJsZX0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQge2NhdGNoRXJyb3J9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7Um91dGVyfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHtPQXV0aDJTZXJ2aWNlfSBmcm9tICcuL29hdXRoMi5zZXJ2aWNlJztcbmltcG9ydCB7RERSX09BVVRIMl9DT05GSUcsIE9BdXRoMkNvbmZpZ30gZnJvbSAnLi9vYXV0aDItY29uZmlnJztcblxuQEluamVjdGFibGUoKVxuZXhwb3J0IGNsYXNzIFJlZGlyZWN0VG9PQXV0aDJMb2dpbkludGVyY2VwdG9yIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yXG57XG4gICAgY29uc3RydWN0b3IoXG4gICAgICAgIHByaXZhdGUgb0F1dGgyU2VydmljZTogT0F1dGgyU2VydmljZSxcbiAgICAgICAgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlcixcbiAgICAgICAgQEluamVjdChERFJfT0FVVEgyX0NPTkZJRykgcHJpdmF0ZSBvQXV0aDJDb25maWc6IE9BdXRoMkNvbmZpZ1xuICAgIClcbiAgICB7XG4gICAgfVxuXG4gICAgLyoqXG4gICAgICogQG92ZXJyaWRlXG4gICAgICovXG4gICAgcHVibGljIGludGVyY2VwdChyZXE6IEh0dHBSZXF1ZXN0PGFueT4sIG5leHQ6IEh0dHBIYW5kbGVyKTogT2JzZXJ2YWJsZTxIdHRwRXZlbnQ8YW55Pj5cbiAgICB7XG4gICAgICAgIHJldHVybiBuZXh0LmhhbmRsZShyZXEpLnBpcGUoY2F0Y2hFcnJvcigoZXJyKSA9PiB7XG5cbiAgICAgICAgICAgIGlmIChlcnIgaW5zdGFuY2VvZiBIdHRwRXJyb3JSZXNwb25zZSkge1xuICAgICAgICAgICAgICAgIGlmIChlcnIuc3RhdHVzID09PSA0MDEpIHtcbiAgICAgICAgICAgICAgICAgICAgaWYgKCF3aW5kb3cubG9jYXRpb24uaHJlZi5zdGFydHNXaXRoKHRoaXMub0F1dGgyQ29uZmlnLnJlZGlyZWN0VXJpKSkge1xuICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5vQXV0aDJTZXJ2aWNlLnNldFJldHVyblVybCh0aGlzLnJvdXRlci5yb3V0ZXJTdGF0ZS5zbmFwc2hvdC51cmwpO1xuICAgICAgICAgICAgICAgICAgICAgICAgdGhpcy5vQXV0aDJTZXJ2aWNlLnJlZGlyZWN0VG9Mb2dpbigpO1xuICAgICAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICAgICAgfVxuICAgICAgICAgICAgfVxuXG4gICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihlcnIpO1xuICAgICAgICB9KSk7XG4gICAgfVxufVxuIl19
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export {};
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4tcmVzcG9uc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvb2F1dGgvdG9rZW4tcmVzcG9uc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgVG9rZW5SZXNwb25zZVxue1xuICAgIHRva2VuX3R5cGU6IHN0cmluZztcbiAgICBleHBpcmVzX2luOiBudW1iZXI7XG4gICAgYWNjZXNzX3Rva2VuOiBzdHJpbmc7XG4gICAgcmVmcmVzaF90b2tlbjogc3RyaW5nO1xufVxuIl19
|
|
@@ -33,15 +33,15 @@ export class BottomHitDirective {
|
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
BottomHitDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
37
|
-
BottomHitDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.
|
|
36
|
+
BottomHitDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: BottomHitDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
|
|
37
|
+
BottomHitDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.3", type: BottomHitDirective, selector: "[ddrBottomHit]", outputs: { onWindowBottomHit: "onWindowBottomHit", onElementBottomHit: "onElementBottomHit" }, host: { listeners: { "scroll": "scrolled($event)", "window:scroll": "windowScrolled($event)" } }, ngImport: i0 });
|
|
38
38
|
__decorate([
|
|
39
39
|
Limit()
|
|
40
40
|
], BottomHitDirective.prototype, "scrolled", null);
|
|
41
41
|
__decorate([
|
|
42
42
|
Limit()
|
|
43
43
|
], BottomHitDirective.prototype, "windowScrolled", null);
|
|
44
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
44
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: BottomHitDirective, decorators: [{
|
|
45
45
|
type: Directive,
|
|
46
46
|
args: [{
|
|
47
47
|
selector: '[ddrBottomHit]'
|
|
@@ -27,9 +27,9 @@ export class ScrollService {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
ScrollService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
31
|
-
ScrollService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.
|
|
32
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
30
|
+
ScrollService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: ScrollService, deps: [{ token: i1.Router }, { token: i2.ViewportScroller }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
31
|
+
ScrollService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: ScrollService, providedIn: 'root' });
|
|
32
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: ScrollService, decorators: [{
|
|
33
33
|
type: Injectable,
|
|
34
34
|
args: [{
|
|
35
35
|
providedIn: 'root'
|
|
@@ -10,9 +10,9 @@ export class VisibilityService {
|
|
|
10
10
|
return this.visibility$;
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
|
-
VisibilityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.
|
|
14
|
-
VisibilityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.
|
|
15
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.
|
|
13
|
+
VisibilityService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: VisibilityService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
14
|
+
VisibilityService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: VisibilityService, providedIn: 'root' });
|
|
15
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.3", ngImport: i0, type: VisibilityService, decorators: [{
|
|
16
16
|
type: Injectable,
|
|
17
17
|
args: [{ providedIn: 'root' }]
|
|
18
18
|
}], ctorParameters: function () { return []; } });
|