@unipin/angular-applet 18.6.1 → 18.6.2
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/lib/guards/auth/auth.guard.mjs +7 -5
- package/esm2022/lib/modules/permission/pages/loading/loading.page.mjs +2 -2
- package/fesm2022/unipin-angular-applet.mjs +7 -5
- package/fesm2022/unipin-angular-applet.mjs.map +1 -1
- package/lib/modules/permission/pages/loading/loading.page.d.ts +3 -0
- package/package.json +1 -1
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { inject } from '@angular/core';
|
|
2
|
-
import {
|
|
2
|
+
import { Router } from '@angular/router';
|
|
3
3
|
import { AuthResolver } from '../../resolvers';
|
|
4
4
|
export const AuthGuard = () => {
|
|
5
5
|
const resolver = inject(AuthResolver);
|
|
6
|
-
const
|
|
7
|
-
if (!resolver.isUserLoggedIn())
|
|
8
|
-
|
|
6
|
+
const router = inject(Router);
|
|
7
|
+
if (!resolver.isUserLoggedIn()) {
|
|
8
|
+
router.navigateByUrl('/auth/login');
|
|
9
|
+
window.location.reload();
|
|
10
|
+
}
|
|
9
11
|
return true;
|
|
10
12
|
};
|
|
11
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL3VuaXBpbi1hbmd1bGFyL3NyYy9saWIvZ3VhcmRzL2F1dGgvYXV0aC5ndWFyZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3ZDLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUN6QyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0saUJBQWlCLENBQUM7QUFFL0MsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFrQixHQUFZLEVBQUU7SUFDcEQsTUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO0lBRXRDLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUU5QixJQUFJLENBQUMsUUFBUSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQUM7UUFDL0IsTUFBTSxDQUFDLGFBQWEsQ0FBQyxhQUFhLENBQUMsQ0FBQztRQUNwQyxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQzNCLENBQUM7SUFDRCxPQUFPLElBQUksQ0FBQztBQUNkLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGluamVjdCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgUm91dGVyIH0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcbmltcG9ydCB7IEF1dGhSZXNvbHZlciB9IGZyb20gJy4uLy4uL3Jlc29sdmVycyc7XG5cbmV4cG9ydCBjb25zdCBBdXRoR3VhcmQ6ICgpID0+IGJvb2xlYW4gPSAoKTogYm9vbGVhbiA9PiB7XG4gIGNvbnN0IHJlc29sdmVyID0gaW5qZWN0KEF1dGhSZXNvbHZlcik7XG4gIFxuICBjb25zdCByb3V0ZXIgPSBpbmplY3QoUm91dGVyKTtcblxuICBpZiAoIXJlc29sdmVyLmlzVXNlckxvZ2dlZEluKCkpIHtcbiAgICByb3V0ZXIubmF2aWdhdGVCeVVybCgnL2F1dGgvbG9naW4nKTtcbiAgICB3aW5kb3cubG9jYXRpb24ucmVsb2FkKCk7XG4gIH1cbiAgcmV0dXJuIHRydWU7XG59O1xuIl19
|
|
@@ -18,7 +18,7 @@ export class LoadingPage {
|
|
|
18
18
|
return;
|
|
19
19
|
}
|
|
20
20
|
const permCodeList = [];
|
|
21
|
-
this.sub = this.permissionService.getPermissions({ pageSize: 1000, subjectGuid, permModule: this.config.permModule, permType: this.config.permType },
|
|
21
|
+
this.sub = this.permissionService.getPermissions({ pageSize: 1000, subjectGuid, permModule: this.config.permModule, permType: this.config.permType }, this.config.fetchPolicy).subscribe({
|
|
22
22
|
next: ({ data: { authMsPermission: { data } } }) => {
|
|
23
23
|
data.forEach(({ permCode }) => {
|
|
24
24
|
if (!permCode)
|
|
@@ -47,4 +47,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.4", ngImpor
|
|
|
47
47
|
type: Inject,
|
|
48
48
|
args: ['LOADING_CONFIG']
|
|
49
49
|
}] }, { type: i1.Router }, { type: i1.ActivatedRoute }, { type: i2.PermissionService }] });
|
|
50
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9hZGluZy5wYWdlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvdW5pcGluLWFuZ3VsYXIvc3JjL2xpYi9tb2R1bGVzL3Blcm1pc3Npb24vcGFnZXMvbG9hZGluZy9sb2FkaW5nLnBhZ2UudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy91bmlwaW4tYW5ndWxhci9zcmMvbGliL21vZHVsZXMvcGVybWlzc2lvbi9wYWdlcy9sb2FkaW5nL2xvYWRpbmcucGFnZS5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFxQixNQUFNLGVBQWUsQ0FBQztBQUdyRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7Ozs7O0FBZ0I3QyxNQUFNLE9BQU8sV0FBVztJQUl0QixZQUM0QyxNQUt6QyxFQUNrQixNQUFjLEVBQ2QsS0FBcUIsRUFDckIsaUJBQW9DO1FBUmIsV0FBTSxHQUFOLE1BQU0sQ0FLL0M7UUFDa0IsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUNkLFVBQUssR0FBTCxLQUFLLENBQWdCO1FBQ3JCLHNCQUFpQixHQUFqQixpQkFBaUIsQ0FBbUI7SUFDckQsQ0FBQztJQUVFLFFBQVE7UUFDYixNQUFNLFdBQVcsR0FBRyxZQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMscUJBQXFCLElBQUksVUFBVSxDQUFDLENBQUM7UUFDMUYsSUFBSSxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQ2pCLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUUsS0FBSyxDQUFFLENBQUMsQ0FBQztZQUNoQyxPQUFPO1FBQ1QsQ0FBQztRQUVELE1BQU0sWUFBWSxHQUFhLEVBQUUsQ0FBQztRQUNsQyxJQUFJLENBQUMsR0FBRyxHQUFHLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxjQUFjLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxVQUFVLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFFLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQyxTQUFTLENBQUM7WUFDdkwsSUFBSSxFQUFFLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxnQkFBZ0IsRUFBRSxFQUFFLElBQUksRUFBRSxFQUFDLEVBQUMsRUFBRSxFQUFFO2dCQUMvQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFO29CQUM1QixJQUFJLENBQUMsUUFBUTt3QkFBRSxPQUFPO29CQUV0QixZQUFZLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO2dCQUM5QixDQUFDLENBQUMsQ0FBQztnQkFFSCxJQUFJLENBQUMsaUJBQWlCLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQztnQkFDMUMsSUFBSSxDQUFDLGlCQUFpQixDQUFDLGFBQWEsQ0FBQyxZQUFZLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQztnQkFFM0UsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsSUFBRyxFQUFFLENBQUMsQ0FBQztZQUMvRSxDQUFDO1lBQ0QsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUUsS0FBSyxDQUFFLENBQUM7U0FDN0MsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUVNLFdBQVcsS0FBVSxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQUMsQ0FBQzs4R0F6QzFDLFdBQVcsa0JBS1osZ0JBQWdCO2tHQUxmLFdBQVcsbUxDbkJ4QixnSkFFQSw4RkRjSSxXQUFXOzsyRkFHRixXQUFXO2tCQVp2QixTQUFTO2lDQUNJLElBQUksWUFDTixZQUFZLFFBR2hCO3dCQUNKLEtBQUssRUFBRSxpRkFBaUY7cUJBQ3pGLFdBQ1E7d0JBQ1AsV0FBVztxQkFDWjs7MEJBT0UsTUFBTTsyQkFBQyxnQkFBZ0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb21wb25lbnQsIEluamVjdCwgT25EZXN0cm95LCBPbkluaXQgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEFjdGl2YXRlZFJvdXRlLCBSb3V0ZXIgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgU3Vic2NyaXB0aW9uIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBJb25pY01vZHVsZSB9IGZyb20gJ0Bpb25pYy9hbmd1bGFyJztcbmltcG9ydCB7IEZldGNoUG9saWN5IH0gZnJvbSAnQGFwb2xsby9jbGllbnQvY29yZSc7XG5pbXBvcnQgeyBQZXJtaXNzaW9uU2VydmljZSB9IGZyb20gJy4uLy4uL3NlcnZpY2VzL3Blcm1pc3Npb24uc2VydmljZSc7XG5cbkBDb21wb25lbnQoe1xuICBzdGFuZGFsb25lOiB0cnVlLFxuICBzZWxlY3RvcjogJ3VwLWxvYWRpbmcnLFxuICBzdHlsZVVybDogJy4vbG9hZGluZy5wYWdlLnNjc3MnLFxuICB0ZW1wbGF0ZVVybDogJy4vbG9hZGluZy5wYWdlLmh0bWwnLFxuICBob3N0OiB7XG4gICAgY2xhc3M6ICdkLWZsZXggZmxleC1jb2x1bW4gYWxpZ24taXRlbXMtY2VudGVyIGp1c3RpZnktY29udGVudC1jZW50ZXIgaC0xMDAgdy03NSBteC1hdXRvJ1xuICB9LFxuICBpbXBvcnRzOiBbXG4gICAgSW9uaWNNb2R1bGVcbiAgXVxufSlcbmV4cG9ydCBjbGFzcyBMb2FkaW5nUGFnZSBpbXBsZW1lbnRzIE9uSW5pdCwgT25EZXN0cm95IHtcblxuICBwcm90ZWN0ZWQgc3ViITogU3Vic2NyaXB0aW9uO1xuXG4gIGNvbnN0cnVjdG9yKFxuICAgIEBJbmplY3QoJ0xPQURJTkdfQ09ORklHJykgcHVibGljIHJlYWRvbmx5IGNvbmZpZzoge1xuICAgICAgcGVybU1vZHVsZTogc3RyaW5nW10sXG4gICAgICBwZXJtVHlwZTogc3RyaW5nW10sXG4gICAgICBmZXRjaFBvbGljeT86IEZldGNoUG9saWN5XG4gICAgICBzdWJqZWN0R3VpZFN0b3JhZ2VLZXk/OiBzdHJpbmdcbiAgICB9LFxuICAgIHByb3RlY3RlZCByZWFkb25seSByb3V0ZXI6IFJvdXRlcixcbiAgICBwcm90ZWN0ZWQgcmVhZG9ubHkgcm91dGU6IEFjdGl2YXRlZFJvdXRlLFxuICAgIHByb3RlY3RlZCByZWFkb25seSBwZXJtaXNzaW9uU2VydmljZTogUGVybWlzc2lvblNlcnZpY2VcbiAgKSB7IH1cblxuICBwdWJsaWMgbmdPbkluaXQoKTogdm9pZHtcbiAgICBjb25zdCBzdWJqZWN0R3VpZCA9IGxvY2FsU3RvcmFnZS5nZXRJdGVtKHRoaXMuY29uZmlnLnN1YmplY3RHdWlkU3RvcmFnZUtleSB8fCAndXNlckd1aWQnKTtcbiAgICBpZiAoIXN1YmplY3RHdWlkKSB7XG4gICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbICc0MDEnIF0pO1xuICAgICAgcmV0dXJuO1xuICAgIH1cbiAgICBcbiAgICBjb25zdCBwZXJtQ29kZUxpc3Q6IHN0cmluZ1tdID0gW107XG4gICAgdGhpcy5zdWIgPSB0aGlzLnBlcm1pc3Npb25TZXJ2aWNlLmdldFBlcm1pc3Npb25zKHsgcGFnZVNpemU6IDEwMDAsIHN1YmplY3RHdWlkLCBwZXJtTW9kdWxlOiB0aGlzLmNvbmZpZy5wZXJtTW9kdWxlLCBwZXJtVHlwZTogdGhpcy5jb25maWcucGVybVR5cGUgfSwgdGhpcy5jb25maWcuZmV0Y2hQb2xpY3kpLnN1YnNjcmliZSh7XG4gICAgICBuZXh0OiAoeyBkYXRhOiB7IGF1dGhNc1Blcm1pc3Npb246IHsgZGF0YSB9fX0pID0+IHtcbiAgICAgICAgZGF0YS5mb3JFYWNoKCh7IHBlcm1Db2RlIH0pID0+IHtcbiAgICAgICAgICBpZiAoIXBlcm1Db2RlKSByZXR1cm47XG5cbiAgICAgICAgICBwZXJtQ29kZUxpc3QucHVzaChwZXJtQ29kZSk7XG4gICAgICAgIH0pO1xuXG4gICAgICAgIHRoaXMucGVybWlzc2lvblNlcnZpY2UuaXNJbml0aWF0ZWQgPSB0cnVlO1xuICAgICAgICB0aGlzLnBlcm1pc3Npb25TZXJ2aWNlLnNldFBlcm1pc3Npb24ocGVybUNvZGVMaXN0LCB0aGlzLmNvbmZpZy5wZXJtTW9kdWxlKTtcblxuICAgICAgICB0aGlzLnJvdXRlci5uYXZpZ2F0ZUJ5VXJsKHRoaXMucm91dGUuc25hcHNob3QucXVlcnlQYXJhbU1hcC5nZXQoJ3VybCcpPz8gJycpO1xuICAgICAgfSxcbiAgICAgIGVycm9yOiAoKSA9PiB0aGlzLnJvdXRlci5uYXZpZ2F0ZShbICc0MDEnIF0pXG4gICAgfSk7XG4gIH1cblxuICBwdWJsaWMgbmdPbkRlc3Ryb3koKTogdm9pZHsgdGhpcy5zdWIudW5zdWJzY3JpYmUoKTsgfVxufVxuIiwiPGlvbi1zcGlubmVyIGNsYXNzPVwibWItNFwiIC8+XG48aDMgY2xhc3M9XCJ0ZXh0LWNlbnRlclwiPlBsZWFzZSB3YWl0LCB3ZSdyZSBwcmVwYXJpbmcgdGhlIGFwcGxldC4gRHJpbmsgd2F0ZXIgb3IgY29mZmVlIHdoaWxlIHdhaXRpbmcuPC9oMz5cbiJdfQ==
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
2
|
import { EventEmitter, Component, ChangeDetectionStrategy, Input, Output, ViewChild, Attribute, HostBinding, enableProdMode, NgZone, Injectable, Inject, Directive, inject, NgModule, HostListener, Pipe, ContentChildren } from '@angular/core';
|
|
3
3
|
import * as i1 from '@ionic/angular';
|
|
4
|
-
import { IonButton, IonicModule
|
|
4
|
+
import { IonButton, IonicModule } from '@ionic/angular';
|
|
5
5
|
import * as i1$2 from '@angular/router';
|
|
6
6
|
import { Router, RouterLink, RouterLinkActive, NavigationEnd } from '@angular/router';
|
|
7
7
|
import { Subject, fromEvent, distinctUntilChanged, debounceTime, tap, switchMap, map, catchError, of, concat, filter, throwError } from 'rxjs';
|
|
@@ -226,7 +226,7 @@ class LoadingPage {
|
|
|
226
226
|
return;
|
|
227
227
|
}
|
|
228
228
|
const permCodeList = [];
|
|
229
|
-
this.sub = this.permissionService.getPermissions({ pageSize: 1000, subjectGuid, permModule: this.config.permModule, permType: this.config.permType },
|
|
229
|
+
this.sub = this.permissionService.getPermissions({ pageSize: 1000, subjectGuid, permModule: this.config.permModule, permType: this.config.permType }, this.config.fetchPolicy).subscribe({
|
|
230
230
|
next: ({ data: { authMsPermission: { data } } }) => {
|
|
231
231
|
data.forEach(({ permCode }) => {
|
|
232
232
|
if (!permCode)
|
|
@@ -3782,9 +3782,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.4", ngImpor
|
|
|
3782
3782
|
|
|
3783
3783
|
const AuthGuard = () => {
|
|
3784
3784
|
const resolver = inject(AuthResolver);
|
|
3785
|
-
const
|
|
3786
|
-
if (!resolver.isUserLoggedIn())
|
|
3787
|
-
|
|
3785
|
+
const router = inject(Router);
|
|
3786
|
+
if (!resolver.isUserLoggedIn()) {
|
|
3787
|
+
router.navigateByUrl('/auth/login');
|
|
3788
|
+
window.location.reload();
|
|
3789
|
+
}
|
|
3788
3790
|
return true;
|
|
3789
3791
|
};
|
|
3790
3792
|
|