Merge branch 'main' into dbajpeyi/bug/deltamath.com

integration-test/helpers/mocks.android.js

@@ -43,6 +43,7 @@ export function androidStringReplacements(overrides = {}) {
                             inputType_credentials: true,
                             inputType_identities: false,
                             inputType_creditCards: false,
+                            partial_form_saves: true,
                             emailProtection: true,
                             emailProtection_incontext_signup: true,
                             password_generation: false,

integration-test/helpers/mocks.webkit.js

@@ -244,6 +244,7 @@ export function createWebkitMocks(platform = 'macos') {
                                     password_generation: true,
                                     credentials_saving: true,
                                     inlineIcon_credentials: true,
+                                    partial_form_saves: true,
                                     email: true,
                                 },
                             },

integration-test/tests/save-prompts.windows.spec.js

@@ -58,4 +58,31 @@ test.describe('Save prompts on windows', () => {
             await signup.assertWasNotPromptedToSaveWindows();
         });
     });
+
+    test.describe('When partial form saves are disabled', () => {
+        test('I should not be prompted to save for username only', async ({ page }) => {
+            // enable in-terminal exceptions
+            await forwardConsoleMessages(page);
+
+            const { personalAddress } = constants.fields.email;
+
+            const credentials = {
+                username: personalAddress,
+            };
+
+            const signup = signupPage(page);
+            await signup.navigate();
+
+            await createWindowsMocks()
+                .withFeatureToggles({
+                    partial_form_saves: false,
+                })
+                .applyTo(page);
+
+            await createAutofillScript().platform('windows').applyTo(page);
+
+            await signup.enterCredentials(credentials);
+            await signup.assertWasNotPromptedToSaveWindows();
+        });
+    });
 });

src/CredentialsImport.js

@@ -59,8 +59,8 @@ class CredentialsImport {
     }
 
     async started() {
-        this.device.deviceApi.notify(new CloseAutofillParentCall(null));
         this.device.deviceApi.notify(new StartCredentialsImportFlowCall({}));
+        this.device.deviceApi.notify(new CloseAutofillParentCall(null));
     }
 
     async dismissed() {

src/DeviceInterface/InterfacePrototype.js

@@ -799,17 +799,22 @@ class InterfacePrototype {
     postSubmit(values, form) {
         if (!form.form) return;
         if (!form.hasValues(values)) return;
-
-        const isUsernameOnly = Object.keys(values?.credentials || {}).length === 1 && values?.credentials?.username;
-        const checks = [form.shouldPromptToStoreData && !form.submitHandlerExecuted, this.passwordGenerator.generated, isUsernameOnly];
+        const shouldTriggerPartialSave =
+            Object.keys(values?.credentials || {}).length === 1 &&
+            Boolean(values?.credentials?.username) &&
+            this.settings.featureToggles.partial_form_saves;
+        const checks = [
+            form.shouldPromptToStoreData && !form.submitHandlerExecuted,
+            this.passwordGenerator.generated,
+            shouldTriggerPartialSave,
+        ];
         if (checks.some(Boolean)) {
             const formData = appendGeneratedKey(values, {
                 password: this.passwordGenerator.password,
                 username: this.emailProtection.lastGenerated,
             });
 
-            // If credentials has only username field, and no password field, then trigger is a partialSave
-            const trigger = isUsernameOnly ? 'partialSave' : 'formSubmission';
+            const trigger = shouldTriggerPartialSave ? 'partialSave' : 'formSubmission';
             this.storeFormData(formData, trigger);
         }
     }

src/Form/Form.js

@@ -240,7 +240,7 @@ class Form {
      */
     getValuesReadyForStorage() {
         const formValues = this.getRawValues();
-        return prepareFormValuesForStorage(formValues);
+        return prepareFormValuesForStorage(formValues, this.device.settings.featureToggles.partial_form_saves);
     }
 
     /**

src/Form/Form.test.js

@@ -84,8 +84,8 @@ describe('Test the form class reading values correctly', () => {
     <input type="password" value="" autocomplete="new-password" />
     <button type="submit">Sign up</button>
 </form>`,
-            expHasValues: true,
-            expValues: { credentials: { username: 'testUsername' } },
+            expHasValues: false,
+            expValues: { credentials: undefined },
         },
         {
             testCase: 'form where the password is <=3 characters long',
@@ -95,8 +95,8 @@ describe('Test the form class reading values correctly', () => {
     <input type="password" value="abc" autocomplete="new-password" />
     <button type="submit">Sign up</button>
 </form>`,
-            expHasValues: true,
-            expValues: { credentials: { username: 'testUsername' } },
+            expHasValues: false,
+            expValues: { credentials: undefined },
         },
         {
             testCase: 'form with hidden email field',

src/Form/formatters.js

@@ -161,14 +161,14 @@ const getMMAndYYYYFromString = (expiration) => {
 };
 
 /**
- * @param {InternalDataStorageObject} credentials
+ * @param {InternalDataStorageObject} data
  * @return {boolean}
  */
 const shouldStoreIdentities = ({ identities }) =>
     Boolean((identities.firstName || identities.fullName) && identities.addressStreet && identities.addressCity);
 
 /**
- * @param {InternalDataStorageObject} credentials
+ * @param {InternalDataStorageObject} data
  * @return {boolean}
  */
 const shouldStoreCreditCards = ({ creditCards }) => {
@@ -193,7 +193,7 @@ const formatPhoneNumber = (phone) => phone.replaceAll(/[^0-9|+]/g, '');
  * @param {InternalDataStorageObject} formValues
  * @return {DataStorageObject}
  */
-const prepareFormValuesForStorage = (formValues) => {
+const prepareFormValuesForStorage = (formValues, canTriggerPartialSave = false) => {
     /** @type {Partial<InternalDataStorageObject>} */
     let { credentials, identities, creditCards } = formValues;
 
@@ -203,13 +203,14 @@ const prepareFormValuesForStorage = (formValues) => {
     }
 
     /** Fixes for credentials */
-    if (!credentials.username && hasUsernameLikeIdentity(identities)) {
-        // @ts-ignore - We know that username is not a useful value here
+    // If we don't have a username to match a password, let's see if email or phone are available
+    if (credentials.password && !credentials.username && hasUsernameLikeIdentity(identities)) {
+        // @ts-ignore - username will be likely undefined, but needs to be specifically assigned to a string value
         credentials.username = identities.emailAddress || identities.phone;
     }
 
-    // If we still don't have any credentials, we discard the object
-    if (Object.keys(credentials ?? {}).length === 0) {
+    // If there's no password, and we shouldn't trigger a partial save, let's discard the object
+    if (!credentials.password && !canTriggerPartialSave) {
         credentials = undefined;
     }