Refactor - auto update credential provider script

Author: github-actions[bot]

firefox-ios/Client/Assets/CC_Script/AutofillTelemetry.sys.mjs

@@ -12,10 +12,6 @@ class AutofillTelemetryBase {
   EVENT_CATEGORY = null;
   EVENT_OBJECT_FORM_INTERACTION = null;
 
-  HISTOGRAM_NUM_USES = null;
-  HISTOGRAM_PROFILE_NUM_USES = null;
-  HISTOGRAM_PROFILE_NUM_USES_KEY = null;
-
   #initFormEventExtra(value) {
     let extra = {};
     for (const field of Object.values(this.SUPPORTED_FIELDS)) {
@@ -183,17 +179,6 @@ class AutofillTelemetryBase {
     throw new Error("Not implemented.");
   }
 
-  recordNumberOfUse(records) {
-    let histogram = Services.telemetry.getKeyedHistogramById(
-      this.HISTOGRAM_PROFILE_NUM_USES
-    );
-    histogram.clear();
-
-    for (let record of records) {
-      histogram.add(this.HISTOGRAM_PROFILE_NUM_USES_KEY, record.timesUsed);
-    }
-  }
-
   recordIframeLayoutDetection(flowId, fieldDetails) {
     const fieldsInMainFrame = [];
     const fieldsInIframe = [];
@@ -238,9 +223,6 @@ export class AddressTelemetry extends AutofillTelemetryBase {
   EVENT_OBJECT_FORM_INTERACTION = "AddressForm";
   EVENT_OBJECT_FORM_INTERACTION_EXT = "AddressFormExt";
 
-  HISTOGRAM_PROFILE_NUM_USES = "AUTOFILL_PROFILE_NUM_USES";
-  HISTOGRAM_PROFILE_NUM_USES_KEY = "address";
-
   // Fields that are recorded in `address_form` and `address_form_ext` telemetry
   SUPPORTED_FIELDS = {
     "street-address": "street_address",
@@ -316,10 +298,6 @@ class CreditCardTelemetry extends AutofillTelemetryBase {
   EVENT_CATEGORY = "creditcard";
   EVENT_OBJECT_FORM_INTERACTION = "CcFormV2";
 
-  HISTOGRAM_NUM_USES = "CREDITCARD_NUM_USES";
-  HISTOGRAM_PROFILE_NUM_USES = "AUTOFILL_PROFILE_NUM_USES";
-  HISTOGRAM_PROFILE_NUM_USES_KEY = "credit_card";
-
   // Mapping of field name used in formautofill code to the field name
   // used in the telemetry.
   SUPPORTED_FIELDS = {
@@ -369,23 +347,6 @@ class CreditCardTelemetry extends AutofillTelemetryBase {
     }
   }
 
-  recordNumberOfUse(records) {
-    super.recordNumberOfUse(records);
-
-    if (!this.HISTOGRAM_NUM_USES) {
-      return;
-    }
-
-    let histogram = Services.telemetry.getHistogramById(
-      this.HISTOGRAM_NUM_USES
-    );
-    histogram.clear();
-
-    for (let record of records) {
-      histogram.add(record.timesUsed);
-    }
-  }
-
   recordAutofillProfileCount(count) {
     Glean.formautofillCreditcards.autofillProfilesCount.set(count);
   }
@@ -463,14 +424,6 @@ export class AutofillTelemetry {
     telemetry.recordAutofillProfileCount(count);
   }
 
-  /**
-   * Utility functions for address/credit card number of use
-   */
-  static recordNumberOfUse(type, records) {
-    const telemetry = this.#getTelemetryByType(type);
-    telemetry.recordNumberOfUse(records);
-  }
-
   static recordFormSubmissionHeuristicCount(label) {
     Glean.formautofill.formSubmissionHeuristic[label].add(1);
   }

firefox-ios/Client/Assets/CC_Script/FormAutofillSection.sys.mjs

@@ -333,27 +333,32 @@ export class FormAutofillSection {
     return data;
   }
 
+  shouldAutofillField(fieldDetail) {
+    // We don't save security code, but if somehow the profile has securty code,
+    // make sure we don't autofill it.
+    if (fieldDetail.fieldName == "cc-csc") {
+      return false;
+    }
+
+    // When both visible and invisible elements exist, we only autofill the
+    // visible element.
+    if (!fieldDetail.isVisible) {
+      return !this.fieldDetails.some(
+        field => field.fieldName == fieldDetail.fieldName && field.isVisible
+      );
+    }
+
+    return true;
+  }
+
   /**
    * Heuristics to determine which fields to autofill when a section contains
    * multiple fields of the same type.
    */
   getAutofillFields() {
-    return this.fieldDetails.filter(fieldDetail => {
-      // We don't save security code, but if somehow the profile has securty code,
-      // make sure we don't autofill it.
-      if (fieldDetail.fieldName == "cc-csc") {
-        return false;
-      }
-
-      // When both visible and invisible elements exist, we only autofill the
-      // visible element.
-      if (!fieldDetail.isVisible) {
-        return !this.fieldDetails.some(
-          field => field.fieldName == fieldDetail.fieldName && field.isVisible
-        );
-      }
-      return true;
-    });
+    return this.fieldDetails.filter(fieldDetail =>
+      this.shouldAutofillField(fieldDetail)
+    );
   }
 
   /*
@@ -645,7 +650,6 @@ export class FormAutofillCreditCardSection extends FormAutofillSection {
         result = decrypted ? "success" : "fail_user_canceled";
       } catch (ex) {
         result = "fail_error";
-        throw ex;
       } finally {
         Glean.formautofill.promptShownOsReauth.record({
           trigger: "autofill",
@@ -677,6 +681,7 @@ export class FormAutofillCreditCardSection extends FormAutofillSection {
     } catch (e) {
       errorResult = e.result;
       if (e.result != Cr.NS_ERROR_ABORT) {
+        this.log.warn(`Decryption failed with result: ${e.result}`);
         throw e;
       }
       this.log.warn("User canceled encryption login");

firefox-ios/Client/Assets/CC_Script/Helpers.ios.mjs

@@ -5,8 +5,6 @@
 import { IOSAppConstants } from "resource://gre/modules/shared/Constants.ios.mjs";
 import Overrides from "resource://gre/modules/Overrides.ios.js";
 
-const EMPTY_MODULE_PATH = "EmptyModule.sys.mjs";
-
 /* eslint mozilla/use-isInstance: 0 */
 HTMLSelectElement.isInstance = element => element instanceof HTMLSelectElement;
 HTMLInputElement.isInstance = element => element instanceof HTMLInputElement;
@@ -30,13 +28,6 @@ Object.defineProperty(HTMLInputElement.prototype, "hasBeenTypePassword", {
   configurable: true,
 });
 
-Object.defineProperty(HTMLInputElement.prototype, "nodePrincipal", {
-  get() {
-    return { isNullPrincipal: false };
-  },
-  configurable: true,
-});
-
 function setUserInput(value) {
   this.value = value;
 
@@ -109,15 +100,13 @@ const internalModuleResolvers = {
     const moduleName = moduleURI.split("/").pop();
     const modulePath =
       "./" + (Overrides.ModuleOverrides[moduleName] ?? moduleName);
-    return { module: moduleResolver(modulePath), path: modulePath };
+    return moduleResolver(modulePath);
   },
 
   resolveModules(obj, modules) {
     for (const [exportName, moduleURI] of Object.entries(modules)) {
       const resolvedModule = this.resolveModule(moduleURI);
-      obj[exportName] = resolvedModule.path.includes(EMPTY_MODULE_PATH)
-        ? resolvedModule.module?.default
-        : resolvedModule.module?.[exportName];
+      obj[exportName] = resolvedModule?.[exportName];
     }
   },
 };
@@ -158,7 +147,7 @@ export const ChromeUtils = withNotImplementedError({
     internalModuleResolvers.resolveModules(obj, modules);
   },
   importESModule(moduleURI) {
-    return internalModuleResolvers.resolveModule(moduleURI)?.module;
+    return internalModuleResolvers.resolveModule(moduleURI);
   },
 });
 window.ChromeUtils = ChromeUtils;

firefox-ios/Client/Assets/CC_Script/HeuristicsRegExp.sys.mjs

@@ -56,7 +56,8 @@ export const HeuristicsRegExp = {
       "address-line3": "addrline3|address_3|addl3",
       "address-level2": "città", // it-IT
       "address-housenumber":
-        "house\\s*number|hausnummer|haus|house[a-z\-]*n(r|o)",
+        "(house|building)\\s*number|hausnummer|haus|house[a-z\-]*n(r|o)" +
+        "|n[úu]mero",
       "address-level3":
         "(^address-?level-?3$)" +
         "|neighbou*rhood|barrio|bairro|colonia|suburb", // en/es/pt/mx/au/nz
@@ -653,10 +654,12 @@ export const HeuristicsRegExp = {
       "address-line2":
         "address|line" +
         "|house|building|apartment|floor" +    // de-DE
+        "|apartamento|" +    // pt
         "|adresse" +      // fr-FR
         "|indirizzo" +    // it-IT
         "|地址" +         // zh-CN
-        "|주소",          // ko-KR
+        "|주소" +         // ko-KR
+        "|mieszkan(ie|ia)",         // pl-PL
     },
   ],
 

firefox-ios/Client/Assets/CC_Script/LabelUtils.sys.mjs

@@ -23,11 +23,6 @@ export const LabelUtils = {
   // @type {Map<string, array>}
   _mappedLabels: null,
 
-  // An array consisting of label elements whose correponding form field doesn't
-  // have an id attribute.
-  // @type {Array<[HTMLLabelElement, HTMLElement]>}
-  _unmappedLabelControls: null,
-
   // A weak map consisting of label element and extracted strings pairs.
   // @type {WeakMap<HTMLLabelElement, array>}
   _labelStrings: null,
@@ -178,41 +173,29 @@ export const LabelUtils = {
 
   generateLabelMap(doc) {
     this._mappedLabels = new Map();
-    this._unmappedLabelControls = [];
     this._labelStrings = new WeakMap();
 
     // A map of potential label -> control for labels that don't have an id or
     // control associated with them. Labels that have ids or associated controls
     // will be placed in _mappedLabels.
     let potentialLabels = new Map();
-
     for (let label of doc.querySelectorAll("label")) {
-      let id = label.htmlFor;
-      let control;
-      if (!id) {
-        control = label.control;
-        if (!control) {
-          // If the label has no control, look for the next input or select
-          // element in the document and add that to the potentialLabels list.
-          control = this.findAdjacentControl(label, potentialLabels);
-          if (control) {
-            potentialLabels.set(control, label);
-          } else {
-            continue;
-          }
-        }
-        id = control.id;
-      }
-      if (id) {
-        let labels = this._mappedLabels.get(id);
+      let control = label.control;
+      if (control) {
+        const controlId = lazy.FormAutofillUtils.getElementIdentifier(control);
+        let labels = this._mappedLabels.get(controlId);
         if (labels) {
           labels.push(label);
         } else {
-          this._mappedLabels.set(id, [label]);
+          this._mappedLabels.set(controlId, [label]);
         }
       } else {
-        // control must be non-empty here
-        this._unmappedLabelControls.push({ label, control });
+        // If the label has no control, look for the next input or select
+        // element in the document and add that to the potentialLabels list.
+        control = this.findAdjacentControl(label, potentialLabels);
+        if (control) {
+          potentialLabels.set(control, label);
+        }
       }
     }
 
@@ -221,22 +204,16 @@ export const LabelUtils = {
     // control that is nearby even when it has no for attribute or doesn't match an id.
     if (potentialLabels.size) {
       for (let label of potentialLabels) {
-        if (
-          !this._unmappedLabelControls.some(e => e.control == label[0]) &&
-          (!label[1].id || !this._mappedLabels.has(label[1].id))
-        ) {
-          this._unmappedLabelControls.push({
-            label: label[1],
-            control: label[0],
-          });
+        const elementId = lazy.FormAutofillUtils.getElementIdentifier(label[0]);
+        if (!this._mappedLabels.has(elementId)) {
+          this._mappedLabels.set(elementId, [label[1]]);
         }
       }
     }
   },
 
   clearLabelMap() {
     this._mappedLabels = null;
-    this._unmappedLabelControls = null;
     this._labelStrings = null;
   },
 
@@ -245,12 +222,7 @@ export const LabelUtils = {
       this.generateLabelMap(element.ownerDocument);
     }
 
-    let id = element.id;
-    if (!id) {
-      return this._unmappedLabelControls
-        .filter(lc => lc.control == element)
-        .map(lc => lc.label);
-    }
+    let id = lazy.FormAutofillUtils.getElementIdentifier(element);
     return this._mappedLabels.get(id) || [];
   },
 };