@mindful-web/marko-web-identity-x 1.98.0 → 1.106.1

package/browser/change-email-init.vue

@@ -106,7 +106,7 @@ export default {
     },
     senderEmailAddress: {
       type: String,
-      default: 'noreply@identity-x.parameter1.com',
+      default: 'no-reply@parameter1.com',
     },
     loginEmailLabel: {
       type: String,

package/browser/login.vue

@@ -173,7 +173,7 @@ export default {
     },
     senderEmailAddress: {
       type: String,
-      default: 'noreply@identity-x.parameter1.com',
+      default: 'no-reply@parameter1.com',
     },
     actionText: {
       type: String,

package/components/access.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/access.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/access.marko",
     marko_component = require("./access.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
@@ -53,7 +53,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/access.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/access.marko",
     component: "./access.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.marko"

package/components/comment-stream.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/comment-stream.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/comment-stream.marko",
     marko_component = require("./comment-stream.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
@@ -91,7 +91,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/comment-stream.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/comment-stream.marko",
     component: "./comment-stream.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",

package/components/context.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/context.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/context.marko",
     marko_component = require("./context.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
@@ -49,7 +49,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/context.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/context.marko",
     component: "./context.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.marko"

package/components/form-access.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/form-access.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/form-access.marko",
     marko_component = require("./form-access.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
@@ -179,7 +179,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/form-access.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/form-access.marko",
     component: "./form-access.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",

package/components/form-authenticate.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/form-authenticate.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/form-authenticate.marko",
     marko_component = require("./form-authenticate.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
@@ -81,7 +81,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/form-authenticate.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/form-authenticate.marko",
     component: "./form-authenticate.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",

package/components/form-change-email.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/form-change-email.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/form-change-email.marko",
     marko_component = require("./form-change-email.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
@@ -59,7 +59,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/form-change-email.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/form-change-email.marko",
     component: "./form-change-email.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",

package/components/form-login.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/form-login.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/form-login.marko",
     marko_component = require("./form-login.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
@@ -92,7 +92,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/form-login.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/form-login.marko",
     component: "./form-login.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",

package/components/form-logout.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/form-logout.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/form-logout.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
@@ -29,7 +29,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/form-logout.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/form-logout.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko"
     ]

package/components/form-profile.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/form-profile.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/form-profile.marko",
     marko_component = require("./form-profile.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
@@ -84,7 +84,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/form-profile.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/form-profile.marko",
     component: "./form-profile.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",

package/components/form-register.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/form-register.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/form-register.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_assign = require("marko/dist/runtime/helpers/assign"),
     marko_web_identity_x_form_login_template = require("./form-login.marko"),
@@ -25,7 +25,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/form-register.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/form-register.marko",
     tags: [
       "./form-login.marko"
     ]

package/components/google-init.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/google-init.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/google-init.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_attr = require("marko/dist/runtime/html/helpers/attr"),
     marko_str = require("marko/dist/runtime/helpers/to-string");
@@ -239,5 +239,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/google-init.marko"
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/google-init.marko"
   };

package/components/google-sign-in-button.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/google-sign-in-button.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/google-sign-in-button.marko",
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     helpers_escape_xml = require("marko/dist/runtime/html/helpers/escape-xml"),
     marko_escapeXml = helpers_escape_xml.x,
@@ -40,5 +40,5 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/google-sign-in-button.marko"
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/google-sign-in-button.marko"
   };

package/components/identify.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/identify.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/identify.marko",
     marko_component = require("./identify.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
@@ -50,7 +50,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/identify.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/identify.marko",
     component: "./identify.marko",
     tags: [
       "@mindful-web/marko-web-gtm/components/push.marko",

package/components/non-auth-identify.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/non-auth-identify.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/non-auth-identify.marko",
     marko_component = require("./non-auth-identify.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     marko_dynamicTag = require("marko/dist/runtime/helpers/dynamic-tag"),
@@ -45,7 +45,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/non-auth-identify.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/non-auth-identify.marko",
     component: "./non-auth-identify.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.marko"

package/components/progressive-profile-form.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/progressive-profile-form.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/progressive-profile-form.marko",
     marko_component = require("./progressive-profile-form.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
@@ -137,7 +137,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/progressive-profile-form.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/progressive-profile-form.marko",
     component: "./progressive-profile-form.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",

package/components/subscribe.marko.js

@@ -2,7 +2,7 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.98.0/components/subscribe.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.106.1/components/subscribe.marko",
     marko_component = require("./subscribe.marko"),
     marko_renderer = require("marko/dist/runtime/components/renderer"),
     module_objectPath_module = require("@mindful-web/object-path"),
@@ -73,7 +73,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.98.0/components/subscribe.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.106.1/components/subscribe.marko",
     component: "./subscribe.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mindful-web/marko-web-identity-x",
-  "version": "1.98.0",
+  "version": "1.106.1",
   "description": "Marko Wrapper for IdentityX",
   "repository": "https://github.com/parameter1/mindful-web/tree/main/packages/marko-web-identity-x",
   "author": "Josh Worden <josh@parameter1.com>",
@@ -43,5 +43,5 @@
     "chai": "^4.3.7",
     "mocha": "^6.2.3"
   },
-  "gitHead": "606c85315b404db6d84a08cb0a0ae7a059ae1fa4"
+  "gitHead": "a7a90d04e081aac7c14a326e9a40dc63e43569d1"
 }

package/routes/authenticate.js

@@ -40,7 +40,9 @@ module.exports = asyncRoute(async (req, res) => {
   const { token: authToken, user, loginSource } = data.loginAppUser;
   const additionalEventData = {
     ...getAsObject(body, 'additionalEventData'),
-    ...getAsObject(data, 'loginAppUer.AdditionContext'),
+    // The login's own event data (displayOverlay, newsletterSignupType, …), stored on the login
+    // token by sendLoginLink. Was read from a misspelled path, so hooks never received it.
+    ...getAsObject(data, 'loginAppUser.additionalContext'),
   };
 
   // call authentication hooks

package/test/routes/authenticate.spec.js

@@ -0,0 +1,67 @@
+const { describe, it } = require('mocha');
+const { expect } = require('chai');
+const route = require('../../routes/authenticate');
+
+const run = async ({ additionalContext, bodyEventData } = {}) => {
+  const hookArgs = [];
+  let json;
+  const identityX = {
+    client: {
+      mutate: async () => ({
+        data: {
+          loginAppUser: {
+            token: { id: 'tok', value: 'tok-value' },
+            user: { id: 'user-1' },
+            loginSource: 'content_meter_login',
+            additionalContext,
+          },
+        },
+      }),
+    },
+    config: {
+      hooks: {
+        onAuthenticationSuccess: [{ fn: (args) => hookArgs.push(args), shouldAwait: true }],
+      },
+      get: () => undefined,
+      getAppId: () => 'app-1',
+    },
+    getOrgUserApiToken: () => 'org-token',
+    setIdentityCookie: () => {},
+    generateEntityId: async () => 'entity-1',
+    findUserById: async (id) => ({ id }),
+  };
+  const req = { identityX, body: { token: 'login-token', additionalEventData: bodyEventData } };
+  const res = { cookie: () => {}, json: (value) => { json = value; } };
+  let error;
+  await route(req, res, (e) => { error = e; });
+  if (error) throw error;
+  return { hookArgs, json };
+};
+
+describe('routes/authenticate', () => {
+  it('passes the login token context to onAuthenticationSuccess', async () => {
+    // The login's own event data is what lets the hook attribute the Verify Email behavior to
+    // the same source as Log In (e.g. a metered-gate overlay). It was read from a misspelled
+    // path, so the hook never received it.
+    const { hookArgs, json } = await run({
+      additionalContext: { displayOverlay: true, actionSource: 'content_meter_login', source: 'content_meter_login' },
+    });
+    expect(hookArgs).to.have.length(1);
+    expect(hookArgs[0].loginSource).to.equal('content_meter_login');
+    expect(hookArgs[0].additionalEventData).to.include({ displayOverlay: true, actionSource: 'content_meter_login' });
+    expect(json.additionalEventData).to.include({ displayOverlay: true });
+  });
+
+  it('lets the token context win over event data posted by the authenticate page', async () => {
+    const { hookArgs } = await run({
+      additionalContext: { newsletterSignupType: 'pushdown' },
+      bodyEventData: { newsletterSignupType: 'footer', fromPage: true },
+    });
+    expect(hookArgs[0].additionalEventData).to.include({ newsletterSignupType: 'pushdown', fromPage: true });
+  });
+
+  it('tolerates a token with no stored context', async () => {
+    const { hookArgs } = await run({ bodyEventData: { fromPage: true } });
+    expect(hookArgs[0].additionalEventData).to.deep.equal({ fromPage: true });
+  });
+});