@shopgate/pwa-common 7.33.2 → 7.33.3-beta.2

package/action-creators/user/index.js

@@ -19,16 +19,24 @@ export const requestLogin = (user, password, strategy = DEFAULT_LOGIN_STRATEGY)
 
 /**
  * Creates the dispatched RECEIVE_LOGIN action object.
- * @param {string} redirect The location to redirect to.
+ * @param {Object|boolean} [redirect] The redirect params. When set to `false` the user stays on
+ * the current page.
  * @param {string} strategy The login strategy.
  * @param {number} [sessionLifetimeInSeconds] The session lifetime in seconds
+ * @param {Object} [options] Further details of the login.
+ * @param {string} [options.source] What the login came from when it wasn't the login form, e.g.
+ * `LOGIN_SOURCE_BIOMETRIC` of `@shopgate/engage/login/constants`. Subscriptions can use it to
+ * react differently, e.g. to skip a confirmation.
  * @returns {Object} The dispatched action object.
  */
-export const successLogin = (redirect, strategy = DEFAULT_LOGIN_STRATEGY, sessionLifetimeInSeconds) => ({
+export const successLogin = (redirect, strategy = DEFAULT_LOGIN_STRATEGY, sessionLifetimeInSeconds = undefined, {
+  source
+} = {}) => ({
   type: SUCCESS_LOGIN,
   redirect,
   strategy,
-  sessionLifetimeInSeconds
+  sessionLifetimeInSeconds,
+  source
 });
 
 /**

package/actions/user/login.js

@@ -1,38 +1,27 @@
-import { PipelineRequest, EINVALIDCALL, ELEGACYSGCONNECT, EINCOMPLETELOGIN } from '@shopgate/pwa-core';
+import { PipelineRequest } from '@shopgate/engage/core/classes';
+import { EINVALIDCALL, ELEGACYSGCONNECT, EINCOMPLETELOGIN } from '@shopgate/engage/core/constants';
+import { getRecaptchaToken } from '@shopgate/engage/core/helpers';
 import { requestLogin, successLogin, errorLogin, errorLegacyConnectRegister } from "../../action-creators/user";
 import { SHOPGATE_USER_LOGIN_USER } from "../../constants/Pipelines";
 import { DEFAULT_LOGIN_STRATEGY } from "../../constants/user";
 import { mutable } from "../../helpers/redux";
-import appConfig from "../../helpers/config";
 
 /**
  * Login the current user.
  * @param {Object} parameters The login credentials.
  * @param {string} parameters.login The username to login.
  * @param {string} parameters.password The password to login.
- * @param {string} redirect The location to redirect to when logged in.
- * @param {string} strategy basic or facebook, amazon, etc
+ * @param {Object|boolean} [redirect] The redirect params, e.g. `{ location }` of the page to open
+ * when logged in. When set to `false` the user stays on the current page.
+ * @param {string} [strategy] basic or facebook, amazon, etc
  * @return {Function} A redux thunk.
  */
 function login(parameters, redirect, strategy = DEFAULT_LOGIN_STRATEGY) {
   return async dispatch => {
-    const {
-      enabled: recaptchaEnabled,
-      googleCloudSiteKey
-    } = appConfig?.recaptcha || {};
     dispatch(requestLogin(parameters.login, parameters.password, strategy));
-    let recaptchaToken;
-    if (recaptchaEnabled && googleCloudSiteKey) {
-      try {
-        // Add a reCAPTCHA token to the login request when feature is configured
-        await new Promise(resolve => window.grecaptcha.enterprise.ready(resolve));
-        recaptchaToken = await window.grecaptcha.enterprise.execute(googleCloudSiteKey, {
-          action: 'login'
-        });
-      } catch (e) {
-        // noting to do here - just for protection
-      }
-    }
+
+    // Add a reCAPTCHA token to the login request when feature is configured
+    const recaptchaToken = await getRecaptchaToken('login', 0);
     const request = new PipelineRequest(SHOPGATE_USER_LOGIN_USER).setTrusted().setErrorBlacklist([EINVALIDCALL, ELEGACYSGCONNECT, EINCOMPLETELOGIN]).setInput({
       strategy,
       parameters: {

package/constants/Portals.d.ts

@@ -18,6 +18,9 @@ export const PAGE_LOGIN_AFTER: "page.login.after";
 export const PAGE_LOGIN_FORM_BEFORE: "page.login.form.before";
 export const PAGE_LOGIN_FORM: "page.login.form";
 export const PAGE_LOGIN_FORM_AFTER: "page.login.form.after";
+export const PAGE_LOGIN_FORM_SUBMIT_BEFORE: "page.login.form.submit.before";
+export const PAGE_LOGIN_FORM_SUBMIT: "page.login.form.submit";
+export const PAGE_LOGIN_FORM_SUBMIT_AFTER: "page.login.form.submit.after";
 export const PAGE_LOGIN_REGISTER_LINK_BEFORE: "page.login.register-link.before";
 export const PAGE_LOGIN_REGISTER_LINK: "page.login.register-link";
 export const PAGE_LOGIN_REGISTER_LINK_AFTER: "page.login.register-link.after";
@@ -68,6 +71,9 @@ export const NO_RESULTS_CONTENT_AFTER: "no-results.content.after";
 export const USER_MENU_CONTAINER_BEFORE: "user-menu.container.before";
 export const USER_MENU_CONTAINER: "user-menu.container";
 export const USER_MENU_CONTAINER_AFTER: "user-menu.container.after";
+export const USER_MENU_LOGIN_BEFORE: "user-menu.login.before";
+export const USER_MENU_LOGIN: "user-menu.login";
+export const USER_MENU_LOGIN_AFTER: "user-menu.login.after";
 export const APP_BAR_DEFAULT_BEFORE: "app-bar.default.before";
 export const APP_BAR_DEFAULT: "app-bar.default";
 export const APP_BAR_DEFAULT_AFTER: "app-bar.default.after";

package/constants/Portals.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Portals.d.ts","sourceRoot":"","sources":["../../constants/Portals.js"],"names":[],"mappings":"AAqCA,qBAAsB,QAAQ,CAAC;AAC/B,oBAAqB,OAAO,CAAC;AAC7B,mBAAoB,MAAM,CAAC;AAC3B,qBAAsB,QAAQ,CAAC;AAC/B,oBAAqB,OAAO,CAAC;AAC7B,oBAAqB,OAAO,CAAC;AAE7B,wCAA+C;AAC/C,sCAA6C;AAE7C,wDAAkE;AAClE,0CAAiD;AACjD,sDAAgE;AAEhE,wDAAkE;AAClE,0CAAiD;AACjD,sDAAgE;AAEhE,oDAA8D;AAC9D,sCAA6C;AAC7C,kDAA4D;AAE5D,8DAA2E;AAC3E,gDAA0D;AAC1D,4DAAyE;AAEzE,gFAA6F;AAC7F,kEAA4E;AAC5E,8EAA2F;AAE3F,gEAA0E;AAC1E,8DAAwE;AAExE,0DAAiE;AACjE,wEAAkF;AAClF,sEAAgF;AAEhF,sEAAgF;AAChF,oFAAiG;AACjG,kFAA+F;AAE/F,0DAAoE;AACpE,4CAAmD;AACnD,wDAAkE;AAElE,gEAA0E;AAC1E,kDAAyD;AACzD,8DAAwE;AAExE,4DAAsE;AACtE,8CAAqD;AACrD,0DAAoE;AAEpE,gEAA0E;AAC1E,kDAAyD;AACzD,8DAAwE;AAExE,kFAA4F;AAC5F,oEAA2E;AAC3E,gFAA0F;AAE1F,gEAA0E;AAC1E,kDAAyD;AACzD,8DAAwE;AAExE,oFAA8F;AAC9F,sEAA6E;AAC7E,kFAA4F;AAE5F,8FAAwG;AACxG,gFAAuF;AACvF,4FAAsG;AAEtG,gGAA0G;AAC1G,kFAAyF;AACzF,8FAAwG;AAExG,sEAAgF;AAChF,wDAA+D;AAC/D,oEAA8E;AAE9E,8DAAwE;AACxE,gDAAuD;AACvD,4DAAsE;AAEtE,oEAA8E;AAC9E,sDAA6D;AAC7D,kEAA4E;AAE5E,sEAAgF;AAChF,wDAA+D;AAC/D,oEAA8E;AAE9E,8DAAwE;AACxE,gDAAuD;AACvD,4DAAsE;AAEtE,wDAAkE;AAClE,0CAAiD;AACjD,sDAAgE;AAEhE,0DAAoE;AACpE,4CAAmD;AACnD,wDAAkE;AAElE,4DAAsE;AACtE,8CAAqD;AACrD,0DAAoE;AAEpE,0CAAiD;AACjD,wDAAkE;AAClE,sDAAgE;AAEhE,8CAAqD;AACrD,4DAAsE;AACtE,0DAAoE;AAEpE,4CAAmD;AACnD,0DAAoE;AACpE,wDAAkE;AAElE,4CAAmD;AACnD,0DAAoE;AACpE,wDAAkE;AAElE,wDAA+D;AAC/D,sEAAgF;AAChF,oEAA8E;AAE9E,gDAAuD;AACvD,8DAAqE;AACrE,4DAAmE"}
+{"version":3,"file":"Portals.d.ts","sourceRoot":"","sources":["../../constants/Portals.js"],"names":[],"mappings":"AAsCA,qBAAsB,QAAQ,CAAC;AAC/B,oBAAqB,OAAO,CAAC;AAC7B,mBAAoB,MAAM,CAAC;AAC3B,qBAAsB,QAAQ,CAAC;AAC/B,oBAAqB,OAAO,CAAC;AAC7B,oBAAqB,OAAO,CAAC;AAE7B,wCAA+C;AAC/C,sCAA6C;AAE7C,wDAAkE;AAClE,0CAAiD;AACjD,sDAAgE;AAEhE,wDAAkE;AAClE,0CAAiD;AACjD,sDAAgE;AAEhE,oDAA8D;AAC9D,sCAA6C;AAC7C,kDAA4D;AAE5D,8DAA2E;AAC3E,gDAA0D;AAC1D,4DAAyE;AAEzE,4EAA4F;AAC5F,8DAA2E;AAC3E,0EAA0F;AAE1F,gFAA6F;AAC7F,kEAA4E;AAC5E,8EAA2F;AAE3F,gEAA0E;AAC1E,8DAAwE;AAExE,0DAAiE;AACjE,wEAAkF;AAClF,sEAAgF;AAEhF,sEAAgF;AAChF,oFAAiG;AACjG,kFAA+F;AAE/F,0DAAoE;AACpE,4CAAmD;AACnD,wDAAkE;AAElE,gEAA0E;AAC1E,kDAAyD;AACzD,8DAAwE;AAExE,4DAAsE;AACtE,8CAAqD;AACrD,0DAAoE;AAEpE,gEAA0E;AAC1E,kDAAyD;AACzD,8DAAwE;AAExE,kFAA4F;AAC5F,oEAA2E;AAC3E,gFAA0F;AAE1F,gEAA0E;AAC1E,kDAAyD;AACzD,8DAAwE;AAExE,oFAA8F;AAC9F,sEAA6E;AAC7E,kFAA4F;AAE5F,8FAAwG;AACxG,gFAAuF;AACvF,4FAAsG;AAEtG,gGAA0G;AAC1G,kFAAyF;AACzF,8FAAwG;AAExG,sEAAgF;AAChF,wDAA+D;AAC/D,oEAA8E;AAE9E,8DAAwE;AACxE,gDAAuD;AACvD,4DAAsE;AAEtE,oEAA8E;AAC9E,sDAA6D;AAC7D,kEAA4E;AAE5E,sEAAgF;AAChF,wDAA+D;AAC/D,oEAA8E;AAE9E,8DAAwE;AACxE,gDAAuD;AACvD,4DAAsE;AAEtE,8DAAwE;AACxE,gDAAuD;AACvD,4DAAsE;AAEtE,wDAAkE;AAClE,0CAAiD;AACjD,sDAAgE;AAEhE,0DAAoE;AACpE,4CAAmD;AACnD,wDAAkE;AAElE,4DAAsE;AACtE,8CAAqD;AACrD,0DAAoE;AAEpE,0CAAiD;AACjD,wDAAkE;AAClE,sDAAgE;AAEhE,8CAAqD;AACrD,4DAAsE;AACtE,0DAAoE;AAEpE,4CAAmD;AACnD,0DAAoE;AACpE,wDAAkE;AAElE,4CAAmD;AACnD,0DAAoE;AACpE,wDAAkE;AAElE,wDAA+D;AAC/D,sEAAgF;AAChF,oEAA8E;AAE9E,gDAAuD;AACvD,8DAAqE;AACrE,4DAAmE"}

package/constants/Portals.js

@@ -33,6 +33,7 @@ const CLOSE = 'close';
 const SIMPLE = 'simple';
 const CART_BUTTON = 'cart-button';
 const ITEMS = 'items';
+const SUBMIT = 'submit';
 
 // POSITIONS
 export const BEFORE = 'before';
@@ -55,6 +56,9 @@ export const PAGE_LOGIN_AFTER = `${PAGE}.${LOGIN}.${AFTER}`;
 export const PAGE_LOGIN_FORM_BEFORE = `${PAGE}.${LOGIN}.${FORM}.${BEFORE}`;
 export const PAGE_LOGIN_FORM = `${PAGE}.${LOGIN}.${FORM}`;
 export const PAGE_LOGIN_FORM_AFTER = `${PAGE}.${LOGIN}.${FORM}.${AFTER}`;
+export const PAGE_LOGIN_FORM_SUBMIT_BEFORE = `${PAGE}.${LOGIN}.${FORM}.${SUBMIT}.${BEFORE}`;
+export const PAGE_LOGIN_FORM_SUBMIT = `${PAGE}.${LOGIN}.${FORM}.${SUBMIT}`;
+export const PAGE_LOGIN_FORM_SUBMIT_AFTER = `${PAGE}.${LOGIN}.${FORM}.${SUBMIT}.${AFTER}`;
 export const PAGE_LOGIN_REGISTER_LINK_BEFORE = `${PAGE}.${LOGIN}.${REGISTER_LINK}.${BEFORE}`;
 export const PAGE_LOGIN_REGISTER_LINK = `${PAGE}.${LOGIN}.${REGISTER_LINK}`;
 export const PAGE_LOGIN_REGISTER_LINK_AFTER = `${PAGE}.${LOGIN}.${REGISTER_LINK}.${AFTER}`;
@@ -105,6 +109,9 @@ export const NO_RESULTS_CONTENT_AFTER = `${NO_RESULTS}.${CONTENT}.${AFTER}`;
 export const USER_MENU_CONTAINER_BEFORE = `${USER_MENU}.${CONTAINER}.${BEFORE}`;
 export const USER_MENU_CONTAINER = `${USER_MENU}.${CONTAINER}`;
 export const USER_MENU_CONTAINER_AFTER = `${USER_MENU}.${CONTAINER}.${AFTER}`;
+export const USER_MENU_LOGIN_BEFORE = `${USER_MENU}.${LOGIN}.${BEFORE}`;
+export const USER_MENU_LOGIN = `${USER_MENU}.${LOGIN}`;
+export const USER_MENU_LOGIN_AFTER = `${USER_MENU}.${LOGIN}.${AFTER}`;
 export const APP_BAR_DEFAULT_BEFORE = `${APP_BAR}.${DEFAULT}.${BEFORE}`;
 export const APP_BAR_DEFAULT = `${APP_BAR}.${DEFAULT}`;
 export const APP_BAR_DEFAULT_AFTER = `${APP_BAR}.${DEFAULT}.${AFTER}`;

package/helpers/redux/mutable.js

@@ -84,7 +84,7 @@ export const mutable = func => {
 
     // Execute pre-processing steps, if any available.
     if (steps.length > 0) {
-      mutatedArgs = steps.reduce((acc, step, i, arr) => {
+      mutatedArgs = steps.slice().reduce((acc, step, i, arr) => {
         // Call next step func in the pipeline with mutated args
         let res = step.apply(void 0, acc);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-common",
-  "version": "7.33.2",
+  "version": "7.33.3-beta.2",
   "description": "Common library for the Shopgate Connect PWA.",
   "license": "Apache-2.0",
   "author": "Shopgate <support@shopgate.com>",
@@ -21,6 +21,7 @@
   "dependencies": {
     "@redux-devtools/extension": "^3.3.0",
     "@sentry/browser": "^7.120.4",
+    "@shopgate/native-modules": "1.1.0-alpha.3",
     "@virtuous/conductor": "~2.5.0",
     "@virtuous/react-conductor": "~2.5.0",
     "@virtuous/redux-persister": "1.1.0-beta.7",
@@ -43,7 +44,7 @@
     "swiper": "12.2.0"
   },
   "devDependencies": {
-    "@shopgate/pwa-core": "7.33.2",
+    "@shopgate/pwa-core": "7.33.3-beta.2",
     "@types/lodash": "^4.17.25",
     "@types/react-portal": "^3.0.9",
     "lodash": "^4.18.1",

package/subscriptions/router.js

@@ -3,7 +3,7 @@ import { router, ACTION_POP, ACTION_PUSH, ACTION_REPLACE, ACTION_RESET } from '@
 import Route from '@virtuous/conductor/Route';
 import { Linking } from '@shopgate/native-modules';
 import { HISTORY_RESET_TO } from '@shopgate/pwa-common/constants/ActionTypes';
-import { logger } from '@shopgate/pwa-core';
+import { logger } from '@shopgate/engage/core/helpers';
 import { isNavigationBlocked } from '@shopgate/engage/admin-preview/helpers';
 import addCouponsToCart from '@shopgate/pwa-common-commerce/cart/actions/addCouponsToCart';
 import { getCurrentRoute, getRouterStackIndex } from "../selectors/router";
@@ -325,7 +325,7 @@ export default function routerSubscriptions(subscribe) {
     action,
     dispatch
   }) => {
-    if (appConfig.webCheckoutShopify === null) {
+    if (appConfig.webCheckoutShopify === null && action.redirect !== false) {
       dispatch(historyRedirect(action.redirect));
     }
   });