@mindful-web/marko-web-identity-x 1.30.0 → 1.32.0

package/browser/access.vue

@@ -80,13 +80,16 @@
         :source="loginSource"
         :redirect="redirect"
         :endpoints="endpoints"
+        :custom-select-field-answers="loginCustomSelectFieldAnswers"
+        :custom-boolean-field-answers="loginCustomBooleanFieldAnswers"
+        :custom-text-field-answers="loginCustomTextFieldAnswers"
         :app-context-id="appContextId"
         :consent-policy="consentPolicy"
         :consent-policy-enabled="consentPolicyEnabled"
         :email-consent-request="emailConsentRequest"
         :email-consent-request-enabled="emailConsentRequestEnabled"
         :regional-consent-policies="regionalConsentPolicies"
-        :required-create-fields="requiredCreateFields"
+        :required-create-field-rows="requiredCreateFieldRows"
         :default-field-labels="defaultFieldLabels"
         :button-labels="loginButtonLabels"
         :lang="lang"
@@ -164,7 +167,7 @@ export default {
       type: Object,
       default: () => ({}),
     },
-    requiredCreateFields: {
+    requiredCreateFieldRows: {
       type: Array,
       default: () => [],
     },
@@ -220,6 +223,18 @@ export default {
       type: Object,
       default: null,
     },
+    loginCustomBooleanFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    loginCustomSelectFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    loginCustomTextFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
     lang: {
       type: String,
       default: 'en',

package/browser/comments/stream.vue

@@ -36,13 +36,15 @@
           :class="element('login-form')"
           :additional-event-data="additionalEventData"
           :source="loginSource"
-          :active-user="activeUser"
           :endpoints="endpoints"
+          :custom-select-field-answers="loginCustomSelectFieldAnswers"
+          :custom-boolean-field-answers="loginCustomBooleanFieldAnswers"
+          :custom-text-field-answers="loginCustomTextFieldAnswers"
           :consent-policy="consentPolicy"
           :app-context-id="appContextId"
           :regional-consent-policies="regionalConsentPolicies"
           :button-labels="loginButtonLabels"
-          :required-create-fields="requiredCreateFields"
+          :required-create-field-rows="requiredCreateFieldRows"
           :default-field-labels="defaultFieldLabels"
           :login-email-label="defaultFieldLabels.email"
           @login-link-sent="showLoginMessage = false"
@@ -215,7 +217,7 @@ export default {
       type: Array,
       default: () => [],
     },
-    requiredCreateFields: {
+    requiredCreateFieldRows: {
       type: Array,
       default: () => [],
     },
@@ -223,6 +225,18 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    loginCustomBooleanFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    loginCustomSelectFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    loginCustomTextFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
     lang: {
       type: String,
       default: 'en',

package/browser/custom-column.vue

@@ -121,7 +121,7 @@
     <custom-select
       v-else-if="type === 'custom-select' && customField"
       :id="fieldId"
-      :label="label"
+      :label="customField.field.label || label"
       :required="required"
       :multiple="customField.field.multiple"
       :selected="customField.answers"
@@ -132,11 +132,19 @@
     <custom-boolean
       v-else-if="type === 'custom-boolean' && customField"
       :id="fieldId"
-      :label="label"
-      :message="label"
+      :message="customField.field.label || label"
       :required="required"
       :value="customField.answer"
-      @input="onCustomBooleanChange(customField.id, $event)"
+      @input="onCustomBooleanChange(customField, $event)"
+    />
+    <custom-text
+      v-else-if="type === 'custom-text' && customField"
+      :id="fieldId"
+      :class-name="className"
+      :label="customField.field.label || label"
+      :required="required"
+      :value="customField.value"
+      @change="onCustomTextChange(customField, $event)"
     />
     <pre v-else>
       label: {{ label }}
@@ -156,6 +164,7 @@ import City from './form/fields/city.vue';
 import CountryCode from './form/fields/country.vue';
 import CustomBoolean from './form/fields/custom-boolean.vue';
 import CustomSelect from './form/fields/custom-select.vue';
+import CustomText from './form/fields/custom-text.vue';
 import FamilyName from './form/fields/family-name.vue';
 import FormLabel from './form/common/form-label.vue';
 import GivenName from './form/fields/given-name.vue';
@@ -177,6 +186,7 @@ export default {
     CountryCode,
     CustomSelect,
     CustomBoolean,
+    CustomText,
     FamilyName,
     FormLabel,
     GivenName,
@@ -192,6 +202,18 @@ export default {
    *
    */
   props: {
+    customBooleanFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    customSelectFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    customTextFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
     label: {
       type: String,
       required: true,
@@ -208,7 +230,7 @@ export default {
       type: String,
       required: true,
       validator(value) {
-        return ['built-in', 'custom-select', 'custom-boolean'].includes(value);
+        return ['built-in', 'custom-select', 'custom-boolean', 'custom-text'].includes(value);
       },
     },
     required: {
@@ -265,10 +287,20 @@ export default {
      *
      */
     customField() {
-      const { fieldId, user, type } = this;
-      const key = type === 'custom-select' ? 'customSelectFieldAnswers' : 'customBooleanFieldAnswers';
-      const found = user[key].find((ans) => ans.id === fieldId);
-      return found;
+      const { fieldId, type } = this;
+
+      const finder = (ans) => ans.id === fieldId;
+
+      switch (type) {
+        case 'custom-boolean':
+          return this.customBooleanFieldAnswers.find(finder);
+        case 'custom-select':
+          return this.customSelectFieldAnswers.find(finder);
+        case 'custom-text':
+          return this.customTextFieldAnswers.find(finder);
+        default:
+          return null;
+      }
     },
     /**
      *
@@ -321,11 +353,11 @@ export default {
     /**
      *
      */
-    onCustomBooleanChange(id) {
-      const objIndex = this.customBooleanFieldAnswers.findIndex(((obj) => obj.id === id));
-      const answer = !this.customBooleanFieldAnswers[objIndex].answer;
-      this.customBooleanFieldAnswers[objIndex].answer = answer;
-      this.customBooleanFieldAnswers[objIndex].hasAnswered = true;
+    onCustomBooleanChange(field) {
+      // eslint-disable-next-line no-param-reassign
+      field.value = !field.value;
+      // eslint-disable-next-line no-param-reassign
+      field.hasAnswered = true;
       this.user.customBooleanFieldAnswers = this.customBooleanFieldAnswers;
     },
 
@@ -334,12 +366,27 @@ export default {
      */
     onCustomSelectChange(field, $event) {
       const ids = Array.isArray($event) ? [...$event] : [...($event ? [$event] : [])];
-      field.answers.splice(0);
+      field.answers.splice(0); // @todo this will break multi-selects...they don't work anyway
+      // eslint-disable-next-line no-param-reassign
+      field.hasAnswered = Boolean(ids.length);
       if (ids.length) {
-        // eslint-disable-next-line no-param-reassign
-        field.hasAnswered = true;
         field.answers.push(...ids.map((id) => ({ id })));
       }
+      this.user.customSelectFieldAnswers = this.customSelectFieldAnswers;
+    },
+
+    /**
+     *
+     */
+    onCustomTextChange(field, $event) {
+      // hack to prevent on focus out with no value from resetting value
+      // @todo find a better solution!!!
+      const value = $event === '' && field.value !== '' ? field.value : $event;
+      // eslint-disable-next-line no-param-reassign
+      field.value = value;
+      // eslint-disable-next-line no-param-reassign
+      field.hasAnswered = value !== '';
+      this.user.customTextFieldAnswers = this.customTextFieldAnswers;
     },
   },
 };

package/browser/download.vue

@@ -78,6 +78,9 @@
         :additional-event-data="additionalEventData"
         :source="loginSource"
         :endpoints="endpoints"
+        :custom-select-field-answers="loginCustomSelectFieldAnswers"
+        :custom-boolean-field-answers="loginCustomBooleanFieldAnswers"
+        :custom-text-field-answers="loginCustomTextFieldAnswers"
         :redirect="redirect"
         :app-context-id="appContextId"
         :consent-policy="consentPolicy"
@@ -85,7 +88,7 @@
         :email-consent-request="emailConsentRequest"
         :email-consent-request-enabled="emailConsentRequestEnabled"
         :regional-consent-policies="regionalConsentPolicies"
-        :required-create-fields="requiredCreateFields"
+        :required-create-field-rows="requiredCreateFieldRows"
         :default-field-labels="defaultFieldLabels"
         :button-labels="loginButtonLabels"
         :login-email-label="defaultFieldLabels.email"
@@ -176,7 +179,7 @@ export default {
       type: Object,
       default: () => ({}),
     },
-    requiredCreateFields: {
+    requiredCreateFieldRows: {
       type: Array,
       default: () => [],
     },
@@ -232,6 +235,18 @@ export default {
       type: Object,
       default: null,
     },
+    loginCustomBooleanFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    loginCustomSelectFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    loginCustomTextFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
     lang: {
       type: String,
       default: 'en',

package/browser/login.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="hasActiveUser">
-    <p>{{ youAreCurrentlyLoggedInAs }} {{ activeUser.email }}.</p>
+    <p>{{ youAreCurrentlyLoggedInAs }} {{ user.email }}.</p>
     <a
       :href="endpoints.profile"
       class="btn btn-secondary mb-2 mr-2"
@@ -31,20 +31,23 @@
       <p v-if="requiresUserInput">
         Thanks! Additional information is required to continue:
       </p>
-      <fieldset v-if="requiresUserInput" :disabled="loading" class="form-group">
-        <div v-for="(row, ridx) in requiredCreateFieldRows" :key="ridx" class="row">
+      <fieldset v-if="requiresUserInput" :disabled="loading" class="">
+        <div v-for="(row, ridx) in requiredCreateFieldRows" :key="ridx" class="form-group row">
           <custom-column
             v-for="(col, cidx) in row"
             :key="`${ridx}_${cidx}`"
-            :label="col.label || defaultFieldLabels[col.key]"
-            :field-key="col.key"
+            :custom-boolean-field-answers="customBooleanFieldAnswers"
+            :custom-select-field-answers="customSelectFieldAnswers"
+            :custom-text-field-answers="customTextFieldAnswers"
+            :endpoints="endpoints"
             :field-id="col.id"
-            :type="col.type"
+            :field-key="col.key"
+            :label="col.label || defaultFieldLabels[col.key]"
+            :lang="lang"
             :required="col.required"
+            :type="col.type"
+            :user="user"
             :width="col.width || 1"
-            :user="activeUser"
-            :endpoints="endpoints"
-            :lang="lang"
           />
         </div>
       </fieldset>
@@ -112,6 +115,18 @@ export default {
       type: Object,
       default: () => {},
     },
+    customBooleanFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    customSelectFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    customTextFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
     endpoints: {
       type: Object,
       required: true,
@@ -202,6 +217,14 @@ export default {
     error: null,
     loading: false,
     requiresUserInput: false,
+    user: {
+      // ...this.activeUser,
+      ...(this.activeUser && { ...this.activeUser }),
+      // ...(this.defaultCountryCode
+      //   && !this.activeUser.countryCode
+      //   && { countryCode: this.defaultCountryCode }
+      // ),
+    },
   }),
 
   /**
@@ -306,7 +329,7 @@ export default {
         this.error = null;
         this.loading = true;
         const res = await post('/login', {
-          ...this.activeUser,
+          ...this.user,
           email: this.email,
           source: this.source,
           redirectTo: this.redirectTo,

package/browser/profile.vue

@@ -237,8 +237,12 @@
       :additional-event-data="additionalEventData"
       :source="loginSource"
       :endpoints="endpoints"
+      :custom-select-field-answers="loginCustomSelectFieldAnswers"
+      :custom-boolean-field-answers="loginCustomBooleanFieldAnswers"
+      :custom-text-field-answers="loginCustomTextFieldAnswers"
       :app-context-id="appContextId"
       :consent-policy="consentPolicy"
+      :required-create-field-rows="requiredCreateFieldRows"
       :consent-policy-enabled="consentPolicyEnabled"
       :email-consent-request="emailConsentRequest"
       :email-consent-request-enabled="emailConsentRequestEnabled"
@@ -329,7 +333,7 @@ export default {
       type: Array,
       default: () => [],
     },
-    requiredCreateFields: {
+    requiredCreateFieldRows: {
       type: Array,
       default: () => [],
     },
@@ -399,7 +403,19 @@ export default {
     },
     loginButtonLabels: {
       type: Object,
-      default: null,
+      default: () => ({}),
+    },
+    loginCustomBooleanFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    loginCustomSelectFieldAnswers: {
+      type: Array,
+      default: () => [],
+    },
+    loginCustomTextFieldAnswers: {
+      type: Array,
+      default: () => [],
     },
     lang: {
       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.30.0/components/access.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/access.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/components/access.marko",
     component: "./access.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.marko"

package/components/comment-stream.marko

@@ -1,6 +1,8 @@
 import { get } from "@mindful-web/object-path";
 import defaultValue from "@mindful-web/marko-core/utils/default-value";
 
+import getCreateUserCustomFields from '../utils/get-create-user-custom-fields'
+
 $ const { req, site } = out.global;
 $ const { identityX } = req;
 $ const additionalEventData = defaultValue(input.additionalEventData, {});
@@ -8,11 +10,15 @@ $ const lang = input.lang || defaultValue(site.config.lang, "en");
 $ const dateFormat = input.dateFormat || defaultValue(site.config.dateFormat, "MMM Do, YYYY h:mma")
 
 <if(identityX)>
-  <marko-web-identity-x-context|{ user, isEnabled, application }|>
+  <marko-web-identity-x-context|{ user, isEnabled, application, fields }| with-fields=true>
+    $ const { customSelectFieldAnswers, customBooleanFieldAnswers, customTextFieldAnswers } = getCreateUserCustomFields({ fields });
     $ const props = {
       additionalEventData: additionalEventData,
       loginSource: input.loginSource,
       activeUser: user,
+      loginCustomSelectFieldAnswers: customSelectFieldAnswers,
+      loginCustomBooleanFieldAnswers: customBooleanFieldAnswers,
+      loginCustomTextFieldAnswers: customTextFieldAnswers,
       identifier: `${input.identifier}`,
       title: input.title,
       description: input.description,

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.30.0/components/comment-stream.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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"),
@@ -10,6 +10,8 @@ var marko_template = module.exports = require("marko/dist/html").t(__filename),
     get = module_objectPath_module.get,
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
+    module_getCreateUserCustomFields = require("../utils/get-create-user-custom-fields"),
+    getCreateUserCustomFields = module_getCreateUserCustomFields.default || module_getCreateUserCustomFields,
     marko_web_browser_component_template = require("@mindful-web/marko-web/components/browser-component.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
     marko_web_browser_component_tag = marko_loadTag(marko_web_browser_component_template),
@@ -31,11 +33,17 @@ function render(input, out, __component, component, state) {
 
   if (identityX) {
     marko_web_identity_x_context_tag({
-        renderBody: function(out, { user, isEnabled, application }) {
+        withFields: true,
+        renderBody: function(out, { user, isEnabled, application, fields }) {
+          const { customSelectFieldAnswers, customBooleanFieldAnswers, customTextFieldAnswers } = getCreateUserCustomFields({ fields });
+
           const props = {
       additionalEventData: additionalEventData,
       loginSource: input.loginSource,
       activeUser: user,
+      loginCustomSelectFieldAnswers: customSelectFieldAnswers,
+      loginCustomBooleanFieldAnswers: customBooleanFieldAnswers,
+      loginCustomTextFieldAnswers: customTextFieldAnswers,
       identifier: `${input.identifier}`,
       title: input.title,
       description: input.description,
@@ -77,7 +85,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.30.0/components/comment-stream.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/context.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/context.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/components/context.marko",
     component: "./context.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.marko"

package/components/form-access.marko

@@ -1,6 +1,8 @@
 
 import defaultValue from "@mindful-web/marko-core/utils/default-value";
-import { get, getAsObject } from "@mindful-web/object-path";
+import { get, getAsArray, getAsObject } from "@mindful-web/object-path";
+
+import getCreateUserCustomFields from '../utils/get-create-user-custom-fields'
 
 $ const { req: { identityX }, site, i18n } = out.global;
 $ const { content, formId, user, application } = input;
@@ -22,6 +24,8 @@ $ const loginButtonLabels = defaultValue(input.loginButtonLabels, {
   profile: i18n("Modify Profile"),
 });
 
+$ const fields = getAsArray(input, 'fields');
+$ const { customSelectFieldAnswers, customBooleanFieldAnswers, customTextFieldAnswers } = getCreateUserCustomFields({ fields });
 
 <if(identityX && form.fieldRows, displayForm)>
   <div class="content-survey-access-idx__wrapper">
@@ -40,6 +44,9 @@ $ const loginButtonLabels = defaultValue(input.loginButtonLabels, {
 
       // Login props
       activeUser: user,
+      loginCustomSelectFieldAnswers: customSelectFieldAnswers,
+      loginCustomBooleanFieldAnswers: customBooleanFieldAnswers,
+      loginCustomTextFieldAnswers: customTextFieldAnswers,
       additionalEventData: additionalEventData,
       appContextId: identityX.config.get("appContextId"),
       buttonLabel: buttonLabel,

package/components/form-access.marko.js

@@ -2,14 +2,17 @@
 "use strict";
 
 var marko_template = module.exports = require("marko/dist/html").t(__filename),
-    marko_componentType = "/@mindful-web/marko-web-identity-x$1.30.0/components/form-access.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/components/form-access.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,
     module_objectPath_module = require("@mindful-web/object-path"),
     objectPath_module = module_objectPath_module.default || module_objectPath_module,
     get = module_objectPath_module.get,
+    getAsArray = module_objectPath_module.getAsArray,
     getAsObject = module_objectPath_module.getAsObject,
+    module_getCreateUserCustomFields = require("../utils/get-create-user-custom-fields"),
+    getCreateUserCustomFields = module_getCreateUserCustomFields.default || module_getCreateUserCustomFields,
     marko_web_browser_component_template = require("@mindful-web/marko-web/components/browser-component.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
     marko_web_browser_component_tag = marko_loadTag(marko_web_browser_component_template),
@@ -54,6 +57,10 @@ function render(input, out, __component, component, state) {
   profile: i18n("Modify Profile"),
 });
 
+  const fields = getAsArray(input, 'fields');
+
+  const { customSelectFieldAnswers, customBooleanFieldAnswers, customTextFieldAnswers } = getCreateUserCustomFields({ fields });
+
   if (identityX && form.fieldRows, displayForm) {
     out.w("<div class=\"content-survey-access-idx__wrapper\">");
 
@@ -72,6 +79,9 @@ function render(input, out, __component, component, state) {
 
       // Login props
       activeUser: user,
+      loginCustomSelectFieldAnswers: customSelectFieldAnswers,
+      loginCustomBooleanFieldAnswers: customBooleanFieldAnswers,
+      loginCustomTextFieldAnswers: customTextFieldAnswers,
       additionalEventData: additionalEventData,
       appContextId: identityX.config.get("appContextId"),
       buttonLabel: buttonLabel,
@@ -114,7 +124,7 @@ marko_template._ = marko_renderer(render, {
   });
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.30.0/components/form-access.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/components/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.30.0/components/form-authenticate.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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"),
@@ -68,7 +68,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.30.0/components/form-authenticate.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/form-change-email.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/form-change-email.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/components/form-change-email.marko",
     component: "./form-change-email.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko",

package/components/form-login.marko

@@ -1,6 +1,8 @@
 import { get } from "@mindful-web/object-path";
 import defaultValue from "@mindful-web/marko-core/utils/default-value";
 
+import getCreateUserCustomFields from '../utils/get-create-user-custom-fields'
+
 $ const { req, site } = out.global;
 $ const { identityX } = req;
 $ const additionalEventData = defaultValue(input.additionalEventData, {});
@@ -11,21 +13,11 @@ $ const withFields = defaultValue(input.withFields, false);
 
 <if(Boolean(identityX))>
   <marko-web-identity-x-context|{ user, isEnabled, application, fields }| with-fields=true>
-    $ const customBooleanFieldAnswers = fields.filter((f) => f.__typename === 'BooleanField').map((f) => {
-      return { id: f.id, hasAnswered: false, answer: null, value: null, field: f };
-    });
-    $ const customSelectFieldAnswers = fields.filter((f) => f['__typename'] == 'SelectField').map((f) => {
-      return { id: f.id, hasAnswered: false, answers: [], field: f };
-    });
-    $ const customTextFieldAnswers = fields.filter((f) => f['__typename'] == 'TextField').map((f) => {
-      return { id: f.id, hasAnswered: false, value: null, field: f };
-    });
+    $ const { customSelectFieldAnswers, customBooleanFieldAnswers, customTextFieldAnswers } = getCreateUserCustomFields({ fields });
+
     $ const activeUser = user ? user : {
       email: null,
-      customSelectFieldAnswers,
-      customBooleanFieldAnswers,
-      customTextFieldAnswers,
-    } 
+    }
     $ const props = {
       additionalEventData,
       source: input.source,
@@ -34,6 +26,9 @@ $ const withFields = defaultValue(input.withFields, false);
       endpoints: identityX.config.getEndpoints(),
       buttonLabels: input.buttonLabels,
       redirect: input.redirect,
+      customSelectFieldAnswers,
+      customBooleanFieldAnswers,
+      customTextFieldAnswers,
       loginEmailLabel: input.loginEmailLabel,
       loginEmailPlaceholder: input.loginEmailPlaceholder,
       defaultFieldLabels: identityX.config.get("defaultFieldLabels"),

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.30.0/components/form-login.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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"),
@@ -10,6 +10,8 @@ var marko_template = module.exports = require("marko/dist/html").t(__filename),
     get = module_objectPath_module.get,
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
+    module_getCreateUserCustomFields = require("../utils/get-create-user-custom-fields"),
+    getCreateUserCustomFields = module_getCreateUserCustomFields.default || module_getCreateUserCustomFields,
     marko_web_browser_component_template = require("@mindful-web/marko-web/components/browser-component.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
     marko_web_browser_component_tag = marko_loadTag(marko_web_browser_component_template),
@@ -33,24 +35,11 @@ function render(input, out, __component, component, state) {
     marko_web_identity_x_context_tag({
         withFields: true,
         renderBody: function(out, { user, isEnabled, application, fields }) {
-          const customBooleanFieldAnswers = fields.filter((f) => f.__typename === 'BooleanField').map((f) => {
-      return { id: f.id, hasAnswered: false, answer: null, value: null, field: f };
-    });
-
-          const customSelectFieldAnswers = fields.filter((f) => f['__typename'] == 'SelectField').map((f) => {
-      return { id: f.id, hasAnswered: false, answers: [], field: f };
-    });
-
-          const customTextFieldAnswers = fields.filter((f) => f['__typename'] == 'TextField').map((f) => {
-      return { id: f.id, hasAnswered: false, value: null, field: f };
-    });
+          const { customSelectFieldAnswers, customBooleanFieldAnswers, customTextFieldAnswers } = getCreateUserCustomFields({ fields });
 
           const activeUser = user ? user : {
       email: null,
-      customSelectFieldAnswers,
-      customBooleanFieldAnswers,
-      customTextFieldAnswers,
-    } 
+    }
 
           const props = {
       additionalEventData,
@@ -60,6 +49,9 @@ function render(input, out, __component, component, state) {
       endpoints: identityX.config.getEndpoints(),
       buttonLabels: input.buttonLabels,
       redirect: input.redirect,
+      customSelectFieldAnswers,
+      customBooleanFieldAnswers,
+      customTextFieldAnswers,
       loginEmailLabel: input.loginEmailLabel,
       loginEmailPlaceholder: input.loginEmailPlaceholder,
       defaultFieldLabels: identityX.config.get("defaultFieldLabels"),
@@ -87,7 +79,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.30.0/components/form-login.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/form-logout.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/form-logout.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/components/form-logout.marko",
     tags: [
       "@mindful-web/marko-web/components/browser-component.marko"
     ]

package/components/form-profile.marko

@@ -1,17 +1,23 @@
 import { get } from "@mindful-web/object-path";
 import defaultValue from "@mindful-web/marko-core/utils/default-value";
 
+import getCreateUserCustomFields from '../utils/get-create-user-custom-fields'
+
 $ const { req, site } = out.global;
 $ const { identityX, query } = req;
 $ const additionalEventData = defaultValue(input.additionalEventData, {});
 $ const lang = input.lang || defaultValue(site.config.lang, "en");
 
 <if(Boolean(identityX))>
-  <marko-web-identity-x-context|{ user, isEnabled, application }|>
+  <marko-web-identity-x-context|{ user, isEnabled, application, fields }| with-fields=true>
+    $ const { customSelectFieldAnswers, customBooleanFieldAnswers, customTextFieldAnswers } = getCreateUserCustomFields({ fields });
     $ const props = {
       additionalEventData: additionalEventData,
       loginSource: input.loginSource,
       activeUser: user,
+      loginCustomSelectFieldAnswers: customSelectFieldAnswers,
+      loginCustomBooleanFieldAnswers: customBooleanFieldAnswers,
+      loginCustomTextFieldAnswers: customTextFieldAnswers,
       requiredServerFields: identityX.config.getRequiredServerFields(),
       requiredClientFields: identityX.config.getRequiredClientFields(),
       requiredCreateFieldRows: identityX.config.getRequiredCreateFieldRows(),

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.30.0/components/form-profile.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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"),
@@ -10,6 +10,8 @@ var marko_template = module.exports = require("marko/dist/html").t(__filename),
     get = module_objectPath_module.get,
     module_defaultValue = require("@mindful-web/marko-core/utils/default-value"),
     defaultValue = module_defaultValue.default || module_defaultValue,
+    module_getCreateUserCustomFields = require("../utils/get-create-user-custom-fields"),
+    getCreateUserCustomFields = module_getCreateUserCustomFields.default || module_getCreateUserCustomFields,
     marko_web_browser_component_template = require("@mindful-web/marko-web/components/browser-component.marko"),
     marko_loadTag = require("marko/dist/runtime/helpers/load-tag"),
     marko_web_browser_component_tag = marko_loadTag(marko_web_browser_component_template),
@@ -29,11 +31,17 @@ function render(input, out, __component, component, state) {
 
   if (Boolean(identityX)) {
     marko_web_identity_x_context_tag({
-        renderBody: function(out, { user, isEnabled, application }) {
+        withFields: true,
+        renderBody: function(out, { user, isEnabled, application, fields }) {
+          const { customSelectFieldAnswers, customBooleanFieldAnswers, customTextFieldAnswers } = getCreateUserCustomFields({ fields });
+
           const props = {
       additionalEventData: additionalEventData,
       loginSource: input.loginSource,
       activeUser: user,
+      loginCustomSelectFieldAnswers: customSelectFieldAnswers,
+      loginCustomBooleanFieldAnswers: customBooleanFieldAnswers,
+      loginCustomTextFieldAnswers: customTextFieldAnswers,
       requiredServerFields: identityX.config.getRequiredServerFields(),
       requiredClientFields: identityX.config.getRequiredClientFields(),
       requiredCreateFieldRows: identityX.config.getRequiredCreateFieldRows(),
@@ -73,7 +81,7 @@ marko_template._ = marko_renderer(render, {
   }, marko_component);
 
 marko_template.meta = {
-    id: "/@mindful-web/marko-web-identity-x$1.30.0/components/form-profile.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/form-register.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/form-register.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/components/form-register.marko",
     tags: [
       "./form-login.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.30.0/components/identify.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/identify.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/non-auth-identify.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/non-auth-identify.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/components/non-auth-identify.marko",
     component: "./non-auth-identify.marko",
     tags: [
       "@mindful-web/marko-core/components/resolve.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.30.0/components/subscribe.marko",
+    marko_componentType = "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0/components/subscribe.marko",
+    id: "/@mindful-web/marko-web-identity-x$1.32.0/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.30.0",
+  "version": "1.32.0",
   "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>",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c2ba676d09db1fbcec92843863485ea36469f242"
+  "gitHead": "aa3ef6e2c50376b37b11a932c3dc46cafd02cf6a"
 }

package/utils/generate-required-field-payload.js

@@ -1,6 +1,7 @@
 const { get } = require('@mindful-web/object-path');
 
-const hasAnswered = (ans) => ans && ans.hasAnswered && ans.answers.length;
+// eslint-disable-next-line max-len
+const hasAnswered = (ans) => ans && ans.hasAnswered && (ans.value || (ans.answers && ans.answers.length));
 
 const hasMappedAnswers = (map) => (id) => {
   const ans = map.get(id);
@@ -15,30 +16,49 @@ const hasMappedAnswers = (map) => (id) => {
  */
 module.exports = ({ appUser, body, definitions }) => {
   // Check for required creation fields
-  const requiredFieldKeys = [...definitions.reduce((set, def) => {
-    if (def.type === 'built-in') set.add(def.key);
+  const requiredFieldKeySet = definitions.reduce((set, def) => {
+    if (def.type === 'built-in' && def.required) set.add(def.key);
     return set;
-  }, new Set())];
+  }, new Set());
+
+  // Modify required field keys for non-na support
+  const depKeys = [
+    'regionCode',
+    'postalCode',
+  ];
+  depKeys.forEach((key) => {
+    // Don't make the dependent address fields required if the parent isn't
+    if (requiredFieldKeySet.has(key) && !requiredFieldKeySet.has('countryCode')) {
+      requiredFieldKeySet.delete(key);
+    }
+    // Don't make dependent address fields required for non-NA countries
+    const countryCode = get(appUser, 'countryCode') || get(body, 'countryCode') || null;
+    if (!['US', 'CA', 'MX'].includes(countryCode)) {
+      requiredFieldKeySet.delete(key);
+    }
+  });
+
+  const requiredFieldKeys = [...requiredFieldKeySet];
 
   // const requiredCustomBooleans = [...definitions.reduce((set, def) => {
-  //   if (def.type === 'custom-boolean') set.add(def.id);
+  //   if (def.type === 'custom-boolean' && def.required) set.add(def.id);
   //   return set;
   // }, new Set())];
 
   const requiredCustomSelects = [...definitions.reduce((set, def) => {
-    if (def.type === 'custom-select') set.add(def.id);
+    if (def.type === 'custom-select' && def.required) set.add(def.id);
     return set;
   }, new Set())];
 
-  // const requiredCustomTexts = [...definitions.reduce((set, def) => {
-  //   if (def.type === 'custom-text') set.add(def.id);
-  //   return set;
-  // }, new Set())];
+  const requiredCustomTexts = [...definitions.reduce((set, def) => {
+    if (def.type === 'custom-text' && def.required) set.add(def.id);
+    return set;
+  }, new Set())];
 
   const userCustomFieldAnswers = new Map([
     // ...(get(appUser, 'customBooleanFieldAnswers') || []).map((a) => [a.field.id, a]),
     ...(get(appUser, 'customSelectFieldAnswers') || []).map((a) => [a.field.id, a]),
-    // ...(get(appUser, 'customTextFieldAnswers') || []).map((a) => [a.field.id, a]),
+    ...(get(appUser, 'customTextFieldAnswers') || []).map((a) => [a.field.id, a]),
   ]);
 
   const customFieldAnswers = new Map([
@@ -46,8 +66,8 @@ module.exports = ({ appUser, body, definitions }) => {
     // ...(get(body, 'customBooleanFieldAnswers') || [])
     //   .filter(hasAnswered).map((a) => [a.field.id, a]),
     ...(get(body, 'customSelectFieldAnswers') || []).filter(hasAnswered).map((a) => [a.field.id, a]),
-    // ...(get(body, 'customTextFieldAnswers') || [])
-    //   .filter(hasAnswered).map((a) => [a.field.id, a]),
+    ...(get(body, 'customTextFieldAnswers') || [])
+      .filter(hasAnswered).map((a) => [a.field.id, a]),
   ]);
 
   const appUserHasAllRequiredFields = [
@@ -58,9 +78,9 @@ module.exports = ({ appUser, body, definitions }) => {
     //   (id) => userCustomFieldAnswers.has(id) && userCustomFieldAnswers.get(id).hasAnswered,
     // ),
     requiredCustomSelects.every(hasMappedAnswers(userCustomFieldAnswers)),
-    // requiredCustomTexts.every(
-    //   (id) => userCustomFieldAnswers.has(id) && userCustomFieldAnswers.get(id).hasAnswered,
-    // ),
+    requiredCustomTexts.every(
+      (id) => userCustomFieldAnswers.has(id) && userCustomFieldAnswers.get(id).hasAnswered,
+    ),
   ].every((v) => v);
 
   const hasAllRequiredFields = [
@@ -69,7 +89,7 @@ module.exports = ({ appUser, body, definitions }) => {
     ),
     // requiredCustomBooleans.every(hasMappedAnswers(customFieldAnswers)),
     requiredCustomSelects.every(hasMappedAnswers(customFieldAnswers)),
-    // requiredCustomTexts.every(hasMappedAnswers(customFieldAnswers)),
+    requiredCustomTexts.every(hasMappedAnswers(customFieldAnswers)),
   ].every((v) => v);
 
   const payload = {
@@ -89,7 +109,15 @@ module.exports = ({ appUser, body, definitions }) => {
           ...(writeInValues && { writeInValues }),
         };
       }),
-    // customTextFieldAnswers: [], // @todo
+    customTextFieldAnswers: requiredCustomTexts
+      .filter(hasMappedAnswers(customFieldAnswers))
+      .map((id) => {
+        const answer = customFieldAnswers.get(id);
+        return {
+          fieldId: answer.field.id,
+          value: answer.value,
+        };
+      }), // @todo
   };
 
   return {

package/utils/get-create-user-custom-fields.js

@@ -0,0 +1,21 @@
+module.exports = ({
+  fields,
+} = {}) => {
+  // eslint-disable-next-line no-underscore-dangle
+  const customBooleanFieldAnswers = fields.filter((f) => f.__typename === 'BooleanField').map((f) => ({
+    id: f.id, hasAnswered: false, answer: null, value: null, field: f,
+  }));
+  // eslint-disable-next-line no-underscore-dangle, eqeqeq
+  const customSelectFieldAnswers = fields.filter((f) => f.__typename == 'SelectField').map((f) => ({
+    id: f.id, hasAnswered: false, answers: [], field: f,
+  }));
+  // eslint-disable-next-line no-underscore-dangle, eqeqeq
+  const customTextFieldAnswers = fields.filter((f) => f.__typename == 'TextField').map((f) => ({
+    id: f.id, hasAnswered: false, value: null, field: f,
+  }));
+  return {
+    customBooleanFieldAnswers,
+    customSelectFieldAnswers,
+    customTextFieldAnswers,
+  };
+};