tf-checkout-react 1.0.96 → 1.0.97-beta.0

package/dist/api/index.d.ts

@@ -1,4 +1,4 @@
-import { AxiosInstance } from 'axios';
+import { AxiosInstance, AxiosResponse } from 'axios';
 interface IPublicRequest extends AxiosInstance {
     setGuestToken: (token: string) => void;
     setAccessToken: (token: string) => void;
@@ -7,26 +7,28 @@ interface IPublicRequest extends AxiosInstance {
 export declare const publicRequest: IPublicRequest;
 export declare const setXSourceOrigin: (sourceOrigin: string) => void;
 export declare const setCustomHeader: (response: any) => void;
-export declare const handleSetAccessToken: (token: any) => void;
-export declare function getEvent(id: string | number): Promise<import("axios").AxiosResponse<any, any>>;
-export declare function getTickets(id: string | number, promoCode: string): Promise<import("axios").AxiosResponse<any, any>>;
-export declare const addToCart: (id: string | number, data: any) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getCart: () => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const postOnCheckout: (data: any, accessToken: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const authorize: (data: FormData) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const register: (data: FormData) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getAccessToken: (data: FormData) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getPaymentData: (hash: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const handlePaymentData: (orderHash: string, data: any) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const handlePaymentSuccess: (orderHash: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const handleFreeSuccess: (orderHash: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getProfileData: (accessToken: any) => Promise<any>;
-export declare const getCountries: () => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getConfirmationData: (orderHash: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getStates: (countryId: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getOrders: (page: number, limit: number, eventSlug: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getOrderDetails: (orderId: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const addToWaitingList: (id: number, data: any) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const getConditions: (eventId: string) => Promise<import("axios").AxiosResponse<any, any>>;
-export declare const postReferralVisits: (eventId: string, referralId: string) => Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getEvent(id: string | number): Promise<AxiosResponse<any, any>>;
+export declare function getTickets(id: string | number, promoCode: string): Promise<AxiosResponse<any, any>>;
+export declare const addToCart: (id: string | number, data: any) => Promise<AxiosResponse<any, any>>;
+export declare const getCart: () => Promise<AxiosResponse<any, any>>;
+export declare const postOnCheckout: (data: any, accessToken?: string | undefined) => Promise<AxiosResponse<any, any>>;
+export declare const authorize: (data: {
+    email: string;
+    password: string;
+}) => Promise<AxiosResponse<any, any>>;
+export declare const register: (data: FormData) => Promise<AxiosResponse<any, any>>;
+export declare const getAccessToken: (data: FormData) => Promise<AxiosResponse<any, any>>;
+export declare const getPaymentData: (hash: string) => Promise<AxiosResponse<any, any>>;
+export declare const handlePaymentData: (orderHash: string, data: any) => Promise<AxiosResponse<any, any>>;
+export declare const handlePaymentSuccess: (orderHash: string) => Promise<AxiosResponse<any, any>>;
+export declare const handleFreeSuccess: (orderHash: string) => Promise<AxiosResponse<any, any>>;
+export declare const getProfileData: (accessToken?: string | undefined) => Promise<any>;
+export declare const getCountries: () => Promise<AxiosResponse<any, any>>;
+export declare const getConfirmationData: (orderHash: string) => Promise<AxiosResponse<any, any>>;
+export declare const getStates: (countryId: string) => Promise<AxiosResponse<any, any>>;
+export declare const getOrders: (page: number, limit: number, eventSlug: string) => Promise<AxiosResponse<any, any>>;
+export declare const getOrderDetails: (orderId: string) => Promise<AxiosResponse<any, any>>;
+export declare const addToWaitingList: (id: number, data: any) => Promise<AxiosResponse<any, any>>;
+export declare const getConditions: (eventId: string) => Promise<AxiosResponse<any, any>>;
+export declare const postReferralVisits: (eventId: string, referralId: string) => Promise<AxiosResponse<any, any>>;
 export {};

package/dist/components/billing-info-container/index.d.ts

@@ -9,10 +9,7 @@ export interface IBillingInfoPage {
     data?: IBillingInfoData[];
     ticketHoldersFields?: IBillingInfoData;
     handleSubmit?: (values: FormikValues, formikHelpers: FormikHelpers<FormikValues>, eventId: any, res: any) => void;
-    onRegisterSuccess?: (value: {
-        accessToken: string;
-        refreshToken: string;
-    }) => void;
+    onRegisterSuccess?: () => void;
     onRegisterError?: (e: AxiosError, email: string) => void;
     onSubmitError?: (e: AxiosError) => void;
     onGetCartSuccess?: (res: any) => void;

package/dist/tf-checkout-react.cjs.development.js

@@ -1104,6 +1104,39 @@ var createCheckoutDataBodyWithDefaultHolder = function createCheckoutDataBodyWit
   return body;
 };
 
+function setCustomCookie(name, value, days) {
+  var expires = '';
+
+  if (days) {
+    var date = new Date();
+    date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000);
+    expires = '; expires=' + date.toUTCString();
+  }
+
+  document.cookie = name + '=' + (value || '') + expires + '; path=/';
+}
+function getCookieByName(cname) {
+  var name = cname + '=';
+  var ca = document.cookie.split(';');
+
+  for (var i = 0; i < ca.length; i++) {
+    var c = ca[i];
+
+    while (c.charAt(0) == ' ') {
+      c = c.substring(1);
+    }
+
+    if (c.indexOf(name) == 0) {
+      return c.substring(name.length, c.length);
+    }
+  }
+
+  return '';
+}
+function deleteCookieByName(name) {
+  document.cookie = name + '=; Path=/; Expires=Thu, 01 Jan 1970 00:00:01 GMT;';
+}
+
 var isWindowDefined = typeof window !== 'undefined';
 var ttfHeaders = {
   Accept: 'application/vnd.api+json',
@@ -1163,20 +1196,37 @@ publicRequest.interceptors.request.use(function (config) {
     config.headers = _updatedHeaders;
   }
 
-  if (CONFIGS.X_SOURCE_ORIGIN) {
+  if (getCookieByName('X-TF-ECOMMERCE')) {
     var _updatedHeaders2 = _extends({}, config.headers, {
-      'X-Source-Origin': CONFIGS.X_SOURCE_ORIGIN
+      'X-TF-ECOMMERCE': getCookieByName('X-TF-ECOMMERCE')
     });
 
     config.headers = _updatedHeaders2;
   }
 
+  if (CONFIGS.X_SOURCE_ORIGIN) {
+    var _updatedHeaders3 = _extends({}, config.headers, {
+      'X-Source-Origin': CONFIGS.X_SOURCE_ORIGIN
+    });
+
+    config.headers = _updatedHeaders3;
+  }
+
   if (CONFIGS.BASE_URL) {
     config.baseURL = CONFIGS.BASE_URL + '/api';
   }
 
   return config;
 });
+publicRequest.interceptors.response.use(function (response) {
+  var xtfCookie = _get(response, 'headers.x-tf-ecommerce');
+
+  if (xtfCookie) {
+    setCustomCookie('X-TF-ECOMMERCE', xtfCookie);
+  }
+
+  return response;
+});
 
 publicRequest.setGuestToken = function (token) {
   return publicRequest.defaults.headers.common['Authorization-Guest'] = token;
@@ -1207,14 +1257,6 @@ var setCustomHeader = function setCustomHeader(response) {
     }
   }
 };
-var handleSetAccessToken = function handleSetAccessToken(token) {
-  if (token) {
-    if (isWindowDefined) {
-      window.localStorage.setItem('access_token', token);
-      publicRequest.setAccessToken(token);
-    }
-  }
-};
 function getEvent(id) {
   var response = publicRequest.get("v1/event/" + id, {
     headers: ttfHeaders
@@ -1255,14 +1297,11 @@ var postOnCheckout = function postOnCheckout(data, accessToken) {
   return res;
 };
 var authorize = function authorize(data) {
-  return publicRequest.post("/v1/oauth/authorize-rn?client_id=" + (CONFIGS.CLIENT_ID || 'e9d8f8922797b4621e562255afe90dbf'), data);
+  return publicRequest.post("/auth?clientId=" + (CONFIGS.CLIENT_ID || 'e9d8f8922797b4621e562255afe90dbf'), data);
 };
 var register = function register(data) {
   return publicRequest.post('/v1/oauth/register-rn', data);
 };
-var getAccessToken = function getAccessToken(data) {
-  return publicRequest.post('/v1/oauth/access_token', data);
-};
 var getPaymentData = function getPaymentData(hash) {
   var response = publicRequest.get("v1/order/" + hash + "/review/")["catch"](function (error) {
     throw error;
@@ -1334,10 +1373,6 @@ var LoginModal = function LoginModal(_ref) {
       alreadyHasUser = _ref$alreadyHasUser === void 0 ? false : _ref$alreadyHasUser,
       _ref$userExpired = _ref.userExpired,
       userExpired = _ref$userExpired === void 0 ? false : _ref$userExpired,
-      _ref$onAuthorizeSucce = _ref.onAuthorizeSuccess,
-      onAuthorizeSuccess = _ref$onAuthorizeSucce === void 0 ? function () {} : _ref$onAuthorizeSucce,
-      _ref$onAuthorizeError = _ref.onAuthorizeError,
-      onAuthorizeError = _ref$onAuthorizeError === void 0 ? function () {} : _ref$onAuthorizeError,
       _ref$onGetProfileData = _ref.onGetProfileDataSuccess,
       onGetProfileDataSuccess = _ref$onGetProfileData === void 0 ? function () {} : _ref$onGetProfileData,
       _ref$onGetProfileData2 = _ref.onGetProfileDataError,
@@ -1370,7 +1405,7 @@ var LoginModal = function LoginModal(_ref) {
     },
     onSubmit: function () {
       var _onSubmit = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(_ref2) {
-        var email, password, bodyFormData, resAutorize, bodyFormDataToken, resAccessToken, accessToken, profileResponse, profileSpecifiedData, profileDataObj, event, _e$response, _e$response$data, _error;
+        var email, password, body, profileResponse, profileSpecifiedData, profileDataObj, event, _e$response, _e$response$data, _error;
 
         return runtime_1.wrap(function _callee$(_context) {
           while (1) {
@@ -1378,66 +1413,36 @@ var LoginModal = function LoginModal(_ref) {
               case 0:
                 email = _ref2.email, password = _ref2.password;
                 _context.prev = 1;
-                bodyFormData = new FormData();
-                bodyFormData.append('email', email);
-                bodyFormData.append('password', password);
-                _context.next = 7;
-                return authorize(bodyFormData);
-
-              case 7:
-                resAutorize = _context.sent;
-                bodyFormDataToken = new FormData();
-                bodyFormDataToken.append('code', resAutorize.data.data.code);
-                bodyFormDataToken.append('scope', 'profile');
-                bodyFormDataToken.append('grant_type', 'authorization_code');
-                bodyFormDataToken.append('client_id', CONFIGS.CLIENT_ID || 'e9d8f8922797b4621e562255afe90dbf');
-                bodyFormDataToken.append('client_secret', CONFIGS.CLIENT_SECRET || 'b89c191eff22fdcf84ac9bfd88d005355a151ec2c83b26b9');
-                resAccessToken = null;
-                _context.prev = 15;
-                _context.next = 18;
-                return getAccessToken(bodyFormDataToken);
-
-              case 18:
-                resAccessToken = _context.sent;
-                onAuthorizeSuccess(resAccessToken.data);
-                _context.next = 26;
-                break;
-
-              case 22:
-                _context.prev = 22;
-                _context.t0 = _context["catch"](15);
-
-                if (axios.isAxiosError(_context.t0)) {
-                  onAuthorizeError(_context.t0);
-                }
-
-                return _context.abrupt("return");
+                body = {
+                  email: email,
+                  password: password
+                };
+                _context.next = 5;
+                return authorize(body);
 
-              case 26:
-                accessToken = _get(resAccessToken, 'data.access_token');
-                handleSetAccessToken(accessToken);
+              case 5:
                 profileResponse = null;
-                _context.prev = 29;
-                _context.next = 32;
-                return getProfileData(accessToken);
+                _context.prev = 6;
+                _context.next = 9;
+                return getProfileData();
 
-              case 32:
+              case 9:
                 profileResponse = _context.sent;
                 onGetProfileDataSuccess(profileResponse.data);
-                _context.next = 40;
+                _context.next = 17;
                 break;
 
-              case 36:
-                _context.prev = 36;
-                _context.t1 = _context["catch"](29);
+              case 13:
+                _context.prev = 13;
+                _context.t0 = _context["catch"](6);
 
-                if (axios.isAxiosError(_context.t1)) {
-                  onGetProfileDataError(_context.t1);
+                if (axios.isAxiosError(_context.t0)) {
+                  onGetProfileDataError(_context.t0);
                 }
 
                 return _context.abrupt("return");
 
-              case 40:
+              case 17:
                 profileSpecifiedData = _get(profileResponse, 'data.data');
                 profileDataObj = {
                   id: profileSpecifiedData.id,
@@ -1448,32 +1453,31 @@ var LoginModal = function LoginModal(_ref) {
 
                 if (typeof window !== 'undefined') {
                   window.localStorage.setItem('user_data', JSON.stringify(profileDataObj));
-                  window.localStorage.setItem('access_token', accessToken);
                   event = new window.CustomEvent('tf-login');
                   window.document.dispatchEvent(event);
                 }
 
                 onLogin();
-                _context.next = 49;
+                _context.next = 26;
                 break;
 
-              case 46:
-                _context.prev = 46;
-                _context.t2 = _context["catch"](1);
+              case 23:
+                _context.prev = 23;
+                _context.t1 = _context["catch"](1);
 
-                if (axios.isAxiosError(_context.t2)) {
-                  _error = (_context.t2 == null ? void 0 : (_e$response = _context.t2.response) == null ? void 0 : (_e$response$data = _e$response.data) == null ? void 0 : _e$response$data.message) || 'Error';
+                if (axios.isAxiosError(_context.t1)) {
+                  _error = (_context.t1 == null ? void 0 : (_e$response = _context.t1.response) == null ? void 0 : (_e$response$data = _e$response.data) == null ? void 0 : _e$response$data.message) || 'Error';
                   setError(_error);
-                } else if (_context.t2 instanceof Error) {
-                  setError((_context.t2 == null ? void 0 : _context.t2.message) || 'Error');
+                } else if (_context.t1 instanceof Error) {
+                  setError((_context.t1 == null ? void 0 : _context.t1.message) || 'Error');
                 }
 
-              case 49:
+              case 26:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[1, 46], [15, 22], [29, 36]]);
+        }, _callee, null, [[1, 23], [6, 13]]);
       }));
 
       function onSubmit(_x) {
@@ -1570,7 +1574,7 @@ var RegisterModal = function RegisterModal(_ref) {
     },
     onSubmit: function () {
       var _onSubmit = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(_ref2) {
-        var firstName, lastName, email, password, confirmPassword, bodyFormData, resRegister, access_token, profileResponse, profileSpecifiedData, profileDataObj;
+        var firstName, lastName, email, password, confirmPassword, bodyFormData, profileResponse, profileSpecifiedData, profileDataObj;
         return runtime_1.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -1588,27 +1592,24 @@ var RegisterModal = function RegisterModal(_ref) {
                 return register(bodyFormData);
 
               case 11:
-                resRegister = _context.sent;
-                access_token = _get(resRegister, 'data.data.attributes.access_token');
-                handleSetAccessToken(access_token);
                 profileResponse = null;
-                _context.prev = 15;
-                _context.next = 18;
-                return getProfileData(access_token);
+                _context.prev = 12;
+                _context.next = 15;
+                return getProfileData();
 
-              case 18:
+              case 15:
                 profileResponse = _context.sent;
                 onGetProfileDataSuccess(profileResponse.data);
-                _context.next = 26;
+                _context.next = 23;
                 break;
 
-              case 22:
-                _context.prev = 22;
-                _context.t0 = _context["catch"](15);
+              case 19:
+                _context.prev = 19;
+                _context.t0 = _context["catch"](12);
                 onGetProfileDataError(_context.t0.response);
                 return _context.abrupt("return");
 
-              case 26:
+              case 23:
                 profileSpecifiedData = _get(profileResponse, 'data.data');
                 profileDataObj = {
                   id: profileSpecifiedData.id,
@@ -1618,18 +1619,17 @@ var RegisterModal = function RegisterModal(_ref) {
                 };
 
                 if (typeof window !== 'undefined') {
-                  window.localStorage.setItem('access_token', access_token);
                   window.localStorage.setItem('user_data', JSON.stringify(profileDataObj));
                 }
 
                 onClose();
 
-              case 30:
+              case 27:
               case "end":
                 return _context.stop();
             }
           }
-        }, _callee, null, [[15, 22]]);
+        }, _callee, null, [[12, 19]]);
       }));
 
       function onSubmit(_x) {
@@ -2322,7 +2322,9 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
       dataWithUniqueIds = _useState[0],
       setDataWithUniqueIds = _useState[1];
 
-  var _useState2 = React.useState(!!access_token),
+  var xtfCookie = getCookieByName('X-TF-ECOMMERCE');
+
+  var _useState2 = React.useState(!!access_token || xtfCookie),
       isLoggedIn = _useState2[0],
       setIsLoggedIn = _useState2[1];
 
@@ -2431,10 +2433,10 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
   };
 
   React.useEffect(function () {
-    if ((pIsLoggedIn || access_token) && !isLoggedIn) {
+    if ((pIsLoggedIn || access_token) && !isLoggedIn || xtfCookie) {
       setIsLoggedIn(true);
     }
-  }, [pIsLoggedIn, isLoggedIn, access_token]); //just once
+  }, [pIsLoggedIn, isLoggedIn, access_token, xtfCookie]); //just once
 
   React.useEffect(function () {
     // fetch countries data
@@ -2543,7 +2545,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
             case 0:
               _context4.prev = 0;
 
-              if (!(isWindowDefined && token)) {
+              if (!(isWindowDefined && token || isLoggedIn)) {
                 _context4.next = 10;
                 break;
               }
@@ -2590,7 +2592,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
 
   React.useEffect(function () {
     fetchUserData(access_token);
-  }, [access_token]);
+  }, [access_token, isLoggedIn]);
   React.useEffect(function () {
     var collectPaymentData = /*#__PURE__*/function () {
       var _ref7 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5() {
@@ -2685,7 +2687,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
     enableReinitialize: true,
     onSubmit: function () {
       var _onSubmit = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6(values, formikHelpers) {
-        var updatedUserData, _profileSpecifiedData, _profileDataObj, _checkoutBody, _res, checkoutBodyForRegistration, bodyFormData, access_token_register, resRegister, refreshToken, tokens, _e$response, _e$response$data, _error, profileData, profileSpecifiedData, profileDataObj, checkoutBody, res, _e$response2, _e$response3;
+        var updatedUserData, _profileSpecifiedData, _profileDataObj, _checkoutBody, _res, checkoutBodyForRegistration, bodyFormData, _e$response, _e$response$data, _error, profileData, profileSpecifiedData, profileDataObj, checkoutBody, res, _e$response2, _e$response3;
 
         return runtime_1.wrap(function _callee6$(_context6) {
           while (1) {
@@ -2732,27 +2734,18 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
                   lastNameLogged: lastNameLogged
                 }, showDOB);
                 bodyFormData = createRegisterFormData(values, checkoutBodyForRegistration);
-                access_token_register = null;
-                _context6.prev = 18;
-                _context6.next = 21;
+                _context6.prev = 17;
+                _context6.next = 20;
                 return register(bodyFormData);
 
-              case 21:
-                resRegister = _context6.sent;
-                access_token_register = _get(resRegister, 'data.data.attributes.access_token');
-                refreshToken = _get(resRegister, 'data.data.attributes.refresh_token');
-                handleSetAccessToken(access_token_register);
-                tokens = {
-                  accessToken: access_token_register,
-                  refreshToken: refreshToken
-                };
-                onRegisterSuccess(tokens);
-                _context6.next = 33;
+              case 20:
+                onRegisterSuccess();
+                _context6.next = 27;
                 break;
 
-              case 29:
-                _context6.prev = 29;
-                _context6.t0 = _context6["catch"](18);
+              case 23:
+                _context6.prev = 23;
+                _context6.t0 = _context6["catch"](17);
 
                 if (axios.isAxiosError(_context6.t0)) {
                   _error = _context6.t0 == null ? void 0 : (_e$response = _context6.t0.response) == null ? void 0 : (_e$response$data = _e$response.data) == null ? void 0 : _e$response$data.message;
@@ -2777,11 +2770,11 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
 
                 return _context6.abrupt("return");
 
-              case 33:
-                _context6.next = 35;
-                return getProfileData(access_token_register);
+              case 27:
+                _context6.next = 29;
+                return getProfileData();
 
-              case 35:
+              case 29:
                 profileData = _context6.sent;
                 profileSpecifiedData = _get(profileData, 'data.data');
                 profileDataObj = setLoggedUserData(profileSpecifiedData);
@@ -2791,17 +2784,17 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
                 }
 
                 checkoutBody = collectCheckoutBody(values);
-                _context6.next = 42;
-                return postOnCheckout(checkoutBody, access_token_register);
+                _context6.next = 36;
+                return postOnCheckout(checkoutBody);
 
-              case 42:
+              case 36:
                 res = _context6.sent;
                 handleSubmit(values, formikHelpers, eventId, res);
-                _context6.next = 49;
+                _context6.next = 43;
                 break;
 
-              case 46:
-                _context6.prev = 46;
+              case 40:
+                _context6.prev = 40;
                 _context6.t1 = _context6["catch"](0);
 
                 if (axios.isAxiosError(_context6.t1)) {
@@ -2825,12 +2818,12 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
                   onSubmitError(_context6.t1);
                 }
 
-              case 49:
+              case 43:
               case "end":
                 return _context6.stop();
             }
           }
-        }, _callee6, null, [[0, 46], [18, 29]]);
+        }, _callee6, null, [[0, 40], [17, 23]]);
       }));
 
       function onSubmit(_x2, _x3) {
@@ -4593,6 +4586,7 @@ var TicketsContainer = function TicketsContainer(_ref) {
 
       var _event = new window.CustomEvent('tf-logout');
 
+      deleteCookieByName('X-TF-ECOMMERCE');
       window.document.dispatchEvent(_event);
     }
   };