@frontegg/angular 4.20.0-alpha.2898017504 → 4.20.0

package/bundles/frontegg-angular.umd.js

@@ -395,7 +395,10 @@
             this.isLoadingSubject = new rxjs.BehaviorSubject(true);
             this.isAuthenticatedSubject = new rxjs.BehaviorSubject(false);
             this.stateSubject = new rxjs.BehaviorSubject({});
-            this.authStateSubject = new rxjs.BehaviorSubject({});
+            this.authStateSubject = new rxjs.BehaviorSubject({
+                isLoading: true,
+                isAuthenticated: false,
+            });
             this.auditsStateSubject = new rxjs.BehaviorSubject({});
             this.connectivityStateSubject = new rxjs.BehaviorSubject({});
             this.subscriptionsStateSubject = new rxjs.BehaviorSubject({});
@@ -436,21 +439,11 @@
                     children: __spreadArray([], __read(this.router.config)),
                 },
             ]));
+            var initialFronteggState = this.fronteggApp.store.getState();
+            this.updateState(initialFronteggState);
             // Subscribe on fronteggApp store to change state subjects
             this.fronteggApp.store.subscribe(function () {
-                var fronteggStore = _this.fronteggApp.store.getState();
-                if (_this.isLoadingSubject.getValue() !== fronteggStore.auth.isLoading) {
-                    _this.isLoadingSubject.next(fronteggStore.auth.isLoading);
-                }
-                if (_this.isAuthenticatedSubject.getValue() !== fronteggStore.auth.isAuthenticated) {
-                    _this.isAuthenticatedSubject.next(fronteggStore.auth.isAuthenticated);
-                }
-                _this.stateSubject.next(fronteggStore);
-                _this.authStateSubject.next(fronteggStore.auth);
-                _this.auditsStateSubject.next(fronteggStore.audits);
-                _this.connectivityStateSubject.next(fronteggStore.connectivity);
-                _this.subscriptionsStateSubject.next(fronteggStore.subscriptions);
-                _this.vendorStateSubject.next(fronteggStore.vendor);
+                _this.updateState(_this.fronteggApp.store.getState());
             });
         }
         Object.defineProperty(FronteggAppService.prototype, "state$", {
@@ -511,6 +504,20 @@
             configurable: true
         });
         ;
+        FronteggAppService.prototype.updateState = function (fronteggStore) {
+            if (this.isLoadingSubject.getValue() !== fronteggStore.auth.isLoading) {
+                this.isLoadingSubject.next(fronteggStore.auth.isLoading);
+            }
+            if (this.isAuthenticatedSubject.getValue() !== fronteggStore.auth.isAuthenticated) {
+                this.isAuthenticatedSubject.next(fronteggStore.auth.isAuthenticated);
+            }
+            this.stateSubject.next(fronteggStore);
+            this.authStateSubject.next(fronteggStore.auth);
+            this.auditsStateSubject.next(fronteggStore.audits);
+            this.connectivityStateSubject.next(fronteggStore.connectivity);
+            this.subscriptionsStateSubject.next(fronteggStore.subscriptions);
+            this.vendorStateSubject.next(fronteggStore.vendor);
+        };
         Object.defineProperty(FronteggAppService.prototype, "mapAuthComponents", {
             get: function () {
                 var authRoutes = this.authRoutes;
@@ -638,9 +645,11 @@
     ]; };
 
     var FronteggAuthService = /** @class */ (function () {
-        function FronteggAuthService(fronteggAppService) {
+        function FronteggAuthService(fronteggAppService, router) {
             var _this = this;
             this.fronteggAppService = fronteggAppService;
+            this.router = router;
+            this.authStateSubject = new rxjs.BehaviorSubject({ isAuthenticated: false, isLoading: true });
             this.acceptInvitationStateSubject = new rxjs.BehaviorSubject({});
             this.accountSettingsStateSubject = new rxjs.BehaviorSubject({});
             this.activateStateSubject = new rxjs.BehaviorSubject({});
@@ -670,7 +679,13 @@
             this.setLoginState = function (state) { return _this.dispatchAction('setLoginState', state); };
             this.resetLoginState = function () { return _this.dispatchAction('resetLoginState'); };
             this.requestAuthorize = function (firstTime) { return _this.dispatchAction('requestAuthorize', firstTime); };
-            this.loginWithRedirect = function () { return _this.dispatchAction('requestHostedLoginAuthorize'); };
+            this.loginWithRedirect = function () {
+                if (_this.isHostedLoginCallbackRoute()) {
+                    return;
+                }
+                _this.dispatchAction('requestHostedLoginAuthorize');
+                _this.setState({ isLoading: true });
+            };
             this.preLogin = function (payload) { return _this.dispatchAction('preLogin', payload); };
             this.postLogin = function (payload) { return _this.dispatchAction('postLogin', payload); };
             this.login = function (payload) { return _this.dispatchAction('login', payload); };
@@ -820,30 +835,21 @@
                 { field: 'isSSOAuth', subject: this.isSSOAuthSubject },
                 { field: 'ssoACS', subject: this.ssoACSSubject },
             ];
+            var state = this.fronteggAppService.fronteggApp.store.getState();
+            this.updateState(state.auth, authSubStates);
             // Memoized Auth State
-            this.fronteggAppService.authState$.subscribe(function (authState) {
-                var e_1, _a;
-                if (authState != null) {
-                    try {
-                        for (var authSubStates_1 = __values(authSubStates), authSubStates_1_1 = authSubStates_1.next(); !authSubStates_1_1.done; authSubStates_1_1 = authSubStates_1.next()) {
-                            var authSubState = authSubStates_1_1.value;
-                            if (!FastDeepEqual__default['default'](authSubState.subject.getValue(), authState[authSubState.field])) {
-                                authSubState.subject.next(authState[authSubState.field]);
-                            }
-                        }
-                    }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                    finally {
-                        try {
-                            if (authSubStates_1_1 && !authSubStates_1_1.done && (_a = authSubStates_1.return)) _a.call(authSubStates_1);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                    }
-                    _this.isAuthenticatedSubject.next(authState.isAuthenticated);
-                    _this.isLoadingSubject.next(authState.isLoading);
-                }
+            this.fronteggAppService.fronteggApp.store.subscribe(function () {
+                var newState = _this.fronteggAppService.fronteggApp.store.getState();
+                _this.updateState(newState.auth, authSubStates);
             });
         }
+        Object.defineProperty(FronteggAuthService.prototype, "authState$", {
+            get: function () {
+                return this.authStateSubject.asObservable();
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(FronteggAuthService.prototype, "acceptInvitationState$", {
             get: function () {
                 return this.acceptInvitationStateSubject.asObservable();
@@ -1005,21 +1011,54 @@
             enumerable: false,
             configurable: true
         });
+        FronteggAuthService.prototype.updateState = function (authState, authSubStates) {
+            var e_1, _a;
+            if (this.authStateSubject.value !== authState) {
+                this.authStateSubject.next(authState);
+            }
+            try {
+                for (var authSubStates_1 = __values(authSubStates), authSubStates_1_1 = authSubStates_1.next(); !authSubStates_1_1.done; authSubStates_1_1 = authSubStates_1.next()) {
+                    var authSubState = authSubStates_1_1.value;
+                    if (!FastDeepEqual__default['default'](authSubState.subject.value, authState[authSubState.field])) {
+                        authSubState.subject.next(authState[authSubState.field]);
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (authSubStates_1_1 && !authSubStates_1_1.done && (_a = authSubStates_1.return)) _a.call(authSubStates_1);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            if (this.isAuthenticatedSubject.value !== authState.isAuthenticated) {
+                this.isAuthenticatedSubject.next(authState.isAuthenticated);
+            }
+            if (this.isLoadingSubject.value !== authState.isLoading) {
+                this.isLoadingSubject.next(authState.isLoading);
+            }
+        };
         FronteggAuthService.prototype.dispatchAction = function (type, payload) {
             var store = this.fronteggAppService.fronteggApp.store;
             // @ts-ignore
             store.dispatch({ type: reduxStore.authStoreName + "/" + type, payload: payload });
         };
+        FronteggAuthService.prototype.isHostedLoginCallbackRoute = function () {
+            var path = this.fronteggAppService.router.url;
+            var hostedLoginRedirectUrl = this.fronteggAppService.authRoutes.hostedLoginRedirectUrl;
+            return path.startsWith(hostedLoginRedirectUrl !== null && hostedLoginRedirectUrl !== void 0 ? hostedLoginRedirectUrl : '/oauth/callback');
+        };
         return FronteggAuthService;
     }());
-    FronteggAuthService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function FronteggAuthService_Factory() { return new FronteggAuthService(i0__namespace.ɵɵinject(FronteggAppService)); }, token: FronteggAuthService, providedIn: "root" });
+    FronteggAuthService.ɵprov = i0__namespace.ɵɵdefineInjectable({ factory: function FronteggAuthService_Factory() { return new FronteggAuthService(i0__namespace.ɵɵinject(FronteggAppService), i0__namespace.ɵɵinject(i1__namespace.Router)); }, token: FronteggAuthService, providedIn: "root" });
     FronteggAuthService.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root',
                 },] }
     ];
     FronteggAuthService.ctorParameters = function () { return [
-        { type: FronteggAppService }
+        { type: FronteggAppService },
+        { type: i1.Router }
     ]; };
 
     var AuthorizedContentDirective = /** @class */ (function () {