Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[_]: feature/Restore stripe checkout for mobile app #1461

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/core/config/views.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import ChangeEmailView from '../views/ChangeEmailView';
import NotFoundView from '../views/NotFoundView/NotFoundView';
import VerifyEmailView from '../views/VerifyEmailView';
import CheckoutViewWrapper from '../../payment/views/IntegratedCheckoutView/CheckoutViewWrapper';
import { CheckoutSessionId } from 'app/payment/views/CheckoutSession/CheckoutSessionId';

const views: Array<{
id: string;
Expand All @@ -57,6 +58,7 @@ const views: Array<{
{ id: AppView.Deactivation, component: DeactivationView },
{ id: AppView.CheckoutSuccess, component: CheckoutSuccessView },
{ id: AppView.CheckoutCancel, component: CheckoutCancelView },
{ id: AppView.CheckoutSession, component: CheckoutSessionId },
{ id: AppView.Checkout, component: CheckoutViewWrapper },
{ id: AppView.RecoveryLink, component: RecoveryLinkView },
{ id: AppView.ShareFileToken, component: ShareFileView },
Expand Down
1 change: 1 addition & 0 deletions src/app/core/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ export enum AppView {
CheckoutSuccess = 'checkout-success',
CheckoutCancel = 'checkout-cancel',
Checkout = 'checkout',
CheckoutSession = 'checkout-session',
RecoveryLink = 'recovery-link',
ShareFileToken = 'share-token',
ShareFileToken2 = 'share-token-2',
Expand Down
31 changes: 31 additions & 0 deletions src/app/payment/views/CheckoutSession/CheckoutSessionId.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import errorService from 'app/core/services/error.service';
import navigationService from 'app/core/services/navigation.service';
import { AppView } from 'app/core/types';
import paymentService from 'app/payment/services/payment.service';
import { useEffect } from 'react';
import { useParams } from 'react-router-dom';

export const CheckoutSessionId = () => {
const { sessionId } = useParams<{ sessionId: string }>();

const checkSessionId = (id: string): boolean => {
const pattern = /^cs_(test|live)_[a-zA-Z0-9]+$/;
return pattern.test(id);
};

useEffect(() => {
if (sessionId) {
const isValid = checkSessionId(sessionId);

if (isValid) {
paymentService.redirectToCheckout({ sessionId }).catch((err) => {
errorService.reportError(err);
navigationService.push(AppView.CheckoutCancel);
});
return;
}
}
}, [sessionId]);

return <></>;
};
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { BaseSyntheticEvent, useCallback, useEffect, useReducer, useRef } from 'react';
import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
import { Elements } from '@stripe/react-stripe-js';
import { useSelector } from 'react-redux';
import { Stripe, StripeElements, StripeElementsOptionsMode } from '@stripe/stripe-js';
import { UserSettings } from '@internxt/sdk/dist/shared/types/userSettings';
import { BaseSyntheticEvent, useCallback, useEffect, useReducer, useRef } from 'react';
import { useSelector } from 'react-redux';

import { Loader } from '@internxt/ui';
import { bytesToString } from 'app/drive/services/size.service';
import { getProductAmount } from 'app/payment/utils/getProductAmount';
import { useCheckout } from 'hooks/checkout/useCheckout';
import { useSignUp } from '../../../auth/components/SignUp/useSignUp';
import envService from '../../../core/services/env.service';
Expand All @@ -15,6 +18,7 @@ import { AppView, IFormValues } from '../../../core/types';
import databaseService from '../../../database/services/database.service';
import { getDatabaseProfileAvatar } from '../../../drive/services/database.service';
import { useTranslationContext } from '../../../i18n/provider/TranslationProvider';
import ChangePlanDialog from '../../../newSettings/Sections/Account/Plans/components/ChangePlanDialog';
import notificationsService, { ToastType } from '../../../notifications/services/notifications.service';
import checkoutService from '../../../payment/services/checkout.service';
import paymentService from '../../../payment/services/payment.service';
Expand All @@ -26,12 +30,6 @@ import authCheckoutService from '../../services/auth-checkout.service';
import { checkoutReducer, initialStateForCheckout } from '../../store/checkoutReducer';
import { AuthMethodTypes, CouponCodeData, RequestedPlanData } from '../../types';
import CheckoutView from './CheckoutView';
import ChangePlanDialog from '../../../newSettings/Sections/Account/Plans/components/ChangePlanDialog';
import { getProductAmount } from 'app/payment/utils/getProductAmount';
import { bytesToString } from 'app/drive/services/size.service';
import { Loader } from '@internxt/ui';
import gaService, { GA_SEND_TO_KEY } from 'app/analytics/ga.service';
import { getCookie } from 'app/analytics/utils';

export const THEME_STYLES = {
dark: {
Expand Down
7 changes: 7 additions & 0 deletions src/app/routes/paths.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@
"exact": false,
"auth": false
},
{
"id": "checkout-session",
"layout": "empty",
"path": "/checkout/:sessionId",
"exact": false,
"auth": false
},
{
"id": "checkout-status",
"layout": "empty",
Expand Down
Loading