diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /services/fxaccounts/FxAccountsCommon.sys.mjs | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'services/fxaccounts/FxAccountsCommon.sys.mjs')
| -rw-r--r-- | services/fxaccounts/FxAccountsCommon.sys.mjs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/services/fxaccounts/FxAccountsCommon.sys.mjs b/services/fxaccounts/FxAccountsCommon.sys.mjs index 2688fc3c0a..18f129af38 100644 --- a/services/fxaccounts/FxAccountsCommon.sys.mjs +++ b/services/fxaccounts/FxAccountsCommon.sys.mjs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ import { Log } from "resource://gre/modules/Log.sys.mjs"; -import { LogManager } from "resource://services-common/logmanager.sys.mjs"; +import { LogManager } from "resource://gre/modules/LogManager.sys.mjs"; // loglevel should be one of "Fatal", "Error", "Warn", "Info", "Config", // "Debug", "Trace" or "All". If none is specified, "Debug" will be used by @@ -29,7 +29,13 @@ let logs = [ ]; // For legacy reasons, the log manager still thinks it's part of sync. -export let logManager = new LogManager("services.sync.", logs, "sync"); +export let logManager = new LogManager({ + prefRoot: "services.sync.", + logNames: logs, + logFilePrefix: "sync", + logFileSubDirectoryEntries: ["weave", "logs"], + testTopicPrefix: "services-tests:common:log-manager:", +}); // A boolean to indicate if personally identifiable information (or anything // else sensitive, such as credentials) should be logged. @@ -77,6 +83,9 @@ export let COMMAND_PREFIX = "https://identity.mozilla.com/cmd/"; // The commands we support - only the _TAIL values are recorded in telemetry. export let COMMAND_SENDTAB_TAIL = "open-uri"; export let COMMAND_SENDTAB = COMMAND_PREFIX + COMMAND_SENDTAB_TAIL; +// A command to close a tab on this device +export let COMMAND_CLOSETAB_TAIL = "close-uri/v1"; +export let COMMAND_CLOSETAB = COMMAND_PREFIX + COMMAND_CLOSETAB_TAIL; // OAuth export let FX_OAUTH_CLIENT_ID = "5882386c6d801776"; @@ -266,6 +275,7 @@ export let FXA_PWDMGR_PLAINTEXT_FIELDS = new Set([ "device", "profileCache", "encryptedSendTabKeys", + "encryptedCloseTabKeys", ]); // Fields we store in secure storage if it exists. |