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

Bug 1894301 - Avoid schema violation before writing backup manifest when not signed into an account. r=backup-reviewers,kpatenio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D209040
This commit is contained in:
Mike Conley
2024-05-01 19:01:56 +00:00
parent 636b19b590
commit 6316b6c912
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
browser/components/backup/BackupService.sys.mjs
View File

@@ -439,30 +439,26 @@ export class BackupService {
profileName = profileSvc.currentProfile.name;
}
// Default these to undefined rather than null so that they're not included
// the meta object if we're not signed in.
let accountID = undefined;
let accountEmail = undefined;
let meta = {
date: new Date().toISOString(),
appName: AppConstants.MOZ_APP_NAME,
appVersion: AppConstants.MOZ_APP_VERSION,
buildID: AppConstants.MOZ_BUILDID,
profileName,
machineName: lazy.fxAccounts.device.getLocalName(),
osName: Services.sysinfo.getProperty("name"),
osVersion: Services.sysinfo.getProperty("version"),
};
let fxaState = lazy.UIState.get();
if (fxaState.status == lazy.UIState.STATUS_SIGNED_IN) {
accountID = fxaState.uid;
accountEmail = fxaState.email;
meta.accountID = fxaState.uid;
meta.accountEmail = fxaState.email;
}
return {
version: BackupService.MANIFEST_SCHEMA_VERSION,
meta: {
date: new Date().toISOString(),
appName: AppConstants.MOZ_APP_NAME,
appVersion: AppConstants.MOZ_APP_VERSION,
buildID: AppConstants.MOZ_BUILDID,
profileName,
machineName: lazy.fxAccounts.device.getLocalName(),
osName: Services.sysinfo.getProperty("name"),
osVersion: Services.sysinfo.getProperty("version"),
accountID,
accountEmail,
},
meta,
resources: {},
};
}