@abp/ng.core 7.0.0-rc.5 → 7.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/esm2020/lib/abstracts/auth.guard.mjs +17 -0
- package/esm2020/lib/abstracts/auth.service.mjs +42 -0
- package/esm2020/lib/abstracts/index.mjs +3 -1
- package/esm2020/lib/core.module.mjs +6 -34
- package/esm2020/lib/guards/index.mjs +1 -2
- package/esm2020/lib/interceptors/api.interceptor.mjs +11 -40
- package/esm2020/lib/models/auth.mjs +1 -1
- package/esm2020/lib/models/environment.mjs +1 -1
- package/esm2020/lib/models/index.mjs +2 -2
- package/esm2020/lib/services/index.mjs +1 -3
- package/esm2020/lib/tokens/check-authentication-state.mjs +3 -0
- package/esm2020/lib/tokens/index.mjs +4 -1
- package/esm2020/lib/tokens/manage-profile.token.mjs +3 -12
- package/esm2020/lib/tokens/pipe-to-login.token.mjs +3 -0
- package/esm2020/lib/tokens/set-token-response-to-storage.token.mjs +3 -0
- package/esm2020/lib/utils/index.mjs +1 -2
- package/esm2020/lib/utils/initial-utils.mjs +15 -18
- package/esm2020/public-api.mjs +2 -2
- package/fesm2015/abp-ng.core.mjs +188 -522
- package/fesm2015/abp-ng.core.mjs.map +1 -1
- package/fesm2020/abp-ng.core.mjs +188 -505
- package/fesm2020/abp-ng.core.mjs.map +1 -1
- package/lib/{guards → abstracts}/auth.guard.d.ts +3 -6
- package/lib/{services → abstracts}/auth.service.d.ts +17 -7
- package/lib/abstracts/index.d.ts +2 -0
- package/lib/core.module.d.ts +7 -10
- package/lib/guards/index.d.ts +0 -1
- package/lib/interceptors/api.interceptor.d.ts +7 -9
- package/lib/models/auth.d.ts +5 -0
- package/lib/models/environment.d.ts +1 -1
- package/lib/models/index.d.ts +1 -1
- package/lib/services/index.d.ts +0 -2
- package/lib/tokens/check-authentication-state.d.ts +3 -0
- package/lib/tokens/index.d.ts +3 -0
- package/lib/tokens/pipe-to-login.token.d.ts +3 -0
- package/lib/tokens/set-token-response-to-storage.token.d.ts +3 -0
- package/lib/utils/index.d.ts +0 -1
- package/lib/utils/initial-utils.d.ts +1 -170
- package/package.json +2 -2
- package/public-api.d.ts +1 -1
- package/esm2020/lib/guards/auth.guard.mjs +0 -29
- package/esm2020/lib/handlers/oauth-configuration.handler.mjs +0 -37
- package/esm2020/lib/services/auth.service.mjs +0 -44
- package/esm2020/lib/services/timeout-limited-oauth.service.mjs +0 -16
- package/esm2020/lib/strategies/auth-flow.strategy.mjs +0 -190
- package/esm2020/lib/utils/auth-utils.mjs +0 -42
- package/lib/handlers/oauth-configuration.handler.d.ts +0 -13
- package/lib/services/timeout-limited-oauth.service.d.ts +0 -7
- package/lib/strategies/auth-flow.strategy.d.ts +0 -393
- package/lib/utils/auth-utils.d.ts +0 -175
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
import { CanActivate, UrlTree } from '@angular/router';
|
|
2
|
-
import { OAuthService } from 'angular-oauth2-oidc';
|
|
3
2
|
import { Observable } from 'rxjs';
|
|
4
|
-
import { AuthService } from '../services/auth.service';
|
|
5
3
|
import * as i0 from "@angular/core";
|
|
6
|
-
export declare class AuthGuard implements
|
|
7
|
-
private oauthService;
|
|
8
|
-
private authService;
|
|
9
|
-
constructor(oauthService: OAuthService, authService: AuthService);
|
|
4
|
+
export declare class AuthGuard implements IAuthGuard {
|
|
10
5
|
canActivate(): Observable<boolean> | boolean | UrlTree;
|
|
11
6
|
static ɵfac: i0.ɵɵFactoryDeclaration<AuthGuard, never>;
|
|
12
7
|
static ɵprov: i0.ɵɵInjectableDeclaration<AuthGuard>;
|
|
13
8
|
}
|
|
9
|
+
export interface IAuthGuard extends CanActivate {
|
|
10
|
+
}
|
|
@@ -1,17 +1,27 @@
|
|
|
1
|
-
import { Injector } from '@angular/core';
|
|
2
1
|
import { Params } from '@angular/router';
|
|
3
2
|
import { Observable } from 'rxjs';
|
|
4
3
|
import { LoginParams } from '../models/auth';
|
|
5
4
|
import * as i0 from "@angular/core";
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
constructor(
|
|
5
|
+
/**
|
|
6
|
+
* Abstract service for Authentication.
|
|
7
|
+
*/
|
|
8
|
+
export declare class AuthService implements IAuthService {
|
|
9
|
+
constructor();
|
|
10
|
+
private warningMessage;
|
|
11
11
|
init(): Promise<any>;
|
|
12
|
+
login(params: LoginParams): Observable<any>;
|
|
12
13
|
logout(queryParams?: Params): Observable<any>;
|
|
13
14
|
navigateToLogin(queryParams?: Params): void;
|
|
14
|
-
|
|
15
|
+
get isInternalAuth(): boolean;
|
|
16
|
+
get isAuthenticated(): boolean;
|
|
15
17
|
static ɵfac: i0.ɵɵFactoryDeclaration<AuthService, never>;
|
|
16
18
|
static ɵprov: i0.ɵɵInjectableDeclaration<AuthService>;
|
|
17
19
|
}
|
|
20
|
+
export interface IAuthService {
|
|
21
|
+
get isInternalAuth(): boolean;
|
|
22
|
+
get isAuthenticated(): boolean;
|
|
23
|
+
init(): Promise<any>;
|
|
24
|
+
logout(queryParams?: Params): Observable<any>;
|
|
25
|
+
navigateToLogin(queryParams?: Params): void;
|
|
26
|
+
login(params: LoginParams): Observable<any>;
|
|
27
|
+
}
|
package/lib/abstracts/index.d.ts
CHANGED
package/lib/core.module.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { ModuleWithProviders } from '@angular/core';
|
|
2
|
-
import { OAuthStorage } from 'angular-oauth2-oidc';
|
|
3
2
|
import { ABP } from './models/common';
|
|
4
3
|
import './utils/date-extensions';
|
|
5
4
|
import * as i0 from "@angular/core";
|
|
@@ -20,13 +19,11 @@ import * as i14 from "./pipes/to-injector.pipe";
|
|
|
20
19
|
import * as i15 from "./pipes/short-date-time.pipe";
|
|
21
20
|
import * as i16 from "./pipes/short-time.pipe";
|
|
22
21
|
import * as i17 from "./pipes/short-date.pipe";
|
|
23
|
-
import * as i18 from "angular
|
|
24
|
-
import * as i19 from "@angular/common";
|
|
25
|
-
import * as i20 from "@angular/
|
|
26
|
-
import * as i21 from "@angular/
|
|
27
|
-
import * as i22 from "
|
|
28
|
-
import * as i23 from "./localization.module";
|
|
29
|
-
export declare function storageFactory(): OAuthStorage;
|
|
22
|
+
import * as i18 from "@angular/common";
|
|
23
|
+
import * as i19 from "@angular/common/http";
|
|
24
|
+
import * as i20 from "@angular/forms";
|
|
25
|
+
import * as i21 from "@angular/router";
|
|
26
|
+
import * as i22 from "./localization.module";
|
|
30
27
|
/**
|
|
31
28
|
* BaseCoreModule is the module that holds
|
|
32
29
|
* all imports, declarations, exports, and entryComponents
|
|
@@ -35,7 +32,7 @@ export declare function storageFactory(): OAuthStorage;
|
|
|
35
32
|
*/
|
|
36
33
|
export declare class BaseCoreModule {
|
|
37
34
|
static ɵfac: i0.ɵɵFactoryDeclaration<BaseCoreModule, never>;
|
|
38
|
-
static ɵmod: i0.ɵɵNgModuleDeclaration<BaseCoreModule, [typeof i1.AbstractNgModelComponent, typeof i2.AutofocusDirective, typeof i3.DynamicLayoutComponent, typeof i4.ForDirective, typeof i5.FormSubmitDirective, typeof i6.InitDirective, typeof i7.InputEventDebounceDirective, typeof i8.PermissionDirective, typeof i9.ReplaceableRouteContainerComponent, typeof i10.ReplaceableTemplateDirective, typeof i11.RouterOutletComponent, typeof i12.SortPipe, typeof i13.StopPropagationDirective, typeof i14.ToInjectorPipe, typeof i15.ShortDateTimePipe, typeof i16.ShortTimePipe, typeof i17.ShortDatePipe], [typeof i18.
|
|
35
|
+
static ɵmod: i0.ɵɵNgModuleDeclaration<BaseCoreModule, [typeof i1.AbstractNgModelComponent, typeof i2.AutofocusDirective, typeof i3.DynamicLayoutComponent, typeof i4.ForDirective, typeof i5.FormSubmitDirective, typeof i6.InitDirective, typeof i7.InputEventDebounceDirective, typeof i8.PermissionDirective, typeof i9.ReplaceableRouteContainerComponent, typeof i10.ReplaceableTemplateDirective, typeof i11.RouterOutletComponent, typeof i12.SortPipe, typeof i13.StopPropagationDirective, typeof i14.ToInjectorPipe, typeof i15.ShortDateTimePipe, typeof i16.ShortTimePipe, typeof i17.ShortDatePipe], [typeof i18.CommonModule, typeof i19.HttpClientModule, typeof i20.FormsModule, typeof i20.ReactiveFormsModule, typeof i21.RouterModule, typeof i22.LocalizationModule], [typeof i18.CommonModule, typeof i19.HttpClientModule, typeof i20.FormsModule, typeof i20.ReactiveFormsModule, typeof i21.RouterModule, typeof i22.LocalizationModule, typeof i1.AbstractNgModelComponent, typeof i2.AutofocusDirective, typeof i3.DynamicLayoutComponent, typeof i4.ForDirective, typeof i5.FormSubmitDirective, typeof i6.InitDirective, typeof i7.InputEventDebounceDirective, typeof i8.PermissionDirective, typeof i9.ReplaceableRouteContainerComponent, typeof i10.ReplaceableTemplateDirective, typeof i11.RouterOutletComponent, typeof i12.SortPipe, typeof i13.StopPropagationDirective, typeof i14.ToInjectorPipe, typeof i15.ShortDateTimePipe, typeof i16.ShortTimePipe, typeof i17.ShortDatePipe]>;
|
|
39
36
|
static ɵinj: i0.ɵɵInjectorDeclaration<BaseCoreModule>;
|
|
40
37
|
}
|
|
41
38
|
/**
|
|
@@ -44,7 +41,7 @@ export declare class BaseCoreModule {
|
|
|
44
41
|
*/
|
|
45
42
|
export declare class RootCoreModule {
|
|
46
43
|
static ɵfac: i0.ɵɵFactoryDeclaration<RootCoreModule, never>;
|
|
47
|
-
static ɵmod: i0.ɵɵNgModuleDeclaration<RootCoreModule, never, [typeof BaseCoreModule, typeof
|
|
44
|
+
static ɵmod: i0.ɵɵNgModuleDeclaration<RootCoreModule, never, [typeof BaseCoreModule, typeof i22.LocalizationModule, typeof i19.HttpClientXsrfModule], [typeof BaseCoreModule, typeof i22.LocalizationModule]>;
|
|
48
45
|
static ɵinj: i0.ɵɵInjectorDeclaration<RootCoreModule>;
|
|
49
46
|
}
|
|
50
47
|
/**
|
package/lib/guards/index.d.ts
CHANGED
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
import { HttpHandler, HttpHeaders, HttpInterceptor, HttpRequest } from '@angular/common/http';
|
|
2
|
-
import {
|
|
3
|
-
import { SessionStateService } from '../services/session-state.service';
|
|
4
|
-
import { HttpWaitService } from '../services/http-wait.service';
|
|
2
|
+
import { HttpWaitService } from '../services';
|
|
5
3
|
import * as i0 from "@angular/core";
|
|
6
|
-
export declare class ApiInterceptor implements
|
|
7
|
-
private oAuthService;
|
|
8
|
-
private sessionState;
|
|
4
|
+
export declare class ApiInterceptor implements IApiInterceptor {
|
|
9
5
|
private httpWaitService;
|
|
10
|
-
|
|
11
|
-
|
|
6
|
+
constructor(httpWaitService: HttpWaitService);
|
|
7
|
+
getAdditionalHeaders(existingHeaders?: HttpHeaders): HttpHeaders;
|
|
12
8
|
intercept(request: HttpRequest<any>, next: HttpHandler): import("rxjs").Observable<import("@angular/common/http").HttpEvent<any>>;
|
|
13
|
-
getAdditionalHeaders(existingHeaders?: HttpHeaders): any;
|
|
14
9
|
static ɵfac: i0.ɵɵFactoryDeclaration<ApiInterceptor, never>;
|
|
15
10
|
static ɵprov: i0.ɵɵInjectableDeclaration<ApiInterceptor>;
|
|
16
11
|
}
|
|
12
|
+
export interface IApiInterceptor extends HttpInterceptor {
|
|
13
|
+
getAdditionalHeaders(existingHeaders?: HttpHeaders): HttpHeaders;
|
|
14
|
+
}
|
package/lib/models/auth.d.ts
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
|
+
import { UnaryFunction } from 'rxjs';
|
|
2
|
+
import { Injector } from '@angular/core';
|
|
1
3
|
export interface LoginParams {
|
|
2
4
|
username: string;
|
|
3
5
|
password: string;
|
|
4
6
|
rememberMe?: boolean;
|
|
5
7
|
redirectUrl?: string;
|
|
6
8
|
}
|
|
9
|
+
export declare type PipeToLoginFn = (params: Pick<LoginParams, 'redirectUrl' | 'rememberMe'>, injector: Injector) => UnaryFunction<any, any>;
|
|
10
|
+
export declare type SetTokenResponseToStorageFn<T = any> = (injector: Injector, tokenRes: T) => void;
|
|
11
|
+
export declare type CheckAuthenticationStateFn = (injector: Injector) => void;
|
package/lib/models/index.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export * from './auth';
|
|
2
1
|
export * from './common';
|
|
3
2
|
export * from './dtos';
|
|
4
3
|
export * from './environment';
|
|
@@ -7,3 +6,4 @@ export * from './replaceable-components';
|
|
|
7
6
|
export * from './rest';
|
|
8
7
|
export * from './session';
|
|
9
8
|
export * from './utility';
|
|
9
|
+
export * from './auth';
|
package/lib/services/index.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
export * from './auth.service';
|
|
2
1
|
export * from './config-state.service';
|
|
3
2
|
export * from './content-projection.service';
|
|
4
3
|
export * from './dom-insertion.service';
|
|
@@ -19,4 +18,3 @@ export * from './routes.service';
|
|
|
19
18
|
export * from './session-state.service';
|
|
20
19
|
export * from './subscription.service';
|
|
21
20
|
export * from './track-by.service';
|
|
22
|
-
export * from './timeout-limited-oauth.service';
|
package/lib/tokens/index.d.ts
CHANGED
|
@@ -7,3 +7,6 @@ export * from './manage-profile.token';
|
|
|
7
7
|
export * from './options.token';
|
|
8
8
|
export * from './tenant-key.token';
|
|
9
9
|
export * from './include-localization-resources.token';
|
|
10
|
+
export * from './pipe-to-login.token';
|
|
11
|
+
export * from './set-token-response-to-storage.token';
|
|
12
|
+
export * from './check-authentication-state';
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -1,172 +1,3 @@
|
|
|
1
1
|
import { Injector } from '@angular/core';
|
|
2
|
-
export declare function getInitialData(injector: Injector): () => Promise<
|
|
3
|
-
localization?: {
|
|
4
|
-
values?: {
|
|
5
|
-
[x: string]: {
|
|
6
|
-
[x: string]: string;
|
|
7
|
-
};
|
|
8
|
-
};
|
|
9
|
-
resources?: {
|
|
10
|
-
[x: string]: {
|
|
11
|
-
texts?: {
|
|
12
|
-
[x: string]: string;
|
|
13
|
-
};
|
|
14
|
-
baseResources?: string[];
|
|
15
|
-
};
|
|
16
|
-
};
|
|
17
|
-
languages?: import("@abp/ng.core").LanguageInfo[];
|
|
18
|
-
currentCulture?: {
|
|
19
|
-
displayName?: string;
|
|
20
|
-
englishName?: string;
|
|
21
|
-
threeLetterIsoLanguageName?: string;
|
|
22
|
-
twoLetterIsoLanguageName?: string;
|
|
23
|
-
isRightToLeft?: boolean;
|
|
24
|
-
cultureName?: string;
|
|
25
|
-
name?: string;
|
|
26
|
-
nativeName?: string;
|
|
27
|
-
dateTimeFormat?: {
|
|
28
|
-
calendarAlgorithmType?: string;
|
|
29
|
-
dateTimeFormatLong?: string;
|
|
30
|
-
shortDatePattern?: string;
|
|
31
|
-
fullDateTimePattern?: string;
|
|
32
|
-
dateSeparator?: string;
|
|
33
|
-
shortTimePattern?: string;
|
|
34
|
-
longTimePattern?: string;
|
|
35
|
-
};
|
|
36
|
-
};
|
|
37
|
-
defaultResourceName?: string;
|
|
38
|
-
languagesMap?: {
|
|
39
|
-
[x: string]: import("@abp/ng.core").NameValue<string>[];
|
|
40
|
-
};
|
|
41
|
-
languageFilesMap?: {
|
|
42
|
-
[x: string]: import("@abp/ng.core").NameValue<string>[];
|
|
43
|
-
};
|
|
44
|
-
};
|
|
45
|
-
auth?: {
|
|
46
|
-
grantedPolicies?: {
|
|
47
|
-
[x: string]: boolean;
|
|
48
|
-
};
|
|
49
|
-
};
|
|
50
|
-
setting?: {
|
|
51
|
-
values?: {
|
|
52
|
-
[x: string]: string;
|
|
53
|
-
};
|
|
54
|
-
};
|
|
55
|
-
currentUser?: {
|
|
56
|
-
isAuthenticated?: boolean;
|
|
57
|
-
id?: string;
|
|
58
|
-
tenantId?: string;
|
|
59
|
-
impersonatorUserId?: string;
|
|
60
|
-
impersonatorTenantId?: string;
|
|
61
|
-
impersonatorUserName?: string;
|
|
62
|
-
impersonatorTenantName?: string;
|
|
63
|
-
userName?: string;
|
|
64
|
-
name?: string;
|
|
65
|
-
surName?: string;
|
|
66
|
-
email?: string;
|
|
67
|
-
emailVerified?: boolean;
|
|
68
|
-
phoneNumber?: string;
|
|
69
|
-
phoneNumberVerified?: boolean;
|
|
70
|
-
roles?: string[];
|
|
71
|
-
};
|
|
72
|
-
features?: {
|
|
73
|
-
values?: {
|
|
74
|
-
[x: string]: string;
|
|
75
|
-
};
|
|
76
|
-
};
|
|
77
|
-
globalFeatures?: {
|
|
78
|
-
enabledFeatures?: string[];
|
|
79
|
-
};
|
|
80
|
-
multiTenancy?: {
|
|
81
|
-
isEnabled?: boolean;
|
|
82
|
-
};
|
|
83
|
-
currentTenant?: {
|
|
84
|
-
id?: string;
|
|
85
|
-
name?: string;
|
|
86
|
-
isAvailable?: boolean;
|
|
87
|
-
};
|
|
88
|
-
timing?: {
|
|
89
|
-
timeZone?: {
|
|
90
|
-
iana?: {
|
|
91
|
-
timeZoneName?: string;
|
|
92
|
-
};
|
|
93
|
-
windows?: {
|
|
94
|
-
timeZoneId?: string;
|
|
95
|
-
};
|
|
96
|
-
};
|
|
97
|
-
};
|
|
98
|
-
clock?: {
|
|
99
|
-
kind?: string;
|
|
100
|
-
};
|
|
101
|
-
objectExtensions?: {
|
|
102
|
-
modules?: {
|
|
103
|
-
[x: string]: {
|
|
104
|
-
entities?: {
|
|
105
|
-
[x: string]: {
|
|
106
|
-
properties?: {
|
|
107
|
-
[x: string]: {
|
|
108
|
-
type?: string;
|
|
109
|
-
typeSimple?: string;
|
|
110
|
-
displayName?: {
|
|
111
|
-
name?: string;
|
|
112
|
-
resource?: string;
|
|
113
|
-
};
|
|
114
|
-
api?: {
|
|
115
|
-
onGet?: {
|
|
116
|
-
isAvailable?: boolean;
|
|
117
|
-
};
|
|
118
|
-
onCreate?: {
|
|
119
|
-
isAvailable?: boolean;
|
|
120
|
-
};
|
|
121
|
-
onUpdate?: {
|
|
122
|
-
isAvailable?: boolean;
|
|
123
|
-
};
|
|
124
|
-
};
|
|
125
|
-
ui?: {
|
|
126
|
-
onTable?: {
|
|
127
|
-
isVisible?: boolean;
|
|
128
|
-
};
|
|
129
|
-
onCreateForm?: {
|
|
130
|
-
isVisible?: boolean;
|
|
131
|
-
};
|
|
132
|
-
onEditForm?: {
|
|
133
|
-
isVisible?: boolean;
|
|
134
|
-
};
|
|
135
|
-
lookup?: {
|
|
136
|
-
url?: string;
|
|
137
|
-
resultListPropertyName?: string;
|
|
138
|
-
displayPropertyName?: string;
|
|
139
|
-
valuePropertyName?: string;
|
|
140
|
-
filterParamName?: string;
|
|
141
|
-
};
|
|
142
|
-
};
|
|
143
|
-
attributes?: import("@abp/ng.core").ExtensionPropertyAttributeDto[];
|
|
144
|
-
configuration?: {
|
|
145
|
-
[x: string]: object;
|
|
146
|
-
};
|
|
147
|
-
defaultValue?: object;
|
|
148
|
-
};
|
|
149
|
-
};
|
|
150
|
-
configuration?: {
|
|
151
|
-
[x: string]: object;
|
|
152
|
-
};
|
|
153
|
-
};
|
|
154
|
-
};
|
|
155
|
-
configuration?: {
|
|
156
|
-
[x: string]: object;
|
|
157
|
-
};
|
|
158
|
-
};
|
|
159
|
-
};
|
|
160
|
-
enums?: {
|
|
161
|
-
[x: string]: {
|
|
162
|
-
fields?: import("@abp/ng.core").ExtensionEnumFieldDto[];
|
|
163
|
-
localizationResource?: string;
|
|
164
|
-
};
|
|
165
|
-
};
|
|
166
|
-
};
|
|
167
|
-
extraProperties?: {
|
|
168
|
-
[x: string]: object;
|
|
169
|
-
};
|
|
170
|
-
}>;
|
|
171
|
-
export declare function checkAccessToken(injector: Injector): void;
|
|
2
|
+
export declare function getInitialData(injector: Injector): () => Promise<void>;
|
|
172
3
|
export declare function localeInitializer(injector: Injector): () => Promise<unknown>;
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@abp/ng.core",
|
|
3
|
-
"version": "7.0.0
|
|
3
|
+
"version": "7.0.0",
|
|
4
4
|
"homepage": "https://abp.io",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
7
7
|
"url": "https://github.com/abpframework/abp.git"
|
|
8
8
|
},
|
|
9
9
|
"dependencies": {
|
|
10
|
-
"@abp/utils": "~7.0.0
|
|
10
|
+
"@abp/utils": "~7.0.0",
|
|
11
11
|
"angular-oauth2-oidc": "^15.0.1",
|
|
12
12
|
"just-clone": "^6.1.1",
|
|
13
13
|
"just-compare": "^1.4.0",
|
package/public-api.d.ts
CHANGED
|
@@ -5,7 +5,6 @@ export * from './lib/core.module';
|
|
|
5
5
|
export * from './lib/directives';
|
|
6
6
|
export * from './lib/enums';
|
|
7
7
|
export * from './lib/guards';
|
|
8
|
-
export * from './lib/interceptors';
|
|
9
8
|
export * from './lib/localization.module';
|
|
10
9
|
export * from './lib/models';
|
|
11
10
|
export * from './lib/pipes';
|
|
@@ -22,3 +21,4 @@ export * from './lib/strategies';
|
|
|
22
21
|
export * from './lib/tokens';
|
|
23
22
|
export * from './lib/utils';
|
|
24
23
|
export * from './lib/validators';
|
|
24
|
+
export * from './lib/interceptors';
|
|
@@ -1,29 +0,0 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
2
|
-
import { OAuthService } from 'angular-oauth2-oidc';
|
|
3
|
-
import { AuthService } from '../services/auth.service';
|
|
4
|
-
import * as i0 from "@angular/core";
|
|
5
|
-
import * as i1 from "angular-oauth2-oidc";
|
|
6
|
-
import * as i2 from "../services/auth.service";
|
|
7
|
-
export class AuthGuard {
|
|
8
|
-
constructor(oauthService, authService) {
|
|
9
|
-
this.oauthService = oauthService;
|
|
10
|
-
this.authService = authService;
|
|
11
|
-
}
|
|
12
|
-
canActivate() {
|
|
13
|
-
const hasValidAccessToken = this.oauthService.hasValidAccessToken();
|
|
14
|
-
if (hasValidAccessToken) {
|
|
15
|
-
return true;
|
|
16
|
-
}
|
|
17
|
-
this.authService.navigateToLogin();
|
|
18
|
-
return false;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
AuthGuard.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: AuthGuard, deps: [{ token: i1.OAuthService }, { token: i2.AuthService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
22
|
-
AuthGuard.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: AuthGuard, providedIn: 'root' });
|
|
23
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: AuthGuard, decorators: [{
|
|
24
|
-
type: Injectable,
|
|
25
|
-
args: [{
|
|
26
|
-
providedIn: 'root',
|
|
27
|
-
}]
|
|
28
|
-
}], ctorParameters: function () { return [{ type: i1.OAuthService }, { type: i2.AuthService }]; } });
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL2NvcmUvc3JjL2xpYi9ndWFyZHMvYXV0aC5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBRTNDLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUVuRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sMEJBQTBCLENBQUM7Ozs7QUFLdkQsTUFBTSxPQUFPLFNBQVM7SUFDcEIsWUFBb0IsWUFBMEIsRUFBVSxXQUF3QjtRQUE1RCxpQkFBWSxHQUFaLFlBQVksQ0FBYztRQUFVLGdCQUFXLEdBQVgsV0FBVyxDQUFhO0lBQUcsQ0FBQztJQUVwRixXQUFXO1FBQ1QsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLENBQUMsWUFBWSxDQUFDLG1CQUFtQixFQUFFLENBQUM7UUFDcEUsSUFBSSxtQkFBbUIsRUFBRTtZQUN2QixPQUFPLElBQUksQ0FBQztTQUNiO1FBRUQsSUFBSSxDQUFDLFdBQVcsQ0FBQyxlQUFlLEVBQUUsQ0FBQztRQUNuQyxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7O3NHQVhVLFNBQVM7MEdBQVQsU0FBUyxjQUZSLE1BQU07MkZBRVAsU0FBUztrQkFIckIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7IENhbkFjdGl2YXRlLCBVcmxUcmVlIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHsgT0F1dGhTZXJ2aWNlIH0gZnJvbSAnYW5ndWxhci1vYXV0aDItb2lkYyc7XHJcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcclxuaW1wb3J0IHsgQXV0aFNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9hdXRoLnNlcnZpY2UnO1xyXG5cclxuQEluamVjdGFibGUoe1xyXG4gIHByb3ZpZGVkSW46ICdyb290JyxcclxufSlcclxuZXhwb3J0IGNsYXNzIEF1dGhHdWFyZCBpbXBsZW1lbnRzIENhbkFjdGl2YXRlIHtcclxuICBjb25zdHJ1Y3Rvcihwcml2YXRlIG9hdXRoU2VydmljZTogT0F1dGhTZXJ2aWNlLCBwcml2YXRlIGF1dGhTZXJ2aWNlOiBBdXRoU2VydmljZSkge31cclxuXHJcbiAgY2FuQWN0aXZhdGUoKTogT2JzZXJ2YWJsZTxib29sZWFuPiB8IGJvb2xlYW4gfCBVcmxUcmVlIHtcclxuICAgIGNvbnN0IGhhc1ZhbGlkQWNjZXNzVG9rZW4gPSB0aGlzLm9hdXRoU2VydmljZS5oYXNWYWxpZEFjY2Vzc1Rva2VuKCk7XHJcbiAgICBpZiAoaGFzVmFsaWRBY2Nlc3NUb2tlbikge1xyXG4gICAgICByZXR1cm4gdHJ1ZTtcclxuICAgIH1cclxuXHJcbiAgICB0aGlzLmF1dGhTZXJ2aWNlLm5hdmlnYXRlVG9Mb2dpbigpO1xyXG4gICAgcmV0dXJuIGZhbHNlO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
import { Inject, Injectable } from '@angular/core';
|
|
2
|
-
import { OAuthService } from 'angular-oauth2-oidc';
|
|
3
|
-
import compare from 'just-compare';
|
|
4
|
-
import { filter, map } from 'rxjs/operators';
|
|
5
|
-
import { EnvironmentService } from '../services/environment.service';
|
|
6
|
-
import { CORE_OPTIONS } from '../tokens/options.token';
|
|
7
|
-
import * as i0 from "@angular/core";
|
|
8
|
-
import * as i1 from "angular-oauth2-oidc";
|
|
9
|
-
import * as i2 from "../services/environment.service";
|
|
10
|
-
export class OAuthConfigurationHandler {
|
|
11
|
-
constructor(oAuthService, environmentService, options) {
|
|
12
|
-
this.oAuthService = oAuthService;
|
|
13
|
-
this.environmentService = environmentService;
|
|
14
|
-
this.options = options;
|
|
15
|
-
this.listenToSetEnvironment();
|
|
16
|
-
}
|
|
17
|
-
listenToSetEnvironment() {
|
|
18
|
-
this.environmentService
|
|
19
|
-
.createOnUpdateStream(state => state)
|
|
20
|
-
.pipe(map(environment => environment.oAuthConfig), filter(config => !compare(config, this.options.environment.oAuthConfig)))
|
|
21
|
-
.subscribe(config => {
|
|
22
|
-
this.oAuthService.configure(config);
|
|
23
|
-
});
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
OAuthConfigurationHandler.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: OAuthConfigurationHandler, deps: [{ token: i1.OAuthService }, { token: i2.EnvironmentService }, { token: CORE_OPTIONS }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
27
|
-
OAuthConfigurationHandler.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: OAuthConfigurationHandler, providedIn: 'root' });
|
|
28
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: OAuthConfigurationHandler, decorators: [{
|
|
29
|
-
type: Injectable,
|
|
30
|
-
args: [{
|
|
31
|
-
providedIn: 'root',
|
|
32
|
-
}]
|
|
33
|
-
}], ctorParameters: function () { return [{ type: i1.OAuthService }, { type: i2.EnvironmentService }, { type: undefined, decorators: [{
|
|
34
|
-
type: Inject,
|
|
35
|
-
args: [CORE_OPTIONS]
|
|
36
|
-
}] }]; } });
|
|
37
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2F1dGgtY29uZmlndXJhdGlvbi5oYW5kbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zcmMvbGliL2hhbmRsZXJzL29hdXRoLWNvbmZpZ3VyYXRpb24uaGFuZGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLFVBQVUsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUNuRCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0scUJBQXFCLENBQUM7QUFDbkQsT0FBTyxPQUFPLE1BQU0sY0FBYyxDQUFDO0FBQ25DLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFN0MsT0FBTyxFQUFFLGtCQUFrQixFQUFFLE1BQU0saUNBQWlDLENBQUM7QUFDckUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHlCQUF5QixDQUFDOzs7O0FBS3ZELE1BQU0sT0FBTyx5QkFBeUI7SUFDcEMsWUFDVSxZQUEwQixFQUMxQixrQkFBc0MsRUFDaEIsT0FBaUI7UUFGdkMsaUJBQVksR0FBWixZQUFZLENBQWM7UUFDMUIsdUJBQWtCLEdBQWxCLGtCQUFrQixDQUFvQjtRQUNoQixZQUFPLEdBQVAsT0FBTyxDQUFVO1FBRS9DLElBQUksQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO0lBQ2hDLENBQUM7SUFFTyxzQkFBc0I7UUFDNUIsSUFBSSxDQUFDLGtCQUFrQjthQUNwQixvQkFBb0IsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQzthQUNwQyxJQUFJLENBQ0gsR0FBRyxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxFQUMzQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FDekU7YUFDQSxTQUFTLENBQUMsTUFBTSxDQUFDLEVBQUU7WUFDbEIsSUFBSSxDQUFDLFlBQVksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDdEMsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDOztzSEFuQlUseUJBQXlCLGdGQUkxQixZQUFZOzBIQUpYLHlCQUF5QixjQUZ4QixNQUFNOzJGQUVQLHlCQUF5QjtrQkFIckMsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkI7OzBCQUtJLE1BQU07MkJBQUMsWUFBWSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdCwgSW5qZWN0YWJsZSB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBPQXV0aFNlcnZpY2UgfSBmcm9tICdhbmd1bGFyLW9hdXRoMi1vaWRjJztcclxuaW1wb3J0IGNvbXBhcmUgZnJvbSAnanVzdC1jb21wYXJlJztcclxuaW1wb3J0IHsgZmlsdGVyLCBtYXAgfSBmcm9tICdyeGpzL29wZXJhdG9ycyc7XHJcbmltcG9ydCB7IEFCUCB9IGZyb20gJy4uL21vZGVscy9jb21tb24nO1xyXG5pbXBvcnQgeyBFbnZpcm9ubWVudFNlcnZpY2UgfSBmcm9tICcuLi9zZXJ2aWNlcy9lbnZpcm9ubWVudC5zZXJ2aWNlJztcclxuaW1wb3J0IHsgQ09SRV9PUFRJT05TIH0gZnJvbSAnLi4vdG9rZW5zL29wdGlvbnMudG9rZW4nO1xyXG5cclxuQEluamVjdGFibGUoe1xyXG4gIHByb3ZpZGVkSW46ICdyb290JyxcclxufSlcclxuZXhwb3J0IGNsYXNzIE9BdXRoQ29uZmlndXJhdGlvbkhhbmRsZXIge1xyXG4gIGNvbnN0cnVjdG9yKFxyXG4gICAgcHJpdmF0ZSBvQXV0aFNlcnZpY2U6IE9BdXRoU2VydmljZSxcclxuICAgIHByaXZhdGUgZW52aXJvbm1lbnRTZXJ2aWNlOiBFbnZpcm9ubWVudFNlcnZpY2UsXHJcbiAgICBASW5qZWN0KENPUkVfT1BUSU9OUykgcHJpdmF0ZSBvcHRpb25zOiBBQlAuUm9vdCxcclxuICApIHtcclxuICAgIHRoaXMubGlzdGVuVG9TZXRFbnZpcm9ubWVudCgpO1xyXG4gIH1cclxuXHJcbiAgcHJpdmF0ZSBsaXN0ZW5Ub1NldEVudmlyb25tZW50KCkge1xyXG4gICAgdGhpcy5lbnZpcm9ubWVudFNlcnZpY2VcclxuICAgICAgLmNyZWF0ZU9uVXBkYXRlU3RyZWFtKHN0YXRlID0+IHN0YXRlKVxyXG4gICAgICAucGlwZShcclxuICAgICAgICBtYXAoZW52aXJvbm1lbnQgPT4gZW52aXJvbm1lbnQub0F1dGhDb25maWcpLFxyXG4gICAgICAgIGZpbHRlcihjb25maWcgPT4gIWNvbXBhcmUoY29uZmlnLCB0aGlzLm9wdGlvbnMuZW52aXJvbm1lbnQub0F1dGhDb25maWcpKSxcclxuICAgICAgKVxyXG4gICAgICAuc3Vic2NyaWJlKGNvbmZpZyA9PiB7XHJcbiAgICAgICAgdGhpcy5vQXV0aFNlcnZpY2UuY29uZmlndXJlKGNvbmZpZyk7XHJcbiAgICAgIH0pO1xyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
import { Injectable, Injector } from '@angular/core';
|
|
2
|
-
import { from } from 'rxjs';
|
|
3
|
-
import { filter, map, switchMap, take, tap } from 'rxjs/operators';
|
|
4
|
-
import { AUTH_FLOW_STRATEGY } from '../strategies/auth-flow.strategy';
|
|
5
|
-
import { EnvironmentService } from './environment.service';
|
|
6
|
-
import * as i0 from "@angular/core";
|
|
7
|
-
export class AuthService {
|
|
8
|
-
constructor(injector) {
|
|
9
|
-
this.injector = injector;
|
|
10
|
-
}
|
|
11
|
-
get isInternalAuth() {
|
|
12
|
-
return this.strategy.isInternalAuth;
|
|
13
|
-
}
|
|
14
|
-
async init() {
|
|
15
|
-
const environmentService = this.injector.get(EnvironmentService);
|
|
16
|
-
return environmentService
|
|
17
|
-
.getEnvironment$()
|
|
18
|
-
.pipe(map(env => env?.oAuthConfig), filter(oAuthConfig => !!oAuthConfig), tap(oAuthConfig => {
|
|
19
|
-
this.strategy =
|
|
20
|
-
oAuthConfig.responseType === 'code'
|
|
21
|
-
? AUTH_FLOW_STRATEGY.Code(this.injector)
|
|
22
|
-
: AUTH_FLOW_STRATEGY.Password(this.injector);
|
|
23
|
-
}), switchMap(() => from(this.strategy.init())), take(1))
|
|
24
|
-
.toPromise();
|
|
25
|
-
}
|
|
26
|
-
logout(queryParams) {
|
|
27
|
-
return this.strategy.logout(queryParams);
|
|
28
|
-
}
|
|
29
|
-
navigateToLogin(queryParams) {
|
|
30
|
-
this.strategy.navigateToLogin(queryParams);
|
|
31
|
-
}
|
|
32
|
-
login(params) {
|
|
33
|
-
return this.strategy.login(params);
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
AuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: AuthService, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
37
|
-
AuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: AuthService, providedIn: 'root' });
|
|
38
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: AuthService, decorators: [{
|
|
39
|
-
type: Injectable,
|
|
40
|
-
args: [{
|
|
41
|
-
providedIn: 'root',
|
|
42
|
-
}]
|
|
43
|
-
}], ctorParameters: function () { return [{ type: i0.Injector }]; } });
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vcGFja2FnZXMvY29yZS9zcmMvbGliL3NlcnZpY2VzL2F1dGguc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUVyRCxPQUFPLEVBQUUsSUFBSSxFQUFjLE1BQU0sTUFBTSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFFbkUsT0FBTyxFQUFvQixrQkFBa0IsRUFBRSxNQUFNLGtDQUFrQyxDQUFDO0FBQ3hGLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDOztBQUszRCxNQUFNLE9BQU8sV0FBVztJQU90QixZQUFzQixRQUFrQjtRQUFsQixhQUFRLEdBQVIsUUFBUSxDQUFVO0lBQUcsQ0FBQztJQUo1QyxJQUFJLGNBQWM7UUFDaEIsT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDLGNBQWMsQ0FBQztJQUN0QyxDQUFDO0lBSUQsS0FBSyxDQUFDLElBQUk7UUFDUixNQUFNLGtCQUFrQixHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFFakUsT0FBTyxrQkFBa0I7YUFDdEIsZUFBZSxFQUFFO2FBQ2pCLElBQUksQ0FDSCxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLEVBQUUsV0FBVyxDQUFDLEVBQzVCLE1BQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsRUFDcEMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxFQUFFO1lBQ2hCLElBQUksQ0FBQyxRQUFRO2dCQUNYLFdBQVcsQ0FBQyxZQUFZLEtBQUssTUFBTTtvQkFDakMsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDO29CQUN4QyxDQUFDLENBQUMsa0JBQWtCLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNuRCxDQUFDLENBQUMsRUFDRixTQUFTLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxFQUMzQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQ1I7YUFDQSxTQUFTLEVBQUUsQ0FBQztJQUNqQixDQUFDO0lBRUQsTUFBTSxDQUFDLFdBQW9CO1FBQ3pCLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELGVBQWUsQ0FBQyxXQUFvQjtRQUNsQyxJQUFJLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxXQUFXLENBQUMsQ0FBQztJQUM3QyxDQUFDO0lBRUQsS0FBSyxDQUFDLE1BQW1CO1FBQ3ZCLE9BQU8sSUFBSSxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDckMsQ0FBQzs7d0dBdkNVLFdBQVc7NEdBQVgsV0FBVyxjQUZWLE1BQU07MkZBRVAsV0FBVztrQkFIdkIsVUFBVTttQkFBQztvQkFDVixVQUFVLEVBQUUsTUFBTTtpQkFDbkIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlLCBJbmplY3RvciB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xyXG5pbXBvcnQgeyBQYXJhbXMgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xyXG5pbXBvcnQgeyBmcm9tLCBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XHJcbmltcG9ydCB7IGZpbHRlciwgbWFwLCBzd2l0Y2hNYXAsIHRha2UsIHRhcCB9IGZyb20gJ3J4anMvb3BlcmF0b3JzJztcclxuaW1wb3J0IHsgTG9naW5QYXJhbXMgfSBmcm9tICcuLi9tb2RlbHMvYXV0aCc7XHJcbmltcG9ydCB7IEF1dGhGbG93U3RyYXRlZ3ksIEFVVEhfRkxPV19TVFJBVEVHWSB9IGZyb20gJy4uL3N0cmF0ZWdpZXMvYXV0aC1mbG93LnN0cmF0ZWd5JztcclxuaW1wb3J0IHsgRW52aXJvbm1lbnRTZXJ2aWNlIH0gZnJvbSAnLi9lbnZpcm9ubWVudC5zZXJ2aWNlJztcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICBwcm92aWRlZEluOiAncm9vdCcsXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBBdXRoU2VydmljZSB7XHJcbiAgcHJpdmF0ZSBzdHJhdGVneTogQXV0aEZsb3dTdHJhdGVneTtcclxuXHJcbiAgZ2V0IGlzSW50ZXJuYWxBdXRoKCkge1xyXG4gICAgcmV0dXJuIHRoaXMuc3RyYXRlZ3kuaXNJbnRlcm5hbEF1dGg7XHJcbiAgfVxyXG5cclxuICBjb25zdHJ1Y3Rvcihwcm90ZWN0ZWQgaW5qZWN0b3I6IEluamVjdG9yKSB7fVxyXG5cclxuICBhc3luYyBpbml0KCkge1xyXG4gICAgY29uc3QgZW52aXJvbm1lbnRTZXJ2aWNlID0gdGhpcy5pbmplY3Rvci5nZXQoRW52aXJvbm1lbnRTZXJ2aWNlKTtcclxuXHJcbiAgICByZXR1cm4gZW52aXJvbm1lbnRTZXJ2aWNlXHJcbiAgICAgIC5nZXRFbnZpcm9ubWVudCQoKVxyXG4gICAgICAucGlwZShcclxuICAgICAgICBtYXAoZW52ID0+IGVudj8ub0F1dGhDb25maWcpLFxyXG4gICAgICAgIGZpbHRlcihvQXV0aENvbmZpZyA9PiAhIW9BdXRoQ29uZmlnKSxcclxuICAgICAgICB0YXAob0F1dGhDb25maWcgPT4ge1xyXG4gICAgICAgICAgdGhpcy5zdHJhdGVneSA9XHJcbiAgICAgICAgICAgIG9BdXRoQ29uZmlnLnJlc3BvbnNlVHlwZSA9PT0gJ2NvZGUnXHJcbiAgICAgICAgICAgICAgPyBBVVRIX0ZMT1dfU1RSQVRFR1kuQ29kZSh0aGlzLmluamVjdG9yKVxyXG4gICAgICAgICAgICAgIDogQVVUSF9GTE9XX1NUUkFURUdZLlBhc3N3b3JkKHRoaXMuaW5qZWN0b3IpO1xyXG4gICAgICAgIH0pLFxyXG4gICAgICAgIHN3aXRjaE1hcCgoKSA9PiBmcm9tKHRoaXMuc3RyYXRlZ3kuaW5pdCgpKSksXHJcbiAgICAgICAgdGFrZSgxKSxcclxuICAgICAgKVxyXG4gICAgICAudG9Qcm9taXNlKCk7XHJcbiAgfVxyXG5cclxuICBsb2dvdXQocXVlcnlQYXJhbXM/OiBQYXJhbXMpOiBPYnNlcnZhYmxlPGFueT4ge1xyXG4gICAgcmV0dXJuIHRoaXMuc3RyYXRlZ3kubG9nb3V0KHF1ZXJ5UGFyYW1zKTtcclxuICB9XHJcblxyXG4gIG5hdmlnYXRlVG9Mb2dpbihxdWVyeVBhcmFtcz86IFBhcmFtcykge1xyXG4gICAgdGhpcy5zdHJhdGVneS5uYXZpZ2F0ZVRvTG9naW4ocXVlcnlQYXJhbXMpO1xyXG4gIH1cclxuXHJcbiAgbG9naW4ocGFyYW1zOiBMb2dpblBhcmFtcykge1xyXG4gICAgcmV0dXJuIHRoaXMuc3RyYXRlZ3kubG9naW4ocGFyYW1zKTtcclxuICB9XHJcbn1cclxuIl19
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
2
|
-
import { OAuthService } from 'angular-oauth2-oidc';
|
|
3
|
-
import * as i0 from "@angular/core";
|
|
4
|
-
export class TimeoutLimitedOAuthService extends OAuthService {
|
|
5
|
-
calcTimeout(storedAt, expiration) {
|
|
6
|
-
const result = super.calcTimeout(storedAt, expiration);
|
|
7
|
-
const MAX_TIMEOUT_DURATION = 2147483647;
|
|
8
|
-
return result < MAX_TIMEOUT_DURATION ? result : MAX_TIMEOUT_DURATION - 1;
|
|
9
|
-
}
|
|
10
|
-
}
|
|
11
|
-
TimeoutLimitedOAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: TimeoutLimitedOAuthService, deps: null, target: i0.ɵɵFactoryTarget.Injectable });
|
|
12
|
-
TimeoutLimitedOAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: TimeoutLimitedOAuthService });
|
|
13
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: TimeoutLimitedOAuthService, decorators: [{
|
|
14
|
-
type: Injectable
|
|
15
|
-
}] });
|
|
16
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGltZW91dC1saW1pdGVkLW9hdXRoLnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9jb3JlL3NyYy9saWIvc2VydmljZXMvdGltZW91dC1saW1pdGVkLW9hdXRoLnNlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBb0IsTUFBTSxlQUFlLENBQUM7QUFDN0QsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHFCQUFxQixDQUFDOztBQUduRCxNQUFNLE9BQU8sMEJBQTJCLFNBQVEsWUFBWTtJQUN2QyxXQUFXLENBQUMsUUFBZ0IsRUFBRSxVQUFrQjtRQUNqRSxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsV0FBVyxDQUFDLFFBQVEsRUFBRSxVQUFVLENBQUMsQ0FBQztRQUN2RCxNQUFNLG9CQUFvQixHQUFHLFVBQVUsQ0FBQztRQUN4QyxPQUFPLE1BQU0sR0FBRyxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxvQkFBb0IsR0FBRyxDQUFDLENBQUM7SUFDM0UsQ0FBQzs7dUhBTFUsMEJBQTBCOzJIQUExQiwwQkFBMEI7MkZBQTFCLDBCQUEwQjtrQkFEdEMsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUsIE5nWm9uZSwgT3B0aW9uYWwgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHsgT0F1dGhTZXJ2aWNlIH0gZnJvbSAnYW5ndWxhci1vYXV0aDItb2lkYyc7XHJcblxyXG5ASW5qZWN0YWJsZSgpXHJcbmV4cG9ydCBjbGFzcyBUaW1lb3V0TGltaXRlZE9BdXRoU2VydmljZSBleHRlbmRzIE9BdXRoU2VydmljZSB7XHJcbiAgcHJvdGVjdGVkIG92ZXJyaWRlIGNhbGNUaW1lb3V0KHN0b3JlZEF0OiBudW1iZXIsIGV4cGlyYXRpb246IG51bWJlcik6IG51bWJlciB7XHJcbiAgICBjb25zdCByZXN1bHQgPSBzdXBlci5jYWxjVGltZW91dChzdG9yZWRBdCwgZXhwaXJhdGlvbik7XHJcbiAgICBjb25zdCBNQVhfVElNRU9VVF9EVVJBVElPTiA9IDIxNDc0ODM2NDc7XHJcbiAgICByZXR1cm4gcmVzdWx0IDwgTUFYX1RJTUVPVVRfRFVSQVRJT04gPyByZXN1bHQgOiBNQVhfVElNRU9VVF9EVVJBVElPTiAtIDE7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|