@frontegg/angular 4.5.2-alpha.1663220219 → 4.5.3-alpha.80880

package/bundles/frontegg-angular.umd.js

@@ -342,38 +342,9 @@
         return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
     }
 
-    var FronteggBaseGuard = /** @class */ (function () {
-        function FronteggBaseGuard() {
-        }
-        FronteggBaseGuard.prototype.parse = function (url) {
-            var dus = new i1.DefaultUrlSerializer();
-            return dus.parse(url);
-        };
-        FronteggBaseGuard.prototype.serialize = function (tree) {
-            var dus = new i1.DefaultUrlSerializer();
-            return dus
-                .serialize(tree)
-                .replace(/%40/gi, '@')
-                .replace(/%3A/gi, ':')
-                .replace(/%24/gi, '$')
-                .replace(/%2C/gi, ',')
-                .replace(/%3B/gi, ';')
-                .replace(/%2B/gi, '+')
-                .replace(/%3D/gi, '=')
-                .replace(/%3F/gi, '?')
-                .replace(/%2F/gi, '/')
-                .replace(/(https?):\/([\w\d])/gi, '$1://$2');
-        };
-        return FronteggBaseGuard;
-    }());
-
-    var FronteggLoadGuard = /** @class */ (function (_super) {
-        __extends(FronteggLoadGuard, _super);
-        function FronteggLoadGuard(fronteggAppService, router) {
-            var _this = _super.call(this) || this;
-            _this.fronteggAppService = fronteggAppService;
-            _this.router = router;
-            return _this;
+    var FronteggLoadGuard = /** @class */ (function () {
+        function FronteggLoadGuard(fronteggAppService) {
+            this.fronteggAppService = fronteggAppService;
         }
         FronteggLoadGuard.prototype.canActivate = function (route, state) {
             var _this = this;
@@ -386,13 +357,12 @@
             });
         };
         return FronteggLoadGuard;
-    }(FronteggBaseGuard));
+    }());
     FronteggLoadGuard.decorators = [
         { type: i0.Injectable }
     ];
     FronteggLoadGuard.ctorParameters = function () { return [
-        { type: FronteggAppService },
-        { type: i1.Router }
+        { type: FronteggAppService }
     ]; };
 
     var FronteggComponent = /** @class */ (function () {
@@ -417,10 +387,11 @@
         return FronteggAppOptionsClass;
     }());
     var FronteggAppService = /** @class */ (function () {
-        function FronteggAppService(config, router) {
+        function FronteggAppService(config, router, ngZone) {
             var _this = this;
             this.config = config;
             this.router = router;
+            this.ngZone = ngZone;
             this.isLoadingSubject = new rxjs.BehaviorSubject(true);
             this.isAuthenticatedSubject = new rxjs.BehaviorSubject(false);
             this.stateSubject = new rxjs.BehaviorSubject({});
@@ -442,12 +413,21 @@
                     window.location.href = path;
                 }
                 else {
-                    if (opts === null || opts === void 0 ? void 0 : opts.replace) {
-                        _this.router.navigate([path], { replaceUrl: true });
+                    console.warn('FronteggRouting.start');
+                    try {
+                        console.warn('FronteggRouting', ngZone.isStable, i0.NgZone.isInAngularZone());
                     }
-                    else {
-                        _this.router.navigate([path]);
+                    catch (e) {
                     }
+                    _this.ngZone.run(function () {
+                        console.warn('FronteggRouting.inside-ngZone');
+                        if (opts === null || opts === void 0 ? void 0 : opts.replace) {
+                            _this.router.navigateByUrl(path, { replaceUrl: true });
+                        }
+                        else {
+                            _this.router.navigateByUrl(path);
+                        }
+                    });
                 }
             };
             restApi.ContextHolder.setOnRedirectTo(onRedirectTo);
@@ -460,18 +440,6 @@
                     children: __spreadArray([], __read(this.router.config)),
                 },
             ]));
-            this.router.events.subscribe(function (event) {
-                if (event instanceof i1.NavigationStart) {
-                    var authRoutes = _this.mapAuthComponents.map(function (_b) {
-                        var path = _b.path;
-                        return (path === null || path === void 0 ? void 0 : path.startsWith('/')) ? path : "/" + path;
-                    });
-                    var curr = authRoutes.find(function (path) { return event.url.split('?')[0] !== path && event.url.startsWith(path); });
-                    if (curr) {
-                        _this.router.navigateByUrl("" + curr + decodeURIComponent(event.url.split(curr)[1]));
-                    }
-                }
-            });
             // Subscribe on fronteggApp store to change state subjects
             this.fronteggApp.store.subscribe(function () {
                 var fronteggStore = _this.fronteggApp.store.getState();
@@ -581,7 +549,7 @@
         };
         return FronteggAppService;
     }());
-    FronteggAppService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function FronteggAppService_Factory() { return new FronteggAppService(i0__namespace.ɵɵinject(FronteggAppOptionsClass), i0__namespace.ɵɵinject(i1__namespace.Router)); }, token: FronteggAppService, providedIn: "root" });
+    FronteggAppService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function FronteggAppService_Factory() { return new FronteggAppService(i0__namespace.ɵɵinject(FronteggAppOptionsClass), i0__namespace.ɵɵinject(i1__namespace.Router), i0__namespace.ɵɵinject(i0__namespace.NgZone)); }, token: FronteggAppService, providedIn: "root" });
     FronteggAppService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
@@ -589,7 +557,8 @@
     ];
     FronteggAppService.ctorParameters = function () { return [
         { type: undefined, decorators: [{ type: i0.Inject, args: [FronteggAppOptionsClass,] }] },
-        { type: i1.Router }
+        { type: i1.Router },
+        { type: i0.NgZone }
     ]; };
 
     var FronteggAuthService = /** @class */ (function () {
@@ -976,27 +945,70 @@
         { type: FronteggAppService }
     ]; };
 
+    var FronteggBaseGuard = /** @class */ (function () {
+        function FronteggBaseGuard() {
+        }
+        FronteggBaseGuard.prototype.parse = function (url) {
+            var dus = new i1.DefaultUrlSerializer();
+            return dus.parse(url);
+        };
+        FronteggBaseGuard.prototype.serialize = function (tree) {
+            var dus = new i1.DefaultUrlSerializer();
+            return dus
+                .serialize(tree)
+                .replace(/%40/gi, '@')
+                .replace(/%3A/gi, ':')
+                .replace(/%24/gi, '$')
+                .replace(/%2C/gi, ',')
+                .replace(/%3B/gi, ';')
+                .replace(/%2B/gi, '+')
+                .replace(/%3D/gi, '=')
+                .replace(/%3F/gi, '?')
+                .replace(/%2F/gi, '/')
+                .replace(/(https?):\/([\w\d])/gi, '$1://$2');
+        };
+        return FronteggBaseGuard;
+    }());
+
     var FronteggAuthGuard = /** @class */ (function (_super) {
         __extends(FronteggAuthGuard, _super);
-        function FronteggAuthGuard(fronteggAppService, router) {
+        function FronteggAuthGuard(fronteggAppService, router, ngZone) {
             var _this = _super.call(this) || this;
             _this.fronteggAppService = fronteggAppService;
             _this.router = router;
-            return _this;
-        }
-        FronteggAuthGuard.prototype.canActivate = function (route, state) {
-            var _this = this;
-            return new rxjs.Observable(function (obs) {
+            _this.ngZone = ngZone;
+            _this.authObservable = new rxjs.Observable(function (obs) {
                 _this.fronteggAppService.isAuthenticated$.subscribe(function (isAuthenticated) {
                     if (isAuthenticated) {
                         obs.next(true);
                     }
                     else {
-                        _this.router.navigate([_this.fronteggAppService.authRoutes.loginUrl + '?redirectUrl=' + encodeURIComponent(state.url)], { queryParamsHandling: "merge" });
+                        console.warn('FronteggAuthGuard.start');
+                        try {
+                            console.warn('FronteggAuthGuard', ngZone.isStable, i0.NgZone.isInAngularZone());
+                        }
+                        catch (e) {
+                        }
+                        if (i0.NgZone.isInAngularZone()) {
+                            _this.navigateToUrl();
+                        }
+                        else {
+                            _this.ngZone.run(function () {
+                                _this.navigateToUrl();
+                            });
+                        }
                         obs.next(false);
                     }
                 });
             });
+            return _this;
+        }
+        FronteggAuthGuard.prototype.navigateToUrl = function () {
+            var redirectUrl = this.router.routerState.snapshot.url;
+            this.router.navigateByUrl(this.fronteggAppService.authRoutes.loginUrl + '?redirectUrl=' + encodeURIComponent(redirectUrl));
+        };
+        FronteggAuthGuard.prototype.canActivate = function (route, state) {
+            return this.authObservable;
         };
         return FronteggAuthGuard;
     }(FronteggBaseGuard));
@@ -1005,7 +1017,8 @@
     ];
     FronteggAuthGuard.ctorParameters = function () { return [
         { type: FronteggAppService },
-        { type: i1.Router }
+        { type: i1.Router },
+        { type: i0.NgZone }
     ]; };
 
     var AuthorizedContentDirective = /** @class */ (function () {