ngx-oauth 4.2.2 → 5.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/{lib/components → components}/login/oauth-login.component.d.ts +3 -4
- package/esm2020/{lib/components → components}/login/oauth-login.component.mjs +8 -12
- package/esm2020/index.mjs +7 -6
- package/esm2020/models/index.mjs +47 -0
- package/esm2020/oauth.module.mjs +120 -0
- package/esm2020/services/oauth.interceptor.mjs +53 -0
- package/esm2020/services/oauth.service.mjs +300 -0
- package/esm2020/services/token.service.mjs +83 -0
- package/fesm2015/ngx-oauth.mjs +44 -38
- package/fesm2015/ngx-oauth.mjs.map +1 -1
- package/fesm2020/ngx-oauth.mjs +45 -39
- package/fesm2020/ngx-oauth.mjs.map +1 -1
- package/index.d.ts +6 -5
- package/{lib/models → models}/index.d.ts +1 -0
- package/{lib/oauth.module.d.ts → oauth.module.d.ts} +0 -0
- package/package.json +5 -5
- package/{lib/services → services}/oauth.interceptor.d.ts +3 -3
- package/{lib/services → services}/oauth.service.d.ts +5 -3
- package/{lib/services → services}/token.service.d.ts +3 -3
- package/esm2020/lib/models/index.mjs +0 -47
- package/esm2020/lib/oauth.module.mjs +0 -120
- package/esm2020/lib/services/oauth.interceptor.mjs +0 -53
- package/esm2020/lib/services/oauth.service.mjs +0 -291
- package/esm2020/lib/services/token.service.mjs +0 -83
|
@@ -1,291 +0,0 @@
|
|
|
1
|
-
import { Inject, Injectable } from '@angular/core';
|
|
2
|
-
import { HttpParams } from '@angular/common/http';
|
|
3
|
-
import { catchError, concatMap, delay, filter, map, shareReplay, switchMap, tap } from 'rxjs/operators';
|
|
4
|
-
import { firstValueFrom, from, noop, of, ReplaySubject, throwError } from 'rxjs';
|
|
5
|
-
import { HEADER_APPLICATION, LOCATION, OAuthStatus, OAuthType } from '../models';
|
|
6
|
-
import * as i0 from "@angular/core";
|
|
7
|
-
import * as i1 from "../models";
|
|
8
|
-
import * as i2 from "./token.service";
|
|
9
|
-
import * as i3 from "@angular/common/http";
|
|
10
|
-
import * as i4 from "@angular/common";
|
|
11
|
-
const arrToString = (buf) => buf.reduce((s, b) => s + String.fromCharCode(b), '');
|
|
12
|
-
const base64url = (str) => btoa(str)
|
|
13
|
-
.replace(/\+/g, '-')
|
|
14
|
-
.replace(/\//g, '_')
|
|
15
|
-
.replace(/=/g, '');
|
|
16
|
-
const randomString = (length = 48) => {
|
|
17
|
-
const buff = arrToString(crypto.getRandomValues(new Uint8Array(length * 2)));
|
|
18
|
-
return base64url(buff).substring(0, length);
|
|
19
|
-
};
|
|
20
|
-
const pkce = async (value) => {
|
|
21
|
-
const buff = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(value));
|
|
22
|
-
return base64url(arrToString(new Uint8Array(buff)));
|
|
23
|
-
};
|
|
24
|
-
const parseOauthUri = (hash) => {
|
|
25
|
-
const regex = /([^&=]+)=([^&]*)/g;
|
|
26
|
-
const params = {};
|
|
27
|
-
let m;
|
|
28
|
-
// tslint:disable-next-line:no-conditional-assignment
|
|
29
|
-
while ((m = regex.exec(hash)) !== null) {
|
|
30
|
-
params[decodeURIComponent(m[1])] = decodeURIComponent(m[2]);
|
|
31
|
-
}
|
|
32
|
-
return Object.keys(params).length && params || {};
|
|
33
|
-
};
|
|
34
|
-
const jwt = (token) => JSON.parse(atob(token.split('.')[1]));
|
|
35
|
-
export class OAuthService {
|
|
36
|
-
constructor(authConfig, tokenService, http, location, locationService) {
|
|
37
|
-
this.authConfig = authConfig;
|
|
38
|
-
this.tokenService = tokenService;
|
|
39
|
-
this.http = http;
|
|
40
|
-
this.location = location;
|
|
41
|
-
this.locationService = locationService;
|
|
42
|
-
this.state$ = new ReplaySubject(1);
|
|
43
|
-
this.config$ = of(this.config).pipe(filter(Boolean), filter(config => !!config?.clientId), map(config => config), switchMap(config => !config.issuerPath && of(config) || this.http.get(`${config.issuerPath}/.well-known/openid-configuration`).pipe(tap(v => this.config = {
|
|
44
|
-
...v.authorization_endpoint && { authorizePath: v.authorization_endpoint } || {},
|
|
45
|
-
...v.token_endpoint && { tokenPath: v.token_endpoint } || {},
|
|
46
|
-
...v.revocation_endpoint && { revokePath: v.revocation_endpoint } || {},
|
|
47
|
-
...v.code_challenge_methods_supported && { pkce: v.code_challenge_methods_supported.indexOf('S256') > -1 } || {},
|
|
48
|
-
...v.userinfo_endpoint && { userPath: v.userinfo_endpoint } || {},
|
|
49
|
-
...v.introspection_endpoint && { introspectionPath: v.introspection_endpoint } || {},
|
|
50
|
-
...v.end_session_endpoint && { logoutPath: v.end_session_endpoint } || {},
|
|
51
|
-
...{ scope: config.scope || 'openid' }
|
|
52
|
-
}), map(() => this.config))), shareReplay(1));
|
|
53
|
-
this.token$ = this.config$.pipe(tap(config => {
|
|
54
|
-
const { hash, search, origin, pathname } = this.location;
|
|
55
|
-
const isImplicitRedirect = hash && /(access_token=)|(error=)/.test(hash);
|
|
56
|
-
const isAuthCodeRedirect = search && /(code=)|(error=)/.test(search) || hash && /(code=)|(error=)/.test(hash);
|
|
57
|
-
if (isImplicitRedirect) {
|
|
58
|
-
const parameters = parseOauthUri(hash.substring(1));
|
|
59
|
-
this.token = {
|
|
60
|
-
...parameters,
|
|
61
|
-
type: OAuthType.IMPLICIT,
|
|
62
|
-
};
|
|
63
|
-
this.checkResponse(this.token, parameters);
|
|
64
|
-
}
|
|
65
|
-
else if (isAuthCodeRedirect) {
|
|
66
|
-
const parameters = parseOauthUri(search && search.substring(1) || hash && hash.substring(1));
|
|
67
|
-
if (!this.checkResponse(this.token, parameters)) {
|
|
68
|
-
this.token = parameters;
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
const newParametersString = this.getCleanedUnSearchParameters();
|
|
72
|
-
const { clientId, clientSecret, tokenPath, scope } = config;
|
|
73
|
-
const { codeVerifier } = this.token || {}; //should be set by authorizationUrl construction
|
|
74
|
-
this.http.post(tokenPath, new HttpParams({
|
|
75
|
-
fromObject: {
|
|
76
|
-
code: parameters?.['code'],
|
|
77
|
-
client_id: clientId,
|
|
78
|
-
...clientSecret && { client_secret: clientSecret } || {},
|
|
79
|
-
redirect_uri: `${origin}${pathname}`,
|
|
80
|
-
grant_type: 'authorization_code',
|
|
81
|
-
...scope && { scope } || {},
|
|
82
|
-
...codeVerifier && { code_verifier: codeVerifier } || {}
|
|
83
|
-
}
|
|
84
|
-
}), { headers: HEADER_APPLICATION }).pipe().subscribe(token => {
|
|
85
|
-
this.token = {
|
|
86
|
-
...token,
|
|
87
|
-
type: OAuthType.AUTHORIZATION_CODE
|
|
88
|
-
};
|
|
89
|
-
this.locationService.replaceState(`${pathname}${newParametersString}`);
|
|
90
|
-
});
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
}), switchMap(() => this.tokenService.token$), shareReplay(1));
|
|
94
|
-
this.status$ = this.token$.pipe(map(token => token.access_token && OAuthStatus.AUTHORIZED || token.error && OAuthStatus.DENIED || OAuthStatus.NOT_AUTHORIZED), shareReplay(1));
|
|
95
|
-
this.userInfo$ = this.status$.pipe(filter(s => s === OAuthStatus.AUTHORIZED), map(() => this.config.userPath), filter(Boolean), switchMap(path => this.getUserInfo(path)), shareReplay(1));
|
|
96
|
-
this.type$ = this.tokenService.type$;
|
|
97
|
-
this.ignorePaths = this.authConfig.ignorePaths || [];
|
|
98
|
-
}
|
|
99
|
-
get token() {
|
|
100
|
-
return this.tokenService.token;
|
|
101
|
-
}
|
|
102
|
-
set token(token) {
|
|
103
|
-
this.tokenService.token = token;
|
|
104
|
-
}
|
|
105
|
-
get config() {
|
|
106
|
-
return this.authConfig.config;
|
|
107
|
-
}
|
|
108
|
-
set config(config) {
|
|
109
|
-
if (config) {
|
|
110
|
-
this.authConfig.config = {
|
|
111
|
-
...this.authConfig.config,
|
|
112
|
-
...config
|
|
113
|
-
};
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
async login(parameters) {
|
|
117
|
-
if (!!parameters && parameters.password) {
|
|
118
|
-
await this.resourceLogin(parameters);
|
|
119
|
-
}
|
|
120
|
-
else if (!!parameters && parameters.redirectUri && parameters.responseType) {
|
|
121
|
-
await this.toAuthorizationUrl(parameters);
|
|
122
|
-
}
|
|
123
|
-
else {
|
|
124
|
-
await this.clientCredentialLogin();
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
logout(useLogoutUrl) {
|
|
128
|
-
this.revoke();
|
|
129
|
-
this.token = {};
|
|
130
|
-
const { logoutPath, logoutRedirectUri } = this.authConfig.config;
|
|
131
|
-
if (useLogoutUrl && logoutPath) {
|
|
132
|
-
const { origin, pathname } = this.location;
|
|
133
|
-
const currentPath = `${origin}${pathname}`;
|
|
134
|
-
this.location.replace(`${logoutPath}?post_logout_redirect_uri=${logoutRedirectUri || currentPath}`);
|
|
135
|
-
}
|
|
136
|
-
}
|
|
137
|
-
getUserInfo(path) {
|
|
138
|
-
const { userPath } = this.config;
|
|
139
|
-
return this.http.get(path || userPath);
|
|
140
|
-
}
|
|
141
|
-
revoke() {
|
|
142
|
-
const { revokePath, clientId, clientSecret } = this.authConfig.config;
|
|
143
|
-
if (revokePath) {
|
|
144
|
-
const { access_token, refresh_token } = this.token || {};
|
|
145
|
-
const toRevoke = [];
|
|
146
|
-
if (access_token) {
|
|
147
|
-
toRevoke.push({
|
|
148
|
-
...clientId && { client_id: clientId } || {},
|
|
149
|
-
...clientSecret && { client_secret: clientSecret } || {},
|
|
150
|
-
token: access_token,
|
|
151
|
-
token_type_hint: 'access_token'
|
|
152
|
-
});
|
|
153
|
-
}
|
|
154
|
-
if (refresh_token) {
|
|
155
|
-
toRevoke.push({
|
|
156
|
-
...clientId && { client_id: clientId } || {},
|
|
157
|
-
...clientSecret && { client_secret: clientSecret } || {},
|
|
158
|
-
token: refresh_token,
|
|
159
|
-
token_type_hint: 'refresh_token'
|
|
160
|
-
});
|
|
161
|
-
}
|
|
162
|
-
from(toRevoke).pipe(concatMap(o => of(o).pipe(delay(300))), // space request to avoid cancellation
|
|
163
|
-
switchMap(o => this.http.post(revokePath, new HttpParams({ fromObject: o })))).subscribe(noop);
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
clientCredentialLogin() {
|
|
167
|
-
const { clientId, clientSecret, tokenPath, scope } = this.authConfig.config;
|
|
168
|
-
return firstValueFrom(this.http.post(tokenPath, new HttpParams({
|
|
169
|
-
fromObject: {
|
|
170
|
-
client_id: clientId,
|
|
171
|
-
client_secret: clientSecret,
|
|
172
|
-
grant_type: OAuthType.CLIENT_CREDENTIAL,
|
|
173
|
-
...scope ? { scope } : {},
|
|
174
|
-
}
|
|
175
|
-
}), { headers: HEADER_APPLICATION }).pipe(catchError((err) => {
|
|
176
|
-
this.token = err;
|
|
177
|
-
return throwError(() => err);
|
|
178
|
-
}), tap(params => {
|
|
179
|
-
this.token = {
|
|
180
|
-
...params,
|
|
181
|
-
type: OAuthType.CLIENT_CREDENTIAL,
|
|
182
|
-
};
|
|
183
|
-
})));
|
|
184
|
-
}
|
|
185
|
-
resourceLogin(parameters) {
|
|
186
|
-
const { clientId, clientSecret, tokenPath, scope } = this.authConfig.config;
|
|
187
|
-
const { username, password } = parameters;
|
|
188
|
-
return firstValueFrom(this.http.post(tokenPath, new HttpParams({
|
|
189
|
-
fromObject: {
|
|
190
|
-
client_id: clientId,
|
|
191
|
-
...clientSecret && { client_secret: clientSecret } || {},
|
|
192
|
-
grant_type: OAuthType.RESOURCE,
|
|
193
|
-
...scope && { scope } || {},
|
|
194
|
-
username,
|
|
195
|
-
password
|
|
196
|
-
}
|
|
197
|
-
}), { headers: HEADER_APPLICATION }).pipe(catchError(err => {
|
|
198
|
-
this.token = err;
|
|
199
|
-
return throwError(() => err);
|
|
200
|
-
}), tap(params => {
|
|
201
|
-
this.token = {
|
|
202
|
-
...params,
|
|
203
|
-
type: OAuthType.RESOURCE,
|
|
204
|
-
};
|
|
205
|
-
})));
|
|
206
|
-
}
|
|
207
|
-
async toAuthorizationUrl(parameters) {
|
|
208
|
-
const { config } = this.authConfig;
|
|
209
|
-
let authorizationUrl = `${config.authorizePath}`;
|
|
210
|
-
authorizationUrl += config.authorizePath.includes('?') && '&' || '?';
|
|
211
|
-
authorizationUrl += `client_id=${config.clientId}`;
|
|
212
|
-
authorizationUrl += `&redirect_uri=${encodeURIComponent(parameters.redirectUri)}`;
|
|
213
|
-
authorizationUrl += `&response_type=${parameters.responseType}`;
|
|
214
|
-
authorizationUrl += `&scope=${encodeURIComponent(config.scope || '')}`;
|
|
215
|
-
authorizationUrl += `&state=${encodeURIComponent(parameters.state || '')}`;
|
|
216
|
-
return this.location.replace(`${authorizationUrl}${this.generateNonce(config)}${await this.generateCodeChallenge(config)}`);
|
|
217
|
-
}
|
|
218
|
-
async generateCodeChallenge(config) {
|
|
219
|
-
if (config.pkce) {
|
|
220
|
-
const codeVerifier = randomString();
|
|
221
|
-
this.token = { ...this.token, codeVerifier };
|
|
222
|
-
return `&code_challenge=${await pkce(codeVerifier)}&code_challenge_method=S256`;
|
|
223
|
-
}
|
|
224
|
-
return '';
|
|
225
|
-
}
|
|
226
|
-
generateNonce(config) {
|
|
227
|
-
if (config && config.scope && config.scope.indexOf('openid') > -1) {
|
|
228
|
-
const nonce = randomString(10);
|
|
229
|
-
this.token = { ...this.token, nonce };
|
|
230
|
-
return `&nonce=${nonce}`;
|
|
231
|
-
}
|
|
232
|
-
return '';
|
|
233
|
-
}
|
|
234
|
-
checkResponse(token, parameters) {
|
|
235
|
-
this.emitState(parameters);
|
|
236
|
-
this.cleanLocationHash();
|
|
237
|
-
if (!parameters || parameters['error']) {
|
|
238
|
-
return false;
|
|
239
|
-
}
|
|
240
|
-
if (token && token.nonce && parameters['access_token']) {
|
|
241
|
-
const jwtToken = jwt(parameters['access_token']);
|
|
242
|
-
return token.nonce === jwtToken.nonce;
|
|
243
|
-
}
|
|
244
|
-
return parameters['access_token'] || parameters['code'];
|
|
245
|
-
}
|
|
246
|
-
getCleanedUnSearchParameters() {
|
|
247
|
-
const { search } = this.location;
|
|
248
|
-
let searchString = search && search.substring(1) || '';
|
|
249
|
-
const hashKeys = ['code', 'state', 'error', 'error_description', 'session_state', 'scope', 'authuser', 'prompt'];
|
|
250
|
-
hashKeys.forEach(hashKey => {
|
|
251
|
-
const re = new RegExp('&' + hashKey + '(=[^&]*)?|^' + hashKey + '(=[^&]*)?&?');
|
|
252
|
-
searchString = searchString.replace(re, '');
|
|
253
|
-
});
|
|
254
|
-
return searchString.length && `?${searchString}` || '';
|
|
255
|
-
}
|
|
256
|
-
cleanLocationHash() {
|
|
257
|
-
const { hash } = this.location;
|
|
258
|
-
let curHash = hash && hash.substring(1) || '';
|
|
259
|
-
const hashKeys = [
|
|
260
|
-
'access_token',
|
|
261
|
-
'token_type',
|
|
262
|
-
'expires_in',
|
|
263
|
-
'scope',
|
|
264
|
-
'state',
|
|
265
|
-
'error',
|
|
266
|
-
'error_description',
|
|
267
|
-
'session_state',
|
|
268
|
-
'nonce',
|
|
269
|
-
'id_token',
|
|
270
|
-
'code'
|
|
271
|
-
];
|
|
272
|
-
hashKeys.forEach(hashKey => {
|
|
273
|
-
const re = new RegExp('&' + hashKey + '(=[^&]*)?|^' + hashKey + '(=[^&]*)?&?');
|
|
274
|
-
curHash = curHash.replace(re, '');
|
|
275
|
-
});
|
|
276
|
-
this.location.hash = curHash;
|
|
277
|
-
}
|
|
278
|
-
emitState(parameters) {
|
|
279
|
-
const { state } = parameters || {};
|
|
280
|
-
state && this.state$.next(state);
|
|
281
|
-
}
|
|
282
|
-
}
|
|
283
|
-
OAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.3", ngImport: i0, type: OAuthService, deps: [{ token: i1.OAuthConfig }, { token: i2.TokenService }, { token: i3.HttpClient }, { token: LOCATION }, { token: i4.Location }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
284
|
-
OAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.3", ngImport: i0, type: OAuthService });
|
|
285
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.3", ngImport: i0, type: OAuthService, decorators: [{
|
|
286
|
-
type: Injectable
|
|
287
|
-
}], ctorParameters: function () { return [{ type: i1.OAuthConfig }, { type: i2.TokenService }, { type: i3.HttpClient }, { type: Location, decorators: [{
|
|
288
|
-
type: Inject,
|
|
289
|
-
args: [LOCATION]
|
|
290
|
-
}] }, { type: i4.Location }]; } });
|
|
291
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../../../../projects/ngx-oauth/src/lib/services/oauth.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, Injectable} from '@angular/core';\nimport {HttpClient, HttpParams} from '@angular/common/http';\nimport {catchError, concatMap, delay, filter, map, shareReplay, switchMap, tap} from 'rxjs/operators';\nimport {firstValueFrom, from, noop, of, ReplaySubject, throwError} from 'rxjs';\nimport {\n  AuthorizationCodeConfig,\n  AuthorizationParameters,\n  HEADER_APPLICATION,\n  LOCATION,\n  OAuthConfig,\n  OAuthParameters,\n  OAuthStatus,\n  OAuthToken,\n  OAuthType,\n  OAuthTypeConfig,\n  OpenIdConfig,\n  OpenIdConfiguration,\n  ResourceParameters,\n  UserInfo\n} from '../models';\nimport {Location as Location2} from '@angular/common';\nimport {TokenService} from './token.service';\n\nconst arrToString = (buf: Uint8Array) => buf.reduce((s, b) => s + String.fromCharCode(b), '');\n\nconst base64url = (str: string) => btoa(str)\n  .replace(/\\+/g, '-')\n  .replace(/\\//g, '_')\n  .replace(/=/g, '');\n\nconst randomString = (length: number = 48) => {\n  const buff = arrToString(crypto.getRandomValues(new Uint8Array(length * 2)));\n  return base64url(buff).substring(0, length);\n};\n\nconst pkce = async (value: string) => {\n  const buff = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(value));\n  return base64url(arrToString(new Uint8Array(buff)));\n};\n\nconst parseOauthUri = (hash: string) => {\n  const regex = /([^&=]+)=([^&]*)/g;\n  const params: Record<string, string> = {};\n  let m;\n  // tslint:disable-next-line:no-conditional-assignment\n  while ((m = regex.exec(hash)) !== null) {\n    params[decodeURIComponent(m[1])] = decodeURIComponent(m[2]);\n  }\n  return Object.keys(params).length && params || {};\n};\n\nconst jwt = (token: string) => JSON.parse(atob(token.split('.')[1]));\n\n@Injectable()\nexport class OAuthService {\n\n  state$ = new ReplaySubject<string>(1);\n  config$ = of(this.config).pipe(\n    filter(Boolean),\n    filter(config => !!config?.clientId),\n    map(config => config as OpenIdConfig),\n    switchMap(config => !config.issuerPath && of(config) || this.http.get<OpenIdConfiguration>(`${config.issuerPath}/.well-known/openid-configuration`).pipe(\n      tap(v => this.config = {\n        ...v.authorization_endpoint && {authorizePath: v.authorization_endpoint} || {},\n        ...v.token_endpoint && {tokenPath: v.token_endpoint} || {},\n        ...v.revocation_endpoint && {revokePath: v.revocation_endpoint} || {},\n        ...v.code_challenge_methods_supported && {pkce: v.code_challenge_methods_supported.indexOf('S256') > -1} || {},\n        ...v.userinfo_endpoint && {userPath: v.userinfo_endpoint} || {},\n        ...v.introspection_endpoint && {introspectionPath: v.introspection_endpoint} || {},\n        ...v.end_session_endpoint && {logoutPath: v.end_session_endpoint} || {},\n        ...{scope: config.scope || 'openid'}\n      } as any),\n      map(() => this.config)\n    )),\n    shareReplay(1)\n  );\n  token$ = this.config$.pipe(\n    tap(config => {\n      const {hash, search, origin, pathname} = this.location;\n      const isImplicitRedirect = hash && /(access_token=)|(error=)/.test(hash);\n      const isAuthCodeRedirect = search && /(code=)|(error=)/.test(search) || hash && /(code=)|(error=)/.test(hash);\n      if (isImplicitRedirect) {\n        const parameters = parseOauthUri(hash.substring(1));\n        this.token = {\n          ...parameters,\n          type: OAuthType.IMPLICIT,\n        };\n        this.checkResponse(this.token, parameters);\n      } else if (isAuthCodeRedirect) {\n        const parameters = parseOauthUri(search && search.substring(1) || hash && hash.substring(1));\n        if (!this.checkResponse(this.token, parameters)) {\n          this.token = parameters;\n        } else {\n          const newParametersString = this.getCleanedUnSearchParameters();\n          const {clientId, clientSecret, tokenPath, scope} = config as AuthorizationCodeConfig;\n          const {codeVerifier} = this.token || {}; //should be set by authorizationUrl construction\n          this.http.post(tokenPath, new HttpParams({\n            fromObject: {\n              code: parameters?.['code'],\n              client_id: clientId,\n              ...clientSecret && {client_secret: clientSecret} || {},\n              redirect_uri: `${origin}${pathname}`,\n              grant_type: 'authorization_code',\n              ...scope && {scope} || {},\n              ...codeVerifier && {code_verifier: codeVerifier} || {}\n            }\n          }), {headers: HEADER_APPLICATION}).pipe(\n          ).subscribe(token => {\n            this.token = {\n              ...token,\n              type: OAuthType.AUTHORIZATION_CODE\n            };\n            this.locationService.replaceState(`${pathname}${newParametersString}`);\n          });\n        }\n      }\n    }),\n    switchMap(() => this.tokenService.token$),\n    shareReplay(1)\n  );\n  status$ = this.token$.pipe(\n    map(token => token.access_token && OAuthStatus.AUTHORIZED || token.error && OAuthStatus.DENIED || OAuthStatus.NOT_AUTHORIZED),\n    shareReplay(1)\n  );\n  userInfo$ = this.status$.pipe(\n    filter(s => s === OAuthStatus.AUTHORIZED),\n    map(() => (this.config as any).userPath),\n    filter(Boolean),\n    switchMap(path => this.getUserInfo(path)),\n    shareReplay(1)\n  );\n  type$ = this.tokenService.type$;\n  ignorePaths = this.authConfig.ignorePaths || [];\n\n  get token() {\n    return this.tokenService.token;\n  }\n\n  set token(token) {\n    this.tokenService.token = token;\n  }\n\n  get config() {\n    return this.authConfig.config;\n  }\n\n  set config(config: OAuthTypeConfig | undefined) {\n    if (config) {\n      this.authConfig.config = {\n        ...this.authConfig.config,\n        ...config\n      };\n    }\n  }\n\n  constructor(protected authConfig: OAuthConfig,\n              protected tokenService: TokenService,\n              protected http: HttpClient,\n              @Inject(LOCATION) protected location: Location,\n              protected locationService: Location2) {\n  }\n\n  async login(parameters?: OAuthParameters) {\n    if (!!parameters && (parameters as ResourceParameters).password) {\n      await this.resourceLogin(parameters as ResourceParameters);\n    } else if (!!parameters && (parameters as AuthorizationParameters).redirectUri && (parameters as AuthorizationParameters).responseType\n    ) {\n      await this.toAuthorizationUrl(parameters as AuthorizationParameters);\n    } else {\n      await this.clientCredentialLogin();\n    }\n  }\n\n  logout(useLogoutUrl?: boolean) {\n    this.revoke();\n    this.token = {};\n    const {logoutPath, logoutRedirectUri} = this.authConfig.config as any;\n    if (useLogoutUrl && logoutPath) {\n      const {origin, pathname} = this.location;\n      const currentPath = `${origin}${pathname}`;\n      this.location.replace(`${logoutPath}?post_logout_redirect_uri=${logoutRedirectUri || currentPath}`);\n    }\n  }\n\n  getUserInfo(path?: string) {\n    const {userPath} = this.config as any;\n    return this.http.get<UserInfo>(path || userPath);\n  }\n\n  protected revoke() {\n    const {revokePath, clientId, clientSecret} = this.authConfig.config as any;\n    if (revokePath) {\n      const {access_token, refresh_token} = this.token || {};\n      const toRevoke = [];\n      if (access_token) {\n        toRevoke.push({\n          ...clientId && {client_id: clientId} || {},\n          ...clientSecret && {client_secret: clientSecret} || {},\n          token: access_token,\n          token_type_hint: 'access_token'\n        });\n      }\n      if (refresh_token) {\n        toRevoke.push({\n          ...clientId && {client_id: clientId} || {},\n          ...clientSecret && {client_secret: clientSecret} || {},\n          token: refresh_token,\n          token_type_hint: 'refresh_token'\n        });\n      }\n      from(toRevoke).pipe(\n        concatMap(o => of(o).pipe(delay(300))), // space request to avoid cancellation\n        switchMap(o => this.http.post(revokePath, new HttpParams({fromObject: o}))),\n      ).subscribe(noop);\n    }\n  }\n\n  protected clientCredentialLogin() {\n    const {clientId, clientSecret, tokenPath, scope} = this.authConfig.config as any;\n    return firstValueFrom(this.http.post(tokenPath, new HttpParams({\n      fromObject: {\n        client_id: clientId,\n        client_secret: clientSecret,\n        grant_type: OAuthType.CLIENT_CREDENTIAL,\n        ...scope ? {scope} : {},\n      }\n    }), {headers: HEADER_APPLICATION}).pipe(\n      catchError((err) => {\n        this.token = err;\n        return throwError(() => err);\n      }),\n      tap(params => {\n        this.token = {\n          ...params,\n          type: OAuthType.CLIENT_CREDENTIAL,\n        };\n      }),\n    ));\n  }\n\n  protected resourceLogin(parameters: ResourceParameters) {\n    const {clientId, clientSecret, tokenPath, scope} = this.authConfig.config as any;\n    const {username, password} = parameters;\n    return firstValueFrom(this.http.post(tokenPath, new HttpParams({\n      fromObject: {\n        client_id: clientId,\n        ...clientSecret && {client_secret: clientSecret} || {},\n        grant_type: OAuthType.RESOURCE,\n        ...scope && {scope} || {},\n        username,\n        password\n      }\n    }), {headers: HEADER_APPLICATION}).pipe(\n      catchError(err => {\n        this.token = err;\n        return throwError(() => err);\n      }),\n      tap(params => {\n        this.token = {\n          ...params,\n          type: OAuthType.RESOURCE,\n        };\n      })\n    ));\n  }\n\n  protected async toAuthorizationUrl(parameters: AuthorizationParameters) {\n    const {config} = this.authConfig as any;\n    let authorizationUrl = `${config.authorizePath}`;\n    authorizationUrl += config.authorizePath.includes('?') && '&' || '?';\n    authorizationUrl += `client_id=${config.clientId}`;\n    authorizationUrl += `&redirect_uri=${encodeURIComponent(parameters.redirectUri)}`;\n    authorizationUrl += `&response_type=${parameters.responseType}`;\n    authorizationUrl += `&scope=${encodeURIComponent(config.scope || '')}`;\n    authorizationUrl += `&state=${encodeURIComponent(parameters.state || '')}`;\n    return this.location.replace(`${authorizationUrl}${this.generateNonce(config)}${await this.generateCodeChallenge(config)}`);\n  }\n\n  protected async generateCodeChallenge(config: any) {\n    if (config.pkce) {\n      const codeVerifier = randomString();\n      this.token = {...this.token, codeVerifier};\n      return `&code_challenge=${await pkce(codeVerifier)}&code_challenge_method=S256`;\n    }\n    return '';\n  }\n\n  protected generateNonce(config: any) {\n    if (config && config.scope && config.scope.indexOf('openid') > -1) {\n      const nonce = randomString(10);\n      this.token = {...this.token, nonce};\n      return `&nonce=${nonce}`;\n    }\n    return '';\n  }\n\n  private checkResponse(token?: OAuthToken,\n                        parameters?: Record<string, string>) {\n    this.emitState(parameters);\n    this.cleanLocationHash();\n    if (!parameters || parameters['error']) {\n      return false;\n    }\n    if (token && token.nonce && parameters['access_token']) {\n      const jwtToken = jwt(parameters['access_token']);\n      return token.nonce === jwtToken.nonce;\n    }\n    return parameters['access_token'] || parameters['code'];\n  }\n\n  private getCleanedUnSearchParameters() {\n    const {search} = this.location;\n    let searchString = search && search.substring(1) || '';\n    const hashKeys = ['code', 'state', 'error', 'error_description', 'session_state', 'scope', 'authuser', 'prompt'];\n    hashKeys.forEach(hashKey => {\n      const re = new RegExp('&' + hashKey + '(=[^&]*)?|^' + hashKey + '(=[^&]*)?&?');\n      searchString = searchString.replace(re, '');\n    });\n    return searchString.length && `?${searchString}` || '';\n  }\n\n  private cleanLocationHash() {\n    const {hash} = this.location;\n    let curHash = hash && hash.substring(1) || '';\n    const hashKeys = [\n      'access_token',\n      'token_type',\n      'expires_in',\n      'scope',\n      'state',\n      'error',\n      'error_description',\n      'session_state',\n      'nonce',\n      'id_token',\n      'code'\n    ];\n    hashKeys.forEach(hashKey => {\n      const re = new RegExp('&' + hashKey + '(=[^&]*)?|^' + hashKey + '(=[^&]*)?&?');\n      curHash = curHash.replace(re, '');\n    });\n    this.location.hash = curHash;\n  }\n\n  private emitState(parameters?: Record<string, string>) {\n    const {state} = parameters || {};\n    state && this.state$.next(state);\n  }\n}\n"]}
|
|
@@ -1,83 +0,0 @@
|
|
|
1
|
-
var _TokenService_token$;
|
|
2
|
-
import { __classPrivateFieldGet } from "tslib";
|
|
3
|
-
import { Inject, Injectable } from '@angular/core';
|
|
4
|
-
import { BehaviorSubject, distinctUntilChanged, of, switchMap } from 'rxjs';
|
|
5
|
-
import { HEADER_APPLICATION, OAUTH_HTTP_CLIENT } from '../models';
|
|
6
|
-
import { catchError, map, shareReplay } from 'rxjs/operators';
|
|
7
|
-
import { HttpParams } from '@angular/common/http';
|
|
8
|
-
import * as i0 from "@angular/core";
|
|
9
|
-
import * as i1 from "../models";
|
|
10
|
-
import * as i2 from "@angular/common/http";
|
|
11
|
-
const isExpiredToken = (token) => token && token.expires && Date.now() > token.expires || false;
|
|
12
|
-
export class TokenService {
|
|
13
|
-
constructor(authConfig, http, zone) {
|
|
14
|
-
this.authConfig = authConfig;
|
|
15
|
-
this.http = http;
|
|
16
|
-
this.zone = zone;
|
|
17
|
-
_TokenService_token$.set(this, new BehaviorSubject(this.saved));
|
|
18
|
-
this.token$ = __classPrivateFieldGet(this, _TokenService_token$, "f").pipe(distinctUntilChanged((p, c) => JSON.stringify(p || null) === JSON.stringify(c || null)), shareReplay(1), switchMap(token => !isExpiredToken(token) && of(token) || this.refreshToken(token)));
|
|
19
|
-
this.type$ = this.token$.pipe(map(token => token?.type), shareReplay(1));
|
|
20
|
-
this.accessToken$ = this.token$.pipe(map(token => token?.access_token), shareReplay(1));
|
|
21
|
-
}
|
|
22
|
-
get token() {
|
|
23
|
-
return __classPrivateFieldGet(this, _TokenService_token$, "f").value;
|
|
24
|
-
}
|
|
25
|
-
set token(token) {
|
|
26
|
-
const expiresIn = Number(token.expires_in) || 0;
|
|
27
|
-
const result = {
|
|
28
|
-
...token,
|
|
29
|
-
...expiresIn && { expires: Date.now() + expiresIn * 1000 } || {}
|
|
30
|
-
};
|
|
31
|
-
this.saved = result;
|
|
32
|
-
__classPrivateFieldGet(this, _TokenService_token$, "f").next(result);
|
|
33
|
-
}
|
|
34
|
-
get saved() {
|
|
35
|
-
const { storageKey, storage } = this.authConfig;
|
|
36
|
-
return storageKey && storage && storage[storageKey] && JSON.parse(storage[storageKey]) || {};
|
|
37
|
-
}
|
|
38
|
-
set saved(token) {
|
|
39
|
-
const { storageKey, storage } = this.authConfig;
|
|
40
|
-
if (storage && storageKey) {
|
|
41
|
-
if (token) {
|
|
42
|
-
storage[storageKey] = JSON.stringify(token);
|
|
43
|
-
}
|
|
44
|
-
else {
|
|
45
|
-
delete storage[storageKey];
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
refreshToken(token) {
|
|
50
|
-
const { tokenPath, clientId, clientSecret, scope } = this.authConfig.config;
|
|
51
|
-
const { refresh_token } = token || {};
|
|
52
|
-
return tokenPath && refresh_token && this.http.post(tokenPath, new HttpParams({
|
|
53
|
-
fromObject: {
|
|
54
|
-
client_id: clientId,
|
|
55
|
-
...clientSecret && { client_secret: clientSecret } || {},
|
|
56
|
-
grant_type: 'refresh_token',
|
|
57
|
-
refresh_token,
|
|
58
|
-
...scope && { scope } || {},
|
|
59
|
-
}
|
|
60
|
-
}), {
|
|
61
|
-
headers: HEADER_APPLICATION
|
|
62
|
-
}).pipe(catchError(() => {
|
|
63
|
-
this.token = {};
|
|
64
|
-
return of(this.token);
|
|
65
|
-
}), map(token => {
|
|
66
|
-
this.token = {
|
|
67
|
-
...this.token,
|
|
68
|
-
...token
|
|
69
|
-
};
|
|
70
|
-
return this.token;
|
|
71
|
-
})) || of(token);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
_TokenService_token$ = new WeakMap();
|
|
75
|
-
TokenService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.1.3", ngImport: i0, type: TokenService, deps: [{ token: i1.OAuthConfig }, { token: OAUTH_HTTP_CLIENT }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
76
|
-
TokenService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.1.3", ngImport: i0, type: TokenService });
|
|
77
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.1.3", ngImport: i0, type: TokenService, decorators: [{
|
|
78
|
-
type: Injectable
|
|
79
|
-
}], ctorParameters: function () { return [{ type: i1.OAuthConfig }, { type: i2.HttpClient, decorators: [{
|
|
80
|
-
type: Inject,
|
|
81
|
-
args: [OAUTH_HTTP_CLIENT]
|
|
82
|
-
}] }, { type: i0.NgZone }]; } });
|
|
83
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidG9rZW4uc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25neC1vYXV0aC9zcmMvbGliL3NlcnZpY2VzL3Rva2VuLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxPQUFPLEVBQUMsTUFBTSxFQUFFLFVBQVUsRUFBUyxNQUFNLGVBQWUsQ0FBQztBQUN6RCxPQUFPLEVBQUMsZUFBZSxFQUFFLG9CQUFvQixFQUFjLEVBQUUsRUFBRSxTQUFTLEVBQUMsTUFBTSxNQUFNLENBQUM7QUFDdEYsT0FBTyxFQUFDLGtCQUFrQixFQUFFLGlCQUFpQixFQUEwQixNQUFNLFdBQVcsQ0FBQztBQUN6RixPQUFPLEVBQUMsVUFBVSxFQUFFLEdBQUcsRUFBRSxXQUFXLEVBQUMsTUFBTSxnQkFBZ0IsQ0FBQztBQUM1RCxPQUFPLEVBQWEsVUFBVSxFQUFDLE1BQU0sc0JBQXNCLENBQUM7Ozs7QUFFNUQsTUFBTSxjQUFjLEdBQUcsQ0FBQyxLQUFrQixFQUFFLEVBQUUsQ0FBQyxLQUFLLElBQUksS0FBSyxDQUFDLE9BQU8sSUFBSSxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsS0FBSyxDQUFDLE9BQU8sSUFBSSxLQUFLLENBQUM7QUFHN0csTUFBTSxPQUFPLFlBQVk7SUFpQnZCLFlBQXNCLFVBQXVCLEVBQ0ksSUFBZ0IsRUFDM0MsSUFBWTtRQUZaLGVBQVUsR0FBVixVQUFVLENBQWE7UUFDSSxTQUFJLEdBQUosSUFBSSxDQUFZO1FBQzNDLFNBQUksR0FBSixJQUFJLENBQVE7UUFqQmxDLCtCQUFVLElBQUksZUFBZSxDQUFhLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBQztRQUN0RCxXQUFNLEdBQUcsdUJBQUEsSUFBSSw0QkFBUSxDQUFDLElBQUksQ0FDeEIsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxJ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Q0FBQyxFQUFFO1lBQ0YsT0FBTyxFQUFFLGtCQUFrQjtTQUM1QixDQUFDLENBQUMsSUFBSSxDQUNMLFVBQVUsQ0FBQyxHQUFHLEVBQUU7WUFDZCxJQUFJLENBQUMsS0FBSyxHQUFHLEVBQUUsQ0FBQztZQUNoQixPQUFPLEVBQUUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDeEIsQ0FBQyxDQUFDLEVBQ0YsR0FBRyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ1YsSUFBSSxDQUFDLEtBQUssR0FBRztnQkFDWCxHQUFHLElBQUksQ0FBQyxLQUFLO2dCQUNiLEdBQUcsS0FBSzthQUNULENBQUM7WUFDRixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUM7UUFDcEIsQ0FBQyxDQUFDLENBQ0gsSUFBSSxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDakIsQ0FBQzs7O3lHQTlFVSxZQUFZLDZDQWtCSCxpQkFBaUI7NkdBbEIxQixZQUFZOzJGQUFaLFlBQVk7a0JBRHhCLFVBQVU7OzBCQW1CSSxNQUFNOzJCQUFDLGlCQUFpQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7SW5qZWN0LCBJbmplY3RhYmxlLCBOZ1pvbmV9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHtCZWhhdmlvclN1YmplY3QsIGRpc3RpbmN0VW50aWxDaGFuZ2VkLCBPYnNlcnZhYmxlLCBvZiwgc3dpdGNoTWFwfSBmcm9tICdyeGpzJztcbmltcG9ydCB7SEVBREVSX0FQUExJQ0FUSU9OLCBPQVVUSF9IVFRQX0NMSUVOVCwgT0F1dGhDb25maWcsIE9BdXRoVG9rZW59IGZyb20gJy4uL21vZGVscyc7XG5pbXBvcnQge2NhdGNoRXJyb3IsIG1hcCwgc2hhcmVSZXBsYXl9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcbmltcG9ydCB7SHR0cENsaWVudCwgSHR0cFBhcmFtc30gZnJvbSAnQGFuZ3VsYXIvY29tbW9uL2h0dHAnO1xuXG5jb25zdCBpc0V4cGlyZWRUb2tlbiA9ICh0b2tlbj86IE9BdXRoVG9rZW4pID0+IHRva2VuICYmIHRva2VuLmV4cGlyZXMgJiYgRGF0ZS5ub3coKSA+IHRva2VuLmV4cGlyZXMgfHwgZmFsc2U7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBUb2tlblNlcnZpY2Uge1xuXG4gICN0b2tlbiQgPSBuZXcgQmVoYXZpb3JTdWJqZWN0PE9BdXRoVG9rZW4+KHRoaXMuc2F2ZWQpO1xuICB0b2tlbiQgPSB0aGlzLiN0b2tlbiQucGlwZShcbiAgICBkaXN0aW5jdFVudGlsQ2hhbmdlZCgocCwgYykgPT4gSlNPTi5zdHJpbmdpZnkocCB8fCBudWxsKSA9PT0gSlNPTi5zdHJpbmdpZnkoYyB8fCBudWxsKSksXG4gICAgc2hhcmVSZXBsYXkoMSksXG4gICAgc3dpdGNoTWFwKHRva2VuID0+ICFpc0V4cGlyZWRUb2tlbih0b2tlbikgJiYgb2YodG9rZW4pIHx8IHRoaXMucmVmcmVzaFRva2VuKHRva2VuKSksXG4gICk7XG4gIHR5cGUkID0gdGhpcy50b2tlbiQucGlwZShcbiAgICBtYXAodG9rZW4gPT4gdG9rZW4/LnR5cGUpLFxuICAgIHNoYXJlUmVwbGF5KDEpXG4gICk7XG4gIGFjY2Vzc1Rva2VuJCA9IHRoaXMudG9rZW4kLnBpcGUoXG4gICAgbWFwKHRva2VuID0+IHRva2VuPy5hY2Nlc3NfdG9rZW4pLFxuICAgIHNoYXJlUmVwbGF5KDEpLFxuICApO1xuXG4gIGNvbnN0cnVjdG9yKHByb3RlY3RlZCBhdXRoQ29uZmlnOiBPQXV0aENvbmZpZyxcbiAgICAgICAgICAgICAgQEluamVjdChPQVVUSF9IVFRQX0NMSUVOVCkgcHJvdGVjdGVkIGh0dHA6IEh0dHBDbGllbnQsXG4gICAgICAgICAgICAgIHByb3RlY3RlZCB6b25lOiBOZ1pvbmUpIHtcbiAgfVxuXG4gIGdldCB0b2tlbigpIHtcbiAgICByZXR1cm4gdGhpcy4jdG9rZW4kLnZhbHVlO1xuICB9XG5cbiAgc2V0IHRva2VuKHRva2VuKSB7XG4gICAgY29uc3QgZXhwaXJlc0luID0gTnVtYmVyKHRva2VuLmV4cGlyZXNfaW4pIHx8IDA7XG4gICAgY29uc3QgcmVzdWx0ID0ge1xuICAgICAgLi4udG9rZW4sXG4gICAgICAuLi5leHBpcmVzSW4gJiYge2V4cGlyZXM6IERhdGUubm93KCkgKyBleHBpcmVzSW4gKiAxMDAwfSB8fCB7fVxuICAgIH07XG4gICAgdGhpcy5zYXZlZCA9IHJlc3VsdDtcbiAgICB0aGlzLiN0b2tlbiQubmV4dChyZXN1bHQpO1xuICB9XG5cbiAgZ2V0IHNhdmVkKCkge1xuICAgIGNvbnN0IHtzdG9yYWdlS2V5LCBzdG9yYWdlfSA9IHRoaXMuYXV0aENvbmZpZztcbiAgICByZXR1cm4gc3RvcmFnZUtleSAmJiBzdG9yYWdlICYmIHN0b3JhZ2Vbc3RvcmFnZUtleV0gJiYgSlNPTi5wYXJzZShzdG9yYWdlW3N0b3JhZ2VLZXldKSB8fCB7fTtcbiAgfVxuXG4gIHNldCBzYXZlZCh0b2tlbjogT0F1dGhUb2tlbikge1xuICAgIGNvbnN0IHtzdG9yYWdlS2V5LCBzdG9yYWdlfSA9IHRoaXMuYXV0aENvbmZpZztcbiAgICBpZiAoc3RvcmFnZSAmJiBzdG9yYWdlS2V5KSB7XG4gICAgICBpZiAodG9rZW4pIHtcbiAgICAgICAgc3RvcmFnZVtzdG9yYWdlS2V5XSA9IEpTT04uc3RyaW5naWZ5KHRva2VuKTtcbiAgICAgIH0gZWxzZSB7XG4gICAgICAgIGRlbGV0ZSBzdG9yYWdlW3N0b3JhZ2VLZXldO1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIHByb3RlY3RlZCByZWZyZXNoVG9rZW4odG9rZW4/OiBPQXV0aFRva2VuKTogT2JzZXJ2YWJsZTxPQXV0aFRva2VuPiB7XG4gICAgY29uc3Qge3Rva2VuUGF0aCwgY2xpZW50SWQsIGNsaWVudFNlY3JldCwgc2NvcGV9ID0gdGhpcy5hdXRoQ29uZmlnLmNvbmZpZyBhcyBhbnk7XG4gICAgY29uc3Qge3JlZnJlc2hfdG9rZW59ID0gdG9rZW4gfHwge307XG4gICAgcmV0dXJuIHRva2VuUGF0aCAmJiByZWZyZXNoX3Rva2VuICYmIHRoaXMuaHR0cC5wb3N0PE9BdXRoVG9rZW4+KHRva2VuUGF0aCwgbmV3IEh0dHBQYXJhbXMoe1xuICAgICAgZnJvbU9iamVjdDoge1xuICAgICAgICBjbGllbnRfaWQ6IGNsaWVudElkLFxuICAgICAgICAuLi5jbGllbnRTZWNyZXQgJiYge2NsaWVudF9zZWNyZXQ6IGNsaWVudFNlY3JldH0gfHwge30sXG4gICAgICAgIGdyYW50X3R5cGU6ICdyZWZyZXNoX3Rva2VuJyxcbiAgICAgICAgcmVmcmVzaF90b2tlbixcbiAgICAgICAgLi4uc2NvcGUgJiYge3Njb3BlfSB8fCB7fSxcbiAgICAgIH1cbiAgICB9KSwge1xuICAgICAgaGVhZGVyczogSEVBREVSX0FQUExJQ0FUSU9OXG4gICAgfSkucGlwZShcbiAgICAgIGNhdGNoRXJyb3IoKCkgPT4ge1xuICAgICAgICB0aGlzLnRva2VuID0ge307XG4gICAgICAgIHJldHVybiBvZih0aGlzLnRva2VuKTtcbiAgICAgIH0pLFxuICAgICAgbWFwKHRva2VuID0+IHtcbiAgICAgICAgdGhpcy50b2tlbiA9IHtcbiAgICAgICAgICAuLi50aGlzLnRva2VuLFxuICAgICAgICAgIC4uLnRva2VuXG4gICAgICAgIH07XG4gICAgICAgIHJldHVybiB0aGlzLnRva2VuO1xuICAgICAgfSlcbiAgICApIHx8IG9mKHRva2VuKTtcbiAgfVxufVxuIl19
|