@delon/auth 16.1.1 → 16.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/esm2022/src/auth.module.mjs +6 -7
- package/esm2022/src/social/social.service.mjs +5 -6
- package/esm2022/src/store/cookie-storage.service.mjs +3 -2
- package/esm2022/src/store/interface.mjs +1 -1
- package/esm2022/src/store/local-storage.service.mjs +1 -1
- package/esm2022/src/store/memory.service.mjs +1 -1
- package/esm2022/src/store/session-storage.service.mjs +1 -1
- package/esm2022/src/token/base.interceptor.mjs +6 -7
- package/esm2022/src/token/jwt/jwt.guard.mjs +47 -46
- package/esm2022/src/token/jwt/jwt.interceptor.mjs +6 -7
- package/esm2022/src/token/jwt/jwt.model.mjs +2 -1
- package/esm2022/src/token/simple/simple.guard.mjs +44 -44
- package/esm2022/src/token/simple/simple.interceptor.mjs +5 -6
- package/esm2022/src/token/token.service.mjs +5 -6
- package/fesm2022/auth.mjs +123 -118
- package/fesm2022/auth.mjs.map +1 -1
- package/package.json +2 -2
- package/src/store/cookie-storage.service.d.ts +1 -1
- package/src/store/local-storage.service.d.ts +1 -1
- package/src/store/memory.service.d.ts +1 -1
- package/src/store/session-storage.service.d.ts +1 -1
- package/src/token/jwt/jwt.guard.d.ts +37 -23
- package/src/token/simple/simple.guard.d.ts +37 -23
- package/src/token/token.service.d.ts +1 -1
|
@@ -11,7 +11,7 @@ export function DA_SERVICE_TOKEN_FACTORY() {
|
|
|
11
11
|
/**
|
|
12
12
|
* 维护Token信息服务，[在线文档](https://ng-alain.com/auth)
|
|
13
13
|
*/
|
|
14
|
-
class TokenService {
|
|
14
|
+
export class TokenService {
|
|
15
15
|
constructor(configSrv, store) {
|
|
16
16
|
this.store = store;
|
|
17
17
|
this.refresh$ = new Subject();
|
|
@@ -79,14 +79,13 @@ class TokenService {
|
|
|
79
79
|
ngOnDestroy() {
|
|
80
80
|
this.cleanRefresh();
|
|
81
81
|
}
|
|
82
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.
|
|
83
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.
|
|
82
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: TokenService, deps: [{ token: i1.AlainConfigService }, { token: DA_STORE_TOKEN }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
83
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: TokenService }); }
|
|
84
84
|
}
|
|
85
|
-
|
|
86
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.5", ngImport: i0, type: TokenService, decorators: [{
|
|
85
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: TokenService, decorators: [{
|
|
87
86
|
type: Injectable
|
|
88
87
|
}], ctorParameters: function () { return [{ type: i1.AlainConfigService }, { type: undefined, decorators: [{
|
|
89
88
|
type: Inject,
|
|
90
89
|
args: [DA_STORE_TOKEN]
|
|
91
90
|
}] }]; } });
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
91
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"token.service.js","sourceRoot":"","sources":["../../../../../../packages/auth/src/token/token.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { inject, Inject, Injectable, OnDestroy } from '@angular/core';\nimport { BehaviorSubject, interval, Observable, Subject, Subscription, filter, map, share } from 'rxjs';\n\nimport { AlainAuthConfig, AlainConfigService } from '@delon/util/config';\n\nimport { AuthReferrer, ITokenModel, ITokenService } from './interface';\nimport { mergeConfig } from '../auth.config';\nimport { DA_STORE_TOKEN, IStore } from '../store/interface';\n\nexport function DA_SERVICE_TOKEN_FACTORY(): ITokenService {\n  return new TokenService(inject(AlainConfigService), inject(DA_STORE_TOKEN));\n}\n\n/**\n * 维护Token信息服务，[在线文档](https://ng-alain.com/auth)\n */\n@Injectable()\nexport class TokenService implements ITokenService, OnDestroy {\n  private refresh$ = new Subject<ITokenModel>();\n  private change$ = new BehaviorSubject<ITokenModel | null>(null);\n  private interval$?: Subscription;\n  private _referrer: AuthReferrer = {};\n  private _options: AlainAuthConfig;\n\n  constructor(\n    configSrv: AlainConfigService,\n    @Inject(DA_STORE_TOKEN) private store: IStore\n  ) {\n    this._options = mergeConfig(configSrv);\n  }\n\n  get refresh(): Observable<ITokenModel> {\n    this.builderRefresh();\n    return this.refresh$.pipe(share());\n  }\n\n  get login_url(): string | undefined {\n    return this._options.login_url;\n  }\n\n  get referrer(): AuthReferrer {\n    return this._referrer;\n  }\n\n  get options(): AlainAuthConfig {\n    return this._options;\n  }\n\n  set(data: ITokenModel): boolean {\n    const res = this.store.set(this._options.store_key!, data);\n    this.change$.next(data);\n    return res;\n  }\n\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  get(type?: any): any;\n  get<T extends ITokenModel>(type?: new () => T): T;\n  get<T extends ITokenModel>(type?: new () => T): T {\n    const data = this.store.get(this._options.store_key!);\n    return type ? (Object.assign(new type(), data) as T) : (data as T);\n  }\n\n  clear(options: { onlyToken: boolean } = { onlyToken: false }): void {\n    let data: ITokenModel | null = null;\n    if (options.onlyToken === true) {\n      data = this.get() as ITokenModel;\n      data.token = ``;\n      this.set(data);\n    } else {\n      this.store.remove(this._options.store_key!);\n    }\n    this.change$.next(data);\n  }\n\n  change(): Observable<ITokenModel | null> {\n    return this.change$.pipe(share());\n  }\n\n  private builderRefresh(): void {\n    const { refreshTime, refreshOffset } = this._options;\n    this.cleanRefresh();\n    this.interval$ = interval(refreshTime)\n      .pipe(\n        map(() => {\n          const item = this.get() as ITokenModel;\n          const expired = item.expired || item.exp || 0;\n          if (expired <= 0) {\n            return null;\n          }\n\n          const curTime = new Date().valueOf() + refreshOffset!;\n          return expired <= curTime ? item : null;\n        }),\n        filter(v => v != null)\n      )\n      .subscribe(res => this.refresh$.next(res!));\n  }\n\n  private cleanRefresh(): void {\n    if (this.interval$ && !this.interval$.closed) {\n      this.interval$.unsubscribe();\n    }\n  }\n\n  ngOnDestroy(): void {\n    this.cleanRefresh();\n  }\n}\n"]}
|
package/fesm2022/auth.mjs
CHANGED
|
@@ -128,10 +128,10 @@ class TokenService {
|
|
|
128
128
|
ngOnDestroy() {
|
|
129
129
|
this.cleanRefresh();
|
|
130
130
|
}
|
|
131
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.
|
|
132
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.
|
|
131
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: TokenService, deps: [{ token: i1.AlainConfigService }, { token: DA_STORE_TOKEN }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
132
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: TokenService }); }
|
|
133
133
|
}
|
|
134
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.
|
|
134
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: TokenService, decorators: [{
|
|
135
135
|
type: Injectable
|
|
136
136
|
}], ctorParameters: function () { return [{ type: i1.AlainConfigService }, { type: undefined, decorators: [{
|
|
137
137
|
type: Inject,
|
|
@@ -231,10 +231,10 @@ class SocialService {
|
|
|
231
231
|
clearInterval(this._winTime);
|
|
232
232
|
this._winTime = null;
|
|
233
233
|
}
|
|
234
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.
|
|
235
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.
|
|
234
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: SocialService, deps: [{ token: DA_SERVICE_TOKEN }, { token: DOCUMENT }, { token: i1$1.Router }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
235
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: SocialService }); }
|
|
236
236
|
}
|
|
237
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.
|
|
237
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: SocialService, decorators: [{
|
|
238
238
|
type: Injectable
|
|
239
239
|
}], ctorParameters: function () { return [{ type: undefined, decorators: [{
|
|
240
240
|
type: Inject,
|
|
@@ -313,7 +313,8 @@ class CookieStorageStore {
|
|
|
313
313
|
}
|
|
314
314
|
}
|
|
315
315
|
set(key, value) {
|
|
316
|
-
|
|
316
|
+
const expires = (value?.expired ?? 0) / 1e3;
|
|
317
|
+
this.srv.put(key, JSON.stringify(value ?? {}), { expires });
|
|
317
318
|
return true;
|
|
318
319
|
}
|
|
319
320
|
remove(key) {
|
|
@@ -321,20 +322,6 @@ class CookieStorageStore {
|
|
|
321
322
|
}
|
|
322
323
|
}
|
|
323
324
|
|
|
324
|
-
/**
|
|
325
|
-
* Whether to allow anonymous login
|
|
326
|
-
*
|
|
327
|
-
* 是否允许匿名登录
|
|
328
|
-
*
|
|
329
|
-
* @example
|
|
330
|
-
* this.http.post(`login`, {
|
|
331
|
-
* name: 'cipchk', pwd: '123456'
|
|
332
|
-
* }, {
|
|
333
|
-
* context: new HttpContext().set(ALLOW_ANONYMOUS, true)
|
|
334
|
-
* })
|
|
335
|
-
*/
|
|
336
|
-
const ALLOW_ANONYMOUS = new HttpContextToken(() => false);
|
|
337
|
-
|
|
338
325
|
function CheckSimple(model) {
|
|
339
326
|
return model != null && typeof model.token === 'string' && model.token.length > 0;
|
|
340
327
|
}
|
|
@@ -364,6 +351,20 @@ function ToLogin(options, injector, url) {
|
|
|
364
351
|
}
|
|
365
352
|
}
|
|
366
353
|
|
|
354
|
+
/**
|
|
355
|
+
* Whether to allow anonymous login
|
|
356
|
+
*
|
|
357
|
+
* 是否允许匿名登录
|
|
358
|
+
*
|
|
359
|
+
* @example
|
|
360
|
+
* this.http.post(`login`, {
|
|
361
|
+
* name: 'cipchk', pwd: '123456'
|
|
362
|
+
* }, {
|
|
363
|
+
* context: new HttpContext().set(ALLOW_ANONYMOUS, true)
|
|
364
|
+
* })
|
|
365
|
+
*/
|
|
366
|
+
const ALLOW_ANONYMOUS = new HttpContextToken(() => false);
|
|
367
|
+
|
|
367
368
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
368
369
|
class HttpAuthInterceptorHandler {
|
|
369
370
|
constructor(next, interceptor) {
|
|
@@ -421,10 +422,10 @@ class BaseInterceptor {
|
|
|
421
422
|
}
|
|
422
423
|
return next.handle(req);
|
|
423
424
|
}
|
|
424
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.
|
|
425
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.
|
|
425
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: BaseInterceptor, deps: [{ token: i0.Injector, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
426
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: BaseInterceptor }); }
|
|
426
427
|
}
|
|
427
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.
|
|
428
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: BaseInterceptor, decorators: [{
|
|
428
429
|
type: Injectable
|
|
429
430
|
}], ctorParameters: function () { return [{ type: i0.Injector, decorators: [{
|
|
430
431
|
type: Optional
|
|
@@ -482,6 +483,7 @@ function b64DecodeUnicode(str) {
|
|
|
482
483
|
.join(''));
|
|
483
484
|
}
|
|
484
485
|
|
|
486
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
485
487
|
class JWTTokenModel {
|
|
486
488
|
/**
|
|
487
489
|
* 获取载荷信息
|
|
@@ -538,70 +540,72 @@ class JWTInterceptor extends BaseInterceptor {
|
|
|
538
540
|
}
|
|
539
541
|
});
|
|
540
542
|
}
|
|
541
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.
|
|
542
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.
|
|
543
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: JWTInterceptor, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
544
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: JWTInterceptor }); }
|
|
543
545
|
}
|
|
544
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.
|
|
546
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: JWTInterceptor, decorators: [{
|
|
545
547
|
type: Injectable
|
|
546
548
|
}] });
|
|
547
549
|
|
|
548
|
-
|
|
549
|
-
* JWT 路由守卫, [ACL Document](https://ng-alain.com/auth/guard).
|
|
550
|
-
*
|
|
551
|
-
* ```ts
|
|
552
|
-
* data: {
|
|
553
|
-
* path: 'home',
|
|
554
|
-
* canActivate: [ JWTGuard ]
|
|
555
|
-
* },
|
|
556
|
-
* {
|
|
557
|
-
* path: 'my',
|
|
558
|
-
* canActivateChild: [JWTGuard],
|
|
559
|
-
* children: [
|
|
560
|
-
* { path: 'profile', component: MockComponent }
|
|
561
|
-
* ],
|
|
562
|
-
* },
|
|
563
|
-
* ```
|
|
564
|
-
*/
|
|
565
|
-
class JWTGuard {
|
|
566
|
-
get cog() {
|
|
567
|
-
return this.srv.options;
|
|
568
|
-
}
|
|
550
|
+
class AuthJWTGuardService {
|
|
569
551
|
constructor(srv, injector) {
|
|
570
552
|
this.srv = srv;
|
|
571
553
|
this.injector = injector;
|
|
572
554
|
}
|
|
573
|
-
process() {
|
|
574
|
-
const
|
|
555
|
+
process(url) {
|
|
556
|
+
const cog = this.srv.options;
|
|
557
|
+
const res = CheckJwt(this.srv.get(JWTTokenModel), cog.token_exp_offset);
|
|
575
558
|
if (!res) {
|
|
576
|
-
ToLogin(
|
|
559
|
+
ToLogin(cog, this.injector, url);
|
|
577
560
|
}
|
|
578
561
|
return res;
|
|
579
562
|
}
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
this.url = route.path;
|
|
583
|
-
return this.process();
|
|
584
|
-
}
|
|
585
|
-
// all children route
|
|
586
|
-
canActivateChild(_childRoute, state) {
|
|
587
|
-
this.url = state.url;
|
|
588
|
-
return this.process();
|
|
589
|
-
}
|
|
590
|
-
// route
|
|
591
|
-
canActivate(_route, state) {
|
|
592
|
-
this.url = state.url;
|
|
593
|
-
return this.process();
|
|
594
|
-
}
|
|
595
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.5", ngImport: i0, type: JWTGuard, deps: [{ token: DA_SERVICE_TOKEN }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
596
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.5", ngImport: i0, type: JWTGuard, providedIn: 'root' }); }
|
|
563
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: AuthJWTGuardService, deps: [{ token: DA_SERVICE_TOKEN }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
564
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: AuthJWTGuardService, providedIn: 'root' }); }
|
|
597
565
|
}
|
|
598
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.
|
|
566
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: AuthJWTGuardService, decorators: [{
|
|
599
567
|
type: Injectable,
|
|
600
568
|
args: [{ providedIn: 'root' }]
|
|
601
569
|
}], ctorParameters: function () { return [{ type: undefined, decorators: [{
|
|
602
570
|
type: Inject,
|
|
603
571
|
args: [DA_SERVICE_TOKEN]
|
|
604
572
|
}] }, { type: i0.Injector }]; } });
|
|
573
|
+
/**
|
|
574
|
+
* JWT 路由守卫, [ACL Document](https://ng-alain.com/auth/guard).
|
|
575
|
+
*
|
|
576
|
+
* ```ts
|
|
577
|
+
* data: {
|
|
578
|
+
* path: 'home',
|
|
579
|
+
* canActivate: [ authJWTCanActivate ],
|
|
580
|
+
* data: { guard: 'user1' }
|
|
581
|
+
* }
|
|
582
|
+
* ```
|
|
583
|
+
*/
|
|
584
|
+
const authJWTCanActivate = (_, state) => inject(AuthJWTGuardService).process(state.url);
|
|
585
|
+
/**
|
|
586
|
+
* JWT 路由守卫, [ACL Document](https://ng-alain.com/auth/guard).
|
|
587
|
+
*
|
|
588
|
+
* ```ts
|
|
589
|
+
* data: {
|
|
590
|
+
* path: 'home',
|
|
591
|
+
* canActivateChild: [ authJWTCanActivateChild ],
|
|
592
|
+
* data: { guard: 'user1' }
|
|
593
|
+
* }
|
|
594
|
+
* ```
|
|
595
|
+
*/
|
|
596
|
+
const authJWTCanActivateChild = (_, state) => inject(AuthJWTGuardService).process(state.url);
|
|
597
|
+
/**
|
|
598
|
+
* JWT 路由守卫, [ACL Document](https://ng-alain.com/auth/guard).
|
|
599
|
+
*
|
|
600
|
+
* ```ts
|
|
601
|
+
* data: {
|
|
602
|
+
* path: 'home',
|
|
603
|
+
* canMatch: [ authJWTCanMatch ],
|
|
604
|
+
* data: { guard: 'user1' }
|
|
605
|
+
* }
|
|
606
|
+
* ```
|
|
607
|
+
*/
|
|
608
|
+
const authJWTCanMatch = route => inject(AuthJWTGuardService).process(route.path);
|
|
605
609
|
|
|
606
610
|
class SimpleTokenModel {
|
|
607
611
|
}
|
|
@@ -645,77 +649,78 @@ class SimpleInterceptor extends BaseInterceptor {
|
|
|
645
649
|
}
|
|
646
650
|
return req;
|
|
647
651
|
}
|
|
648
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.
|
|
649
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.
|
|
652
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: SimpleInterceptor, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
653
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: SimpleInterceptor }); }
|
|
650
654
|
}
|
|
651
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.
|
|
655
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: SimpleInterceptor, decorators: [{
|
|
652
656
|
type: Injectable
|
|
653
657
|
}] });
|
|
654
658
|
|
|
655
|
-
|
|
656
|
-
* Simple 路由守卫, [ACL Document](https://ng-alain.com/auth/guard).
|
|
657
|
-
*
|
|
658
|
-
* ```ts
|
|
659
|
-
* data: {
|
|
660
|
-
* path: 'home',
|
|
661
|
-
* canActivate: [ SimpleGuard ]
|
|
662
|
-
* },
|
|
663
|
-
* {
|
|
664
|
-
* path: 'my',
|
|
665
|
-
* canActivateChild: [SimpleGuard],
|
|
666
|
-
* children: [
|
|
667
|
-
* { path: 'profile', component: MockComponent }
|
|
668
|
-
* ],
|
|
669
|
-
* },
|
|
670
|
-
* ```
|
|
671
|
-
*/
|
|
672
|
-
class SimpleGuard {
|
|
673
|
-
get cog() {
|
|
674
|
-
return this.srv.options;
|
|
675
|
-
}
|
|
659
|
+
class AuthSimpleGuardService {
|
|
676
660
|
constructor(srv, injector) {
|
|
677
661
|
this.srv = srv;
|
|
678
662
|
this.injector = injector;
|
|
679
663
|
}
|
|
680
|
-
process() {
|
|
664
|
+
process(url) {
|
|
681
665
|
const res = CheckSimple(this.srv.get());
|
|
682
666
|
if (!res) {
|
|
683
|
-
ToLogin(this.
|
|
667
|
+
ToLogin(this.srv.options, this.injector, url);
|
|
684
668
|
}
|
|
685
669
|
return res;
|
|
686
670
|
}
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
this.url = route.path;
|
|
690
|
-
return this.process();
|
|
691
|
-
}
|
|
692
|
-
// all children route
|
|
693
|
-
canActivateChild(_childRoute, state) {
|
|
694
|
-
this.url = state.url;
|
|
695
|
-
return this.process();
|
|
696
|
-
}
|
|
697
|
-
// route
|
|
698
|
-
canActivate(_route, state) {
|
|
699
|
-
this.url = state.url;
|
|
700
|
-
return this.process();
|
|
701
|
-
}
|
|
702
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.5", ngImport: i0, type: SimpleGuard, deps: [{ token: DA_SERVICE_TOKEN }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
703
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.5", ngImport: i0, type: SimpleGuard, providedIn: 'root' }); }
|
|
671
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: AuthSimpleGuardService, deps: [{ token: DA_SERVICE_TOKEN }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
672
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: AuthSimpleGuardService, providedIn: 'root' }); }
|
|
704
673
|
}
|
|
705
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.
|
|
674
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: AuthSimpleGuardService, decorators: [{
|
|
706
675
|
type: Injectable,
|
|
707
676
|
args: [{ providedIn: 'root' }]
|
|
708
677
|
}], ctorParameters: function () { return [{ type: undefined, decorators: [{
|
|
709
678
|
type: Inject,
|
|
710
679
|
args: [DA_SERVICE_TOKEN]
|
|
711
680
|
}] }, { type: i0.Injector }]; } });
|
|
681
|
+
/**
|
|
682
|
+
* Simple 路由守卫, [ACL Document](https://ng-alain.com/auth/guard).
|
|
683
|
+
*
|
|
684
|
+
* ```ts
|
|
685
|
+
* data: {
|
|
686
|
+
* path: 'home',
|
|
687
|
+
* canActivate: [ authSimpleCanActivate ],
|
|
688
|
+
* data: { guard: 'user1' }
|
|
689
|
+
* }
|
|
690
|
+
* ```
|
|
691
|
+
*/
|
|
692
|
+
const authSimpleCanActivate = (_, state) => inject(AuthSimpleGuardService).process(state.url);
|
|
693
|
+
/**
|
|
694
|
+
* Simple 路由守卫, [ACL Document](https://ng-alain.com/auth/guard).
|
|
695
|
+
*
|
|
696
|
+
* ```ts
|
|
697
|
+
* data: {
|
|
698
|
+
* path: 'home',
|
|
699
|
+
* canActivateChild: [ authSimpleCanActivateChild ],
|
|
700
|
+
* data: { guard: 'user1' }
|
|
701
|
+
* }
|
|
702
|
+
* ```
|
|
703
|
+
*/
|
|
704
|
+
const authSimpleCanActivateChild = (_, state) => inject(AuthSimpleGuardService).process(state.url);
|
|
705
|
+
/**
|
|
706
|
+
* Simple 路由守卫, [ACL Document](https://ng-alain.com/auth/guard).
|
|
707
|
+
*
|
|
708
|
+
* ```ts
|
|
709
|
+
* data: {
|
|
710
|
+
* path: 'home',
|
|
711
|
+
* canMatch: [ authSimpleCanMatch ],
|
|
712
|
+
* data: { guard: 'user1' }
|
|
713
|
+
* }
|
|
714
|
+
* ```
|
|
715
|
+
*/
|
|
716
|
+
const authSimpleCanMatch = route => inject(AuthSimpleGuardService).process(route.path);
|
|
712
717
|
|
|
713
718
|
class DelonAuthModule {
|
|
714
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.
|
|
715
|
-
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.1.
|
|
716
|
-
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.1.
|
|
719
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: DelonAuthModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
|
|
720
|
+
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.1.8", ngImport: i0, type: DelonAuthModule }); }
|
|
721
|
+
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: DelonAuthModule }); }
|
|
717
722
|
}
|
|
718
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.
|
|
723
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: DelonAuthModule, decorators: [{
|
|
719
724
|
type: NgModule,
|
|
720
725
|
args: [{}]
|
|
721
726
|
}] });
|
|
@@ -724,5 +729,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.5", ngImpor
|
|
|
724
729
|
* Generated bundle index. Do not edit.
|
|
725
730
|
*/
|
|
726
731
|
|
|
727
|
-
export { ALLOW_ANONYMOUS, AUTH_DEFAULT_CONFIG, BaseInterceptor, CookieStorageStore, DA_SERVICE_TOKEN, DA_SERVICE_TOKEN_FACTORY, DA_STORE_TOKEN, DA_STORE_TOKEN_LOCAL_FACTORY, DelonAuthModule,
|
|
732
|
+
export { ALLOW_ANONYMOUS, AUTH_DEFAULT_CONFIG, AuthJWTGuardService, AuthSimpleGuardService, BaseInterceptor, CookieStorageStore, DA_SERVICE_TOKEN, DA_SERVICE_TOKEN_FACTORY, DA_STORE_TOKEN, DA_STORE_TOKEN_LOCAL_FACTORY, DelonAuthModule, JWTInterceptor, JWTTokenModel, LocalStorageStore, MemoryStore, SessionStorageStore, SimpleInterceptor, SimpleTokenModel, SocialService, TokenService, authJWTCanActivate, authJWTCanActivateChild, authJWTCanMatch, authSimpleCanActivate, authSimpleCanActivateChild, authSimpleCanMatch, mergeConfig, urlBase64Decode };
|
|
728
733
|
//# sourceMappingURL=auth.mjs.map
|