@frontegg/redux-store 6.201.0-alpha.1 → 6.201.0-alpha.3

package/auth/LoginState/saga.js

@@ -30,7 +30,7 @@ import { loadVendorPublicInfo } from '../../vendor/saga';
 import { createRandomString, generateCodeChallenge, getFeatureFlags } from '../../helpers';
 import { base64urlDecode, publicKeyCredentialToJSON } from '../utils';
 import { loadPublicAuthStrategiesPolicy } from '../Security/SecurityPolicyState/saga';
-import { getSearchParam, TENANT_ID_PARAM_KEY, isMfaRequired, isOauthCallbackRoute, isEmailPayload } from './utils';
+import { getSearchParam, TENANT_ID_PARAM_KEY, isMfaRequired, isOauthCallbackRoute, isEmailPayload, getBaseNameWithoutSlashSuffix } from './utils';
 import { errorHandler, GTMEventAction, reportGTMEvent } from '../../utils';
 import { authStrategyLoginStepMap } from './consts';
 import { isEntitlementsDeeplyEqual } from '../Entitlements';
@@ -518,7 +518,6 @@ function* refreshOrRequestHostedLoginAuthorizeV2({
   }
 }
 export function* requestHostedLoginAuthorize(additionalParams) {
-  var _ContextHolder$getBas;
   const {
     routes,
     context,
@@ -545,7 +544,8 @@ export function* requestHostedLoginAuthorize(additionalParams) {
 
   // We are saving the verifier in session storage to be able to validate the response
   localStorage.setItem(HOSTED_LOGIN_VERIFIER_KEY, code_verifier);
-  let redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${(_ContextHolder$getBas = ContextHolder.getBasename()) != null ? _ContextHolder$getBas : ''}${routes.hostedLoginRedirectUrl}`;
+  const basename = getBaseNameWithoutSlashSuffix();
+  let redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${basename != null ? basename : ''}${routes.hostedLoginRedirectUrl}`;
   yield call(loadCustomLoginRoutes);
   const customLoginSearchParam = yield select(state => {
     var _state$auth$customLog;
@@ -597,7 +597,8 @@ function* handleHostedLoginCallback({
     routes: state.auth.routes,
     urlStrategy: state.root.urlStrategy
   }));
-  let redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${routes.hostedLoginRedirectUrl}`;
+  const basename = getBaseNameWithoutSlashSuffix();
+  let redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${basename != null ? basename : ''}${routes.hostedLoginRedirectUrl}`;
   yield call(loadCustomLoginRoutes);
   const customLoginSearchParam = yield select(state => {
     var _state$auth$customLog2;

package/auth/LoginState/utils.d.ts

@@ -28,3 +28,4 @@ export declare const getMfaStepForEnrolledUsers: (mfaDevices: UserMFADevicesResp
 export declare const getMfaStepForNotEnrolledUsers: (mfaStrategies: MFAStrategyEnum[]) => MFAStep.verify | MFAStep.authenticatorApp | MFAStep.smsSetPhoneNumber | MFAStep.emailVerifyCode;
 export declare const isOauthCallbackRoute: (activeUri: string) => boolean;
 export declare function isEmailPayload(payload: IPasswordlessPreLogin): payload is IEmailPasswordlessPreLogin;
+export declare const getBaseNameWithoutSlashSuffix: () => string | null;

package/auth/LoginState/utils.js

@@ -131,4 +131,11 @@ export const isOauthCallbackRoute = activeUri => {
 };
 export function isEmailPayload(payload) {
   return 'email' in payload;
-}
+}
+export const getBaseNameWithoutSlashSuffix = () => {
+  const basename = ContextHolder.getBasename();
+  if (basename != null && basename.endsWith('/')) {
+    return basename.slice(0, -1);
+  }
+  return basename;
+};

package/index.js

@@ -1,4 +1,4 @@
-/** @license Frontegg v6.201.0-alpha.1
+/** @license Frontegg v6.201.0-alpha.3
  *
  * 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

@@ -544,7 +544,6 @@ function* refreshOrRequestHostedLoginAuthorizeV2({
   }
 }
 function* requestHostedLoginAuthorize(additionalParams) {
-  var _ContextHolder$getBas;
   const {
     routes,
     context,
@@ -571,7 +570,8 @@ function* requestHostedLoginAuthorize(additionalParams) {
 
   // We are saving the verifier in session storage to be able to validate the response
   localStorage.setItem(_constants.HOSTED_LOGIN_VERIFIER_KEY, code_verifier);
-  let redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${(_ContextHolder$getBas = _restApi.ContextHolder.getBasename()) != null ? _ContextHolder$getBas : ''}${routes.hostedLoginRedirectUrl}`;
+  const basename = (0, _utils2.getBaseNameWithoutSlashSuffix)();
+  let redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${basename != null ? basename : ''}${routes.hostedLoginRedirectUrl}`;
   yield (0, _effects.call)(_saga4.loadCustomLoginRoutes);
   const customLoginSearchParam = yield (0, _effects.select)(state => {
     var _state$auth$customLog;
@@ -623,7 +623,8 @@ function* handleHostedLoginCallback({
     routes: state.auth.routes,
     urlStrategy: state.root.urlStrategy
   }));
-  let redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${routes.hostedLoginRedirectUrl}`;
+  const basename = (0, _utils2.getBaseNameWithoutSlashSuffix)();
+  let redirectUrl = `${window.location.origin}${urlStrategy === 'path' ? '' : '#'}${basename != null ? basename : ''}${routes.hostedLoginRedirectUrl}`;
   yield (0, _effects.call)(_saga4.loadCustomLoginRoutes);
   const customLoginSearchParam = yield (0, _effects.select)(state => {
     var _state$auth$customLog2;

package/node/auth/LoginState/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isAbsoluteUrl = exports.getSearchParamsFromUrl = exports.getSearchParam = exports.getRedirectUrl = exports.getPathAndSearchParamsFromUrl = exports.getNumberOfMfaDevices = exports.getMfaStepForNotEnrolledUsers = exports.getMfaStepForEnrolledUsers = exports.TENANT_ID_PARAM_KEY = void 0;
+exports.isAbsoluteUrl = exports.getSearchParamsFromUrl = exports.getSearchParam = exports.getRedirectUrl = exports.getPathAndSearchParamsFromUrl = exports.getNumberOfMfaDevices = exports.getMfaStepForNotEnrolledUsers = exports.getMfaStepForEnrolledUsers = exports.getBaseNameWithoutSlashSuffix = exports.TENANT_ID_PARAM_KEY = void 0;
 exports.isEmailPayload = isEmailPayload;
 exports.isOauthCallbackRoute = exports.isMfaRequired = void 0;
 var _restApi = require("@frontegg/rest-api");
@@ -150,4 +150,12 @@ const isOauthCallbackRoute = activeUri => {
 exports.isOauthCallbackRoute = isOauthCallbackRoute;
 function isEmailPayload(payload) {
   return 'email' in payload;
-}
+}
+const getBaseNameWithoutSlashSuffix = () => {
+  const basename = _restApi.ContextHolder.getBasename();
+  if (basename != null && basename.endsWith('/')) {
+    return basename.slice(0, -1);
+  }
+  return basename;
+};
+exports.getBaseNameWithoutSlashSuffix = getBaseNameWithoutSlashSuffix;

package/node/index.js

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

package/package.json

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