@frontegg/angular 4.5.1 → 4.5.3-alpha.80779
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/bundles/frontegg-angular.umd.js +49 -55
- package/bundles/frontegg-angular.umd.js.map +1 -1
- package/bundles/frontegg-angular.umd.min.js +1 -1
- package/bundles/frontegg-angular.umd.min.js.map +1 -1
- package/esm2015/lib/frontegg-app.service.js +21 -19
- package/esm2015/lib/guards/frontegg-auth.guard.js +2 -2
- package/esm2015/lib/guards/frontegg-load.guard.js +4 -9
- package/fesm2015/frontegg-angular.js +46 -47
- package/fesm2015/frontegg-angular.js.map +1 -1
- package/frontegg-angular.metadata.json +1 -1
- package/lib/frontegg-app.service.d.ts +3 -1
- package/lib/frontegg-app.service.d.ts.map +1 -1
- package/lib/guards/frontegg-load.guard.d.ts +3 -5
- package/lib/guards/frontegg-load.guard.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Inject, Injectable } from '@angular/core';
|
|
2
|
-
import {
|
|
1
|
+
import { Inject, Injectable, NgZone } from '@angular/core';
|
|
2
|
+
import { Router } from '@angular/router';
|
|
3
3
|
import { initialize } from '@frontegg/admin-portal';
|
|
4
4
|
import { BehaviorSubject } from 'rxjs';
|
|
5
5
|
import { FronteggLoadGuard } from './guards/frontegg-load.guard';
|
|
@@ -15,9 +15,10 @@ export class FronteggAppOptionsClass {
|
|
|
15
15
|
}
|
|
16
16
|
}
|
|
17
17
|
export class FronteggAppService {
|
|
18
|
-
constructor(config, router) {
|
|
18
|
+
constructor(config, router, ngZone) {
|
|
19
19
|
this.config = config;
|
|
20
20
|
this.router = router;
|
|
21
|
+
this.ngZone = ngZone;
|
|
21
22
|
this.isLoadingSubject = new BehaviorSubject(true);
|
|
22
23
|
this.isAuthenticatedSubject = new BehaviorSubject(false);
|
|
23
24
|
this.stateSubject = new BehaviorSubject({});
|
|
@@ -39,12 +40,21 @@ export class FronteggAppService {
|
|
|
39
40
|
window.location.href = path;
|
|
40
41
|
}
|
|
41
42
|
else {
|
|
42
|
-
|
|
43
|
-
|
|
43
|
+
console.warn('FronteggRouting.start');
|
|
44
|
+
try {
|
|
45
|
+
console.warn('FronteggRouting', ngZone.isStable, NgZone.isInAngularZone());
|
|
44
46
|
}
|
|
45
|
-
|
|
46
|
-
this.router.navigate([path], { queryParamsHandling: 'merge' });
|
|
47
|
+
catch (e) {
|
|
47
48
|
}
|
|
49
|
+
this.ngZone.run(() => {
|
|
50
|
+
console.warn('FronteggRouting.inside-ngZone');
|
|
51
|
+
if (opts === null || opts === void 0 ? void 0 : opts.replace) {
|
|
52
|
+
this.router.navigateByUrl(path, { replaceUrl: true });
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
this.router.navigateByUrl(path);
|
|
56
|
+
}
|
|
57
|
+
});
|
|
48
58
|
}
|
|
49
59
|
};
|
|
50
60
|
ContextHolder.setOnRedirectTo(onRedirectTo);
|
|
@@ -58,15 +68,6 @@ export class FronteggAppService {
|
|
|
58
68
|
children: [...this.router.config],
|
|
59
69
|
},
|
|
60
70
|
]);
|
|
61
|
-
this.router.events.subscribe((event) => {
|
|
62
|
-
if (event instanceof NavigationStart) {
|
|
63
|
-
const authRoutes = this.mapAuthComponents.map(({ path }) => (path === null || path === void 0 ? void 0 : path.startsWith('/')) ? path : `/${path}`);
|
|
64
|
-
const curr = authRoutes.find((path) => event.url.split('?')[0] !== path && event.url.startsWith(path));
|
|
65
|
-
if (curr) {
|
|
66
|
-
this.router.navigate([`${curr}${decodeURIComponent(event.url.split(curr)[1])}`], { queryParamsHandling: 'merge' });
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
});
|
|
70
71
|
// Subscribe on fronteggApp store to change state subjects
|
|
71
72
|
this.fronteggApp.store.subscribe(() => {
|
|
72
73
|
const fronteggStore = this.fronteggApp.store.getState();
|
|
@@ -135,7 +136,7 @@ export class FronteggAppService {
|
|
|
135
136
|
(_a = this.fronteggApp) === null || _a === void 0 ? void 0 : _a.hideAdminPortal();
|
|
136
137
|
}
|
|
137
138
|
}
|
|
138
|
-
FronteggAppService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FronteggAppService_Factory() { return new FronteggAppService(i0.ɵɵinject(FronteggAppOptionsClass), i0.ɵɵinject(i1.Router)); }, token: FronteggAppService, providedIn: "root" });
|
|
139
|
+
FronteggAppService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FronteggAppService_Factory() { return new FronteggAppService(i0.ɵɵinject(FronteggAppOptionsClass), i0.ɵɵinject(i1.Router), i0.ɵɵinject(i0.NgZone)); }, token: FronteggAppService, providedIn: "root" });
|
|
139
140
|
FronteggAppService.decorators = [
|
|
140
141
|
{ type: Injectable, args: [{
|
|
141
142
|
providedIn: 'root',
|
|
@@ -143,6 +144,7 @@ FronteggAppService.decorators = [
|
|
|
143
144
|
];
|
|
144
145
|
FronteggAppService.ctorParameters = () => [
|
|
145
146
|
{ type: undefined, decorators: [{ type: Inject, args: [FronteggAppOptionsClass,] }] },
|
|
146
|
-
{ type: Router }
|
|
147
|
+
{ type: Router },
|
|
148
|
+
{ type: NgZone }
|
|
147
149
|
];
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"frontegg-app.service.js","sourceRoot":"","sources":["../../../../../projects/frontegg-app/src/lib/frontegg-app.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable } from '@angular/core';\nimport { NavigationStart, Route, Router, RoutesRecognized } from '@angular/router';\nimport { AuthPageRoutes, FronteggState, initialize } from '@frontegg/admin-portal';\nimport { FronteggAppInstance, FronteggAppOptions } from '@frontegg/types';\nimport { BehaviorSubject, Observable } from 'rxjs';\nimport { FronteggLoadGuard } from './guards/frontegg-load.guard';\nimport { ContextHolder, RedirectOptions } from '@frontegg/rest-api';\nimport { FronteggComponent } from './frontegg.component';\n\ntype FronteggApp = FronteggAppInstance & {\n  showAdminPortal(): void;\n  hideAdminPortal(): void;\n};\n\nexport class FronteggAppOptionsClass implements FronteggAppOptions {\n  contextOptions: FronteggAppOptions['contextOptions'] = {\n    baseUrl: 'https://david.frontegg.com',\n  };\n}\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class FronteggAppService {\n  fronteggApp: FronteggApp;\n\n  private isLoadingSubject = new BehaviorSubject<boolean>(true);\n  private isAuthenticatedSubject = new BehaviorSubject<boolean>(false);\n  private stateSubject = new BehaviorSubject<FronteggState>({} as FronteggState);\n  private authStateSubject = new BehaviorSubject<FronteggState['auth']>({} as FronteggState['auth']);\n  private auditsStateSubject = new BehaviorSubject<FronteggState['audits']>({} as FronteggState['audits']);\n  private connectivityStateSubject = new BehaviorSubject<FronteggState['connectivity']>({} as FronteggState['connectivity']);\n  private subscriptionsStateSubject = new BehaviorSubject<FronteggState['subscriptions']>({} as FronteggState['subscriptions']);\n  private vendorStateSubject = new BehaviorSubject<FronteggState['vendor']>({} as FronteggState['vendor']);\n\n\n  get state$(): Observable<FronteggState> {\n    return this.stateSubject.asObservable();\n  }\n\n  get authState$(): Observable<FronteggState['auth']> {\n    return this.authStateSubject.asObservable();\n  }\n\n  get auditsState$(): Observable<FronteggState['audits']> {\n    return this.auditsStateSubject.asObservable();\n  }\n\n  get connectivityState$(): Observable<FronteggState['connectivity']> {\n    return this.connectivityStateSubject.asObservable();\n  }\n\n  get subscriptionsState$(): Observable<FronteggState['subscriptions']> {\n    return this.subscriptionsStateSubject.asObservable();\n  }\n\n  get vendorState$(): Observable<FronteggState['vendor']> {\n    return this.vendorStateSubject.asObservable();\n  }\n\n  get isLoading$(): Observable<boolean> {\n    return this.isLoadingSubject.asObservable();\n  };\n\n\n  get isAuthenticated$(): Observable<boolean> {\n    return this.isAuthenticatedSubject.asObservable();\n  };\n\n  constructor(@Inject(FronteggAppOptionsClass) private config: FronteggAppOptions, private router: Router) {\n    if (!this.config) {\n      throw Error('Need to pass config: FronteggConfigOptions in FronteggAppModule.forRoot(config)');\n    }\n\n    const onRedirectTo = (to: string, opts?: RedirectOptions) => {\n      const baseName = window.location.origin;\n      let path = to;\n      if (path.startsWith(baseName) && baseName !== '/') {\n        path = path.substring(baseName.length - 1);\n      }\n\n      if (opts?.refresh) {\n        window.location.href = path;\n      } else {\n        if (opts?.replace) {\n          this.router.navigate([path], { replaceUrl: true });\n        } else {\n          this.router.navigate([path], {queryParamsHandling: 'merge'});\n        }\n      }\n    };\n    ContextHolder.setOnRedirectTo(onRedirectTo);\n    this.fronteggApp = initialize({\n      onRedirectTo,\n      ...this.config,\n    });\n\n\n    // Add all login box routes to Angular router config\n    this.router.resetConfig([\n      ...this.mapAuthComponents,\n      {\n        path: '',\n        canActivate: [FronteggLoadGuard],\n        children: [...this.router.config],\n      },\n    ]);\n\n    this.router.events.subscribe((event) => {\n      if(event instanceof NavigationStart) {\n        const authRoutes = this.mapAuthComponents.map(({path}) => path?.startsWith('/')? path : `/${path}`);\n        const curr = authRoutes.find((path) => event.url.split('?')[0] !== path && event.url.startsWith(path));\n        if(curr){\n          this.router.navigate([`${curr}${decodeURIComponent(event.url.split(curr)[1])}`], {queryParamsHandling: 'merge'});\n        }\n      }\n    });\n\n    // Subscribe on fronteggApp store to change state subjects\n    this.fronteggApp.store.subscribe(() => {\n      const fronteggStore = this.fronteggApp.store.getState() as FronteggState;\n      if (this.isLoadingSubject.getValue() !== fronteggStore.auth.isLoading) {\n        this.isLoadingSubject.next(fronteggStore.auth.isLoading);\n      }\n      if (this.isAuthenticatedSubject.getValue() !== fronteggStore.auth.isAuthenticated) {\n        this.isAuthenticatedSubject.next(fronteggStore.auth.isAuthenticated);\n      }\n\n      this.stateSubject.next(fronteggStore);\n      this.authStateSubject.next(fronteggStore.auth);\n      this.auditsStateSubject.next(fronteggStore.audits);\n      this.connectivityStateSubject.next(fronteggStore.connectivity);\n      this.subscriptionsStateSubject.next(fronteggStore.subscriptions);\n      this.vendorStateSubject.next(fronteggStore.vendor);\n    });\n  }\n\n  get mapAuthComponents(): Route[] {\n    const authRoutes = this.authRoutes;\n    return (Object.keys(authRoutes) as (keyof AuthPageRoutes)[])\n      .filter((key: keyof AuthPageRoutes) => key !== 'authenticatedUrl' && key !== 'signUpSuccessUrl' && key != null)\n      .map((key: keyof AuthPageRoutes) => ({\n        path: authRoutes[key]?.substring(1),\n        component: FronteggComponent,\n      }));\n  }\n\n  get authRoutes(): AuthPageRoutes {\n    return this.fronteggApp.store.getState().auth.routes;\n  }\n\n  // Open admin portal\n  public showAdminPortal(): void {\n    this.fronteggApp.showAdminPortal();\n  }\n\n  // Open admin portal\n  public hideAdminPortal(): void {\n    this.fronteggApp?.hideAdminPortal();\n  }\n}\n"]}
|
|
150
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"frontegg-app.service.js","sourceRoot":"","sources":["../../../../../projects/frontegg-app/src/lib/frontegg-app.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable, NgZone } from '@angular/core';\nimport { NavigationStart, Route, Router, RoutesRecognized } from '@angular/router';\nimport { AuthPageRoutes, FronteggState, initialize } from '@frontegg/admin-portal';\nimport { FronteggAppInstance, FronteggAppOptions } from '@frontegg/types';\nimport { BehaviorSubject, Observable } from 'rxjs';\nimport { FronteggLoadGuard } from './guards/frontegg-load.guard';\nimport { ContextHolder, RedirectOptions } from '@frontegg/rest-api';\nimport { FronteggComponent } from './frontegg.component';\n\ntype FronteggApp = FronteggAppInstance & {\n  showAdminPortal(): void;\n  hideAdminPortal(): void;\n};\n\nexport class FronteggAppOptionsClass implements FronteggAppOptions {\n  contextOptions: FronteggAppOptions['contextOptions'] = {\n    baseUrl: 'https://david.frontegg.com',\n  };\n}\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class FronteggAppService {\n  fronteggApp: FronteggApp;\n\n  private isLoadingSubject = new BehaviorSubject<boolean>(true);\n  private isAuthenticatedSubject = new BehaviorSubject<boolean>(false);\n  private stateSubject = new BehaviorSubject<FronteggState>({} as FronteggState);\n  private authStateSubject = new BehaviorSubject<FronteggState['auth']>({} as FronteggState['auth']);\n  private auditsStateSubject = new BehaviorSubject<FronteggState['audits']>({} as FronteggState['audits']);\n  private connectivityStateSubject = new BehaviorSubject<FronteggState['connectivity']>({} as FronteggState['connectivity']);\n  private subscriptionsStateSubject = new BehaviorSubject<FronteggState['subscriptions']>({} as FronteggState['subscriptions']);\n  private vendorStateSubject = new BehaviorSubject<FronteggState['vendor']>({} as FronteggState['vendor']);\n\n\n  get state$(): Observable<FronteggState> {\n    return this.stateSubject.asObservable();\n  }\n\n  get authState$(): Observable<FronteggState['auth']> {\n    return this.authStateSubject.asObservable();\n  }\n\n  get auditsState$(): Observable<FronteggState['audits']> {\n    return this.auditsStateSubject.asObservable();\n  }\n\n  get connectivityState$(): Observable<FronteggState['connectivity']> {\n    return this.connectivityStateSubject.asObservable();\n  }\n\n  get subscriptionsState$(): Observable<FronteggState['subscriptions']> {\n    return this.subscriptionsStateSubject.asObservable();\n  }\n\n  get vendorState$(): Observable<FronteggState['vendor']> {\n    return this.vendorStateSubject.asObservable();\n  }\n\n  get isLoading$(): Observable<boolean> {\n    return this.isLoadingSubject.asObservable();\n  };\n\n\n  get isAuthenticated$(): Observable<boolean> {\n    return this.isAuthenticatedSubject.asObservable();\n  };\n\n  constructor(@Inject(FronteggAppOptionsClass) private config: FronteggAppOptions, private router: Router, private ngZone: NgZone) {\n    if (!this.config) {\n      throw Error('Need to pass config: FronteggConfigOptions in FronteggAppModule.forRoot(config)');\n    }\n\n    const onRedirectTo = (to: string, opts?: RedirectOptions) => {\n      const baseName = window.location.origin;\n      let path = to;\n      if (path.startsWith(baseName) && baseName !== '/') {\n        path = path.substring(baseName.length - 1);\n      }\n\n      if (opts?.refresh) {\n        window.location.href = path;\n      } else {\n        console.warn('FronteggRouting.start');\n        try {\n          console.warn('FronteggRouting', ngZone.isStable, NgZone.isInAngularZone());\n        } catch (e) {\n        }\n        this.ngZone.run(() => {\n          console.warn('FronteggRouting.inside-ngZone');\n          if (opts?.replace) {\n            this.router.navigateByUrl(path, { replaceUrl: true });\n          } else {\n            this.router.navigateByUrl(path);\n          }\n        });\n      }\n    };\n    ContextHolder.setOnRedirectTo(onRedirectTo);\n    this.fronteggApp = initialize({\n      onRedirectTo,\n      ...this.config,\n    });\n\n\n    // Add all login box routes to Angular router config\n    this.router.resetConfig([\n      ...this.mapAuthComponents,\n      {\n        path: '',\n        canActivate: [FronteggLoadGuard],\n        children: [...this.router.config],\n      },\n    ]);\n\n    // Subscribe on fronteggApp store to change state subjects\n    this.fronteggApp.store.subscribe(() => {\n      const fronteggStore = this.fronteggApp.store.getState() as FronteggState;\n      if (this.isLoadingSubject.getValue() !== fronteggStore.auth.isLoading) {\n        this.isLoadingSubject.next(fronteggStore.auth.isLoading);\n      }\n      if (this.isAuthenticatedSubject.getValue() !== fronteggStore.auth.isAuthenticated) {\n        this.isAuthenticatedSubject.next(fronteggStore.auth.isAuthenticated);\n      }\n\n      this.stateSubject.next(fronteggStore);\n      this.authStateSubject.next(fronteggStore.auth);\n      this.auditsStateSubject.next(fronteggStore.audits);\n      this.connectivityStateSubject.next(fronteggStore.connectivity);\n      this.subscriptionsStateSubject.next(fronteggStore.subscriptions);\n      this.vendorStateSubject.next(fronteggStore.vendor);\n    });\n  }\n\n  get mapAuthComponents(): Route[] {\n    const authRoutes = this.authRoutes;\n    return (Object.keys(authRoutes) as (keyof AuthPageRoutes)[])\n      .filter((key: keyof AuthPageRoutes) => key !== 'authenticatedUrl' && key !== 'signUpSuccessUrl' && key != null)\n      .map((key: keyof AuthPageRoutes) => ({\n        path: authRoutes[key]?.substring(1),\n        component: FronteggComponent,\n      }));\n  }\n\n  get authRoutes(): AuthPageRoutes {\n    return this.fronteggApp.store.getState().auth.routes;\n  }\n\n  // Open admin portal\n  public showAdminPortal(): void {\n    this.fronteggApp.showAdminPortal();\n  }\n\n  // Open admin portal\n  public hideAdminPortal(): void {\n    this.fronteggApp?.hideAdminPortal();\n  }\n}\n"]}
|
|
@@ -16,7 +16,7 @@ export class FronteggAuthGuard extends FronteggBaseGuard {
|
|
|
16
16
|
obs.next(true);
|
|
17
17
|
}
|
|
18
18
|
else {
|
|
19
|
-
this.router.
|
|
19
|
+
this.router.navigateByUrl(this.fronteggAppService.authRoutes.loginUrl + '?redirectUrl=' + encodeURIComponent(state.url));
|
|
20
20
|
obs.next(false);
|
|
21
21
|
}
|
|
22
22
|
});
|
|
@@ -30,4 +30,4 @@ FronteggAuthGuard.ctorParameters = () => [
|
|
|
30
30
|
{ type: FronteggAppService },
|
|
31
31
|
{ type: Router }
|
|
32
32
|
];
|
|
33
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJvbnRlZ2ctYXV0aC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Zyb250ZWdnLWFwcC9zcmMvbGliL2d1YXJkcy9mcm9udGVnZy1hdXRoLmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDM0MsT0FBTyxFQUEwQixNQUFNLEVBQXVCLE1BQU0saUJBQWlCLENBQUM7QUFDdEYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNsQyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUMxRCxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUc3RCxNQUFNLE9BQU8saUJBQWtCLFNBQVEsaUJBQWlCO0lBQ3RELFlBQXNCLGtCQUFzQyxFQUFZLE1BQWM7UUFDcEYsS0FBSyxFQUFFLENBQUM7UUFEWSx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO1FBQVksV0FBTSxHQUFOLE1BQU0sQ0FBUTtJQUV0RixDQUFDO0lBRUQsV0FBVyxDQUFDLEtBQTZCLEVBQUUsS0FBMEI7UUFDbkUsT0FBTyxJQUFJLFVBQVUsQ0FBVSxHQUFHLENBQUMsRUFBRTtZQUNuQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCLENBQUMsU0FBUyxDQUFDLENBQUMsZUFBd0IsRUFBRSxFQUFFO2dCQUM5RSxJQUFJLGVBQWUsRUFBRTtvQkFDbkIsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztpQkFDaEI7cUJBQU07b0JBQ0wsSUFBSSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxRQUFRLEdBQUcsZUFBZSxHQUFHLGtCQUFrQixDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUN6SCxHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO2lCQUNqQjtZQUNILENBQUMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDLENBQUM7SUFDTCxDQUFDOzs7WUFqQkYsVUFBVTs7O1lBRkYsa0JBQWtCO1lBSE0sTUFBTSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIFJvdXRlciwgUm91dGVyU3RhdGVTbmFwc2hvdCB9IGZyb20gJ0Bhbmd1bGFyL3JvdXRlcic7XG5pbXBvcnQgeyBPYnNlcnZhYmxlIH0gZnJvbSAncnhqcyc7XG5pbXBvcnQgeyBGcm9udGVnZ0Jhc2VHdWFyZCB9IGZyb20gJy4vZnJvbnRlZ2ctYmFzZS1ndWFyZCc7XG5pbXBvcnQgeyBGcm9udGVnZ0FwcFNlcnZpY2UgfSBmcm9tICcuLi9mcm9udGVnZy1hcHAuc2VydmljZSc7XG5cbkBJbmplY3RhYmxlKClcbmV4cG9ydCBjbGFzcyBGcm9udGVnZ0F1dGhHdWFyZCBleHRlbmRzIEZyb250ZWdnQmFzZUd1YXJkIHtcbiAgY29uc3RydWN0b3IocHJvdGVjdGVkIGZyb250ZWdnQXBwU2VydmljZTogRnJvbnRlZ2dBcHBTZXJ2aWNlLCBwcm90ZWN0ZWQgcm91dGVyOiBSb3V0ZXIpIHtcbiAgICBzdXBlcigpO1xuICB9XG5cbiAgY2FuQWN0aXZhdGUocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIHN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90KTogT2JzZXJ2YWJsZTxib29sZWFuPiB8IFByb21pc2U8Ym9vbGVhbj4gfCBib29sZWFuIHtcbiAgICByZXR1cm4gbmV3IE9ic2VydmFibGU8Ym9vbGVhbj4ob2JzID0+IHtcbiAgICAgIHRoaXMuZnJvbnRlZ2dBcHBTZXJ2aWNlLmlzQXV0aGVudGljYXRlZCQuc3Vic2NyaWJlKChpc0F1dGhlbnRpY2F0ZWQ6IGJvb2xlYW4pID0+IHtcbiAgICAgICAgaWYgKGlzQXV0aGVudGljYXRlZCkge1xuICAgICAgICAgIG9icy5uZXh0KHRydWUpO1xuICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgIHRoaXMucm91dGVyLm5hdmlnYXRlQnlVcmwodGhpcy5mcm9udGVnZ0FwcFNlcnZpY2UuYXV0aFJvdXRlcy5sb2dpblVybCArICc/cmVkaXJlY3RVcmw9JyArIGVuY29kZVVSSUNvbXBvbmVudChzdGF0ZS51cmwpKTtcbiAgICAgICAgICBvYnMubmV4dChmYWxzZSk7XG4gICAgICAgIH1cbiAgICAgIH0pO1xuICAgIH0pO1xuICB9XG59XG4iXX0=
|
|
@@ -1,13 +1,9 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
|
-
import { Router } from '@angular/router';
|
|
3
2
|
import { Observable } from 'rxjs';
|
|
4
|
-
import { FronteggBaseGuard } from './frontegg-base-guard';
|
|
5
3
|
import { FronteggAppService } from '../frontegg-app.service';
|
|
6
|
-
export class FronteggLoadGuard
|
|
7
|
-
constructor(fronteggAppService
|
|
8
|
-
super();
|
|
4
|
+
export class FronteggLoadGuard {
|
|
5
|
+
constructor(fronteggAppService) {
|
|
9
6
|
this.fronteggAppService = fronteggAppService;
|
|
10
|
-
this.router = router;
|
|
11
7
|
}
|
|
12
8
|
canActivate(route, state) {
|
|
13
9
|
return new Observable(obs => {
|
|
@@ -23,7 +19,6 @@ FronteggLoadGuard.decorators = [
|
|
|
23
19
|
{ type: Injectable }
|
|
24
20
|
];
|
|
25
21
|
FronteggLoadGuard.ctorParameters = () => [
|
|
26
|
-
{ type: FronteggAppService }
|
|
27
|
-
{ type: Router }
|
|
22
|
+
{ type: FronteggAppService }
|
|
28
23
|
];
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
24
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJvbnRlZ2ctbG9hZC5ndWFyZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2Zyb250ZWdnLWFwcC9zcmMvbGliL2d1YXJkcy9mcm9udGVnZy1sb2FkLmd1YXJkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFM0MsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNsQyxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQztBQUc3RCxNQUFNLE9BQU8saUJBQWlCO0lBQzVCLFlBQXNCLGtCQUFzQztRQUF0Qyx1QkFBa0IsR0FBbEIsa0JBQWtCLENBQW9CO0lBQzVELENBQUM7SUFFRCxXQUFXLENBQUMsS0FBNkIsRUFBRSxLQUEwQjtRQUNuRSxPQUFPLElBQUksVUFBVSxDQUFVLEdBQUcsQ0FBQyxFQUFFO1lBQ25DLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUNyRCxJQUFJLENBQUMsT0FBTyxFQUFFO29CQUNaLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7aUJBQ2hCO1lBQ0gsQ0FBQyxDQUFDLENBQUM7UUFDTCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7OztZQWJGLFVBQVU7OztZQUZGLGtCQUFrQiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEluamVjdGFibGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCB7IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIENhbkFjdGl2YXRlLCBSb3V0ZXIsIFJvdXRlclN0YXRlU25hcHNob3QgfSBmcm9tICdAYW5ndWxhci9yb3V0ZXInO1xuaW1wb3J0IHsgT2JzZXJ2YWJsZSB9IGZyb20gJ3J4anMnO1xuaW1wb3J0IHsgRnJvbnRlZ2dBcHBTZXJ2aWNlIH0gZnJvbSAnLi4vZnJvbnRlZ2ctYXBwLnNlcnZpY2UnO1xuXG5ASW5qZWN0YWJsZSgpXG5leHBvcnQgY2xhc3MgRnJvbnRlZ2dMb2FkR3VhcmQgaW1wbGVtZW50cyBDYW5BY3RpdmF0ZSB7XG4gIGNvbnN0cnVjdG9yKHByb3RlY3RlZCBmcm9udGVnZ0FwcFNlcnZpY2U6IEZyb250ZWdnQXBwU2VydmljZSkge1xuICB9XG5cbiAgY2FuQWN0aXZhdGUocm91dGU6IEFjdGl2YXRlZFJvdXRlU25hcHNob3QsIHN0YXRlOiBSb3V0ZXJTdGF0ZVNuYXBzaG90KTogT2JzZXJ2YWJsZTxib29sZWFuPiB8IFByb21pc2U8Ym9vbGVhbj4gfCBib29sZWFuIHtcbiAgICByZXR1cm4gbmV3IE9ic2VydmFibGU8Ym9vbGVhbj4ob2JzID0+IHtcbiAgICAgIHRoaXMuZnJvbnRlZ2dBcHBTZXJ2aWNlLmlzTG9hZGluZyQuc3Vic2NyaWJlKGxvYWRpbmcgPT4ge1xuICAgICAgICBpZiAoIWxvYWRpbmcpIHtcbiAgICAgICAgICBvYnMubmV4dCh0cnVlKTtcbiAgICAgICAgfVxuICAgICAgfSk7XG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
|
-
import { Injectable, Component, Inject, Directive, TemplateRef, ViewContainerRef, Input, NgModule } from '@angular/core';
|
|
2
|
+
import { Injectable, Component, NgZone, Inject, Directive, TemplateRef, ViewContainerRef, Input, NgModule } from '@angular/core';
|
|
3
3
|
import * as i1 from '@angular/router';
|
|
4
|
-
import {
|
|
4
|
+
import { Router, DefaultUrlSerializer, RouterModule } from '@angular/router';
|
|
5
5
|
import { initialize } from '@frontegg/admin-portal';
|
|
6
6
|
import { Observable, BehaviorSubject } from 'rxjs';
|
|
7
7
|
import { ContextHolder } from '@frontegg/rest-api';
|
|
@@ -9,33 +9,9 @@ import FastDeepEqual from 'fast-deep-equal';
|
|
|
9
9
|
import { authStoreName } from '@frontegg/redux-store';
|
|
10
10
|
import { CommonModule } from '@angular/common';
|
|
11
11
|
|
|
12
|
-
class
|
|
13
|
-
|
|
14
|
-
const dus = new DefaultUrlSerializer();
|
|
15
|
-
return dus.parse(url);
|
|
16
|
-
}
|
|
17
|
-
serialize(tree) {
|
|
18
|
-
const dus = new DefaultUrlSerializer();
|
|
19
|
-
return dus
|
|
20
|
-
.serialize(tree)
|
|
21
|
-
.replace(/%40/gi, '@')
|
|
22
|
-
.replace(/%3A/gi, ':')
|
|
23
|
-
.replace(/%24/gi, '$')
|
|
24
|
-
.replace(/%2C/gi, ',')
|
|
25
|
-
.replace(/%3B/gi, ';')
|
|
26
|
-
.replace(/%2B/gi, '+')
|
|
27
|
-
.replace(/%3D/gi, '=')
|
|
28
|
-
.replace(/%3F/gi, '?')
|
|
29
|
-
.replace(/%2F/gi, '/')
|
|
30
|
-
.replace(/(https?):\/([\w\d])/gi, '$1://$2');
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
class FronteggLoadGuard extends FronteggBaseGuard {
|
|
35
|
-
constructor(fronteggAppService, router) {
|
|
36
|
-
super();
|
|
12
|
+
class FronteggLoadGuard {
|
|
13
|
+
constructor(fronteggAppService) {
|
|
37
14
|
this.fronteggAppService = fronteggAppService;
|
|
38
|
-
this.router = router;
|
|
39
15
|
}
|
|
40
16
|
canActivate(route, state) {
|
|
41
17
|
return new Observable(obs => {
|
|
@@ -51,8 +27,7 @@ FronteggLoadGuard.decorators = [
|
|
|
51
27
|
{ type: Injectable }
|
|
52
28
|
];
|
|
53
29
|
FronteggLoadGuard.ctorParameters = () => [
|
|
54
|
-
{ type: FronteggAppService }
|
|
55
|
-
{ type: Router }
|
|
30
|
+
{ type: FronteggAppService }
|
|
56
31
|
];
|
|
57
32
|
|
|
58
33
|
class FronteggComponent {
|
|
@@ -73,9 +48,10 @@ class FronteggAppOptionsClass {
|
|
|
73
48
|
}
|
|
74
49
|
}
|
|
75
50
|
class FronteggAppService {
|
|
76
|
-
constructor(config, router) {
|
|
51
|
+
constructor(config, router, ngZone) {
|
|
77
52
|
this.config = config;
|
|
78
53
|
this.router = router;
|
|
54
|
+
this.ngZone = ngZone;
|
|
79
55
|
this.isLoadingSubject = new BehaviorSubject(true);
|
|
80
56
|
this.isAuthenticatedSubject = new BehaviorSubject(false);
|
|
81
57
|
this.stateSubject = new BehaviorSubject({});
|
|
@@ -97,12 +73,21 @@ class FronteggAppService {
|
|
|
97
73
|
window.location.href = path;
|
|
98
74
|
}
|
|
99
75
|
else {
|
|
100
|
-
|
|
101
|
-
|
|
76
|
+
console.warn('FronteggRouting.start');
|
|
77
|
+
try {
|
|
78
|
+
console.warn('FronteggRouting', ngZone.isStable, NgZone.isInAngularZone());
|
|
102
79
|
}
|
|
103
|
-
|
|
104
|
-
this.router.navigate([path], { queryParamsHandling: 'merge' });
|
|
80
|
+
catch (e) {
|
|
105
81
|
}
|
|
82
|
+
this.ngZone.run(() => {
|
|
83
|
+
console.warn('FronteggRouting.inside-ngZone');
|
|
84
|
+
if (opts === null || opts === void 0 ? void 0 : opts.replace) {
|
|
85
|
+
this.router.navigateByUrl(path, { replaceUrl: true });
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
this.router.navigateByUrl(path);
|
|
89
|
+
}
|
|
90
|
+
});
|
|
106
91
|
}
|
|
107
92
|
};
|
|
108
93
|
ContextHolder.setOnRedirectTo(onRedirectTo);
|
|
@@ -116,15 +101,6 @@ class FronteggAppService {
|
|
|
116
101
|
children: [...this.router.config],
|
|
117
102
|
},
|
|
118
103
|
]);
|
|
119
|
-
this.router.events.subscribe((event) => {
|
|
120
|
-
if (event instanceof NavigationStart) {
|
|
121
|
-
const authRoutes = this.mapAuthComponents.map(({ path }) => (path === null || path === void 0 ? void 0 : path.startsWith('/')) ? path : `/${path}`);
|
|
122
|
-
const curr = authRoutes.find((path) => event.url.split('?')[0] !== path && event.url.startsWith(path));
|
|
123
|
-
if (curr) {
|
|
124
|
-
this.router.navigate([`${curr}${decodeURIComponent(event.url.split(curr)[1])}`], { queryParamsHandling: 'merge' });
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
});
|
|
128
104
|
// Subscribe on fronteggApp store to change state subjects
|
|
129
105
|
this.fronteggApp.store.subscribe(() => {
|
|
130
106
|
const fronteggStore = this.fronteggApp.store.getState();
|
|
@@ -193,7 +169,7 @@ class FronteggAppService {
|
|
|
193
169
|
(_a = this.fronteggApp) === null || _a === void 0 ? void 0 : _a.hideAdminPortal();
|
|
194
170
|
}
|
|
195
171
|
}
|
|
196
|
-
FronteggAppService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FronteggAppService_Factory() { return new FronteggAppService(i0.ɵɵinject(FronteggAppOptionsClass), i0.ɵɵinject(i1.Router)); }, token: FronteggAppService, providedIn: "root" });
|
|
172
|
+
FronteggAppService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FronteggAppService_Factory() { return new FronteggAppService(i0.ɵɵinject(FronteggAppOptionsClass), i0.ɵɵinject(i1.Router), i0.ɵɵinject(i0.NgZone)); }, token: FronteggAppService, providedIn: "root" });
|
|
197
173
|
FronteggAppService.decorators = [
|
|
198
174
|
{ type: Injectable, args: [{
|
|
199
175
|
providedIn: 'root',
|
|
@@ -201,7 +177,8 @@ FronteggAppService.decorators = [
|
|
|
201
177
|
];
|
|
202
178
|
FronteggAppService.ctorParameters = () => [
|
|
203
179
|
{ type: undefined, decorators: [{ type: Inject, args: [FronteggAppOptionsClass,] }] },
|
|
204
|
-
{ type: Router }
|
|
180
|
+
{ type: Router },
|
|
181
|
+
{ type: NgZone }
|
|
205
182
|
];
|
|
206
183
|
|
|
207
184
|
class FronteggAuthService {
|
|
@@ -483,6 +460,28 @@ FronteggAuthService.ctorParameters = () => [
|
|
|
483
460
|
{ type: FronteggAppService }
|
|
484
461
|
];
|
|
485
462
|
|
|
463
|
+
class FronteggBaseGuard {
|
|
464
|
+
parse(url) {
|
|
465
|
+
const dus = new DefaultUrlSerializer();
|
|
466
|
+
return dus.parse(url);
|
|
467
|
+
}
|
|
468
|
+
serialize(tree) {
|
|
469
|
+
const dus = new DefaultUrlSerializer();
|
|
470
|
+
return dus
|
|
471
|
+
.serialize(tree)
|
|
472
|
+
.replace(/%40/gi, '@')
|
|
473
|
+
.replace(/%3A/gi, ':')
|
|
474
|
+
.replace(/%24/gi, '$')
|
|
475
|
+
.replace(/%2C/gi, ',')
|
|
476
|
+
.replace(/%3B/gi, ';')
|
|
477
|
+
.replace(/%2B/gi, '+')
|
|
478
|
+
.replace(/%3D/gi, '=')
|
|
479
|
+
.replace(/%3F/gi, '?')
|
|
480
|
+
.replace(/%2F/gi, '/')
|
|
481
|
+
.replace(/(https?):\/([\w\d])/gi, '$1://$2');
|
|
482
|
+
}
|
|
483
|
+
}
|
|
484
|
+
|
|
486
485
|
class FronteggAuthGuard extends FronteggBaseGuard {
|
|
487
486
|
constructor(fronteggAppService, router) {
|
|
488
487
|
super();
|
|
@@ -496,7 +495,7 @@ class FronteggAuthGuard extends FronteggBaseGuard {
|
|
|
496
495
|
obs.next(true);
|
|
497
496
|
}
|
|
498
497
|
else {
|
|
499
|
-
this.router.
|
|
498
|
+
this.router.navigateByUrl(this.fronteggAppService.authRoutes.loginUrl + '?redirectUrl=' + encodeURIComponent(state.url));
|
|
500
499
|
obs.next(false);
|
|
501
500
|
}
|
|
502
501
|
});
|