Merge pull request #1281 from internxt/refactor/remove-old-checkout

[_]: refactor/remove unused payment code

src/App.tsx

@@ -188,7 +188,7 @@ const App = (props: AppProps): JSX.Element => {
               to={`/?preferences=open&section=account&subsection=${params.get('tab') ?? 'account'}`}
             />
             <Redirect from="/app/:section?" to={{ pathname: '/:section?', search: `${queryParameters}` }} />
-            {pathName !== 'checkout-plan' && pathName !== 'checkout' && isMobile && isAuthenticated ? (
+            {pathName !== 'checkout' && isMobile && isAuthenticated ? (
               <Route path="*">
                 <Mobile user={props.user} />
               </Route>

src/app/auth/views/Auth/signup.ts

@@ -39,13 +39,7 @@ const signup = async (data, dispatch, doRegister, setLoading, appRedirect?, setE
     localStorage.removeItem('email');
     localStorage.removeItem('password');
     setLoading(false);
-    appRedirect
-      ? window.open(`${process.env.REACT_APP_HOSTNAME}`, '_parent', 'noopener')
-      : window.open(
-          `${process.env.REACT_APP_HOSTNAME}/checkout-plan?planId=plan_F7ptyrVRmyL8Gn&couponCode=g3S2TZFZ&freeTrials=30&mode=subscription`,
-          '_parent',
-          'noopener',
-        );
+    window.open(`${process.env.REACT_APP_HOSTNAME}`, '_parent', 'noopener');
   } catch (err: unknown) {
     setError(errorService.castError(err).message);
     setLoading(false);

src/app/core/config/views.ts

@@ -31,7 +31,6 @@ import ChangeEmailView from '../views/ChangeEmailView';
 import NotFoundView from '../views/NotFoundView/NotFoundView';
 import VerifyEmailView from '../views/VerifyEmailView';
 import CheckoutViewWrapper from '../../payment/views/IntegratedCheckoutView/CheckoutViewWrapper';
-import CheckoutPlanView from '../../payment/views/RedirectToCheckoutView/CheckoutPlanView';
 
 const views: Array<{
   id: string;
@@ -59,7 +58,6 @@ const views: Array<{
   { id: AppView.CheckoutSuccess, component: CheckoutSuccessView },
   { id: AppView.CheckoutCancel, component: CheckoutCancelView },
   { id: AppView.Checkout, component: CheckoutViewWrapper },
-  { id: AppView.CheckoutPlan, component: CheckoutPlanView },
   { id: AppView.RecoveryLink, component: RecoveryLinkView },
   { id: AppView.ShareFileToken, component: ShareFileView },
   { id: AppView.ShareFileToken2, component: ShareFileView },

src/app/core/types.ts

@@ -126,7 +126,6 @@ export enum AppView {
   Deactivation = 'deactivation',
   CheckoutSuccess = 'checkout-success',
   CheckoutCancel = 'checkout-cancel',
-  CheckoutPlan = 'checkout-plan',
   Checkout = 'checkout',
   RecoveryLink = 'recovery-link',
   ShareFileToken = 'share-token',

src/app/newSettings/Sections/Account/Plans/PlansSection.tsx

@@ -17,7 +17,7 @@ import { RootState } from '../../../../store';
 import { useAppDispatch } from '../../../../store/hooks';
 import { PlanState, planThunks } from '../../../../store/slices/plan';
 import CancelSubscriptionModal from '../../Workspace/Billing/CancelSubscriptionModal';
-import { createCheckoutSession, fetchPlanPrices, getStripe } from './api/plansApi';
+import { fetchPlanPrices, getStripe } from './api/plansApi';
 import ChangePlanDialog from './components/ChangePlanDialog';
 import PlanCard from './components/PlanCard';
 import PlanSelectionCard from './components/PlanSelectionCard';
@@ -200,28 +200,6 @@ const PlansSection = ({ changeSection, onClosePreferences }: PlansSectionProps)
     }
   };
 
-  const handleCheckoutSession = async ({
-    priceId,
-    currency,
-    userEmail,
-    mode,
-  }: {
-    userEmail: string;
-    priceId: string;
-    mode: string;
-    currency: string;
-  }) => {
-    try {
-      const response = await createCheckoutSession({ userEmail, priceId, currency, mode });
-      localStorage.setItem('sessionId', response.sessionId);
-      await paymentService.redirectToCheckout(response);
-    } catch (err) {
-      const error = errorService.castError(err);
-      errorService.reportError(error);
-      showCancelSubscriptionErrorNotification();
-    }
-  };
-
   const onChangePlanClicked = async (priceId: string, currency: string) => {
     setIsLoadingCheckout(true);
     setIsUpdatingSubscription(true);

src/app/newSettings/Sections/Account/Plans/api/plansApi.ts

@@ -38,27 +38,6 @@ const fetchPlanPrices = async (userType: UserType) => {
   }
 };
 
-const createCheckoutSession = async ({
-  userEmail,
-  priceId,
-  mode,
-  currency,
-}: {
-  userEmail: string;
-  priceId: string;
-  mode: string;
-  currency: string;
-}) => {
-  return paymentService.createCheckoutSession({
-    price_id: priceId,
-    success_url: `${window.location.origin}/checkout/success`,
-    cancel_url: `${window.location.origin}/checkout/cancel?price_id=${priceId}`,
-    customer_email: userEmail,
-    mode: mode,
-    currency: currency,
-  });
-};
-
 const getStripe = async (stripe): Promise<Stripe> => {
   if (!stripe) {
     stripe = (await loadStripe(
@@ -69,4 +48,4 @@ const getStripe = async (stripe): Promise<Stripe> => {
   return stripe;
 };
 
-export { createCheckoutSession, fetchPlanPrices, getStripe };
+export { fetchPlanPrices, getStripe };

src/app/payment/services/payment.service.ts

@@ -1,5 +1,4 @@
 import {
-  CreateCheckoutSessionPayload,
   CreatedSubscriptionData,
   CustomerBillingInfo,
   DisplayPrice,
@@ -167,14 +166,6 @@ const paymentService = {
     return paymentsClient.cancelSubscription(userType);
   },
 
-  async createCheckoutSession(
-    payload: CreateCheckoutSessionPayload & { mode?: string },
-  ): Promise<{ sessionId: string }> {
-    const paymentsClient = await SdkFactory.getInstance().createPaymentsClient();
-
-    return paymentsClient.createCheckoutSession(payload);
-  },
-
   async updateCustomerBillingInfo(payload: CustomerBillingInfo): Promise<void> {
     const paymentsClient = await SdkFactory.getInstance().createPaymentsClient();
     return paymentsClient.updateCustomerBillingInfo(payload);

src/app/routes/paths.json

@@ -143,13 +143,6 @@
       "exact": true,
       "auth": false
     },
-    {
-      "id": "checkout-plan",
-      "layout": "empty",
-      "path": "/checkout-plan/",
-      "exact": true,
-      "auth": true
-    },
     {
       "id": "recovery-link",
       "layout": "empty",