@frontegg/redux-store 6.5.1 → 6.6.0

package/auth/LoginState/saga.js

@@ -375,11 +375,13 @@ function* requestHostedLoginAuthorize({
   const {
     routes,
     context,
-    onRedirectTo
+    onRedirectTo,
+    urlStrategy
   } = yield select(state => ({
     routes: state.auth.routes,
     onRedirectTo: state.auth.onRedirectTo,
-    context: state.root.context
+    context: state.root.context,
+    urlStrategy: state.root.urlStrategy
   })); // Generate the relevant params for the redirect
 
   const nonce = createRandomString();
@@ -387,7 +389,7 @@ function* requestHostedLoginAuthorize({
   const code_challenge = yield call(generateCodeChallenge, code_verifier); // We are saving the verifier in session storage to be able to validate the response
 
   localStorage.setItem(HOSTED_LOGIN_VERIFIER_KEY, code_verifier);
-  const redirectUrl = `${window.location.origin}${routes.hostedLoginRedirectUrl}`;
+  const redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${routes.hostedLoginRedirectUrl}`;
   const baseUrl = fetch.getBaseUrl(context, '/oauth/authorize'); // Hard coded for now
 
   const oauthUrl = `${baseUrl}/oauth/authorize`;
@@ -414,22 +416,34 @@ function* handleHostedLoginCallback({
 }) {
   // Hard coded for now
   const code_verifier = localStorage.getItem(HOSTED_LOGIN_VERIFIER_KEY) || 'INVALID-CODE-VERIFIER';
-  const routes = yield select(state => state.auth.routes);
-  const redirectUrl = `${window.location.origin}${routes.hostedLoginRedirectUrl}`;
+  const {
+    routes,
+    urlStrategy
+  } = yield select(state => ({
+    routes: state.auth.routes,
+    urlStrategy: state.root.urlStrategy
+  }));
+  const redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${routes.hostedLoginRedirectUrl}`;
   const body = {
     code: payload.code,
     redirect_uri: redirectUrl,
     code_verifier,
     grant_type: 'authorization_code'
   };
-  const user = yield call(api.auth.exchangeOAuthTokens, body); // TODO: Validate nonce and aud
 
-  yield put(actions.setState({
-    user,
-    isAuthenticated: true
-  }));
-  yield put(actions.loadTenants());
-  yield afterAuthNavigation();
+  try {
+    const user = yield call(api.auth.exchangeOAuthTokens, body); // TODO: Validate nonce and aud
+
+    yield put(actions.setState({
+      user,
+      isAuthenticated: true
+    }));
+    yield put(actions.loadTenants());
+  } catch (e) {
+    console.error('Failed to exchangeOAuthTokens', e);
+  } finally {
+    yield afterAuthNavigation();
+  }
 }
 
 function* changePhoneNumberWithVerification(_ref2) {

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.5.1
+/** @license Frontegg v6.6.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/auth/LoginState/saga.js

@@ -430,11 +430,13 @@ function* requestHostedLoginAuthorize({
   const {
     routes,
     context,
-    onRedirectTo
+    onRedirectTo,
+    urlStrategy
   } = yield (0, _effects.select)(state => ({
     routes: state.auth.routes,
     onRedirectTo: state.auth.onRedirectTo,
-    context: state.root.context
+    context: state.root.context,
+    urlStrategy: state.root.urlStrategy
   })); // Generate the relevant params for the redirect
 
   const nonce = (0, _helpers.createRandomString)();
@@ -442,7 +444,7 @@ function* requestHostedLoginAuthorize({
   const code_challenge = yield (0, _effects.call)(_helpers.generateCodeChallenge, code_verifier); // We are saving the verifier in session storage to be able to validate the response
 
   localStorage.setItem(_constants.HOSTED_LOGIN_VERIFIER_KEY, code_verifier);
-  const redirectUrl = `${window.location.origin}${routes.hostedLoginRedirectUrl}`;
+  const redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${routes.hostedLoginRedirectUrl}`;
 
   const baseUrl = _restApi.fetch.getBaseUrl(context, '/oauth/authorize'); // Hard coded for now
 
@@ -469,22 +471,34 @@ function* handleHostedLoginCallback({
 }) {
   // Hard coded for now
   const code_verifier = localStorage.getItem(_constants.HOSTED_LOGIN_VERIFIER_KEY) || 'INVALID-CODE-VERIFIER';
-  const routes = yield (0, _effects.select)(state => state.auth.routes);
-  const redirectUrl = `${window.location.origin}${routes.hostedLoginRedirectUrl}`;
+  const {
+    routes,
+    urlStrategy
+  } = yield (0, _effects.select)(state => ({
+    routes: state.auth.routes,
+    urlStrategy: state.root.urlStrategy
+  }));
+  const redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${routes.hostedLoginRedirectUrl}`;
   const body = {
     code: payload.code,
     redirect_uri: redirectUrl,
     code_verifier,
     grant_type: 'authorization_code'
   };
-  const user = yield (0, _effects.call)(_restApi.api.auth.exchangeOAuthTokens, body); // TODO: Validate nonce and aud
 
-  yield (0, _effects.put)(_reducer.actions.setState({
-    user,
-    isAuthenticated: true
-  }));
-  yield (0, _effects.put)(_reducer.actions.loadTenants());
-  yield afterAuthNavigation();
+  try {
+    const user = yield (0, _effects.call)(_restApi.api.auth.exchangeOAuthTokens, body); // TODO: Validate nonce and aud
+
+    yield (0, _effects.put)(_reducer.actions.setState({
+      user,
+      isAuthenticated: true
+    }));
+    yield (0, _effects.put)(_reducer.actions.loadTenants());
+  } catch (e) {
+    console.error('Failed to exchangeOAuthTokens', e);
+  } finally {
+    yield afterAuthNavigation();
+  }
 }
 
 function* changePhoneNumberWithVerification(_ref2) {

package/node/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.5.1
+/** @license Frontegg v6.6.0
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

package/node/toolkit/index.js

@@ -72,7 +72,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 const initialState = {
-  context: undefined
+  context: undefined,
+  urlStrategy: 'path'
 };
 const {
   reducer: rootReducer
@@ -97,7 +98,7 @@ const {
   }
 });
 
-const createFronteggStore = (rootInitialState, storeHolder, previewMode = false, authInitialState, overrideInitialState, builderMode = false) => {
+const createFronteggStore = (rootInitialState, storeHolder, previewMode = false, authInitialState, overrideInitialState, builderMode = false, urlStrategy = 'path') => {
   const isSSR = typeof window === 'undefined';
   let holder = storeHolder;
 
@@ -126,7 +127,8 @@ const createFronteggStore = (rootInitialState, storeHolder, previewMode = false,
       middleware,
       preloadedState: {
         root: (0, _extends2.default)({}, rootInitialState, {
-          previewMode
+          previewMode,
+          urlStrategy: urlStrategy
         }),
         [_auth.default.storeName]: (0, _extends2.default)({}, _auth.default.initialState, authInitialState, (_overrideInitialState = overrideInitialState == null ? void 0 : overrideInitialState.auth) != null ? _overrideInitialState : {}, {
           routes: (0, _extends2.default)({}, _auth.default.initialState.routes, (_authInitialState$rou = authInitialState == null ? void 0 : authInitialState.routes) != null ? _authInitialState$rou : {}, (_overrideInitialState2 = overrideInitialState == null ? void 0 : (_overrideInitialState3 = overrideInitialState.auth) == null ? void 0 : _overrideInitialState3.routes) != null ? _overrideInitialState2 : {})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frontegg/redux-store",
-  "version": "6.5.1",
+  "version": "6.6.0",
   "main": "./node/index.js",
   "license": "MIT",
   "author": "Frontegg LTD",

package/toolkit/index.d.ts

@@ -12,6 +12,7 @@ export { bindActionCreators } from '@reduxjs/toolkit';
 export type { CaseReducerActions, SliceCaseReducers } from '@reduxjs/toolkit';
 export interface RootState {
     context?: ContextOptions;
+    urlStrategy: 'hash' | 'path';
 }
 export declare const createFronteggStore: (rootInitialState: InitialState, storeHolder?: any, previewMode?: boolean, authInitialState?: (Partial<Pick<AuthState, "user" | "error" | "onRedirectTo" | "isAuthenticated" | "isLoading" | "keepSessionAlive" | "isSSOAuth" | "ssoACS" | "loginState" | "activateState" | "acceptInvitationState" | "forgotPasswordState" | "resetPhoneNumberState" | "ssoState" | "profileState" | "mfaState" | "teamState" | "socialLoginState" | "signUpState" | "apiTokensState" | "securityPolicyState" | "accountSettingsState" | "tenantsState" | "rolesState" | "sessionsState" | "hostedLoginBox" | "sessionsPolicyState" | "header" | "loaderComponent">> & {
     routes?: Partial<AuthPageRoutes> | undefined;
@@ -21,4 +22,4 @@ export declare const createFronteggStore: (rootInitialState: InitialState, store
     };
     auditLogs: Partial<AuditsState>;
     audits: Partial<OldAuditsState>;
-}> | undefined, builderMode?: boolean) => EnhancedStore;
+}> | undefined, builderMode?: boolean, urlStrategy?: 'hash' | 'path') => EnhancedStore;

package/toolkit/index.js

@@ -14,7 +14,8 @@ export * from './redux';
 export * from './redux-saga';
 export { bindActionCreators } from '@reduxjs/toolkit';
 const initialState = {
-  context: undefined
+  context: undefined,
+  urlStrategy: 'path'
 };
 const {
   reducer: rootReducer
@@ -37,7 +38,7 @@ const {
     }
   }
 });
-export const createFronteggStore = (rootInitialState, storeHolder, previewMode = false, authInitialState, overrideInitialState, builderMode = false) => {
+export const createFronteggStore = (rootInitialState, storeHolder, previewMode = false, authInitialState, overrideInitialState, builderMode = false, urlStrategy = 'path') => {
   const isSSR = typeof window === 'undefined';
   let holder = storeHolder;
 
@@ -66,7 +67,8 @@ export const createFronteggStore = (rootInitialState, storeHolder, previewMode =
       middleware,
       preloadedState: {
         root: _extends({}, rootInitialState, {
-          previewMode
+          previewMode,
+          urlStrategy: urlStrategy
         }),
         [authStore.storeName]: _extends({}, authStore.initialState, authInitialState, (_overrideInitialState = overrideInitialState == null ? void 0 : overrideInitialState.auth) != null ? _overrideInitialState : {}, {
           routes: _extends({}, authStore.initialState.routes, (_authInitialState$rou = authInitialState == null ? void 0 : authInitialState.routes) != null ? _authInitialState$rou : {}, (_overrideInitialState2 = overrideInitialState == null ? void 0 : (_overrideInitialState3 = overrideInitialState.auth) == null ? void 0 : _overrideInitialState3.routes) != null ? _overrideInitialState2 : {})