@salesforcedevs/dw-components 1.3.196 → 1.3.197-canary.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dw-components",
-    "version": "1.3.196",
+    "version": "1.3.197-canary.0",
     "description": "Lightning web components for https://developer.salesforce.com",
     "license": "MIT",
     "engines": {
@@ -23,6 +23,5 @@
         "@types/lodash.uniqby": "^4.7.7",
         "@types/setimmediate": "^1.0.2",
         "setimmediate": "^1.0.5"
-    },
-    "gitHead": "3ca1796a050dd87c8083f73e41d8cb0cfb15328d"
+    }
 }

package/src/modules/dw/j2sCardSequence/j2sCardSequence.html

@@ -4,6 +4,7 @@
         communicate-step-changes="true"
         force-initially-visible={forceInitiallyVisible}
         initial-step-index={initialStepIndex}
+        lwc:ref="stepSequence"
         onstepsequencechange={handleStepSequenceChange}
         optimize-position-after-animation="true"
         session-storage-id={sessionStorageId}

package/src/modules/dw/j2sCardSequence/j2sCardSequence.ts

@@ -79,8 +79,8 @@ export default class J2sCardSequence extends LightningElement {
     _recaptchaResetTimeoutId: number | null = null;
     _stepsData: StepDatum[] = [];
     @api drmDomain: string = "https://drm.my.salesforce-sites.com";
-    @api formHandler: string =
-        "https://formhandlermule-1s9xrb.5sc6y6-4.usa-e2.cloudhub.io/form_handler";
+    @api drmHandlerBaseUrl: string =
+        "https://dev-sapi-th-ms-infra-form-handler-proxy.us-w2.cloudhub.io";
     @api tbidApiBaseUrl: string | undefined;
     @api useHistory: boolean = false;
 
@@ -128,6 +128,14 @@ export default class J2sCardSequence extends LightningElement {
         return Boolean(this.tbidUserInfo);
     }
 
+    private get drmEmailUrl() {
+        return `${this.drmHandlerBaseUrl}/getEmail`;
+    }
+
+    private get formHandlerUrl() {
+        return `${this.drmHandlerBaseUrl}/form_handler`;
+    }
+
     private get formIncomingUserInfo() {
         if (!this.tbidUserInfo) {
             return {} as DrmFormData;
@@ -141,8 +149,8 @@ export default class J2sCardSequence extends LightningElement {
             Company__c: this.tbidUserInfo.custom_attributes?.CompanyName,
             MailingCountry: this.tbidUserInfo.custom_attributes?.Country,
             MailingState: this.tbidUserInfo.address?.region,
-            RelationshipToSalesforce: this.tbidUserInfo.custom_attributes
-                ?.RelationshipToSalesforce
+            RelationshipToSalesforce:
+                this.tbidUserInfo.custom_attributes?.RelationshipToSalesforce
         };
 
         // Return above object but only with keys that have a truthy value, and with any URI-encoded values decoded
@@ -219,18 +227,16 @@ export default class J2sCardSequence extends LightningElement {
 
     renderedCallback() {
         if (!this.isLoading) {
-            ((this.template.querySelector(
-                "dx-step-sequence"
-            ) as unknown) as StepSequence)?.remeasureSteps();
+            (this.refs.stepSequence as StepSequence)?.remeasureSteps();
         }
 
         if (
             this.formSubmissionFailureState &&
             this.stepsData[this.currentSequenceStep].formData
         ) {
-            const j2sCardStep = (this.template.querySelectorAll(
+            const j2sCardStep = this.template.querySelectorAll(
                 "dw-j2s-card-sequence-step"
-            ) as unknown) as J2sCardSequenceStep[];
+            ) as unknown as J2sCardSequenceStep[];
             j2sCardStep[this.currentSequenceStep]?.notifyFormSubmitFailure(
                 this.formSubmissionFailureState
             );
@@ -285,14 +291,14 @@ export default class J2sCardSequence extends LightningElement {
     }
 
     async handleFormSubmit({ detail: formData }: CustomEvent<DrmFormData>) {
-        if (!this.formHandler || !this.isLoggedIn) {
+        if (!this.formHandlerUrl || !this.isLoggedIn) {
             return;
         }
 
         this._isFormSubmitting = true;
 
         try {
-            const res = await fetch(this.formHandler, {
+            const res = await fetch(this.formHandlerUrl, {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json",
@@ -374,9 +380,7 @@ export default class J2sCardSequence extends LightningElement {
         if (andStoreIndex) {
             this.initialStepIndex = stepIndex; // update sessionStorage value
         }
-        ((this.template.querySelector(
-            "dx-step-sequence"
-        ) as unknown) as StepSequence)?.jumpToStep(stepIndex);
+        (this.refs.stepSequence as StepSequence)?.jumpToStep(stepIndex);
     }
 
     private async getCountryList() {
@@ -409,7 +413,16 @@ export default class J2sCardSequence extends LightningElement {
         try {
             const res = await fetch(`${this.tbidApiBaseUrl}/userinfo`);
             if (res.ok) {
-                this.tbidUserInfo = await res.json();
+                const userInfo = await res.json();
+                const emailOverride = await this.getDrmEmailOverride(
+                    userInfo?.user_id
+                );
+                this.tbidUserInfo = !emailOverride
+                    ? userInfo
+                    : {
+                          ...userInfo,
+                          email: emailOverride
+                      };
                 this.selectedCountry = this.formIncomingUserInfo.MailingCountry;
             }
         } catch (ex) {
@@ -424,4 +437,30 @@ export default class J2sCardSequence extends LightningElement {
 
         this._isTbidLoading = false;
     }
+
+    private async getDrmEmailOverride(
+        tbid: string
+    ): Promise<string | undefined> {
+        let resolvedEmail = "";
+
+        if (!tbid) {
+            return resolvedEmail;
+        }
+
+        try {
+            const res = await fetch(`${this.drmEmailUrl}?tbid=${tbid}`);
+            if (res.ok) {
+                const resData = await res.json();
+                if (resData.message === "success") {
+                    resolvedEmail = resData.Email;
+                }
+            }
+        } catch (ex) {
+            console.warn(
+                `Could not fetch email address from DRM, defaulting to TBID info. (Exception: ${ex})`
+            );
+        }
+
+        return resolvedEmail;
+    }
 }

package/LICENSE

@@ -1,12 +0,0 @@
-Copyright (c) 2020, Salesforce.com, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of Salesforce.com nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.