Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-25 11:15:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1322856 - Expose ContextualIdentities (aka containers) to WebExtensions - part 2, r=kmaglione

Browse Source
This commit is contained in:
Andrea Marchesini 2016-12-16 22:01:24 +01:00
parent 95cb113c9f
commit 7e2488aeeb
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolkit/components/extensions/.eslintrc.js
View File

@ -19,6 +19,10 @@ module.exports = { // eslint-disable-line no-undef
"getContainerForCookieStoreId": true,
"getCookieStoreIdForContainer": true,
"global": true,
"isContainerCookieStoreId": true,
"isDefaultCookieStoreId": true,
"isPrivateCookieStoreId": true,
"isValidCookieStoreId": true,
"NetUtil": true,
"openOptionsPage": true,
"require": false,

26
toolkit/components/extensions/ext-cookies.js
View File

@ -45,7 +45,7 @@ global.getCookieStoreIdForContainer = function(containerId) {
};
global.getContainerForCookieStoreId = function(storeId) {
if (!global.isContainerCookieStoreId(storeId)) {
if (!isContainerCookieStoreId(storeId)) {
return null;
}
@ -58,9 +58,9 @@ global.getContainerForCookieStoreId = function(storeId) {
};
global.isValidCookieStoreId = function(storeId) {
return global.isDefaultCookieStoreId(storeId) ||
global.isPrivateCookieStoreId(storeId) ||
global.isContainerCookieStoreId(storeId);
return isDefaultCookieStoreId(storeId) ||
isPrivateCookieStoreId(storeId) ||
isContainerCookieStoreId(storeId);
};
function convert({cookie, isPrivate}) {
@ -201,17 +201,17 @@ function* query(detailsIn, props, context) {
let userContextId = 0;
let isPrivate = context.incognito;
if (details.storeId) {
if (!global.isValidCookieStoreId(details.storeId)) {
if (!isValidCookieStoreId(details.storeId)) {
return;
}
if (global.isDefaultCookieStoreId(details.storeId)) {
if (isDefaultCookieStoreId(details.storeId)) {
isPrivate = false;
} else if (global.isPrivateCookieStoreId(details.storeId)) {
} else if (isPrivateCookieStoreId(details.storeId)) {
isPrivate = true;
} else if (global.isContainerCookieStoreId(details.storeId)) {
} else if (isContainerCookieStoreId(details.storeId)) {
isPrivate = false;
userContextId = global.getContainerForCookieStoreId(details.storeId);
userContextId = getContainerForCookieStoreId(details.storeId);
if (!userContextId) {
return;
}
@ -372,12 +372,12 @@ extensions.registerSchemaAPI("cookies", "addon_parent", context => {
let expiry = isSession ? Number.MAX_SAFE_INTEGER : details.expirationDate;
let isPrivate = context.incognito;
let userContextId = 0;
if (global.isDefaultCookieStoreId(details.storeId)) {
if (isDefaultCookieStoreId(details.storeId)) {
isPrivate = false;
} else if (global.isPrivateCookieStoreId(details.storeId)) {
} else if (isPrivateCookieStoreId(details.storeId)) {
isPrivate = true;
} else if (global.isContainerCookieStoreId(details.storeId)) {
let containerId = global.getContainerForCookieStoreId(details.storeId);
} else if (isContainerCookieStoreId(details.storeId)) {
let containerId = getContainerForCookieStoreId(details.storeId);
if (containerId === null) {
return Promise.reject({message: `Illegal storeId: ${details.storeId}`});
}