tf-checkout-react 1.3.11 → 1.3.12-beta.2

package/dist/utils/index.d.ts

@@ -6,3 +6,4 @@ export { createCheckoutDataBodyWithDefaultHolder } from './createCheckoutDataBod
 export { setCustomCookie, getCookieByName, deleteCookieByName } from './cookies';
 export { getDomain } from './getDomain';
 export { createMarkup } from './createMarkup';
+export { replaceVarInString } from './replaceVarInString';

package/dist/utils/replaceVarInString.d.ts

@@ -0,0 +1 @@
+export declare const replaceVarInString: (message: string | undefined, varArray: Array<string>) => string;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.11",
+  "version": "1.3.12-beta.2",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/api/index.ts

@@ -382,3 +382,18 @@ export const getCheckoutPageConfigs = async () => {
   const response = await publicRequest.get(`v1/checkout-configs`)
   return response.data
 }
+
+export const confirmPreRegistration = async (
+  eventId: string | number,
+  data: IConfirmPreRegistrationRequestData
+) => {
+  const response = await publicRequest.post(
+    `v1/event/${eventId}/pre-registration/confirm`,
+    {
+      data: {
+        attributes: data,
+      },
+    }
+  )
+  return response.data
+}

package/src/components/billing-info-container/index.tsx

@@ -35,6 +35,7 @@ import {
 import { IBillingInfoData } from '../../types'
 import {
   createCheckoutDataBodyWithDefaultHolder,
+  deleteCookieByName,
   getCookieByName,
 } from '../../utils'
 import { ErrorFocus } from '../../utils/formikErrorFocus'
@@ -81,8 +82,6 @@ export interface IBillingInfoPage {
   onGetStatesError?: (e: AxiosError) => void;
   onGetProfileDataSuccess?: (res: any) => void;
   onGetProfileDataError?: (e: AxiosError) => void;
-  onAuthorizeSuccess?: () => void;
-  onAuthorizeError?: (e: AxiosError) => void;
   onLogin?: () => void;
   onLoginSuccess?: () => void;
   onErrorClose?: () => void;
@@ -222,8 +221,6 @@ export const BillingInfoContainer = React.memo(
     onGetStatesError = _identity,
     onGetProfileDataSuccess = _identity,
     onGetProfileDataError = _identity,
-    onAuthorizeSuccess = _identity,
-    onAuthorizeError = _identity,
     onLogin,
     onLoginSuccess = _identity,
     isLoggedIn: pIsLoggedIn = false,
@@ -640,12 +637,18 @@ export const BillingInfoContainer = React.memo(
             } catch (e) {
               setLoading(false)
               if (axios.isAxiosError(e)) {
-                if (e.response?.data.error === 'invalid_token') {
+                if (e.response?.status === 401 || e.response?.data?.error === 'invalid_token') {
                   if (isWindowDefined) {
                     window.localStorage.removeItem('user_data')
                     window.localStorage.removeItem('access_token')
                     setUserExpired(true)
                     setShowModalLogin(true)
+                    setIsLoggedIn(false)
+                    setShowModalSignup(false)
+                    setShowModalForgotPassword(false)
+                    const event = new window.CustomEvent('tf-logout')
+                    deleteCookieByName('X-TF-ECOMMERCE')
+                    window.document.dispatchEvent(event)
                   }
                 }
                 if (e.response?.data.message && !hideErrorsAlertSection) {
@@ -917,8 +920,6 @@ export const BillingInfoContainer = React.memo(
             }}
             alreadyHasUser={alreadyHasUser}
             userExpired={userExpired}
-            onAuthorizeSuccess={onAuthorizeSuccess}
-            onAuthorizeError={onAuthorizeError}
             onGetProfileDataSuccess={(data: any) => {
               fetchCart()
               onGetProfileDataSuccess(data)
@@ -954,7 +955,7 @@ export const BillingInfoContainer = React.memo(
             onClose={() => {
               setShowModalForgotPassword(false)
             }}
-            onLogin={() => {
+            onLoginButtonClick={() => {
               setShowModalForgotPassword(false)
               setShowModalLogin(true)
             }}

package/src/components/common/SelectField.tsx

@@ -63,7 +63,7 @@ export const SelectField = ({
           id: field.name,
         }}
         native={true}
-        className={theme}
+        className={`Mui-Select ${theme}`}
         MenuProps={{ className: theme }}
         {...field}
         style={customTheme?.input}

package/src/components/common/dist/PhoneNumberField.js

@@ -0,0 +1,96 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+exports.PhoneNumberField = void 0;
+var TextField_1 = require("@mui/material/TextField");
+var debounce_1 = require("lodash/debounce");
+var get_1 = require("lodash/get");
+var react_1 = require("react");
+var api_1 = require("../../api");
+exports.PhoneNumberField = function (_a) {
+    var label = _a.label, _b = _a.type, type = _b === void 0 ? 'text' : _b, field = _a.field, _c = _a.form, errors = _c.errors, setFieldError = _c.setFieldError, setStatus = _c.setStatus;
+    var error = get_1["default"](errors, field.name);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    var debounceCb = react_1.useCallback(debounce_1["default"](function (cb) { return void cb(); }, 1000), []);
+    react_1.useEffect(function () {
+        var _a;
+        if (field.value) {
+            setStatus((_a = {}, _a[field.name] = true, _a));
+        }
+        debounceCb(function () { return __awaiter(void 0, void 0, void 0, function () {
+            var error_1, message;
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _b.trys.push([0, 3, 4, 5]);
+                        if (!field.value) return [3 /*break*/, 2];
+                        return [4 /*yield*/, api_1.validatePhoneNumber(field.value)];
+                    case 1:
+                        _b.sent();
+                        _b.label = 2;
+                    case 2:
+                        setFieldError(field.name, '');
+                        return [3 /*break*/, 5];
+                    case 3:
+                        error_1 = _b.sent();
+                        message = get_1["default"](error_1, 'response.data.message', 'Invalid phone number');
+                        setFieldError(field.name, message);
+                        return [3 /*break*/, 5];
+                    case 4:
+                        setStatus((_a = {}, _a[field.name] = false, _a));
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
+                }
+            });
+        }); });
+        // eslint-disable-next-line
+    }, [field.value]);
+    return (react_1["default"].createElement(TextField_1["default"], __assign({}, field, { id: field.name, label: label, type: type, fullWidth: true, error: !!error, helperText: error, value: field.value || '', inputProps: { pattern: '[+0-9]/d+' } })));
+};

package/src/components/forgotPasswordModal/index.tsx

@@ -1,15 +1,17 @@
-import React, { FC, useState } from 'react'
-import { Field, Form, Formik } from 'formik'
+import './style.css'
+
+import { Box, CircularProgress, Modal } from '@mui/material'
 import axios, { AxiosError } from 'axios'
-import { Modal, Box, CircularProgress } from '@mui/material'
-import { CustomField } from '../common/CustomField'
+import { Field, Form, Formik } from 'formik'
+import React, { FC, useState } from 'react'
 import * as Yup from 'yup'
+
 import { forgotPassword } from '../../api'
-import './style.css'
+import { CustomField } from '../common/CustomField'
 
-interface IForgotPasswordProps {
+export interface IForgotPasswordProps {
   onClose: () => void;
-  onLogin: () => void;
+  onLoginButtonClick: () => void;
   onForgotPasswordSuccess: (res: any) => void;
   onForgotPasswordError: (e: AxiosError) => void;
 }
@@ -38,7 +40,7 @@ const Schema = Yup.object().shape({
 
 export const ForgotPasswordModal: FC<IForgotPasswordProps> = ({
   onClose = () => {},
-  onLogin = () => {},
+  onLoginButtonClick = () => {},
   onForgotPasswordSuccess = () => {},
   onForgotPasswordError = () => {},
 }) => {
@@ -82,11 +84,7 @@ export const ForgotPasswordModal: FC<IForgotPasswordProps> = ({
                 <div className="forgot-password-container">
                   <div className="title">Password Reset</div>
                   <div className="forgot-password-container__singleField">
-                    <Field
-                      name="email"
-                      label="Email"
-                      component={CustomField}
-                    />
+                    <Field name="email" label="Email" component={CustomField} />
                   </div>
                 </div>
                 <div className="forgot-password-action-button">
@@ -95,7 +93,7 @@ export const ForgotPasswordModal: FC<IForgotPasswordProps> = ({
                   </button>
                 </div>
                 <div className="login">
-                  <span onClick={onLogin}>Back to Log In</span>
+                  <span onClick={onLoginButtonClick}>Back to Log In</span>
                 </div>
               </Form>
             )}

package/src/components/loginForm/index.tsx

@@ -0,0 +1,195 @@
+import axios, { AxiosError } from 'axios'
+import { Field, Form, Formik } from 'formik'
+import _get from 'lodash/get'
+import _identity from 'lodash/identity'
+import React, { FC, useState } from 'react'
+
+import { authorize, getProfileData } from '../../api'
+import {
+  combineValidators,
+  emailValidator,
+  requiredValidator,
+} from '../../validators'
+import { CustomField } from '../common'
+
+export interface ILoginFormProps {
+  alreadyHasUser?: boolean;
+  userExpired?: boolean;
+
+  onLoginSuccess?: (res: IProfileData) => void;
+  onLoginError?: (e: AxiosError) => void;
+
+  onGetProfileDataSuccess?: (res: IProfileData) => void;
+  onGetProfileDataError?: (e: AxiosError) => void;
+
+  onForgotPasswordButtonClick?: () => void;
+  onSignupButtonClick?: () => void;
+
+  logo?: string;
+  showForgotPasswordButton?: boolean;
+  showSignUpButton?: boolean;
+}
+
+interface IUserData {
+  id: string;
+  firstName: string;
+  lastName: string;
+  email: string;
+  city?: string;
+  country?: string;
+  countryId?: string;
+  phone?: string;
+  streetAddress?: string;
+  state?: string;
+  zip?: string;
+  zipCode?: string;
+  stateId?: string;
+}
+
+export const setLoggedUserData = (data: IUserData) => ({
+  id: data.id,
+  first_name: data.firstName,
+  last_name: data.lastName,
+  email: data.email,
+  confirmEmail: data.email,
+  city: data?.city || '',
+  country: data?.countryId || data?.country || '',
+  phone: data?.phone || '',
+  street_address: data?.streetAddress || '',
+  state: data?.stateId || '',
+  zip: data?.zip || data?.zipCode || '',
+})
+
+export const LoginForm: FC<ILoginFormProps> = ({
+  alreadyHasUser = false,
+  userExpired = false,
+
+  onLoginSuccess = _identity,
+  onLoginError = _identity,
+
+  onGetProfileDataSuccess = _identity,
+  onGetProfileDataError = _identity,
+
+  onForgotPasswordButtonClick = _identity,
+  onSignupButtonClick = _identity,
+
+  logo,
+  showForgotPasswordButton = false,
+  showSignUpButton = false,
+}) => {
+  const [error, setError] = useState('')
+  return (
+    <div>
+      <Formik
+        initialValues={{ email: '', password: '' }}
+        onSubmit={async ({ email, password }) => {
+          try {
+            const body = { email, password }
+            const authRes = await authorize(body)
+            let profileResponse = null
+            try {
+              profileResponse = await getProfileData()
+              onGetProfileDataSuccess(_get(profileResponse, 'data.data'))
+            } catch (e) {
+              if (axios.isAxiosError(e)) {
+                onGetProfileDataError(e)
+              }
+              return
+            }
+
+            const profileSpecifiedData = _get(profileResponse, 'data.data')
+            const profileDataObj = setLoggedUserData(profileSpecifiedData)
+            if (typeof window !== 'undefined') {
+              window.localStorage.setItem(
+                'user_data',
+                JSON.stringify(profileDataObj)
+              )
+              const event = new window.CustomEvent('tf-login')
+              window.document.dispatchEvent(event)
+            }
+            onLoginSuccess(_get(authRes, 'data.data'))
+          } catch (e) {
+            if (axios.isAxiosError(e)) {
+              const error = e?.response?.data?.message || 'Error'
+              setError(error)
+              onLoginError(e)
+            } else if (e instanceof Error) {
+              setError(e?.message || 'Error')
+            }
+          }
+        }}
+      >
+        {props => (
+          <Form onSubmit={props.handleSubmit}>
+            <div className="modal-title">Login</div>
+            <div className="login-logo-container">
+              <img
+                className="login-logo-tff"
+                src={
+                  logo ||
+                  'https://www.ticketfairy.com/resources/images/logo-ttf-black.svg'
+                }
+                alt="logo"
+              />
+            </div>
+            <div className="server_auth__error">{error}</div>
+            {alreadyHasUser && (
+              <p className="info-text-for-login">
+                It appears this email is already attached to an account. Please
+                log in here to complete your registration.
+              </p>
+            )}
+            {userExpired && (
+              <p className="info-text-for-login">
+                Your session has expired, please log in again.
+              </p>
+            )}
+            <div className="login-modal-body">
+              <div className="login-modal-body__email">
+                <Field
+                  name="email"
+                  label="Email"
+                  type="email"
+                  component={CustomField}
+                  validate={combineValidators(
+                    requiredValidator,
+                    emailValidator
+                  )}
+                />
+              </div>
+              <div className="login-modal-body__password">
+                <Field
+                  name="password"
+                  label="Password"
+                  type="password"
+                  component={CustomField}
+                  validate={requiredValidator}
+                />
+              </div>
+              <div className="login-action-button">
+                <button type="submit">Login</button>
+              </div>
+              {showForgotPasswordButton && (
+                <div className="forgot-password">
+                  <span
+                    aria-hidden="true"
+                    onClick={onForgotPasswordButtonClick}
+                  >
+                    Forgot password?
+                  </span>
+                </div>
+              )}
+              {showSignUpButton && (
+                <div className="forgot-password">
+                  <span aria-hidden="true" onClick={onSignupButtonClick}>
+                    Sign up
+                  </span>
+                </div>
+              )}
+            </div>
+          </Form>
+        )}
+      </Formik>
+    </div>
+  )
+}