@salesforcedevs/dw-components 1.3.396 → 1.3.397-canary.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforcedevs/dw-components",
-    "version": "1.3.396",
+    "version": "1.3.397-canary.1",
     "description": "Lightning web components for https://developer.salesforce.com",
     "license": "MIT",
     "engines": {
@@ -25,6 +25,5 @@
         "@types/lodash.uniqby": "4.7.9",
         "@types/setimmediate": "1.0.4",
         "setimmediate": "1.0.5"
-    },
-    "gitHead": "ef208488b6cf979514f09d3b4a643bee356d984b"
+    }
 }

package/src/modules/dw/deSignupForm/deSignupForm.html

@@ -117,6 +117,8 @@
             <span lwc:dom="manual" class="legal-checkbox privacy-terms"></span>
         </dx-checkbox>
 
+        <slot class="form-captcha-slot" name="form-captcha-slot"></slot>
+
         <dx-button
             class="submit-button"
             variant="custom"

package/src/modules/dw/deSignupForm/deSignupForm.ts

@@ -47,6 +47,7 @@ export default class DeSignupForm extends LightningElement {
     private marketingText: string = "";
     private showLegalCheckbox: boolean = false;
     private privacyText: string = "";
+    private recaptchaToken = "";
 
     @track knownDuplicateUsers: string[] = [];
 
@@ -73,6 +74,26 @@ export default class DeSignupForm extends LightningElement {
         return stateMap[this.country] || [];
     }
 
+    @api
+    recaptchaCallback(responseToken: string) {
+        this.recaptchaToken = responseToken;
+    }
+
+    @api
+    recaptchaExpiredCallback() {
+        this.recaptchaToken = "";
+    }
+
+    @api
+    recaptchaErrorCallback() {
+        this.resetRecaptcha();
+    }
+
+    private resetRecaptcha() {
+        this.recaptchaToken = "";
+        (window as any).grecaptcha?.reset();
+    }
+
     connectedCallback(): void {
         this.getCountryList();
     }
@@ -119,11 +140,14 @@ export default class DeSignupForm extends LightningElement {
         );
     }
 
-    trackFormCompletion(target: EventTarget, formData: SignupForm, convertingPage = "success") {
+    trackFormCompletion(
+        target: EventTarget,
+        formData: SignupForm,
+        convertingPage = "success"
+    ) {
         trackGtm(target!, "custEv_formCompletion", {
             converting_page: `SFDC:us:signup:${convertingPage}`,
-            converting_page_url:
-                `https://developer.salesforce.com/signup/${convertingPage}`,
+            converting_page_url: `https://developer.salesforce.com/signup/${convertingPage}`,
             form_country: formData.user.country,
             form_name: "Dev Edition Signup",
             form_primary_product_interest: "Developer Edition",
@@ -145,7 +169,7 @@ export default class DeSignupForm extends LightningElement {
         }
 
         const formData = this.prepareUserData();
-        if (!formData) {
+        if (!formData || !this.recaptchaToken) {
             return;
         }
 
@@ -164,7 +188,7 @@ export default class DeSignupForm extends LightningElement {
         );
 
         this.setSubmitButtonDisabled(true);
-        submitForm(formData)
+        submitForm(formData, this.recaptchaToken)
             .then(() => {
                 trackGtm(event.target!, "custEv_signUp", {
                     authentication_method: "email",
@@ -176,13 +200,18 @@ export default class DeSignupForm extends LightningElement {
             })
             .catch((error) => {
                 if (error.message === ErrorCode.GENERIC && didSubmitTimeout) {
-                    this.trackFormCompletion(event.target!, formData, "account-verification");
+                    this.trackFormCompletion(
+                        event.target!,
+                        formData,
+                        "account-verification"
+                    );
                     // If the timeout time has passed at the point of error, and the error code is simply "GENERIC",
                     // we do not know whether the org will ultimately be created (and we have no current way of confirming),
                     // so we navigate the user to an interim page that tells them to watch their email.
                     window.location.href = "/signup/account-verification";
                 } else {
                     this.setSubmitButtonDisabled(false);
+                    this.resetRecaptcha();
                     if (error.message === ErrorCode.DUPLICATE) {
                         this.knownDuplicateUsers.push(formData.user.username);
                     } else {

package/src/modules/dw/deSignupForm/submitForm.ts

@@ -79,13 +79,19 @@ const checkOrgStatus = (id: string, retries = 0): Promise<void> => {
     });
 };
 
-export const submitForm = async (formData: SignupForm): Promise<void> => {
+export const submitForm = async (
+    formData: SignupForm,
+    recaptchaToken: string
+): Promise<void> => {
     const response = await fetch(CREATE_PATH, {
         method: "POST",
         headers: {
             "Content-Type": "application/json"
         },
-        body: JSON.stringify(formData)
+        body: JSON.stringify({
+            ...formData,
+            "g-recaptcha-response": recaptchaToken
+        })
     });
 
     if (!response.ok) {

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.