@dontdrinkandroot/ngx-extensions 0.3.2 → 0.4.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.
- package/{esm2020 → esm2022}/src/cookie/cookie.service.mjs +4 -4
- package/esm2022/src/ddr-extensions.module.mjs +67 -0
- package/{esm2020 → esm2022}/src/http/redirect-to-login-interceptor.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/http/with-credentials-interceptor.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/image/lazy-image.directive.mjs +4 -4
- package/{esm2020 → esm2022}/src/jwt/jwt-interceptor.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/jwt/jwt-refresh-token-interceptor.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/jwt/jwt.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/logger/console-logger.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/oauth/oauth2-access-token-interceptor.service.mjs +4 -4
- package/esm2022/src/oauth/oauth2-error.mjs +8 -0
- package/{esm2020 → esm2022}/src/oauth/oauth2-refresh-token-interceptor.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/oauth/oauth2.module.mjs +5 -5
- package/esm2022/src/oauth/oauth2.service.mjs +125 -0
- package/{esm2020 → esm2022}/src/oauth/redirect-to-oauth2-login-interceptor.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/scroll/bottom-hit.directive.mjs +4 -4
- package/{esm2020 → esm2022}/src/scroll/scroll.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/storage/local-storage.service.mjs +4 -4
- package/{esm2020 → esm2022}/src/visibility/visibility.service.mjs +4 -4
- package/{fesm2020 → fesm2022}/dontdrinkandroot-ngx-extensions.mjs +82 -80
- package/{fesm2020 → fesm2022}/dontdrinkandroot-ngx-extensions.mjs.map +1 -1
- package/package.json +9 -15
- package/src/image/lazy-image.directive.d.ts +1 -1
- package/esm2020/src/ddr-extensions.module.mjs +0 -67
- package/esm2020/src/oauth/oauth2-error.mjs +0 -8
- package/esm2020/src/oauth/oauth2.service.mjs +0 -125
- package/fesm2015/dontdrinkandroot-ngx-extensions.mjs +0 -1132
- package/fesm2015/dontdrinkandroot-ngx-extensions.mjs.map +0 -1
- /package/{esm2020 → esm2022}/dontdrinkandroot-ngx-extensions.mjs +0 -0
- /package/{esm2020 → esm2022}/public-api.mjs +0 -0
- /package/{esm2020 → esm2022}/src/http/url-info.mjs +0 -0
- /package/{esm2020 → esm2022}/src/jwt/jwt-token-response.mjs +0 -0
- /package/{esm2020 → esm2022}/src/logger/logger.service.mjs +0 -0
- /package/{esm2020 → esm2022}/src/methoddecorator/debounce.mjs +0 -0
- /package/{esm2020 → esm2022}/src/methoddecorator/limit.mjs +0 -0
- /package/{esm2020 → esm2022}/src/oauth/json-web-token.mjs +0 -0
- /package/{esm2020 → esm2022}/src/oauth/oauth2-config.mjs +0 -0
- /package/{esm2020 → esm2022}/src/oauth/token-response.mjs +0 -0
- /package/{esm2020 → esm2022}/src/storage/storage.service.mjs +0 -0
- /package/{esm2020 → esm2022}/src/typeguard/is-non-null.mjs +0 -0
- /package/{esm2020 → esm2022}/src/util/collection-utils.mjs +0 -0
- /package/{esm2020 → esm2022}/src/util/number-utils.mjs +0 -0
- /package/{esm2020 → esm2022}/src/util/object-utils.mjs +0 -0
- /package/{esm2020 → esm2022}/src/util/string-utils.mjs +0 -0
- /package/{esm2020 → esm2022}/src/util/type-utils.mjs +0 -0
|
@@ -1,125 +0,0 @@
|
|
|
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 "../logger/logger.service";
|
|
13
|
-
import * as i4 from "./oauth2-config";
|
|
14
|
-
export class OAuth2Service {
|
|
15
|
-
constructor(route, httpClient, loggerService, config) {
|
|
16
|
-
this.route = route;
|
|
17
|
-
this.httpClient = httpClient;
|
|
18
|
-
this.loggerService = loggerService;
|
|
19
|
-
this.config = config;
|
|
20
|
-
this.accessTokenString = null;
|
|
21
|
-
this.accessToken = null;
|
|
22
|
-
this.REFRESH_MARGIN_SECONDS = 60 * 10;
|
|
23
|
-
this.refreshTokenRequest$ = null;
|
|
24
|
-
}
|
|
25
|
-
redirectToLogin() {
|
|
26
|
-
const challenge = this.createChallenge();
|
|
27
|
-
localStorage.setItem(OAuth2Service.STORAGE_KEY_CHALLENGE, challenge);
|
|
28
|
-
const params = new HttpParams()
|
|
29
|
-
.set('client_id', this.config.clientId)
|
|
30
|
-
.set('response_type', 'code')
|
|
31
|
-
.set('redirect_uri', this.config.redirectUri)
|
|
32
|
-
.set('code_challenge', challenge)
|
|
33
|
-
.set('code_challenge_method', 'plain');
|
|
34
|
-
window.location.href = this.config.authorizeUri + '?' + params.toString();
|
|
35
|
-
}
|
|
36
|
-
handleCode() {
|
|
37
|
-
if (this.route.snapshot.queryParamMap.has('error')) {
|
|
38
|
-
const error = this.route.snapshot.queryParamMap.get('error');
|
|
39
|
-
return throwError(() => new OAuth2Error(error ?? 'Unknown error'));
|
|
40
|
-
}
|
|
41
|
-
if (!this.route.snapshot.queryParamMap.has('code')) {
|
|
42
|
-
return throwError(() => new OAuth2Error(OAuth2Error.CODE_NOT_FOUND));
|
|
43
|
-
}
|
|
44
|
-
const code = TypeUtils.notNull(this.route.snapshot.queryParamMap.get('code'));
|
|
45
|
-
const params = new HttpParams()
|
|
46
|
-
.set('grant_type', 'authorization_code')
|
|
47
|
-
.set('code', code)
|
|
48
|
-
.set('redirect_uri', this.config.redirectUri)
|
|
49
|
-
.set('code_verifier', TypeUtils.notNull(localStorage.getItem(OAuth2Service.STORAGE_KEY_CHALLENGE)))
|
|
50
|
-
.set('client_id', this.config.clientId);
|
|
51
|
-
return this.httpClient.post(this.config.tokenUri, params).pipe(map(tokenResponse => this.processTokenResponse(tokenResponse)));
|
|
52
|
-
}
|
|
53
|
-
createChallenge() {
|
|
54
|
-
return StringUtils.createRandomString(64, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890-._~');
|
|
55
|
-
}
|
|
56
|
-
getRefreshToken() {
|
|
57
|
-
return localStorage.getItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);
|
|
58
|
-
}
|
|
59
|
-
getAccessTokenString() {
|
|
60
|
-
return this.accessTokenString;
|
|
61
|
-
}
|
|
62
|
-
isAccessTokenExpired() {
|
|
63
|
-
return (null == this.accessToken
|
|
64
|
-
|| this.accessToken.exp * 1000 < Date.now());
|
|
65
|
-
}
|
|
66
|
-
isRefreshPossibleAndRequired(req = null) {
|
|
67
|
-
return ((null == req || !req.url.endsWith(this.config.tokenUri))
|
|
68
|
-
&& null != this.getRefreshToken()
|
|
69
|
-
&& (null == this.accessToken
|
|
70
|
-
|| (this.accessToken.exp - this.REFRESH_MARGIN_SECONDS) * 1000 < Date.now()));
|
|
71
|
-
}
|
|
72
|
-
performRefresh() {
|
|
73
|
-
if (null == this.refreshTokenRequest$) {
|
|
74
|
-
this.loggerService.info('Performing token refesh');
|
|
75
|
-
const params = new HttpParams()
|
|
76
|
-
.set('grant_type', 'refresh_token')
|
|
77
|
-
.set('refresh_token', TypeUtils.notNull(this.getRefreshToken()))
|
|
78
|
-
.set('client_id', this.config.clientId);
|
|
79
|
-
this.refreshTokenRequest$ = this.httpClient.post(this.config.tokenUri, params).pipe(map(tokenResponse => {
|
|
80
|
-
const token = this.processTokenResponse(tokenResponse);
|
|
81
|
-
this.refreshTokenRequest$ = null;
|
|
82
|
-
return token;
|
|
83
|
-
}), catchError(error => {
|
|
84
|
-
this.accessTokenString = null;
|
|
85
|
-
this.accessToken = null;
|
|
86
|
-
localStorage.removeItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);
|
|
87
|
-
this.refreshTokenRequest$ = null;
|
|
88
|
-
return throwError(error);
|
|
89
|
-
}), shareReplay(1));
|
|
90
|
-
}
|
|
91
|
-
return this.refreshTokenRequest$;
|
|
92
|
-
}
|
|
93
|
-
processTokenResponse(tokenResponse) {
|
|
94
|
-
localStorage.removeItem(OAuth2Service.STORAGE_KEY_CHALLENGE);
|
|
95
|
-
this.accessTokenString = tokenResponse.access_token;
|
|
96
|
-
this.accessToken = JSON.parse(atob(tokenResponse.access_token.split('.')[1]));
|
|
97
|
-
this.loggerService.info('Access Token Expiry', new Date(this.accessToken.exp * 1000));
|
|
98
|
-
localStorage.setItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN, tokenResponse.refresh_token);
|
|
99
|
-
return this.accessToken;
|
|
100
|
-
}
|
|
101
|
-
clear() {
|
|
102
|
-
this.accessToken = null;
|
|
103
|
-
this.accessTokenString = null;
|
|
104
|
-
localStorage.removeItem(OAuth2Service.STORAGE_KEY_REFRESH_TOKEN);
|
|
105
|
-
localStorage.removeItem(OAuth2Service.STORAGE_KEY_RETURN_URL);
|
|
106
|
-
}
|
|
107
|
-
setReturnUrl(url) {
|
|
108
|
-
localStorage.setItem(OAuth2Service.STORAGE_KEY_RETURN_URL, url);
|
|
109
|
-
}
|
|
110
|
-
getReturnUrl() {
|
|
111
|
-
return localStorage.getItem(OAuth2Service.STORAGE_KEY_RETURN_URL);
|
|
112
|
-
}
|
|
113
|
-
}
|
|
114
|
-
OAuth2Service.STORAGE_KEY_CHALLENGE = 'ddr_oauth2_challenge';
|
|
115
|
-
OAuth2Service.STORAGE_KEY_REFRESH_TOKEN = 'ddr_oauth2_refresh_token';
|
|
116
|
-
OAuth2Service.STORAGE_KEY_RETURN_URL = 'ddr_oauth2_return_url';
|
|
117
|
-
OAuth2Service.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.4", ngImport: i0, type: OAuth2Service, deps: [{ token: i1.ActivatedRoute }, { token: i2.HttpClient }, { token: i3.Logger }, { token: DDR_OAUTH2_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
118
|
-
OAuth2Service.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.4", ngImport: i0, type: OAuth2Service });
|
|
119
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.4", ngImport: i0, type: OAuth2Service, decorators: [{
|
|
120
|
-
type: Injectable
|
|
121
|
-
}], ctorParameters: function () { return [{ type: i1.ActivatedRoute }, { type: i2.HttpClient }, { type: i3.Logger }, { type: i4.OAuth2Config, decorators: [{
|
|
122
|
-
type: Inject,
|
|
123
|
-
args: [DDR_OAUTH2_CONFIG]
|
|
124
|
-
}] }]; } });
|
|
125
|
-
//# 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';\nimport {Logger} from '../logger/logger.service';\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        private loggerService: Logger,\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            this.loggerService.info('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 => {\n                    const token = this.processTokenResponse(tokenResponse);\n                    this.refreshTokenRequest$ = null;\n                    return token;\n                }),\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        this.loggerService.info('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"]}
|