@frontegg/redux-store 4.39.0 → 4.40.1

package/auth/LoginState/saga.d.ts

@@ -65,9 +65,7 @@ export declare function refreshToken(): Generator<import("redux-saga/effects").S
         callback?: ((data: import("@frontegg/rest-api").ITenantsResponse[] | null, error?: string | undefined) => void) | undefined;
     } | undefined;
     type: string;
-}>, void, {
-    routes: any;
-} & import("@frontegg/rest-api").IUserProfile & {
+}>, void, AuthState & import("@frontegg/rest-api").IUserProfile & {
     mfaRequired: boolean;
     accessToken: string;
     refreshToken: string;

package/auth/index.js

@@ -1056,7 +1056,7 @@ function* getMfaRequiredState(user) {
 function* refreshToken() {
     try {
         const onRedirectTo = ContextHolder.onRedirectTo;
-        const { routes } = yield select((state) => state.auth);
+        const { routes, loginState } = yield select((state) => state.auth);
         const user = yield call(api.auth.refreshToken);
         if (isMfaRequired(user)) {
             const mfaRequiredState = yield getMfaRequiredState(user);
@@ -1066,9 +1066,14 @@ function* refreshToken() {
         else {
             yield put(actions.loadTenants());
             yield put(actions.setState({ user, isAuthenticated: true }));
-            if ([routes.loginUrl, routes.socialLoginCallbackUrl, routes.signupUrl, routes.oidcRedirectUrl].includes(window.location.pathname) ||
+            if ([routes.loginUrl, routes.socialLoginCallbackUrl, routes.signUpUrl, routes.oidcRedirectUrl].includes(window.location.pathname) ||
                 (window.location.pathname.endsWith(routes.activateUrl) && user.verified)) {
-                yield afterAuthNavigation();
+                if (loginState.isNewUser && routes.signUpSuccessUrl && routes.socialLoginCallbackUrl === window.location.pathname) {
+                    onRedirectTo(routes.signUpSuccessUrl, { refresh: routes.signUpSuccessUrl.startsWith('http') });
+                }
+                else {
+                    yield afterAuthNavigation();
+                }
             }
         }
     }
@@ -2448,6 +2453,7 @@ function* loginViaSocialLogin({ payload }) {
         const { email, isNewUser } = yield call(api.auth.loginViaSocialLogin, payload);
         yield put(actions.setLoginState({ email, isNewUser }));
         yield refreshToken();
+        yield put(actions.setSocialLoginsState({ loading: false }));
     }
     catch (e) {
         yield put(actions.setSocialLoginsState({ loading: false, error: (_a = e.message) !== null && _a !== void 0 ? _a : 'Failed to authenticate', firstLoad: false }));

package/node/auth/index.js

@@ -1058,7 +1058,7 @@ function* getMfaRequiredState(user) {
 function* refreshToken() {
     try {
         const onRedirectTo = restApi.ContextHolder.onRedirectTo;
-        const { routes } = yield effects.select((state) => state.auth);
+        const { routes, loginState } = yield effects.select((state) => state.auth);
         const user = yield effects.call(restApi.api.auth.refreshToken);
         if (isMfaRequired(user)) {
             const mfaRequiredState = yield getMfaRequiredState(user);
@@ -1068,9 +1068,14 @@ function* refreshToken() {
         else {
             yield effects.put(actions.loadTenants());
             yield effects.put(actions.setState({ user, isAuthenticated: true }));
-            if ([routes.loginUrl, routes.socialLoginCallbackUrl, routes.signupUrl, routes.oidcRedirectUrl].includes(window.location.pathname) ||
+            if ([routes.loginUrl, routes.socialLoginCallbackUrl, routes.signUpUrl, routes.oidcRedirectUrl].includes(window.location.pathname) ||
                 (window.location.pathname.endsWith(routes.activateUrl) && user.verified)) {
-                yield afterAuthNavigation();
+                if (loginState.isNewUser && routes.signUpSuccessUrl && routes.socialLoginCallbackUrl === window.location.pathname) {
+                    onRedirectTo(routes.signUpSuccessUrl, { refresh: routes.signUpSuccessUrl.startsWith('http') });
+                }
+                else {
+                    yield afterAuthNavigation();
+                }
             }
         }
     }
@@ -2450,6 +2455,7 @@ function* loginViaSocialLogin({ payload }) {
         const { email, isNewUser } = yield effects.call(restApi.api.auth.loginViaSocialLogin, payload);
         yield effects.put(actions.setLoginState({ email, isNewUser }));
         yield refreshToken();
+        yield effects.put(actions.setSocialLoginsState({ loading: false }));
     }
     catch (e) {
         yield effects.put(actions.setSocialLoginsState({ loading: false, error: (_a = e.message) !== null && _a !== void 0 ? _a : 'Failed to authenticate', firstLoad: false }));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@frontegg/redux-store",
   "libName": "FronteggReduxStore",
-  "version": "4.39.0",
+  "version": "4.40.1",
   "author": "Frontegg LTD",
   "main": "./node/index.js",
   "module": "./index.js",