@frontegg/angular 6.8.0 → 6.9.0-alpha.7030137218

package/bundles/frontegg-angular.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/router'), require('@frontegg/js'), require('@frontegg/redux-store'), require('rxjs'), require('@frontegg/rest-api'), require('@angular/core/package.json'), require('rxjs/operators'), require('fast-deep-equal')) :
-    typeof define === 'function' && define.amd ? define('@frontegg/angular', ['exports', '@angular/core', '@angular/common', '@angular/router', '@frontegg/js', '@frontegg/redux-store', 'rxjs', '@frontegg/rest-api', '@angular/core/package.json', 'rxjs/operators', 'fast-deep-equal'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.frontegg = global.frontegg || {}, global.frontegg.angular = {}), global.ng.core, global.ng.common, global.ng.router, global.FronteggJS, global.FronteggReduxStore, global.rxjs, global.FronteggRestApi, global.ng.core.packageJson, global.rxjs.operators, global.FastDeepEqual));
-})(this, (function (exports, i0, common, i1, js, reduxStore, rxjs, restApi, angularCoreVersion, operators, FastDeepEqual) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/common'), require('@angular/router'), require('@frontegg/js'), require('@frontegg/redux-store'), require('rxjs'), require('@frontegg/rest-api'), require('@angular/core/package.json'), require('fast-deep-equal')) :
+    typeof define === 'function' && define.amd ? define('@frontegg/angular', ['exports', '@angular/core', '@angular/common', '@angular/router', '@frontegg/js', '@frontegg/redux-store', 'rxjs', '@frontegg/rest-api', '@angular/core/package.json', 'fast-deep-equal'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.frontegg = global.frontegg || {}, global.frontegg.angular = {}), global.ng.core, global.ng.common, global.ng.router, global.FronteggJS, global.FronteggReduxStore, global.rxjs, global.FronteggRestApi, global.ng.core.packageJson, global.FastDeepEqual));
+})(this, (function (exports, i0, common, i1, js, reduxStore, rxjs, restApi, angularCoreVersion, FastDeepEqual) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -357,7 +357,7 @@
                     }]
             }] });
 
-    var sdkVersion = { version: '6.8.0' };
+    var sdkVersion = { version: '6.9.0' };
 
     var FronteggAppOptionsClass = /** @class */ (function () {
         function FronteggAppOptionsClass() {
@@ -415,13 +415,14 @@
                     });
                 }
             };
-            var contextOptions = ((_a = this.config) !== null && _a !== void 0 ? _a : {}).contextOptions;
-            contextOptions.metadataHeaders = {
+            var metadataHeaders = {
                 fronteggSdkVersion: "@frontegg/angular@" + sdkVersion.version,
-                //TODO: remove this ts-ignore after updating rest-api context options type to accept string.
-                //@ts-ignore
+                // TODO: remove this any type after updating rest-api context options type to accept string.
+                // @ts-ignore
                 framework: restApi.FronteggFrameworks.Angular + "@" + angularCoreVersion__default["default"].version,
             };
+            // prepare config default values
+            this.config = Object.assign(Object.assign({}, this.config), { contextOptions: Object.assign(Object.assign({}, this.config.contextOptions), { metadataHeaders: metadataHeaders }), authOptions: Object.assign(Object.assign({}, this.config.authOptions), { hostedLoginOptions: Object.assign({ loadUserOnFirstLoad: true }, (_a = this.config.authOptions) === null || _a === void 0 ? void 0 : _a.hostedLoginOptions), onRedirectTo: onRedirectTo }) });
             restApi.ContextHolder.setOnRedirectTo(onRedirectTo);
             this.fronteggApp = js.initialize(Object.assign({ onRedirectTo: onRedirectTo }, this.config));
             // Add all login box routes to Angular router config
@@ -614,6 +615,15 @@
         return FronteggBaseGuard;
     }());
 
+    var runNgZoneIfNeeded = function (ngZone, fn) {
+        if (i0.NgZone.isInAngularZone()) {
+            fn();
+        }
+        else {
+            ngZone.run(fn);
+        }
+    };
+
     var FronteggAuthService = /** @class */ (function () {
         function FronteggAuthService(fronteggAppService, router) {
             var _this = this;
@@ -649,11 +659,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 (params) {
+            this.loginWithRedirect = function (params, shouldRedirectToLogin, firstTime) {
+                if (shouldRedirectToLogin === void 0) { shouldRedirectToLogin = true; }
+                if (firstTime === void 0) { firstTime = false; }
                 if (_this.isHostedLoginCallbackRoute()) {
                     return;
                 }
-                _this.dispatchAction('requestHostedLoginAuthorize', params);
+                _this.dispatchAction('requestHostedLoginAuthorizeV2', { additionalParams: params, shouldRedirectToLogin: shouldRedirectToLogin, firstTime: firstTime });
                 _this.setState({ isLoading: true });
             };
             this.preLogin = function (payload) { return _this.dispatchAction('preLogin', payload); };
@@ -813,6 +825,9 @@
                 _this.updateState(newState.auth, authSubStates);
             });
         }
+        FronteggAuthService.prototype.getAuthState = function () {
+            return this.fronteggAppService.fronteggApp.store.getState().auth;
+        };
         Object.defineProperty(FronteggAuthService.prototype, "authState$", {
             get: function () {
                 return this.authStateSubject.asObservable();
@@ -1039,42 +1054,68 @@
             _this.ngZone = ngZone;
             return _this;
         }
-        FronteggAuthGuard.prototype.navigateToUrl = function (redirectUrl) {
+        /**
+         * Wait for loader to finish
+         * @private
+         */
+        FronteggAuthGuard.prototype.waitForLoader = function () {
+            var _this = this;
+            return new Promise(function (resolve) {
+                var subscription = _this.fronteggAppService.isLoading$.subscribe(function (isLoading) {
+                    if (!isLoading) {
+                        resolve(true);
+                        subscription.unsubscribe();
+                    }
+                });
+            });
+        };
+        /**
+         * Navigate to login page if user is not authenticated
+         * @private
+         */
+        FronteggAuthGuard.prototype.navigateToLoginIfNeeded = function (redirectUrl) {
             return __awaiter(this, void 0, void 0, function () {
+                var isAuthenticated;
                 return __generator(this, function (_a) {
-                    if (this.fronteggAppService.fronteggApp.options.hostedLoginBox) {
-                        localStorage.setItem('FRONTEGG_AFTER_AUTH_REDIRECT_URL', redirectUrl);
-                        this.fronteggAuthService.loginWithRedirect();
-                        return [2 /*return*/, false];
-                    }
-                    else {
-                        return [2 /*return*/, this.router.navigateByUrl(this.fronteggAppService.authRoutes.loginUrl + '?redirectUrl=' + encodeURIComponent(redirectUrl))];
+                    isAuthenticated = this.fronteggAuthService.getAuthState().isAuthenticated;
+                    if (!isAuthenticated) {
+                        if (this.fronteggAppService.fronteggApp.options.hostedLoginBox) {
+                            localStorage.setItem('FRONTEGG_AFTER_AUTH_REDIRECT_URL', redirectUrl);
+                            this.fronteggAuthService.loginWithRedirect({ prompt: 'login' });
+                            return [2 /*return*/, false];
+                        }
+                        else {
+                            return [2 /*return*/, this.router.navigateByUrl(this.fronteggAppService.authRoutes.loginUrl + '?redirectUrl=' + encodeURIComponent(redirectUrl))];
+                        }
                     }
-                    return [2 /*return*/];
+                    return [2 /*return*/, true]; // activate navigation
                 });
             });
         };
         FronteggAuthGuard.prototype.canActivate = function (route, state) {
             var _this = this;
             var redirectUrl = state.url;
-            return new Promise(function (resolve, reject) {
-                var subscription = _this.fronteggAppService.isAuthenticated$.pipe(operators.take(1)).subscribe(function (isAuthenticated) {
-                    if (isAuthenticated) {
-                        resolve(true);
-                    }
-                    else {
-                        if (i0.NgZone.isInAngularZone()) {
-                            _this.navigateToUrl(redirectUrl).then(resolve, reject);
-                        }
-                        else {
-                            _this.ngZone.run(function () {
-                                _this.navigateToUrl(redirectUrl).then(resolve, reject);
+            var isLoading = this.fronteggAuthService.getAuthState().isLoading;
+            if (!isLoading) {
+                // if showLoader false
+                // check if user is authenticated
+                return this.navigateToLoginIfNeeded(redirectUrl);
+            }
+            // wait for loader to finish and then check if user is authenticated
+            return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.waitForLoader()];
+                        case 1:
+                            _a.sent();
+                            runNgZoneIfNeeded(this.ngZone, function () {
+                                _this.navigateToLoginIfNeeded(redirectUrl).then(resolve).catch(reject);
                             });
-                        }
+                            return [2 /*return*/];
                     }
                 });
-                subscription.unsubscribe();
-            });
+            }); });
         };
         return FronteggAuthGuard;
     }(FronteggBaseGuard));