@frontegg/redux-store 5.26.0 → 5.28.1

package/node/subscriptions/index.js

@@ -69,6 +69,7 @@ const initialBillingInformationState = {
     fetching: true,
     externallyManaged: false,
     defaultPlanId: null,
+    defaultPaymentId: null,
     cancellation: {
         loading: false,
         error: null,
@@ -199,7 +200,7 @@ const managedSubscriptionsInitialState = {
     loading: false,
     error: null,
     fetching: true,
-    managedSubscriptions: [],
+    managedSubscription: null,
 };
 const reducers = Object.assign({}, createModuleCaseReducers());
 const { reducer: reducer$1, actions: sliceActions, name } = toolkit.createSlice({
@@ -281,6 +282,7 @@ const subscriptionResponseMock = {
     externalId: 'sub_1JbhYVEwsu4qiqnnfMhYAdY6',
     startDate: '2021-09-20T08:08:51.000Z',
     status: restApi.ISubscriptionStatus.ACTIVE,
+    externallyManaged: false,
     cancellation: null,
     currentPeriodStart: '2021-09-20T08:08:51.000Z',
     currentPeriodEnd: '2021-10-20T08:08:51.000Z',
@@ -359,8 +361,8 @@ const paymentMethodsMock = [
         billingDetails: {
             name: 'Dummy',
             email: 'dummy@email.com',
-        }
-    }
+        },
+    },
 ];
 
 function* subscriptionBillingInformationSagas() {
@@ -388,11 +390,12 @@ function* loadSummaries(tenantId) {
     var _a, _b;
     yield effects.put(actions$6.setLoading(true));
     try {
-        const { currentPlanId, subscriptionId, externallyManaged, defaultPlanId } = yield effects.call(restApi.api.subscriptions.getSubscriptionSummaries, tenantId);
-        const subscriptionResponse = yield effects.call(restApi.api.subscriptions.getSubscription, subscriptionId);
+        const { currentPlanId, subscriptionId, externallyManaged, defaultPlanId, paymentMethodId: defaultPaymentId, } = yield effects.call(restApi.api.subscriptions.getSubscriptionSummaries, tenantId);
+        const subscriptionResponse = yield effects.call(restApi.api.subscriptions.getManagedSubscription, subscriptionId);
         const planResponse = yield effects.call(restApi.api.subscriptions.getSubscriptionPlan, currentPlanId);
         yield effects.put(actions$6.setBillingInformation(Object.assign(Object.assign({ loading: false, fetching: false, externallyManaged,
-            defaultPlanId }, (subscriptionResponse
+            defaultPlanId,
+            defaultPaymentId }, (subscriptionResponse
             ? {
                 subscription: {
                     id: subscriptionResponse.id,
@@ -439,7 +442,7 @@ function* cancelSubscription() {
     if (isCancellable) {
         try {
             yield effects.put(actions$6.setCancellationLoading(true));
-            yield effects.call(restApi.api.subscriptions.cancelSubscription, subscriptionId);
+            yield effects.call(restApi.api.subscriptions.cancelManagedSubscription, subscriptionId);
             yield effects.put(actions$6.setBillingInformation({
                 subscription: Object.assign(Object.assign({}, overview.subscription), { cancellation: {
                         policy: exports.SubscriptionCancellationPolicy.AT_PERIOD_END,
@@ -466,7 +469,7 @@ function* renewSubscription() {
     if (renewable) {
         try {
             yield effects.put(actions$6.setRenewalLoading(true));
-            yield effects.call(restApi.api.subscriptions.renewSubscription, subscriptionId);
+            yield effects.call(restApi.api.subscriptions.renewManagedSubscription, subscriptionId);
             yield effects.put(actions$6.setBillingInformation({
                 subscription: Object.assign(Object.assign({}, overview.subscription), { cancellation: null }),
             }));
@@ -692,9 +695,9 @@ function* confirmPlan({ payload: paymentMethodId }) {
             error: null,
         }));
         try {
-            yield effects.call(restApi.api.subscriptions.updateSubscription, subscription.id, {
+            yield effects.call(restApi.api.subscriptions.updateManagedSubscription, subscription.id, {
                 paymentMethodId,
-                planId,
+                planId
             });
             yield effects.put(actions$3.setState({
                 checkoutPlanId: null,
@@ -893,7 +896,7 @@ function* loadManagedSubscriptions() {
         yield effects.put(actions$1.setState({
             fetching: false,
             loading: false,
-            managedSubscriptions,
+            managedSubscription: managedSubscriptions === null || managedSubscriptions === void 0 ? void 0 : managedSubscriptions[0],
         }));
     }
     catch (e) {

package/package.json

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

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

@@ -5,6 +5,7 @@ export interface BillingInformationState {
     fetching: boolean;
     externallyManaged: boolean;
     defaultPlanId: string | null;
+    defaultPaymentId: string | null;
     subscription?: Subscription;
     plan?: Plan;
     cancellation: {

package/subscriptions/ManagedSubscriptions/interfaces.d.ts

@@ -3,7 +3,7 @@ export interface ManagedSubscriptionsState {
     loading: boolean;
     error: string | null;
     fetching: boolean;
-    managedSubscriptions: ISubscriptionResponse[];
+    managedSubscription: ISubscriptionResponse | null;
 }
 export interface ManagedSubscriptionsActions {
     loadManagedSubscriptions: () => void;

package/subscriptions/index.js

@@ -66,6 +66,7 @@ const initialBillingInformationState = {
     fetching: true,
     externallyManaged: false,
     defaultPlanId: null,
+    defaultPaymentId: null,
     cancellation: {
         loading: false,
         error: null,
@@ -196,7 +197,7 @@ const managedSubscriptionsInitialState = {
     loading: false,
     error: null,
     fetching: true,
-    managedSubscriptions: [],
+    managedSubscription: null,
 };
 const reducers = Object.assign({}, createModuleCaseReducers());
 const { reducer: reducer$1, actions: sliceActions, name } = createSlice({
@@ -278,6 +279,7 @@ const subscriptionResponseMock = {
     externalId: 'sub_1JbhYVEwsu4qiqnnfMhYAdY6',
     startDate: '2021-09-20T08:08:51.000Z',
     status: ISubscriptionStatus.ACTIVE,
+    externallyManaged: false,
     cancellation: null,
     currentPeriodStart: '2021-09-20T08:08:51.000Z',
     currentPeriodEnd: '2021-10-20T08:08:51.000Z',
@@ -356,8 +358,8 @@ const paymentMethodsMock = [
         billingDetails: {
             name: 'Dummy',
             email: 'dummy@email.com',
-        }
-    }
+        },
+    },
 ];
 
 function* subscriptionBillingInformationSagas() {
@@ -385,11 +387,12 @@ function* loadSummaries(tenantId) {
     var _a, _b;
     yield put(actions$6.setLoading(true));
     try {
-        const { currentPlanId, subscriptionId, externallyManaged, defaultPlanId } = yield call(api.subscriptions.getSubscriptionSummaries, tenantId);
-        const subscriptionResponse = yield call(api.subscriptions.getSubscription, subscriptionId);
+        const { currentPlanId, subscriptionId, externallyManaged, defaultPlanId, paymentMethodId: defaultPaymentId, } = yield call(api.subscriptions.getSubscriptionSummaries, tenantId);
+        const subscriptionResponse = yield call(api.subscriptions.getManagedSubscription, subscriptionId);
         const planResponse = yield call(api.subscriptions.getSubscriptionPlan, currentPlanId);
         yield put(actions$6.setBillingInformation(Object.assign(Object.assign({ loading: false, fetching: false, externallyManaged,
-            defaultPlanId }, (subscriptionResponse
+            defaultPlanId,
+            defaultPaymentId }, (subscriptionResponse
             ? {
                 subscription: {
                     id: subscriptionResponse.id,
@@ -436,7 +439,7 @@ function* cancelSubscription() {
     if (isCancellable) {
         try {
             yield put(actions$6.setCancellationLoading(true));
-            yield call(api.subscriptions.cancelSubscription, subscriptionId);
+            yield call(api.subscriptions.cancelManagedSubscription, subscriptionId);
             yield put(actions$6.setBillingInformation({
                 subscription: Object.assign(Object.assign({}, overview.subscription), { cancellation: {
                         policy: SubscriptionCancellationPolicy.AT_PERIOD_END,
@@ -463,7 +466,7 @@ function* renewSubscription() {
     if (renewable) {
         try {
             yield put(actions$6.setRenewalLoading(true));
-            yield call(api.subscriptions.renewSubscription, subscriptionId);
+            yield call(api.subscriptions.renewManagedSubscription, subscriptionId);
             yield put(actions$6.setBillingInformation({
                 subscription: Object.assign(Object.assign({}, overview.subscription), { cancellation: null }),
             }));
@@ -689,9 +692,9 @@ function* confirmPlan({ payload: paymentMethodId }) {
             error: null,
         }));
         try {
-            yield call(api.subscriptions.updateSubscription, subscription.id, {
+            yield call(api.subscriptions.updateManagedSubscription, subscription.id, {
                 paymentMethodId,
-                planId,
+                planId
             });
             yield put(actions$3.setState({
                 checkoutPlanId: null,
@@ -890,7 +893,7 @@ function* loadManagedSubscriptions() {
         yield put(actions$1.setState({
             fetching: false,
             loading: false,
-            managedSubscriptions,
+            managedSubscription: managedSubscriptions === null || managedSubscriptions === void 0 ? void 0 : managedSubscriptions[0],
         }));
     }
     catch (e) {