@shopgate/pwa-webcheckout-shopify 7.30.0-alpha.7 → 7.30.0-alpha.8

package/action-creators/errorShopifyLogin.js

@@ -1,4 +1,10 @@
-import{ERROR_SHOPIFY_LOGIN}from"../constants";/**
+import { ERROR_SHOPIFY_LOGIN } from "../constants";
+
+/**
  * Creates the dispatched ERROR_SHOPIFY_LOGIN action object.
  * @returns {Object} The dispatched action object.
- */var errorShopifyLogin=function errorShopifyLogin(){return{type:ERROR_SHOPIFY_LOGIN};};export default errorShopifyLogin;
+ */
+const errorShopifyLogin = () => ({
+  type: ERROR_SHOPIFY_LOGIN
+});
+export default errorShopifyLogin;

package/action-creators/errorShopifyLogout.js

@@ -1,4 +1,10 @@
-import{ERROR_SHOPIFY_LOGOUT}from"../constants";/**
+import { ERROR_SHOPIFY_LOGOUT } from "../constants";
+
+/**
  * Creates the dispatched ERROR_SHOPIFY_LOGOUT action object.
  * @returns {Object} The dispatched action object.
- */var errorShopifyLogout=function errorShopifyLogout(){return{type:ERROR_SHOPIFY_LOGOUT};};export default errorShopifyLogout;
+ */
+const errorShopifyLogout = () => ({
+  type: ERROR_SHOPIFY_LOGOUT
+});
+export default errorShopifyLogout;

package/action-creators/register.js

@@ -1,5 +1,11 @@
-import{WEBCHECKOUT_REGISTER_REDIRECT}from"../constants";/**
+import { WEBCHECKOUT_REGISTER_REDIRECT } from "../constants";
+
+/**
  * Creates the dispatched WEBCHECKOUT_REGISTER_REDIRECT action object
  * @param {string} location of webcheckout register
  * @returns {Object} The dispatched action object
- */export var registerRedirect=function registerRedirect(location){return{type:WEBCHECKOUT_REGISTER_REDIRECT,location:location};};
+ */
+export const registerRedirect = location => ({
+  type: WEBCHECKOUT_REGISTER_REDIRECT,
+  location
+});

package/action-creators/requestShopifyLogin.js

@@ -1,4 +1,10 @@
-import{REQUEST_SHOPIFY_LOGIN}from"../constants";/**
+import { REQUEST_SHOPIFY_LOGIN } from "../constants";
+
+/**
  * Creates the dispatched REQUEST_SHOPIFY_LOGIN action object.
  * @returns {Object} The dispatched action object.
- */var requestShopifyLogin=function requestShopifyLogin(){return{type:REQUEST_SHOPIFY_LOGIN};};export default requestShopifyLogin;
+ */
+const requestShopifyLogin = () => ({
+  type: REQUEST_SHOPIFY_LOGIN
+});
+export default requestShopifyLogin;

package/action-creators/requestShopifyLogout.js

@@ -1,4 +1,10 @@
-import{REQUEST_SHOPIFY_LOGOUT}from"../constants";/**
+import { REQUEST_SHOPIFY_LOGOUT } from "../constants";
+
+/**
  * Creates the dispatched REQUEST_SHOPIFY_LOGOUT action object.
  * @returns {Object} The dispatched action object.
- */var requestShopifyLogout=function requestShopifyLogout(){return{type:REQUEST_SHOPIFY_LOGOUT};};export default requestShopifyLogout;
+ */
+const requestShopifyLogout = () => ({
+  type: REQUEST_SHOPIFY_LOGOUT
+});
+export default requestShopifyLogout;

package/action-creators/successShopifyLogin.js

@@ -1,4 +1,10 @@
-import{SUCCESS_SHOPIFY_LOGIN}from"../constants";/**
+import { SUCCESS_SHOPIFY_LOGIN } from "../constants";
+
+/**
  * Creates the dispatched SUCCESS_SHOPIFY_LOGIN action object.
  * @returns {Object} The dispatched action object.
- */var successShopifyLogin=function successShopifyLogin(){return{type:SUCCESS_SHOPIFY_LOGIN};};export default successShopifyLogin;
+ */
+const successShopifyLogin = () => ({
+  type: SUCCESS_SHOPIFY_LOGIN
+});
+export default successShopifyLogin;

package/action-creators/successShopifyLogout.js

@@ -1,4 +1,10 @@
-import{SUCCESS_SHOPIFY_LOGOUT}from"../constants";/**
+import { SUCCESS_SHOPIFY_LOGOUT } from "../constants";
+
+/**
  * Creates the dispatched SUCCESS_SHOPIFY_LOGOUT action object.
  * @returns {Object} The dispatched action object.
- */var successShopifyLogout=function successShopifyLogout(){return{type:SUCCESS_SHOPIFY_LOGOUT};};export default successShopifyLogout;
+ */
+const successShopifyLogout = () => ({
+  type: SUCCESS_SHOPIFY_LOGOUT
+});
+export default successShopifyLogout;

package/actions/login.js

@@ -1,8 +1,46 @@
-import{mutable}from'@shopgate/pwa-common/helpers/redux';import HttpRequest from'@shopgate/pwa-core/classes/HttpRequest';import requestShopifyLogin from"../action-creators/requestShopifyLogin";import errorShopifyLogin from"../action-creators/errorShopifyLogin";import successShopifyLogin from"../action-creators/successShopifyLogin";import{isShopify,getShopifyUrl}from"../selectors";/**
+import { mutable } from '@shopgate/pwa-common/helpers/redux';
+import HttpRequest from '@shopgate/pwa-core/classes/HttpRequest';
+import requestShopifyLogin from "../action-creators/requestShopifyLogin";
+import errorShopifyLogin from "../action-creators/errorShopifyLogin";
+import successShopifyLogin from "../action-creators/successShopifyLogin";
+import { isShopify, getShopifyUrl } from "../selectors";
+
+/**
  * Login the current user.
  * @param {string} user The login user name.
  * @param {string} password The login password.
  * @return {Function} A redux thunk.
- */var webCheckoutLogin=function webCheckoutLogin(user,password){return function(dispatch){if(!isShopify()){// The success is dispatched here to take care that the streams work as expected
-dispatch(successShopifyLogin());return;}dispatch(requestShopifyLogin());new HttpRequest("".concat(getShopifyUrl(),"/account/login")).setMethod('POST').setTimeout(20000).setPayload({// eslint-disable-next-line camelcase
-form_type:'customer_login',customer:{email:user,password:password}}).dispatch().then(function(response){var _response$headers=response.headers,_response$headers2=_response$headers===void 0?{}:_response$headers,location=_response$headers2.location,statusCode=response.statusCode;if(statusCode===302&&location&&location.endsWith('/account')){dispatch(successShopifyLogin());}else{dispatch(errorShopifyLogin());}})["catch"](function(){dispatch(errorShopifyLogin());});};};/** @mixes {MutableFunction} */export default mutable(webCheckoutLogin);
+ */
+const webCheckoutLogin = (user, password) => dispatch => {
+  if (!isShopify()) {
+    // The success is dispatched here to take care that the streams work as expected
+    dispatch(successShopifyLogin());
+    return;
+  }
+  dispatch(requestShopifyLogin());
+  new HttpRequest(`${getShopifyUrl()}/account/login`).setMethod('POST').setTimeout(20000).setPayload({
+    // eslint-disable-next-line camelcase
+    form_type: 'customer_login',
+    customer: {
+      email: user,
+      password
+    }
+  }).dispatch().then(response => {
+    const {
+      headers: {
+        location
+      } = {},
+      statusCode
+    } = response;
+    if (statusCode === 302 && location && location.endsWith('/account')) {
+      dispatch(successShopifyLogin());
+    } else {
+      dispatch(errorShopifyLogin());
+    }
+  }).catch(() => {
+    dispatch(errorShopifyLogin());
+  });
+};
+
+/** @mixes {MutableFunction} */
+export default mutable(webCheckoutLogin);

package/actions/logout.js

@@ -1,10 +1,48 @@
-import{mutable}from'@shopgate/pwa-common/helpers/redux';import HttpRequest from'@shopgate/pwa-core/classes/HttpRequest';import requestShopifyLogout from"../action-creators/requestShopifyLogout";import errorShopifyLogout from"../action-creators/errorShopifyLogout";import successShopifyLogout from"../action-creators/successShopifyLogout";import{getLogoutUrl,getLogoutSuccessUrl}from"../selectors";/**
+import { mutable } from '@shopgate/pwa-common/helpers/redux';
+import HttpRequest from '@shopgate/pwa-core/classes/HttpRequest';
+import requestShopifyLogout from "../action-creators/requestShopifyLogout";
+import errorShopifyLogout from "../action-creators/errorShopifyLogout";
+import successShopifyLogout from "../action-creators/successShopifyLogout";
+import { getLogoutUrl, getLogoutSuccessUrl } from "../selectors";
+
+/**
  * @typedef {Object} LogoutOptions
  * @property {Object.<string, string>} [headers] - Optional request headers.
- */ /**
+ */
+
+/**
  * Log out the current user.
  * @param {LogoutOptions} [options] - Optional options containing request headers.
  * @returns {Function} A Redux thunk.
- */var webCheckoutLogout=function webCheckoutLogout(){var options=arguments.length>0&&arguments[0]!==undefined?arguments[0]:{};return function(dispatch){var logoutUrl=getLogoutUrl();if(!logoutUrl){// When no logout url is available it doesn't make sense to do the request
-return;}dispatch(requestShopifyLogout());var request=new HttpRequest(logoutUrl);if(options.headers)request.setHeaders(options.headers);request.dispatch().then(function(response){var _response$headers=response.headers,_response$headers2=_response$headers===void 0?{}:_response$headers,location=_response$headers2.location,statusCode=response.statusCode;var logoutSuccessUrl=getLogoutSuccessUrl();// When a success url is available it needs to be considered at the response evaluation
-var urlCheckValid=!logoutSuccessUrl||location&&location.startsWith(logoutSuccessUrl);if(statusCode===302&&urlCheckValid){dispatch(successShopifyLogout());}else{dispatch(errorShopifyLogout());}})["catch"](function(){dispatch(errorShopifyLogout());});};};/** @mixes {MutableFunction} */export default mutable(webCheckoutLogout);
+ */
+const webCheckoutLogout = (options = {}) => dispatch => {
+  const logoutUrl = getLogoutUrl();
+  if (!logoutUrl) {
+    // When no logout url is available it doesn't make sense to do the request
+    return;
+  }
+  dispatch(requestShopifyLogout());
+  const request = new HttpRequest(logoutUrl);
+  if (options.headers) request.setHeaders(options.headers);
+  request.dispatch().then(response => {
+    const {
+      headers: {
+        location
+      } = {},
+      statusCode
+    } = response;
+    const logoutSuccessUrl = getLogoutSuccessUrl();
+    // When a success url is available it needs to be considered at the response evaluation
+    const urlCheckValid = !logoutSuccessUrl || location && location.startsWith(logoutSuccessUrl);
+    if (statusCode === 302 && urlCheckValid) {
+      dispatch(successShopifyLogout());
+    } else {
+      dispatch(errorShopifyLogout());
+    }
+  }).catch(() => {
+    dispatch(errorShopifyLogout());
+  });
+};
+
+/** @mixes {MutableFunction} */
+export default mutable(webCheckoutLogout);

package/constants/index.js

@@ -1 +1,7 @@
-export var REQUEST_SHOPIFY_LOGIN='REQUEST_SHOPIFY_LOGIN';export var SUCCESS_SHOPIFY_LOGIN='SUCCESS_SHOPIFY_LOGIN';export var ERROR_SHOPIFY_LOGIN='ERROR_SHOPIFY_LOGIN';export var REQUEST_SHOPIFY_LOGOUT='REQUEST_SHOPIFY_LOGOUT';export var SUCCESS_SHOPIFY_LOGOUT='SUCCESS_SHOPIFY_LOGOUT';export var ERROR_SHOPIFY_LOGOUT='ERROR_SHOPIFY_LOGOUT';export var WEBCHECKOUT_REGISTER_REDIRECT='WEBCHECKOUT_REGISTER_REDIRECT';
+export const REQUEST_SHOPIFY_LOGIN = 'REQUEST_SHOPIFY_LOGIN';
+export const SUCCESS_SHOPIFY_LOGIN = 'SUCCESS_SHOPIFY_LOGIN';
+export const ERROR_SHOPIFY_LOGIN = 'ERROR_SHOPIFY_LOGIN';
+export const REQUEST_SHOPIFY_LOGOUT = 'REQUEST_SHOPIFY_LOGOUT';
+export const SUCCESS_SHOPIFY_LOGOUT = 'SUCCESS_SHOPIFY_LOGOUT';
+export const ERROR_SHOPIFY_LOGOUT = 'ERROR_SHOPIFY_LOGOUT';
+export const WEBCHECKOUT_REGISTER_REDIRECT = 'WEBCHECKOUT_REGISTER_REDIRECT';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-webcheckout-shopify",
-  "version": "7.30.0-alpha.7",
+  "version": "7.30.0-alpha.8",
   "description": "Webcheckout Shopify library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -17,8 +17,8 @@
     "connect"
   ],
   "devDependencies": {
-    "@shopgate/pwa-common": "7.30.0-alpha.7",
-    "@shopgate/pwa-core": "7.30.0-alpha.7",
+    "@shopgate/pwa-common": "7.30.0-alpha.8",
+    "@shopgate/pwa-core": "7.30.0-alpha.8",
     "react": "~16.14.0"
   }
 }

package/selectors/index.js

@@ -1,23 +1,70 @@
-import appConfig from'@shopgate/pwa-common/helpers/config';/**
+import "core-js/modules/es.string.replace.js";
+import appConfig from '@shopgate/pwa-common/helpers/config';
+
+/**
  * Checks if Shopify checkout is available.
  * @returns {boolean}
- */export var hasShopifyCheckout=function hasShopifyCheckout(){return appConfig.webCheckoutShopify!==null;};/**
+ */
+export const hasShopifyCheckout = () => appConfig.webCheckoutShopify !== null;
+
+/**
  * Returns the Shopify checkout configuration.
  * @returns {Object|null}
- */export var getShopifyCheckout=function getShopifyCheckout(){return appConfig.webCheckoutShopify;};/**
+ */
+export const getShopifyCheckout = () => appConfig.webCheckoutShopify;
+
+/**
  * Returns the Shopify URL based on the given domain or alias.
  * @returns {string}
- */export var getShopifyUrl=function getShopifyUrl(){// Prioritize the "domain" property over alias, if it exists.
-var url=typeof getShopifyCheckout().domain==='string'?getShopifyCheckout().domain.replace(/\/+$/g,''):"https://".concat(getShopifyCheckout().alias,".myshopify.com");// Add https protocol if none is set, yet.
-if(!url.match(/^https:\/\/.*/g)&&!url.match(/^http:\/\/.*/g)){// Cut out "://" or "//" from the beginning. E.g.: "//www.myshop.com" or "://www.myshop.com"
-url="https://".concat(url.replace(/^[:/]*/g,''));}return url;};/**
+ */
+export const getShopifyUrl = () => {
+  // Prioritize the "domain" property over alias, if it exists.
+  let url = typeof getShopifyCheckout().domain === 'string' ? getShopifyCheckout().domain.replace(/\/+$/g, '') : `https://${getShopifyCheckout().alias}.myshopify.com`;
+
+  // Add https protocol if none is set, yet.
+  if (!url.match(/^https:\/\/.*/g) && !url.match(/^http:\/\/.*/g)) {
+    // Cut out "://" or "//" from the beginning. E.g.: "//www.myshop.com" or "://www.myshop.com"
+    url = `https://${url.replace(/^[:/]*/g, '')}`;
+  }
+  return url;
+};
+
+/**
  * Checks if a configuration for Shopify is available
  * @return {boolean}
- */export var isShopify=function isShopify(){var _ref=getShopifyCheckout()||{},alias=_ref.alias;return!!alias;};/**
+ */
+export const isShopify = () => {
+  const {
+    alias
+  } = getShopifyCheckout() || {};
+  return !!alias;
+};
+
+/**
  * Returns the logout url for the logout action
  * @return {string}
- */export var getLogoutUrl=function getLogoutUrl(){var result;if(isShopify()){result="".concat(getShopifyUrl(),"/account/logout");}else{result=getShopifyCheckout().logoutUrl;}return result;};/**
+ */
+export const getLogoutUrl = () => {
+  let result;
+  if (isShopify()) {
+    result = `${getShopifyUrl()}/account/logout`;
+  } else {
+    result = getShopifyCheckout().logoutUrl;
+  }
+  return result;
+};
+
+/**
  * Returns the logout success url for the logout action. It's used to determine, if the logout
  * process worked as expected.
  * @return {string}
- */export var getLogoutSuccessUrl=function getLogoutSuccessUrl(){var result;if(isShopify()){result="".concat(getShopifyUrl(),"/");}else{result=getShopifyCheckout().logoutSuccessUrl;}return result;};
+ */
+export const getLogoutSuccessUrl = () => {
+  let result;
+  if (isShopify()) {
+    result = `${getShopifyUrl()}/`;
+  } else {
+    result = getShopifyCheckout().logoutSuccessUrl;
+  }
+  return result;
+};

package/spec.js

@@ -1 +1,6 @@
-describe('Blank Test',function(){it('Ignore',function(){var x=5;expect(x).toEqual(5);});});
+describe('Blank Test', () => {
+  it('Ignore', () => {
+    const x = 5;
+    expect(x).toEqual(5);
+  });
+});

package/streams/index.js

@@ -1,13 +1,32 @@
-import{main$}from'@shopgate/pwa-common/streams/main';import{SUCCESS_SHOPIFY_LOGIN,ERROR_SHOPIFY_LOGIN,WEBCHECKOUT_REGISTER_REDIRECT}from"../constants";/**
+import { main$ } from '@shopgate/pwa-common/streams/main';
+import { SUCCESS_SHOPIFY_LOGIN, ERROR_SHOPIFY_LOGIN, WEBCHECKOUT_REGISTER_REDIRECT } from "../constants";
+
+/**
  * Gets triggered on successful Shopify login.
  * @type {Observable}
- */export var shopifyDidLogin$=main$.filter(function(_ref){var action=_ref.action;return action.type===SUCCESS_SHOPIFY_LOGIN;});/**
+ */
+export const shopifyDidLogin$ = main$.filter(({
+  action
+}) => action.type === SUCCESS_SHOPIFY_LOGIN);
+
+/**
  * Gets triggered on failed Shopify login.
  * @type {Observable}
- */export var shopifyLoginFailed$=main$.filter(function(_ref2){var action=_ref2.action;return action.type===ERROR_SHOPIFY_LOGIN;});/**
+ */
+export const shopifyLoginFailed$ = main$.filter(({
+  action
+}) => action.type === ERROR_SHOPIFY_LOGIN);
+
+/**
  * Gets triggered on any Shopify login response (success or error).
  * @type {Observable}
- */export var shopifyDidRespond$=shopifyDidLogin$.merge(shopifyLoginFailed$);/**
+ */
+export const shopifyDidRespond$ = shopifyDidLogin$.merge(shopifyLoginFailed$);
+
+/**
  * Gets triggered before redirect to we registration
  * @type {Observable}
- */export var webCheckoutRegisterRedirect$=main$.filter(function(_ref3){var action=_ref3.action;return action.type===WEBCHECKOUT_REGISTER_REDIRECT;});
+ */
+export const webCheckoutRegisterRedirect$ = main$.filter(({
+  action
+}) => action.type === WEBCHECKOUT_REGISTER_REDIRECT);

package/subscriptions/index.js

@@ -1,12 +1,49 @@
-function _slicedToArray(arr,i){return _arrayWithHoles(arr)||_iterableToArrayLimit(arr,i)||_nonIterableRest();}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance");}function _iterableToArrayLimit(arr,i){var _arr=[];var _n=true;var _d=false;var _e=undefined;try{for(var _i=arr[Symbol.iterator](),_s;!(_n=(_s=_i.next()).done);_n=true){_arr.push(_s.value);if(i&&_arr.length===i)break;}}catch(err){_d=true;_e=err;}finally{try{if(!_n&&_i["return"]!=null)_i["return"]();}finally{if(_d)throw _e;}}return _arr;}function _arrayWithHoles(arr){if(Array.isArray(arr))return arr;}import{userWillLogin$,userDidLogin$,userWillLogout$}from'@shopgate/pwa-common/streams/user';import{historyRedirect}from'@shopgate/pwa-common/actions/router';import{hasShopifyCheckout}from"../selectors";import login from"../actions/login";import logout from"../actions/logout";import{shopifyDidRespond$}from"../streams";/**
+import { userWillLogin$, userDidLogin$, userWillLogout$ } from '@shopgate/pwa-common/streams/user';
+import { historyRedirect } from '@shopgate/pwa-common/actions/router';
+import { hasShopifyCheckout } from "../selectors";
+import login from "../actions/login";
+import logout from "../actions/logout";
+import { shopifyDidRespond$ } from "../streams";
+
+/**
  * Shopify subscriptions.
  * @param {Function} subscribe The subscribe function.
- */export default function shopify(subscribe){/**
+ */
+export default function shopify(subscribe) {
+  /**
    * Don't create any subscriptions if there is no Shopify checkout available.
-   */if(!hasShopifyCheckout()){return;}/**
+   */
+  if (!hasShopifyCheckout()) {
+    return;
+  }
+
+  /**
    * Gets triggered when the user did log in and a Shopify response was received.
-   */var shouldRedirect$=userDidLogin$.zip(shopifyDidRespond$).map(function(_ref){var _ref2=_slicedToArray(_ref,1),first=_ref2[0];return first;});subscribe(shouldRedirect$,function(_ref3){var dispatch=_ref3.dispatch,action=_ref3.action;dispatch(historyRedirect(action.redirect));});/**
+   */
+  const shouldRedirect$ = userDidLogin$.zip(shopifyDidRespond$).map(([first]) => first);
+  subscribe(shouldRedirect$, ({
+    dispatch,
+    action
+  }) => {
+    dispatch(historyRedirect(action.redirect));
+  });
+
+  /**
    * Gets triggered when the user wants to login.
-   */subscribe(userWillLogin$,function(_ref4){var dispatch=_ref4.dispatch,action=_ref4.action;dispatch(login(action.user,action.password));});/**
+   */
+  subscribe(userWillLogin$, ({
+    dispatch,
+    action
+  }) => {
+    dispatch(login(action.user, action.password));
+  });
+
+  /**
    * Gets triggered when the user wants to logout.
-   */subscribe(userWillLogout$,function(_ref5){var dispatch=_ref5.dispatch;dispatch(logout());});}
+   */
+  subscribe(userWillLogout$, ({
+    dispatch
+  }) => {
+    dispatch(logout());
+  });
+}