@frontegg/redux-store 5.45.2 → 5.47.0

package/index.js

@@ -1,7 +1,7 @@
 export { AcceptInvitationStep, ActivateAccountStep, ApiStateKeys, AuthenticationTypes, ForgotPasswordStep, LoginStep, MFAStep, ResetPhoneNumberStep, SSOStateKeys, SamlVendors, SignUpStage, TeamStateKeys, UserVeirifedOriginTypes, acceptInvitationActions, acceptInvitationReducers, acceptInvitationState, accountSettingsActions, accountSettingsReducers, accountSettingsState, activateAccountActions, activateAccountReducers, activateState, apiTokensActions, apiTokensReducers, apiTokensState, default as auth, authActions, authInitialState, authMockSagas, authReducers, authSagas, forgotPasswordActions, forgotPasswordReducers, forgotPasswordState, loginActions, loginReducers, loginState, mfaActions, mfaReducers, mfaState, profileActions, profileReducers, profileState, resetPhoneNumberActions, resetPhoneNumberReducers, resetPhoneNumberState, rolesActions, rolesReducers, rolesState, securityPolicyActions, securityPolicyReducers, securityPolicyState, signUpActions, signUpReducers, signUpState, socialLoginState, socialLoginsActions, socialLoginsReducer, ssoActions, ssoReducers, ssoState, teamActions, teamReducers, teamState, tenantsActions, tenantsReducers, tenantsState } from './auth/index.js';
 export { auditLogsActions, auditLogsReducers, auditLogsState, default as audits, auditsActions, auditsInitialState, auditsMetadataActions, auditsMetadataReducers, auditsMetadataState, auditsMockSagas, auditsReducers, auditsSagas } from './audits/index.js';
 export { default as connectivity, connectivityActions, connectivityInitialState, connectivityReducers, connectivitySagas } from './connectivity/index.js';
-export { CheckoutEvent, CheckoutStatus, PaymentMethodType, PaymentProvider, SubscriptionCancellationPolicy, SubscriptionStatus, subscriptionActions, subscriptionInitialState, subscriptionReducers, subscriptionSagas, subscriptionSagasMock, default as subscriptions } from './subscriptions/index.js';
+export { PaymentMethodType, PaymentProvider, SubscriptionCancellationPolicy, SubscriptionStatus, subscriptionActions, subscriptionInitialState, subscriptionReducers, subscriptionSagas, subscriptionSagasMock, default as subscriptions } from './subscriptions/index.js';
 export { default as vendor } from './vendor/index.js';
 export { createFronteggStore } from './toolkit/index.js';
 export { AuthStrategyEnum } from '@frontegg/rest-api';

package/node/auth/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var auth_index = require('../index-28ae5ca1.js');
+var auth_index = require('../index-7ba717da.js');
 var constants = require('../constants-52e37c08.js');
 var restApi = require('@frontegg/rest-api');
 require('@reduxjs/toolkit');

package/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var auth_index = require('./index-28ae5ca1.js');
+var auth_index = require('./index-7ba717da.js');
 var audits_index = require('./audits/index.js');
 var connectivity_index = require('./connectivity/index.js');
 var subscriptions_index = require('./subscriptions/index.js');
@@ -172,18 +172,6 @@ exports.connectivityActions = connectivity_index.connectivityActions;
 exports.connectivityInitialState = connectivity_index.connectivityInitialState;
 exports.connectivityReducers = connectivity_index.connectivityReducers;
 exports.connectivitySagas = connectivity_index.connectivitySagas;
-Object.defineProperty(exports, 'CheckoutEvent', {
-  enumerable: true,
-  get: function () {
-    return subscriptions_index.CheckoutEvent;
-  }
-});
-Object.defineProperty(exports, 'CheckoutStatus', {
-  enumerable: true,
-  get: function () {
-    return subscriptions_index.CheckoutStatus;
-  }
-});
 Object.defineProperty(exports, 'PaymentMethodType', {
   enumerable: true,
   get: function () {

package/node/subscriptions/index.js

@@ -153,42 +153,19 @@ const billingReducer = toolkit.combineReducers({
     subscription: reducer$6,
 });
 
-exports.CheckoutStatus = void 0;
-(function (CheckoutStatus) {
-    CheckoutStatus["SELECTION"] = "SELECTION";
-    CheckoutStatus["CHECKOUT"] = "CHECKOUT";
-    CheckoutStatus["CONFIRM"] = "CONFIRM";
-    CheckoutStatus["ERROR"] = "ERROR";
-    CheckoutStatus["CANCEL"] = "CANCEL";
-})(exports.CheckoutStatus || (exports.CheckoutStatus = {}));
-exports.CheckoutEvent = void 0;
-(function (CheckoutEvent) {
-    CheckoutEvent["SUBMITTED"] = "SUBMITTED";
-    CheckoutEvent["ABORT"] = "ABORT";
-    CheckoutEvent["CANCEL"] = "CANCEL";
-    CheckoutEvent["ERROR"] = "ERROR";
-    CheckoutEvent["CONFIRMED"] = "CONFIRMED";
-})(exports.CheckoutEvent || (exports.CheckoutEvent = {}));
-
 const checkoutInitialState = {
+    fetching: true,
     loading: false,
     error: null,
-    status: exports.CheckoutStatus.SELECTION,
-    checkoutPlanId: null,
+    confirmed: false,
 };
-const reducers$1 = Object.assign(Object.assign({}, createModuleCaseReducers()), { setStatus: {
-        prepare: (payload) => ({ payload }),
-        reducer: (state, action) => (Object.assign(Object.assign({}, state), { status: action.payload })),
-    }, selectPlan: {
-        prepare: (payload) => ({ payload }),
-        reducer: (state, action) => (Object.assign(Object.assign({}, state), { checkoutPlanId: action.payload })),
-    } });
+const reducers$1 = Object.assign({}, createModuleCaseReducers());
 const { actions: checkoutActions, reducer: reducer$2, name: name$1 } = toolkit.createSlice({
     name: `${constants.subscriptionsStoreName}/checkout`,
     initialState: checkoutInitialState,
     reducers: reducers$1,
 });
-const actions$2 = Object.assign({ checkoutPlan: toolkit.createAction(`${name$1}/checkoutPlan`, (payload) => ({ payload })), resetCheckout: toolkit.createAction(`${name$1}/resetCheckout`), confirmCheckout: toolkit.createAction(`${name$1}/confirmCheckout`, (payload) => ({ payload, })), cancelCheckout: toolkit.createAction(`${name$1}/cancelCheckout`), submitCheckout: toolkit.createAction(`${name$1}/submitCheckout`), errorCheckout: toolkit.createAction(`${name$1}/errorCheckout`, (payload) => ({ payload, })), checkoutEvent: toolkit.createAction(`${name$1}/checkoutEvent`, (payload) => ({ payload, })) }, checkoutActions);
+const actions$2 = Object.assign({ loadCheckout: toolkit.createAction(`${name$1}/loadCheckout`), resetCheckout: toolkit.createAction(`${name$1}/resetCheckout`), submitCheckout: toolkit.createAction(`${name$1}/submitCheckout`), confirmCheckout: toolkit.createAction(`${name$1}/confirmCheckout`, (payload) => ({ payload })), errorCheckout: toolkit.createAction(`${name$1}/errorCheckout`, (payload) => ({ payload })) }, checkoutActions);
 
 const initialSubscriptionStripeState = {
     loading: false,
@@ -450,7 +427,6 @@ function* subscriptionSagasMock() {
 
 function* subscriptionBillingInformationSagas() {
     yield effects.takeEvery(actions$5.loadBillingInformation, loadBillingInformation);
-    yield effects.takeEvery(actions$2.checkoutEvent, checkoutEvent$2);
 }
 function* loadBillingInformation() {
     yield loadBillingInformationAction(false);
@@ -512,11 +488,6 @@ function* loadSummaries(tenantId, forceActive) {
         yield effects.put(actions$5.setError(e.message));
     }
 }
-function* checkoutEvent$2({ payload }) {
-    if (payload === exports.CheckoutEvent.CONFIRMED) {
-        yield loadBillingInformationAction(true);
-    }
-}
 /*********************************
  *  Preview Sagas
  *********************************/
@@ -552,7 +523,6 @@ function* subscriptionsPaymentMethodSagas() {
     yield effects.takeEvery(actions$4.submitPaymentMethodError, submitPaymentMethodError);
     yield effects.takeEvery(actions$4.submitPaymentMethodSuccess, submitPaymentMethodSuccess);
     yield effects.takeEvery(actions$4.updatePaymentMethodBillingDetails, updateBillingDetails);
-    yield effects.takeEvery(actions$2.checkoutEvent, checkoutEvent$1);
 }
 function* loadPaymentMethod() {
     yield effects.put(actions$4.setLoading(true));
@@ -569,11 +539,6 @@ function* loadPaymentMethod() {
         yield effects.put(actions$4.setError(e.message));
     }
 }
-function* checkoutEvent$1({ payload }) {
-    if (payload === exports.CheckoutEvent.CONFIRMED) {
-        yield loadPaymentMethod();
-    }
-}
 function* updateBillingDetails({ payload, }) {
     yield effects.put(actions$4.setLoading(true));
     const { id, email, address, callback } = payload;
@@ -617,7 +582,6 @@ function* subscriptionsPaymentMethodSagasMock() {
 function* subscriptionInvoicesSagas() {
     yield effects.takeEvery(actions$3.loadInvoices, loadInvoices);
     yield effects.takeEvery(actions$3.downloadInvoice, downloadInvoice);
-    yield effects.takeEvery(actions$2.checkoutEvent, checkoutEvent);
 }
 function* loadInvoices() {
     yield effects.put(actions$3.setLoading(true));
@@ -653,11 +617,6 @@ function* downloadInvoice({ payload }) {
         yield effects.put(actions$3.setInvoiceDownloadState({ loading: false, error: e.message || null }));
     }
 }
-function* checkoutEvent({ payload }) {
-    if (payload === exports.CheckoutEvent.CONFIRMED) {
-        yield loadInvoices();
-    }
-}
 /*********************************
  *  Preview Sagas
  *********************************/
@@ -694,120 +653,96 @@ function* billingSagasMock() {
 }
 
 function* checkoutSagas() {
-    yield effects.takeEvery(actions$2.checkoutPlan, checkoutPlan);
+    yield effects.takeEvery(actions$2.loadCheckout, loadCheckout);
     yield effects.takeEvery(actions$2.resetCheckout, resetCheckout);
-    yield effects.takeEvery(actions$2.confirmCheckout, confirmPlan);
-    yield effects.takeEvery(actions$2.cancelCheckout, cancelPlan);
     yield effects.takeEvery(actions$2.submitCheckout, submitCheckout);
+    yield effects.takeEvery(actions$2.confirmCheckout, confirmPlan);
     yield effects.takeEvery(actions$2.errorCheckout, errorCheckout);
 }
-function* checkoutPlan({ payload: planId }) {
+function* loadCheckout() {
     yield effects.put(actions$2.setState({
-        checkoutPlanId: planId,
+        fetching: false,
         loading: false,
         error: null,
-        status: exports.CheckoutStatus.CHECKOUT,
+        confirmed: false,
     }));
 }
 function* resetCheckout() {
     yield effects.put(actions$2.setState({
-        checkoutPlanId: null,
         loading: false,
-        status: exports.CheckoutStatus.SELECTION,
+        error: null,
+        confirmed: false,
     }));
 }
-function* confirmPlan({ payload: paymentMethodId }) {
-    const { checkout: { status, checkoutPlanId, }, subscription, summary, } = yield effects.select(({ subscriptions: { billing: { information: { summary }, subscription: { subscription } }, checkout, }, }) => ({
-        checkout,
-        subscription,
-        summary,
+/**
+ * Based on payment provider type
+ */
+function* submitCheckout() {
+    yield effects.put(actions$2.setState({
+        loading: true,
+        error: null,
     }));
-    const isTrialing = (subscription === null || subscription === void 0 ? void 0 : subscription.trialEnd) || (subscription === null || subscription === void 0 ? void 0 : subscription.status) === exports.SubscriptionStatus.TRIALING;
+}
+function* confirmPlan({ payload: { paymentMethodId, planId } }) {
+    const subscription = yield effects.select((state) => state.subscriptions.billing.subscription.subscription);
+    const summary = yield effects.select((state) => state.subscriptions.billing.information.summary);
+    const isTrialing = (subscription === null || subscription === void 0 ? void 0 : subscription.status) === exports.SubscriptionStatus.TRIALING;
     const hasPaymentMethod = !!(summary === null || summary === void 0 ? void 0 : summary.paymentMethodId);
-    if (!checkoutPlanId || !subscription) {
+    if (!subscription) {
         yield effects.put(actions$2.setState({
             loading: false,
-            status: exports.CheckoutStatus.ERROR,
+            error: 'Subscription not found',
         }));
         return;
     }
+    yield effects.put(actions$2.setState({
+        loading: true,
+        error: null,
+    }));
     if (isTrialing && hasPaymentMethod) {
-        yield effects.put(actions$2.setState({
-            checkoutPlanId: null,
-            loading: false,
-            status: exports.CheckoutStatus.CONFIRM,
+        yield confirmCheckout();
+        yield effects.put(actions$6.setState({
+            subscription: Object.assign(Object.assign({}, subscription), { status: restApi.ISubscriptionStatus.ACTIVE }),
         }));
-        yield loadSubscription();
-        yield effects.put(actions$2.checkoutEvent(exports.CheckoutEvent.CONFIRMED));
         return;
     }
-    if (status === exports.CheckoutStatus.CHECKOUT) {
-        yield effects.put(actions$2.setState({
-            loading: true,
-            error: null,
-        }));
-        try {
-            yield effects.call(restApi.api.subscriptions.updateManagedSubscription, subscription.id, {
-                paymentMethodId,
-                planId: checkoutPlanId,
-            });
-            yield effects.put(actions$2.setState({
-                checkoutPlanId: null,
-                loading: false,
-                status: exports.CheckoutStatus.CONFIRM,
-            }));
-            yield effects.put(actions$2.checkoutEvent(exports.CheckoutEvent.CONFIRMED));
-        }
-        catch (e) {
-            yield effects.put(actions$2.setState({
-                loading: false,
-                error: e.message,
-                status: exports.CheckoutStatus.ERROR,
-            }));
-            yield effects.put(actions$2.checkoutEvent(exports.CheckoutEvent.ERROR));
-        }
+    try {
+        yield effects.call(restApi.api.subscriptions.updateManagedSubscription, subscription.id, {
+            paymentMethodId,
+            planId,
+        });
+        yield effects.all([
+            loadBillingInformation(),
+            loadPaymentMethod(),
+            loadInvoices(),
+        ]);
+        yield confirmCheckout();
     }
-}
-function* cancelPlan() {
-    const { status } = yield effects.select((state) => state.subscriptions.checkout);
-    if (status === exports.CheckoutStatus.CHECKOUT) {
+    catch (e) {
         yield effects.put(actions$2.setState({
-            checkoutPlanId: null,
             loading: false,
-            error: null,
-            status: exports.CheckoutStatus.CANCEL,
+            error: e.message,
         }));
-        yield effects.put(actions$2.checkoutEvent(exports.CheckoutEvent.CANCEL));
     }
 }
-/**
- * Based on payment provider type
- */
-function* submitCheckout() {
-    const { paymentProvider } = yield effects.select((state) => state.subscriptions.config.config);
-    if (paymentProvider === exports.PaymentProvider.STRIPE) {
-        yield effects.put(actions$2.setState({
-            loading: true,
-            error: null,
-        }));
-        yield effects.put(actions$2.checkoutEvent(exports.CheckoutEvent.SUBMITTED));
-    }
+function* confirmCheckout() {
+    yield effects.put(actions$2.setState({
+        loading: false,
+        error: null,
+        confirmed: true,
+    }));
 }
 function* errorCheckout({ payload }) {
     yield effects.put(actions$2.setState({
         loading: false,
         error: payload,
-        status: exports.CheckoutStatus.ERROR,
     }));
-    yield effects.put(actions$2.checkoutEvent(exports.CheckoutEvent.ERROR));
 }
 /*********************************
  *  Preview Sagas
  *********************************/
 function* checkoutSagasMock() {
-    yield effects.takeEvery(actions$2.checkoutPlan, checkoutPlan);
     yield effects.takeEvery(actions$2.resetCheckout, resetCheckout);
-    yield effects.takeEvery(actions$2.cancelCheckout, cancelPlan);
 }
 
 function* plansSagas() {

package/node/toolkit/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var auth_index = require('../index-28ae5ca1.js');
+var auth_index = require('../index-7ba717da.js');
 var toolkit = require('@reduxjs/toolkit');
 var createSagaMiddleware = require('redux-saga');
 var effects = require('redux-saga/effects');

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@frontegg/redux-store",
   "libName": "FronteggReduxStore",
-  "version": "5.45.2",
+  "version": "5.47.0",
   "author": "Frontegg LTD",
   "main": "./node/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
   "dependencies": {
-    "@frontegg/rest-api": "2.10.64",
+    "@frontegg/rest-api": "2.10.65",
     "@reduxjs/toolkit": "^1.5.0",
     "redux-saga": "^1.1.0",
     "tslib": "^2.3.1",

package/subscriptions/Billing/Information/saga.d.ts

@@ -1,5 +1,28 @@
 import { IPlanResponse, ISubscriptionResponse, ISubscriptionSummariesResponse } from '@frontegg/rest-api';
+import { PaymentProvider } from '../../general.interfaces';
 export declare function subscriptionBillingInformationSagas(): Generator<import("redux-saga/effects").ForkEffect<never>, void, unknown>;
+export declare function loadBillingInformation(): Generator<Generator<import("redux-saga/effects").SelectEffect | import("redux-saga/effects").PutEffect<{
+    payload: string | null;
+    type: string;
+}> | Generator<import("redux-saga/effects").SelectEffect | import("redux-saga/effects").PutEffect<{
+    payload: string | null;
+    type: string;
+}> | import("redux-saga/effects").PutEffect<{
+    payload: boolean;
+    type: string;
+}> | import("redux-saga/effects").CallEffect<ISubscriptionSummariesResponse> | Generator<import("redux-saga/effects").PutEffect<{
+    payload: string | null;
+    type: string;
+}> | import("redux-saga/effects").PutEffect<{
+    payload: boolean;
+    type: string;
+}> | import("redux-saga/effects").CallEffect<ISubscriptionResponse[]> | import("redux-saga/effects").PutEffect<{
+    payload: Partial<import("../Subscription/interfaces").SubscriptionState>;
+    type: string;
+}>, void, [any]> | import("redux-saga/effects").CallEffect<IPlanResponse[]> | import("redux-saga/effects").AllEffect<any> | import("redux-saga/effects").PutEffect<{
+    payload: Partial<import("./interfaces").BillingInformationState>;
+    type: string;
+}>, void, any>, void, PaymentProvider>, void, unknown>;
 export declare function loadSummaries(tenantId: string, forceActive?: boolean): Generator<import("redux-saga/effects").SelectEffect | import("redux-saga/effects").PutEffect<{
     payload: string | null;
     type: string;

package/subscriptions/Billing/Invoices/saga.d.ts

@@ -1,2 +1,13 @@
+import { ISubscriptionInvoiceResponse } from '@frontegg/rest-api';
 export declare function subscriptionInvoicesSagas(): Generator<import("redux-saga/effects").ForkEffect<never>, void, unknown>;
+export declare function loadInvoices(): Generator<import("redux-saga/effects").PutEffect<{
+    payload: boolean;
+    type: string;
+}> | import("redux-saga/effects").CallEffect<ISubscriptionInvoiceResponse[]> | import("redux-saga/effects").PutEffect<{
+    payload: Partial<import("./interfaces").InvoicesState>;
+    type: string;
+}> | import("redux-saga/effects").PutEffect<{
+    payload: string | null;
+    type: string;
+}>, void, ISubscriptionInvoiceResponse[]>;
 export declare function subscriptionInvoicesSagasMock(): Generator<import("redux-saga/effects").ForkEffect<never>, void, unknown>;

package/subscriptions/Billing/PaymentMethod/saga.d.ts

@@ -1,2 +1,13 @@
+import { ISubscriptionPaymentMethodCardResponse } from '@frontegg/rest-api';
 export declare function subscriptionsPaymentMethodSagas(): Generator<import("redux-saga/effects").ForkEffect<never>, void, unknown>;
+export declare function loadPaymentMethod(): Generator<import("redux-saga/effects").PutEffect<{
+    payload: boolean;
+    type: string;
+}> | import("redux-saga/effects").CallEffect<import("@frontegg/rest-api").ISubscriptionPaymentMethodResponse[]> | import("redux-saga/effects").PutEffect<{
+    payload: Partial<import("./interfaces").PaymentMethodState>;
+    type: string;
+}> | import("redux-saga/effects").PutEffect<{
+    payload: string | null;
+    type: string;
+}>, void, ISubscriptionPaymentMethodCardResponse[]>;
 export declare function subscriptionsPaymentMethodSagasMock(): Generator<import("redux-saga/effects").ForkEffect<never>, void, unknown>;

package/subscriptions/Checkout/index.d.ts

@@ -1,18 +1,14 @@
-import { CheckoutEvent, CheckoutState, CheckoutStatus } from './interfaces';
+import { CheckoutState, ConfirmCheckoutActionPayload } from './interfaces';
 export declare const checkoutInitialState: CheckoutState;
 declare const reducer: import("redux").Reducer<CheckoutState, import("redux").AnyAction>;
 declare const actions: {
-    setStatus: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[CheckoutStatus], CheckoutStatus, string, never, never>;
-    selectPlan: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string | null], string | null, string, never, never>;
     setLoading: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[boolean], boolean, string, never, never>;
     setError: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string | null], string | null, string, never, never>;
     setState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[Partial<CheckoutState>], Partial<CheckoutState>, string, never, never>;
-    checkoutPlan: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string], string, string, never, never>;
+    loadCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
     resetCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
-    confirmCheckout: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string], string, string, never, never>;
-    cancelCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
     submitCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+    confirmCheckout: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[ConfirmCheckoutActionPayload], ConfirmCheckoutActionPayload, string, never, never>;
     errorCheckout: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string], string, string, never, never>;
-    checkoutEvent: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[CheckoutEvent], CheckoutEvent, string, never, never>;
 };
 export { reducer as checkoutReducer, actions as checkoutActions };

package/subscriptions/Checkout/interfaces.d.ts

@@ -1,28 +1,17 @@
-export declare enum CheckoutStatus {
-    SELECTION = "SELECTION",
-    CHECKOUT = "CHECKOUT",
-    CONFIRM = "CONFIRM",
-    ERROR = "ERROR",
-    CANCEL = "CANCEL"
-}
 export interface CheckoutState {
+    fetching: boolean;
     loading: boolean;
     error: string | null;
-    status: CheckoutStatus;
-    checkoutPlanId: string | null;
-}
-export declare enum CheckoutEvent {
-    SUBMITTED = "SUBMITTED",
-    ABORT = "ABORT",
-    CANCEL = "CANCEL",
-    ERROR = "ERROR",
-    CONFIRMED = "CONFIRMED"
+    confirmed: boolean;
 }
 export interface CheckoutActions {
-    checkoutPlan: (planId: string) => void;
+    loadCheckout: () => void;
     resetCheckout: () => void;
-    confirmCheckout: (paymentMethodId: string) => void;
-    cancelCheckout: () => void;
     submitCheckout: () => void;
+    confirmCheckout: (payload: ConfirmCheckoutActionPayload) => void;
     errorCheckout: (error: string) => void;
 }
+export interface ConfirmCheckoutActionPayload {
+    paymentMethodId: string;
+    planId: string;
+}

package/subscriptions/index.d.ts

@@ -77,18 +77,14 @@ declare const _default: {
             loadPlans: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
         };
         checkout: {
-            setStatus: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./interfaces").CheckoutStatus], import("./interfaces").CheckoutStatus, string, never, never>;
-            selectPlan: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string | null], string | null, string, never, never>;
             setLoading: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[boolean], boolean, string, never, never>;
             setError: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string | null], string | null, string, never, never>;
             setState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[Partial<import("./interfaces").CheckoutState>], Partial<import("./interfaces").CheckoutState>, string, never, never>;
-            checkoutPlan: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string], string, string, never, never>;
+            loadCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
             resetCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
-            confirmCheckout: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string], string, string, never, never>;
-            cancelCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
             submitCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+            confirmCheckout: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./interfaces").ConfirmCheckoutActionPayload], import("./interfaces").ConfirmCheckoutActionPayload, string, never, never>;
             errorCheckout: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string], string, string, never, never>;
-            checkoutEvent: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./interfaces").CheckoutEvent], import("./interfaces").CheckoutEvent, string, never, never>;
         };
         stripe: {
             setLoading: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[boolean], boolean, string, never, never>;

package/subscriptions/index.js

@@ -150,42 +150,19 @@ const billingReducer = combineReducers({
     subscription: reducer$6,
 });
 
-var CheckoutStatus;
-(function (CheckoutStatus) {
-    CheckoutStatus["SELECTION"] = "SELECTION";
-    CheckoutStatus["CHECKOUT"] = "CHECKOUT";
-    CheckoutStatus["CONFIRM"] = "CONFIRM";
-    CheckoutStatus["ERROR"] = "ERROR";
-    CheckoutStatus["CANCEL"] = "CANCEL";
-})(CheckoutStatus || (CheckoutStatus = {}));
-var CheckoutEvent;
-(function (CheckoutEvent) {
-    CheckoutEvent["SUBMITTED"] = "SUBMITTED";
-    CheckoutEvent["ABORT"] = "ABORT";
-    CheckoutEvent["CANCEL"] = "CANCEL";
-    CheckoutEvent["ERROR"] = "ERROR";
-    CheckoutEvent["CONFIRMED"] = "CONFIRMED";
-})(CheckoutEvent || (CheckoutEvent = {}));
-
 const checkoutInitialState = {
+    fetching: true,
     loading: false,
     error: null,
-    status: CheckoutStatus.SELECTION,
-    checkoutPlanId: null,
+    confirmed: false,
 };
-const reducers$1 = Object.assign(Object.assign({}, createModuleCaseReducers()), { setStatus: {
-        prepare: (payload) => ({ payload }),
-        reducer: (state, action) => (Object.assign(Object.assign({}, state), { status: action.payload })),
-    }, selectPlan: {
-        prepare: (payload) => ({ payload }),
-        reducer: (state, action) => (Object.assign(Object.assign({}, state), { checkoutPlanId: action.payload })),
-    } });
+const reducers$1 = Object.assign({}, createModuleCaseReducers());
 const { actions: checkoutActions, reducer: reducer$2, name: name$1 } = createSlice({
     name: `${subscriptionsStoreName}/checkout`,
     initialState: checkoutInitialState,
     reducers: reducers$1,
 });
-const actions$2 = Object.assign({ checkoutPlan: createAction(`${name$1}/checkoutPlan`, (payload) => ({ payload })), resetCheckout: createAction(`${name$1}/resetCheckout`), confirmCheckout: createAction(`${name$1}/confirmCheckout`, (payload) => ({ payload, })), cancelCheckout: createAction(`${name$1}/cancelCheckout`), submitCheckout: createAction(`${name$1}/submitCheckout`), errorCheckout: createAction(`${name$1}/errorCheckout`, (payload) => ({ payload, })), checkoutEvent: createAction(`${name$1}/checkoutEvent`, (payload) => ({ payload, })) }, checkoutActions);
+const actions$2 = Object.assign({ loadCheckout: createAction(`${name$1}/loadCheckout`), resetCheckout: createAction(`${name$1}/resetCheckout`), submitCheckout: createAction(`${name$1}/submitCheckout`), confirmCheckout: createAction(`${name$1}/confirmCheckout`, (payload) => ({ payload })), errorCheckout: createAction(`${name$1}/errorCheckout`, (payload) => ({ payload })) }, checkoutActions);
 
 const initialSubscriptionStripeState = {
     loading: false,
@@ -447,7 +424,6 @@ function* subscriptionSagasMock() {
 
 function* subscriptionBillingInformationSagas() {
     yield takeEvery(actions$5.loadBillingInformation, loadBillingInformation);
-    yield takeEvery(actions$2.checkoutEvent, checkoutEvent$2);
 }
 function* loadBillingInformation() {
     yield loadBillingInformationAction(false);
@@ -509,11 +485,6 @@ function* loadSummaries(tenantId, forceActive) {
         yield put(actions$5.setError(e.message));
     }
 }
-function* checkoutEvent$2({ payload }) {
-    if (payload === CheckoutEvent.CONFIRMED) {
-        yield loadBillingInformationAction(true);
-    }
-}
 /*********************************
  *  Preview Sagas
  *********************************/
@@ -549,7 +520,6 @@ function* subscriptionsPaymentMethodSagas() {
     yield takeEvery(actions$4.submitPaymentMethodError, submitPaymentMethodError);
     yield takeEvery(actions$4.submitPaymentMethodSuccess, submitPaymentMethodSuccess);
     yield takeEvery(actions$4.updatePaymentMethodBillingDetails, updateBillingDetails);
-    yield takeEvery(actions$2.checkoutEvent, checkoutEvent$1);
 }
 function* loadPaymentMethod() {
     yield put(actions$4.setLoading(true));
@@ -566,11 +536,6 @@ function* loadPaymentMethod() {
         yield put(actions$4.setError(e.message));
     }
 }
-function* checkoutEvent$1({ payload }) {
-    if (payload === CheckoutEvent.CONFIRMED) {
-        yield loadPaymentMethod();
-    }
-}
 function* updateBillingDetails({ payload, }) {
     yield put(actions$4.setLoading(true));
     const { id, email, address, callback } = payload;
@@ -614,7 +579,6 @@ function* subscriptionsPaymentMethodSagasMock() {
 function* subscriptionInvoicesSagas() {
     yield takeEvery(actions$3.loadInvoices, loadInvoices);
     yield takeEvery(actions$3.downloadInvoice, downloadInvoice);
-    yield takeEvery(actions$2.checkoutEvent, checkoutEvent);
 }
 function* loadInvoices() {
     yield put(actions$3.setLoading(true));
@@ -650,11 +614,6 @@ function* downloadInvoice({ payload }) {
         yield put(actions$3.setInvoiceDownloadState({ loading: false, error: e.message || null }));
     }
 }
-function* checkoutEvent({ payload }) {
-    if (payload === CheckoutEvent.CONFIRMED) {
-        yield loadInvoices();
-    }
-}
 /*********************************
  *  Preview Sagas
  *********************************/
@@ -691,120 +650,96 @@ function* billingSagasMock() {
 }
 
 function* checkoutSagas() {
-    yield takeEvery(actions$2.checkoutPlan, checkoutPlan);
+    yield takeEvery(actions$2.loadCheckout, loadCheckout);
     yield takeEvery(actions$2.resetCheckout, resetCheckout);
-    yield takeEvery(actions$2.confirmCheckout, confirmPlan);
-    yield takeEvery(actions$2.cancelCheckout, cancelPlan);
     yield takeEvery(actions$2.submitCheckout, submitCheckout);
+    yield takeEvery(actions$2.confirmCheckout, confirmPlan);
     yield takeEvery(actions$2.errorCheckout, errorCheckout);
 }
-function* checkoutPlan({ payload: planId }) {
+function* loadCheckout() {
     yield put(actions$2.setState({
-        checkoutPlanId: planId,
+        fetching: false,
         loading: false,
         error: null,
-        status: CheckoutStatus.CHECKOUT,
+        confirmed: false,
     }));
 }
 function* resetCheckout() {
     yield put(actions$2.setState({
-        checkoutPlanId: null,
         loading: false,
-        status: CheckoutStatus.SELECTION,
+        error: null,
+        confirmed: false,
     }));
 }
-function* confirmPlan({ payload: paymentMethodId }) {
-    const { checkout: { status, checkoutPlanId, }, subscription, summary, } = yield select(({ subscriptions: { billing: { information: { summary }, subscription: { subscription } }, checkout, }, }) => ({
-        checkout,
-        subscription,
-        summary,
+/**
+ * Based on payment provider type
+ */
+function* submitCheckout() {
+    yield put(actions$2.setState({
+        loading: true,
+        error: null,
     }));
-    const isTrialing = (subscription === null || subscription === void 0 ? void 0 : subscription.trialEnd) || (subscription === null || subscription === void 0 ? void 0 : subscription.status) === SubscriptionStatus.TRIALING;
+}
+function* confirmPlan({ payload: { paymentMethodId, planId } }) {
+    const subscription = yield select((state) => state.subscriptions.billing.subscription.subscription);
+    const summary = yield select((state) => state.subscriptions.billing.information.summary);
+    const isTrialing = (subscription === null || subscription === void 0 ? void 0 : subscription.status) === SubscriptionStatus.TRIALING;
     const hasPaymentMethod = !!(summary === null || summary === void 0 ? void 0 : summary.paymentMethodId);
-    if (!checkoutPlanId || !subscription) {
+    if (!subscription) {
         yield put(actions$2.setState({
             loading: false,
-            status: CheckoutStatus.ERROR,
+            error: 'Subscription not found',
         }));
         return;
     }
+    yield put(actions$2.setState({
+        loading: true,
+        error: null,
+    }));
     if (isTrialing && hasPaymentMethod) {
-        yield put(actions$2.setState({
-            checkoutPlanId: null,
-            loading: false,
-            status: CheckoutStatus.CONFIRM,
+        yield confirmCheckout();
+        yield put(actions$6.setState({
+            subscription: Object.assign(Object.assign({}, subscription), { status: ISubscriptionStatus.ACTIVE }),
         }));
-        yield loadSubscription();
-        yield put(actions$2.checkoutEvent(CheckoutEvent.CONFIRMED));
         return;
     }
-    if (status === CheckoutStatus.CHECKOUT) {
-        yield put(actions$2.setState({
-            loading: true,
-            error: null,
-        }));
-        try {
-            yield call(api.subscriptions.updateManagedSubscription, subscription.id, {
-                paymentMethodId,
-                planId: checkoutPlanId,
-            });
-            yield put(actions$2.setState({
-                checkoutPlanId: null,
-                loading: false,
-                status: CheckoutStatus.CONFIRM,
-            }));
-            yield put(actions$2.checkoutEvent(CheckoutEvent.CONFIRMED));
-        }
-        catch (e) {
-            yield put(actions$2.setState({
-                loading: false,
-                error: e.message,
-                status: CheckoutStatus.ERROR,
-            }));
-            yield put(actions$2.checkoutEvent(CheckoutEvent.ERROR));
-        }
+    try {
+        yield call(api.subscriptions.updateManagedSubscription, subscription.id, {
+            paymentMethodId,
+            planId,
+        });
+        yield all([
+            loadBillingInformation(),
+            loadPaymentMethod(),
+            loadInvoices(),
+        ]);
+        yield confirmCheckout();
     }
-}
-function* cancelPlan() {
-    const { status } = yield select((state) => state.subscriptions.checkout);
-    if (status === CheckoutStatus.CHECKOUT) {
+    catch (e) {
         yield put(actions$2.setState({
-            checkoutPlanId: null,
             loading: false,
-            error: null,
-            status: CheckoutStatus.CANCEL,
+            error: e.message,
         }));
-        yield put(actions$2.checkoutEvent(CheckoutEvent.CANCEL));
     }
 }
-/**
- * Based on payment provider type
- */
-function* submitCheckout() {
-    const { paymentProvider } = yield select((state) => state.subscriptions.config.config);
-    if (paymentProvider === PaymentProvider.STRIPE) {
-        yield put(actions$2.setState({
-            loading: true,
-            error: null,
-        }));
-        yield put(actions$2.checkoutEvent(CheckoutEvent.SUBMITTED));
-    }
+function* confirmCheckout() {
+    yield put(actions$2.setState({
+        loading: false,
+        error: null,
+        confirmed: true,
+    }));
 }
 function* errorCheckout({ payload }) {
     yield put(actions$2.setState({
         loading: false,
         error: payload,
-        status: CheckoutStatus.ERROR,
     }));
-    yield put(actions$2.checkoutEvent(CheckoutEvent.ERROR));
 }
 /*********************************
  *  Preview Sagas
  *********************************/
 function* checkoutSagasMock() {
-    yield takeEvery(actions$2.checkoutPlan, checkoutPlan);
     yield takeEvery(actions$2.resetCheckout, resetCheckout);
-    yield takeEvery(actions$2.cancelCheckout, cancelPlan);
 }
 
 function* plansSagas() {
@@ -964,4 +899,4 @@ var subscriptionsStore = {
     storeName: subscriptionsStoreName,
 };
 
-export { CheckoutEvent, CheckoutStatus, PaymentMethodType, PaymentProvider, SubscriptionCancellationPolicy, SubscriptionStatus, subscriptionsStore as default, actions as subscriptionActions, initialState as subscriptionInitialState, reducer as subscriptionReducers, sagas as subscriptionSagas, mockSagas as subscriptionSagasMock };
+export { PaymentMethodType, PaymentProvider, SubscriptionCancellationPolicy, SubscriptionStatus, subscriptionsStore as default, actions as subscriptionActions, initialState as subscriptionInitialState, reducer as subscriptionReducers, sagas as subscriptionSagas, mockSagas as subscriptionSagasMock };

package/subscriptions/reducer.d.ts

@@ -65,18 +65,14 @@ declare const actions: {
         loadPlans: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
     };
     checkout: {
-        setStatus: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./interfaces").CheckoutStatus], import("./interfaces").CheckoutStatus, string, never, never>;
-        selectPlan: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string | null], string | null, string, never, never>;
         setLoading: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[boolean], boolean, string, never, never>;
         setError: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string | null], string | null, string, never, never>;
         setState: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[Partial<import("./interfaces").CheckoutState>], Partial<import("./interfaces").CheckoutState>, string, never, never>;
-        checkoutPlan: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string], string, string, never, never>;
+        loadCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
         resetCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
-        confirmCheckout: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string], string, string, never, never>;
-        cancelCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
         submitCheckout: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
+        confirmCheckout: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./interfaces").ConfirmCheckoutActionPayload], import("./interfaces").ConfirmCheckoutActionPayload, string, never, never>;
         errorCheckout: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[string], string, string, never, never>;
-        checkoutEvent: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[import("./interfaces").CheckoutEvent], import("./interfaces").CheckoutEvent, string, never, never>;
     };
     stripe: {
         setLoading: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[boolean], boolean, string, never, never>;