Ensure password gen feature flag is respected

Signed-off-by: Emanuele Feliziani <[email protected]>
duckduckgo · Apr 9, 2024 · 4c16e52 · 4c16e52
1 parent b88d3f6
commit 4c16e52
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 24 deletions.
diff --git a/dist/autofill-debug.js b/dist/autofill-debug.js
diff --git a/dist/autofill.js b/dist/autofill.js
diff --git a/src/Settings.js b/src/Settings.js
@@ -176,11 +176,18 @@ export class Settings {
      * @param {{
      *   mainType: SupportedMainTypes
      *   subtype: import('./Form/matching.js').SupportedSubTypes | "unknown"
+     *   variant?: import('./Form/matching.js').SupportedVariants | ""
      * }} types
      * @returns {boolean}
      */
-    isTypeUnavailable ({mainType, subtype}) {
+    isTypeUnavailable ({mainType, subtype, variant}) {
         if (mainType === 'unknown') return true
+
+        // Ensure password generation feature flag is respected
+        if (subtype === 'password' && variant === 'new') {
+            return !this.featureToggles.password_generation
+        }
+
         if (!this.featureToggles[`inputType_${mainType}`] && subtype !== 'emailAddress') {
             return true
         }
@@ -201,11 +208,12 @@ export class Settings {
      * @param {{
      *   mainType: SupportedMainTypes
      *   subtype: import('./Form/matching.js').SupportedSubTypes | "unknown"
+     *   variant?: import('./Form/matching.js').SupportedVariants | ""
      * }} types
      * @returns {Promise<boolean>}
      */
-    async populateDataIfNeeded ({mainType, subtype}) {
-        if (this.isTypeUnavailable({mainType, subtype})) return false
+    async populateDataIfNeeded ({mainType, subtype, variant}) {
+        if (this.isTypeUnavailable({mainType, subtype, variant})) return false
         if (this.availableInputTypes?.[mainType] === undefined) {
             await this.populateData()
             return true
@@ -225,7 +233,7 @@ export class Settings {
      * @returns {boolean}
      */
     canAutofillType ({mainType, subtype, variant}, inContextSignup) {
-        if (this.isTypeUnavailable({ mainType, subtype })) return false
+        if (this.isTypeUnavailable({ mainType, subtype, variant })) return false
 
         // If it's an email field and Email Protection is enabled, return true regardless of other options
         const isEmailProtectionEnabled = this.featureToggles.emailProtection && this.availableInputTypes.email

diff --git a/src/Settings.test.js b/src/Settings.test.js
@@ -50,6 +50,17 @@ describe('Settings', () => {
                     expect(settings.canAutofillType({ mainType: 'credentials', subtype: 'password', variant: 'current' }, null)).toBe(false)
                 }
             ],
+            [
+                { password_generation: false },
+                {
+                    ...createAvailableInputTypes({
+                        credentials: {username: true, password: true}
+                    })
+                },
+                (settings) => {
+                    expect(settings.canAutofillType({ mainType: 'credentials', subtype: 'password', variant: 'new' }, null)).toBe(false)
+                }
+            ],
             [
                 {},
                 {

diff --git a/swift-package/Resources/assets/autofill-debug.js b/swift-package/Resources/assets/autofill-debug.js
diff --git a/swift-package/Resources/assets/autofill.js b/swift-package/Resources/assets/autofill.js