corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1786708 - Migrate formautofill management dialogs to Fluent. r=sgalich,fluent-reviewers,preferences-reviewers,flod,jaws

Browse Source 
A new FTL file for the extension is added under `browser/preferences/` rather than `browser/extensions/formautofill/`, as the former is a more common location for FTL localizations, and the extension already relies on an FTL file hosted outside its own directory, `toolkit/payments/payments.ftl`.

The dialogs are not fully migrated in this patch, as some of the strings are shared with the edit dialogs and are migrated separately.

A Fluent migration for the localization changes applied here is included in the next patch after this one.

Differential Revision: https://phabricator.services.mozilla.com/D155478
This commit is contained in:
Eemeli Aro
2022-09-01 20:35:34 +00:00
parent d75c8df1e9
commit 6186d62a9e
7 changed files with 101 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
browser/extensions/formautofill/content/manageDialog.js
View File

@@ -41,17 +41,16 @@ ChromeUtils.defineModuleGetter(
"resource://gre/modules/OSKeyStore.jsm"
);
XPCOMUtils.defineLazyGetter(this, "reauthPasswordPromptMessage", () => {
const brandShortName = FormAutofillUtils.brandBundle.GetStringFromName(
"brandShortName"
);
// The string name for Mac is changed because the value needed updating.
const platform = AppConstants.platform.replace("macosx", "macos");
return FormAutofillUtils.stringBundle.formatStringFromName(
`editCreditCardPasswordPrompt.${platform}`,
[brandShortName]
);
});
const lazy = {};
XPCOMUtils.defineLazyGetter(
lazy,
"l10n",
() =>
new Localization([
"browser/preferences/formAutofill.ftl",
"branding/brand.ftl",
])
);
this.log = null;
XPCOMUtils.defineLazyGetter(this, "log", () =>
@@ -66,7 +65,6 @@ class ManageRecords {
this._newRequest = false;
this._isLoadingRecords = false;
this.prefWin = window.opener;
this.localizeDocument();
window.addEventListener("DOMContentLoaded", this, { once: true });
}
@@ -83,13 +81,6 @@ class ManageRecords {
this._elements = null;
}
localizeDocument() {
document.documentElement.style.minWidth = FormAutofillUtils.stringBundle.GetStringFromName(
"manageDialogsWidth"
);
FormAutofillUtils.localizeMarkup(document);
}
/**
* Get the selected options on the addresses element.
*
@@ -380,43 +371,45 @@ class ManageCreditCards extends ManageRecords {
*/
async openEditDialog(creditCard) {
// Ask for reauth if user is trying to edit an existing credit card.
if (
!creditCard ||
(await FormAutofillUtils.ensureLoggedIn(reauthPasswordPromptMessage))
.authenticated
) {
let decryptedCCNumObj = {};
if (creditCard && creditCard["cc-number-encrypted"]) {
try {
decryptedCCNumObj["cc-number"] = await OSKeyStore.decrypt(
creditCard["cc-number-encrypted"]
);
} catch (ex) {
if (ex.result == Cr.NS_ERROR_ABORT) {
// User shouldn't be ask to reauth here, but it could happen.
// Return here and skip opening the dialog.
return;
}
// We've got ourselves a real error.
// Recover from encryption error so the user gets a chance to re-enter
// unencrypted credit card number.
decryptedCCNumObj["cc-number"] = "";
Cu.reportError(ex);
}
if (creditCard) {
const reauthPasswordPromptMessage = await lazy.l10n.formatValue(
"autofill-edit-card-password-prompt"
);
const loggedIn = await FormAutofillUtils.ensureLoggedIn(
reauthPasswordPromptMessage
);
if (!loggedIn.authenticated) {
return;
}
let decryptedCreditCard = Object.assign(
{},
creditCard,
decryptedCCNumObj
);
this.prefWin.gSubDialog.open(
EDIT_CREDIT_CARD_URL,
{ features: "resizable=no" },
{
record: decryptedCreditCard,
}
);
}
let decryptedCCNumObj = {};
if (creditCard && creditCard["cc-number-encrypted"]) {
try {
decryptedCCNumObj["cc-number"] = await OSKeyStore.decrypt(
creditCard["cc-number-encrypted"]
);
} catch (ex) {
if (ex.result == Cr.NS_ERROR_ABORT) {
// User shouldn't be ask to reauth here, but it could happen.
// Return here and skip opening the dialog.
return;
}
// We've got ourselves a real error.
// Recover from encryption error so the user gets a chance to re-enter
// unencrypted credit card number.
decryptedCCNumObj["cc-number"] = "";
Cu.reportError(ex);
}
}
let decryptedCreditCard = Object.assign({}, creditCard, decryptedCCNumObj);
this.prefWin.gSubDialog.open(
EDIT_CREDIT_CARD_URL,
{ features: "resizable=no" },
{
record: decryptedCreditCard,
}
);
}
/**