Update Prettify, update copyright year, minor html housekeeping. (#1310)
Signed-off-by: Kenneth T <6724477+kennethtran93@users.noreply.github.com>
This commit is contained in:
parent
2e066c6a6e
commit
0fd618d875
|
@ -1,3 +1,15 @@
|
|||
/**
|
||||
* Copyright (c) 2022 CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
import {
|
||||
activityLog,
|
||||
cache,
|
||||
|
@ -433,7 +445,7 @@ describe('Reducer', () => {
|
|||
{
|
||||
payload: {
|
||||
...mockExpression,
|
||||
listType: (undefined as unknown) as ListType,
|
||||
listType: undefined as unknown as ListType,
|
||||
},
|
||||
type: ReduxConstants.UPDATE_EXPRESSION,
|
||||
},
|
||||
|
|
|
@ -1,3 +1,15 @@
|
|||
/**
|
||||
* Copyright (c) 2022 CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
import { advanceTo, clear } from 'jest-date-mock';
|
||||
import { when } from 'jest-when';
|
||||
import { initialState } from '../../src/redux/State';
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2020 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2020-2022 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2020 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2020-2022 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
@ -79,12 +79,13 @@ class TestContextualIdentitiesEvents extends ContextualIdentitiesEvents {
|
|||
}
|
||||
}
|
||||
|
||||
const defaultContextualIdentity: browser.contextualIdentities.ContextualIdentity = {
|
||||
cookieStoreId: 'firefox-container-0',
|
||||
color: 'blue',
|
||||
icon: 'fingerprint',
|
||||
name: 'Testing Container',
|
||||
};
|
||||
const defaultContextualIdentity: browser.contextualIdentities.ContextualIdentity =
|
||||
{
|
||||
cookieStoreId: 'firefox-container-0',
|
||||
color: 'blue',
|
||||
icon: 'fingerprint',
|
||||
name: 'Testing Container',
|
||||
};
|
||||
|
||||
describe('ContextualIdentitiesEvents', () => {
|
||||
beforeAll(() => {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2020 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2020-2022 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2020-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
@ -168,8 +168,7 @@ describe('Library Functions', () => {
|
|||
expect(consoleOutput).toEqual([
|
||||
{
|
||||
type: 'error',
|
||||
msg:
|
||||
'CAD_0.12.34 - Invalid Console Output Type given [ invalid ]. Using [debug] instead.',
|
||||
msg: 'CAD_0.12.34 - Invalid Console Output Type given [ invalid ]. Using [debug] instead.',
|
||||
},
|
||||
{ type: 'debug', msg: 'CAD_0.12.34 - debug - invalidType\n' },
|
||||
]);
|
||||
|
@ -189,13 +188,11 @@ describe('Library Functions', () => {
|
|||
expect(consoleOutput).toEqual([
|
||||
{
|
||||
type: 'warn',
|
||||
msg:
|
||||
'CAD_0.12.34 - Received unexpected typeof [ function ]. Attempting to display it...',
|
||||
msg: 'CAD_0.12.34 - Received unexpected typeof [ function ]. Attempting to display it...',
|
||||
},
|
||||
{
|
||||
type: 'debug',
|
||||
msg:
|
||||
'CAD_0.12.34 - debug - objectFunction\nfunction toString() { [native code] }',
|
||||
msg: 'CAD_0.12.34 - debug - objectFunction\nfunction toString() { [native code] }',
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
@ -1310,14 +1307,9 @@ describe('Library Functions', () => {
|
|||
});
|
||||
|
||||
it('should return cleanup domains from example.com', () => {
|
||||
expect(
|
||||
prepareCleanupDomains('example.com', browserName.Firefox),
|
||||
).toEqual([
|
||||
'example.com',
|
||||
'.example.com',
|
||||
'www.example.com',
|
||||
'.www.example.com',
|
||||
]);
|
||||
expect(prepareCleanupDomains('example.com', browserName.Firefox)).toEqual(
|
||||
['example.com', '.example.com', 'www.example.com', '.www.example.com'],
|
||||
);
|
||||
});
|
||||
|
||||
it('should return cleanup domains from example.com for Chrome', () => {
|
||||
|
@ -1699,9 +1691,10 @@ describe('Library Functions', () => {
|
|||
});
|
||||
it('should return invalid message on invalid RegExp', () => {
|
||||
validateExpressionDomain('/abc(def]/');
|
||||
expect(
|
||||
global.browser.i18n.getMessage,
|
||||
).toHaveBeenCalledWith('inputErrorRegExp', [expect.any(String)]);
|
||||
expect(global.browser.i18n.getMessage).toHaveBeenCalledWith(
|
||||
'inputErrorRegExp',
|
||||
[expect.any(String)],
|
||||
);
|
||||
});
|
||||
it('should return invalid message on start slash missing end slash', () => {
|
||||
validateExpressionDomain('/abc');
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2020 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2022 CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2020 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2020-2022 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
@ -27,9 +27,8 @@ import StoreUser from '../../src/services/StoreUser';
|
|||
|
||||
jest.requireActual('../../src/services/AlarmEvents');
|
||||
const spyAlarmEvents: JestSpyObject = global.generateSpies(AlarmEvents);
|
||||
const spyBrowserActions: JestSpyObject = global.generateSpies(
|
||||
BrowserActionService,
|
||||
);
|
||||
const spyBrowserActions: JestSpyObject =
|
||||
global.generateSpies(BrowserActionService);
|
||||
jest.requireActual('../../src/services/Libs');
|
||||
const spyLib: JestSpyObject = global.generateSpies(Lib);
|
||||
jest.requireActual('../../src/services/TabEvents');
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/**
|
||||
* @jest-environment jsdom
|
||||
*
|
||||
* Copyright (c) 2020 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2020-2022 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
|
@ -1,3 +1,15 @@
|
|||
/**
|
||||
* Copyright (c) 2022 CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
.addHover:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
|
|
@ -1,16 +1,26 @@
|
|||
<!DOCTYPE html>
|
||||
<!--
|
||||
Copyright (c) 2022 CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
-->
|
||||
<html>
|
||||
<head>
|
||||
<link rel="stylesheet" href="../global_files/bootstrap.min.css" />
|
||||
<link rel="stylesheet" href="popup.css" />
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1" />
|
||||
<title>Cookie AutoDelete Popup</title>
|
||||
<link rel="stylesheet" href="../global_files/bootstrap.min.css" />
|
||||
<link rel="stylesheet" href="popup.css" />
|
||||
</head>
|
||||
<body>
|
||||
<script
|
||||
type="text/javascript"
|
||||
src="../global_files/browser-polyfill.min.js"
|
||||
></script>
|
||||
<script src="../global_files/browser-polyfill.min.js"></script>
|
||||
<script src="../global_files/browserDetect.js"></script>
|
||||
<script src="../global_files/redux-webext.js"></script>
|
||||
<script src="../global_files/jquery.slim.min.js"></script>
|
||||
|
|
|
@ -1,3 +1,15 @@
|
|||
/**
|
||||
* Copyright (c) 2022 CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
button:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
|
|
@ -1,9 +1,21 @@
|
|||
<!DOCTYPE html>
|
||||
<!--
|
||||
Copyright (c) 2022 CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
-->
|
||||
<html>
|
||||
<head>
|
||||
<title>Cookie AutoDelete Settings</title>
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>Cookie AutoDelete Settings</title>
|
||||
<link rel="icon" type="image/png" href="../icons/icon_24.png" />
|
||||
<link rel="stylesheet" href="../global_files/bootstrap.min.css" />
|
||||
<link rel="stylesheet" href="./side-menu.css" />
|
||||
|
|
|
@ -1,3 +1,15 @@
|
|||
/**
|
||||
* Copyright (c) 2022 CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
body {
|
||||
color: #777;
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
"jest": "^26.6.3",
|
||||
"jest-date-mock": "^1.0.8",
|
||||
"jest-when": "^3.3.1",
|
||||
"prettier": "^2.3.0",
|
||||
"prettier": "^2.5.1",
|
||||
"source-map-loader": "^3.0.0",
|
||||
"ts-jest": "^26.5.6",
|
||||
"ts-loader": "^9.2.2",
|
||||
|
@ -4578,10 +4578,14 @@
|
|||
}
|
||||
},
|
||||
"node_modules/caniuse-lite": {
|
||||
"version": "1.0.30001170",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001170.tgz",
|
||||
"integrity": "sha512-Dd4d/+0tsK0UNLrZs3CvNukqalnVTRrxb5mcQm8rHL49t7V5ZaTygwXkrq+FB+dVDf++4ri8eJnFEJAB8332PA==",
|
||||
"dev": true
|
||||
"version": "1.0.30001309",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz",
|
||||
"integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==",
|
||||
"dev": true,
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/browserslist"
|
||||
}
|
||||
},
|
||||
"node_modules/capture-exit": {
|
||||
"version": "2.0.0",
|
||||
|
@ -5215,6 +5219,7 @@
|
|||
"resolved": "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.8.tgz",
|
||||
"integrity": "sha512-b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg==",
|
||||
"dev": true,
|
||||
"hasInstallScript": true,
|
||||
"optional": true,
|
||||
"dependencies": {
|
||||
"nan": "^2.14.0"
|
||||
|
@ -12566,9 +12571,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/prettier": {
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
|
||||
"integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
|
||||
"version": "2.5.1",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
|
||||
"integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
|
||||
"dev": true,
|
||||
"bin": {
|
||||
"prettier": "bin-prettier.js"
|
||||
|
@ -19105,9 +19110,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"caniuse-lite": {
|
||||
"version": "1.0.30001170",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001170.tgz",
|
||||
"integrity": "sha512-Dd4d/+0tsK0UNLrZs3CvNukqalnVTRrxb5mcQm8rHL49t7V5ZaTygwXkrq+FB+dVDf++4ri8eJnFEJAB8332PA==",
|
||||
"version": "1.0.30001309",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001309.tgz",
|
||||
"integrity": "sha512-Pl8vfigmBXXq+/yUz1jUwULeq9xhMJznzdc/xwl4WclDAuebcTHVefpz8lE/bMI+UN7TOkSSe7B7RnZd6+dzjA==",
|
||||
"dev": true
|
||||
},
|
||||
"capture-exit": {
|
||||
|
@ -25440,9 +25445,9 @@
|
|||
"dev": true
|
||||
},
|
||||
"prettier": {
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
|
||||
"integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
|
||||
"version": "2.5.1",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
|
||||
"integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
|
||||
"dev": true
|
||||
},
|
||||
"pretty-format": {
|
||||
|
|
|
@ -53,7 +53,7 @@
|
|||
"jest": "^26.6.3",
|
||||
"jest-date-mock": "^1.0.8",
|
||||
"jest-when": "^3.3.1",
|
||||
"prettier": "^2.3.0",
|
||||
"prettier": "^2.5.1",
|
||||
"source-map-loader": "^3.0.0",
|
||||
"ts-jest": "^26.5.6",
|
||||
"ts-loader": "^9.2.2",
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
@ -233,8 +233,7 @@ browser.runtime.onStartup.addListener(async () => {
|
|||
} else {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'Found a tab with [ about:sessionrestore ] in Firefox. Skipping Grey startup cleanup this time.',
|
||||
msg: 'Found a tab with [ about:sessionrestore ] in Firefox. Skipping Grey startup cleanup this time.',
|
||||
type: 'info',
|
||||
},
|
||||
getSetting(store.getState(), SettingID.DEBUG_MODE) === true,
|
||||
|
@ -243,8 +242,7 @@ browser.runtime.onStartup.addListener(async () => {
|
|||
} else {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'GreyList Cleanup setting is disabled. Not cleaning cookies on startup.',
|
||||
msg: 'GreyList Cleanup setting is disabled. Not cleaning cookies on startup.',
|
||||
type: 'info',
|
||||
},
|
||||
getSetting(store.getState(), SettingID.DEBUG_MODE) === true,
|
||||
|
@ -305,9 +303,8 @@ browser.runtime.onInstalled.addListener(async (details) => {
|
|||
);
|
||||
containers.add('default');
|
||||
if (getSetting(store.getState(), SettingID.CONTEXTUAL_IDENTITIES)) {
|
||||
const contextualIdentitiesObjects = await browser.contextualIdentities.query(
|
||||
{},
|
||||
);
|
||||
const contextualIdentitiesObjects =
|
||||
await browser.contextualIdentities.query({});
|
||||
contextualIdentitiesObjects.forEach((c) =>
|
||||
containers.add(c.cookieStoreId),
|
||||
);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
@ -161,8 +161,7 @@ export const isSafeToClean = (
|
|||
) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'CleanupService.isSafeToClean: Internal CAD Cookie. Removing Cookie to trigger browsingData cleanups.',
|
||||
msg: 'CleanupService.isSafeToClean: Internal CAD Cookie. Removing Cookie to trigger browsingData cleanups.',
|
||||
x: {
|
||||
partialCookieInfo,
|
||||
cleanSiteData: matchedExpression.cleanSiteData,
|
||||
|
@ -184,8 +183,7 @@ export const isSafeToClean = (
|
|||
if (greyCleanup && !matchedExpression) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'CleanupService.isSafeToClean: unmatched and greyCleanup. Safe to Clean',
|
||||
msg: 'CleanupService.isSafeToClean: unmatched and greyCleanup. Safe to Clean',
|
||||
x: partialCookieInfo,
|
||||
},
|
||||
debug,
|
||||
|
@ -210,8 +208,7 @@ export const isSafeToClean = (
|
|||
) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'CleanupService.isSafeToClean: greyCleanup - matching Expression and cookie name was unchecked. Safe to Clean.',
|
||||
msg: 'CleanupService.isSafeToClean: greyCleanup - matching Expression and cookie name was unchecked. Safe to Clean.',
|
||||
x: { partialCookieInfo, matchedExpression },
|
||||
},
|
||||
debug,
|
||||
|
@ -230,8 +227,7 @@ export const isSafeToClean = (
|
|||
if (!matchedExpression) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'CleanupService.isSafeToClean: unmatched Expression. Safe to Clean.',
|
||||
msg: 'CleanupService.isSafeToClean: unmatched Expression. Safe to Clean.',
|
||||
x: partialCookieInfo,
|
||||
},
|
||||
debug,
|
||||
|
@ -252,8 +248,7 @@ export const isSafeToClean = (
|
|||
) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'CleanupService.isSafeToClean: matched Expression but unchecked cookie name. Safe to Clean.',
|
||||
msg: 'CleanupService.isSafeToClean: matched Expression but unchecked cookie name. Safe to Clean.',
|
||||
x: { partialCookieInfo, matchedExpression },
|
||||
},
|
||||
debug,
|
||||
|
@ -269,8 +264,7 @@ export const isSafeToClean = (
|
|||
}
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'CleanupService.isSafeToClean: Matched Expression and cookie name. Cookie stays!',
|
||||
msg: 'CleanupService.isSafeToClean: Matched Expression and cookie name. Cookie stays!',
|
||||
x: { partialCookieInfo, matchedExpression },
|
||||
},
|
||||
debug,
|
||||
|
@ -305,8 +299,7 @@ export const cleanCookies = async (
|
|||
// url: "http://domain.com" + cookies[i].path
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'CleanupService.cleanCookies: Cookie being removed through browser.cookies.remove via Promises:',
|
||||
msg: 'CleanupService.cleanCookies: Cookie being removed through browser.cookies.remove via Promises:',
|
||||
x: cookieRemove,
|
||||
},
|
||||
getSetting(state, SettingID.DEBUG_MODE) as boolean,
|
||||
|
@ -814,9 +807,8 @@ export const cleanCookiesOperation = async (
|
|||
|
||||
// Store cookieStoreIds from the contextualIdentities API
|
||||
if (getSetting(state, SettingID.CONTEXTUAL_IDENTITIES)) {
|
||||
const contextualIdentitiesObjects = await browser.contextualIdentities.query(
|
||||
{},
|
||||
);
|
||||
const contextualIdentitiesObjects =
|
||||
await browser.contextualIdentities.query({});
|
||||
|
||||
for (const cio of contextualIdentitiesObjects) {
|
||||
cookieStoreIds.add(cio.cookieStoreId);
|
||||
|
@ -878,8 +870,7 @@ export const cleanCookiesOperation = async (
|
|||
});
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'CleanupService.cleanCookiesOperation: isSafeToCleanObjects Result',
|
||||
msg: 'CleanupService.cleanCookiesOperation: isSafeToCleanObjects Result',
|
||||
x: sanitized,
|
||||
},
|
||||
debug,
|
||||
|
@ -910,8 +901,7 @@ export const cleanCookiesOperation = async (
|
|||
});
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'CleanupService.cleanCookiesOperation: Cookies markedForDeletion Result',
|
||||
msg: 'CleanupService.cleanCookiesOperation: Cookies markedForDeletion Result',
|
||||
x: sanitized,
|
||||
},
|
||||
debug,
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2020 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2020-2022 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
@ -162,9 +162,8 @@ export default class ContextualIdentitiesEvents extends StoreUser {
|
|||
|
||||
// Map the cookieStoreId to their actual names and store in cache
|
||||
public static async cacheCookieStoreIdNames(): Promise<void> {
|
||||
const contextualIdentitiesObjects = await browser.contextualIdentities.query(
|
||||
{},
|
||||
);
|
||||
const contextualIdentitiesObjects =
|
||||
await browser.contextualIdentities.query({});
|
||||
StoreUser.store.dispatch({
|
||||
payload: {
|
||||
key: 'default',
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2020 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2020-2022 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
/* istanbul ignore file: Redux init. */
|
||||
|
||||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
@ -50,8 +50,7 @@ export default class TabEvents extends StoreUser {
|
|||
if (changeInfo.discarded || tab.discarded) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.onTabDiscarded: Tab was discarded. Executing cleanFromTabEvents',
|
||||
msg: 'TabEvents.onTabDiscarded: Tab was discarded. Executing cleanFromTabEvents',
|
||||
x: { tabId, changeInfo, partialTabInfo },
|
||||
},
|
||||
debug,
|
||||
|
@ -87,8 +86,7 @@ export default class TabEvents extends StoreUser {
|
|||
TabEvents.onTabUpdateDelay = true;
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.onTabUpdate: action delay has been set for ~750 ms.',
|
||||
msg: 'TabEvents.onTabUpdate: action delay has been set for ~750 ms.',
|
||||
x: { tabId, changeInfo, partialTabInfo },
|
||||
},
|
||||
debug,
|
||||
|
@ -105,8 +103,7 @@ export default class TabEvents extends StoreUser {
|
|||
TabEvents.onTabUpdateDelay = false;
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.onTabUpdate: actions have been processed and flag cleared.',
|
||||
msg: 'TabEvents.onTabUpdate: actions have been processed and flag cleared.',
|
||||
},
|
||||
debug,
|
||||
);
|
||||
|
@ -164,8 +161,7 @@ export default class TabEvents extends StoreUser {
|
|||
if (oldMainDomain === '') {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.onDomainChange: mainDomain has changed, but previous domain may have been a blank or new tab. Not executing domainChangeCleanup',
|
||||
msg: 'TabEvents.onDomainChange: mainDomain has changed, but previous domain may have been a blank or new tab. Not executing domainChangeCleanup',
|
||||
x: { tabId, changeInfo, partialTabInfo },
|
||||
},
|
||||
debug,
|
||||
|
@ -174,8 +170,7 @@ export default class TabEvents extends StoreUser {
|
|||
}
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.onDomainChange: mainDomain has changed. Executing domainChangeCleanup',
|
||||
msg: 'TabEvents.onDomainChange: mainDomain has changed. Executing domainChangeCleanup',
|
||||
x: {
|
||||
tabId,
|
||||
changeInfo,
|
||||
|
@ -190,8 +185,7 @@ export default class TabEvents extends StoreUser {
|
|||
} else {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.onDomainChange: mainDomain has changed, but cleanOnDomainChange is not enabled. Not cleaning.',
|
||||
msg: 'TabEvents.onDomainChange: mainDomain has changed, but cleanOnDomainChange is not enabled. Not cleaning.',
|
||||
x: {
|
||||
tabId,
|
||||
changeInfo,
|
||||
|
@ -224,8 +218,7 @@ export default class TabEvents extends StoreUser {
|
|||
): void {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.onDomainChangeRemove: Tab was closed. Removing old tabToDomain info.',
|
||||
msg: 'TabEvents.onDomainChangeRemove: Tab was closed. Removing old tabToDomain info.',
|
||||
x: { tabId, mainDomain: TabEvents.tabToDomain[tabId], removeInfo },
|
||||
},
|
||||
getSetting(StoreUser.store.getState(), SettingID.DEBUG_MODE) as boolean,
|
||||
|
@ -243,8 +236,7 @@ export default class TabEvents extends StoreUser {
|
|||
if (!alarm || (alarm.name && alarm.name !== 'activeModeAlarm')) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.cleanFromTabEvents: No Alarms detected. Creating alarm for cleaning...',
|
||||
msg: 'TabEvents.cleanFromTabEvents: No Alarms detected. Creating alarm for cleaning...',
|
||||
},
|
||||
debug,
|
||||
);
|
||||
|
@ -252,8 +244,7 @@ export default class TabEvents extends StoreUser {
|
|||
} else {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.cleanFromTabEvents: An alarm for cleaning was created already. Cleaning will commence soon.',
|
||||
msg: 'TabEvents.cleanFromTabEvents: An alarm for cleaning was created already. Cleaning will commence soon.',
|
||||
x: alarm,
|
||||
},
|
||||
debug,
|
||||
|
@ -280,8 +271,7 @@ export default class TabEvents extends StoreUser {
|
|||
if (!cookies) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.getAllCookieActions: Libs.getAllCookiesForDomain returned undefined. Skipping Cookie Actions.',
|
||||
msg: 'TabEvents.getAllCookieActions: Libs.getAllCookiesForDomain returned undefined. Skipping Cookie Actions.',
|
||||
x: { partialTabInfo },
|
||||
},
|
||||
debug,
|
||||
|
@ -326,8 +316,7 @@ export default class TabEvents extends StoreUser {
|
|||
await browser.cookies.set({ ...cookiesAttributes, url: tab.url });
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.getAllCookieActions: A temporary cookie has been set for future BrowsingData cleaning as the site did not set any cookies yet.',
|
||||
msg: 'TabEvents.getAllCookieActions: A temporary cookie has been set for future BrowsingData cleaning as the site did not set any cookies yet.',
|
||||
x: { partialTabInfo, cadLSCookie: cookiesAttributes },
|
||||
},
|
||||
debug,
|
||||
|
@ -338,8 +327,7 @@ export default class TabEvents extends StoreUser {
|
|||
if (cookies.length !== cookieLength) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.getAllCookieActions: New Cookie Count after filtering out cookie set by extension',
|
||||
msg: 'TabEvents.getAllCookieActions: New Cookie Count after filtering out cookie set by extension',
|
||||
x: { preFilterCount: cookies.length, newCookieCount: cookieLength },
|
||||
},
|
||||
debug,
|
||||
|
@ -347,8 +335,7 @@ export default class TabEvents extends StoreUser {
|
|||
}
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.getAllCookieActions: executing checkIfProtected to update Icons and Title.',
|
||||
msg: 'TabEvents.getAllCookieActions: executing checkIfProtected to update Icons and Title.',
|
||||
},
|
||||
debug,
|
||||
);
|
||||
|
@ -361,8 +348,7 @@ export default class TabEvents extends StoreUser {
|
|||
) {
|
||||
cadLog(
|
||||
{
|
||||
msg:
|
||||
'TabEvents.getAllCookieActions: executing showNumberOfCookiesInIcon.',
|
||||
msg: 'TabEvents.getAllCookieActions: executing showNumberOfCookiesInIcon.',
|
||||
},
|
||||
debug,
|
||||
);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
// This file is only a stub to make typescript happy.
|
||||
// Tests uses global.browser.*, actual usage is browser.*
|
||||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2019 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2019-2022 Kenneth Tran and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright (c) 2017-2020 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Copyright (c) 2017-2022 Kenny Do and CAD Team (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/graphs/contributors)
|
||||
* Licensed under MIT (https://github.com/Cookie-AutoDelete/Cookie-AutoDelete/blob/3.X.X-Branch/LICENSE)
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
|
@ -37,83 +37,82 @@ interface StateProps {
|
|||
|
||||
type CleanCollapseComponentProps = DispatchProps & OwnProps & StateProps;
|
||||
|
||||
const CleanCollapseGroup: React.FunctionComponent<CleanCollapseComponentProps> = (
|
||||
props,
|
||||
) => {
|
||||
const { hostname, tab, state, onCookieCleanup } = props;
|
||||
return (
|
||||
<div
|
||||
className="row justify-content-center collapse"
|
||||
id="cleanCollapse"
|
||||
role="group"
|
||||
style={{
|
||||
alignItems: 'center',
|
||||
backgroundColor: 'rgba(0, 0, 0, 0.05)',
|
||||
borderBottom: '1px solid rgba(0, 0, 0, 0.1)',
|
||||
padding: '4px 4px 8px 4px',
|
||||
}}
|
||||
>
|
||||
<div className="btn-group-vertical">
|
||||
<CleanDataButton
|
||||
btnColor="btn-warning"
|
||||
onClick={async () => {
|
||||
onCookieCleanup({
|
||||
greyCleanup: false,
|
||||
ignoreOpenTabs: true,
|
||||
});
|
||||
return true;
|
||||
}}
|
||||
title={browser.i18n.getMessage('cookieCleanupIgnoreOpenTabsText')}
|
||||
text={browser.i18n.getMessage('cleanIgnoringOpenTabsText')}
|
||||
/>
|
||||
<button
|
||||
aria-disabled={true}
|
||||
className="px-2 btn btn-light btn-block text-danger font-weight-bold"
|
||||
disabled={true}
|
||||
type="button"
|
||||
>
|
||||
{browser.i18n.getMessage('cleanupActionsBypass')}
|
||||
</button>
|
||||
<CleanDataButton siteData="All" hostname={hostname} tab={tab} />
|
||||
<CleanDataButton
|
||||
altColor
|
||||
siteData={SiteDataType.CACHE}
|
||||
hostname={hostname}
|
||||
/>
|
||||
<CleanDataButton
|
||||
onClick={async () => {
|
||||
return await clearCookiesForThisDomain(state, tab);
|
||||
}}
|
||||
title={browser.i18n.getMessage('manualCleanSiteDataCookiesDomain', [
|
||||
hostname,
|
||||
])}
|
||||
text={browser.i18n.getMessage('manualCleanSiteDataCookies')}
|
||||
/>
|
||||
<CleanDataButton
|
||||
altColor
|
||||
siteData={SiteDataType.INDEXEDDB}
|
||||
hostname={hostname}
|
||||
/>
|
||||
<CleanDataButton
|
||||
onClick={async () => {
|
||||
return await clearLocalStorageForThisDomain(state, tab);
|
||||
}}
|
||||
siteData={SiteDataType.LOCALSTORAGE}
|
||||
hostname={hostname}
|
||||
/>
|
||||
<CleanDataButton
|
||||
altColor
|
||||
siteData={SiteDataType.PLUGINDATA}
|
||||
hostname={hostname}
|
||||
/>
|
||||
<CleanDataButton
|
||||
siteData={SiteDataType.SERVICEWORKERS}
|
||||
hostname={hostname}
|
||||
/>
|
||||
const CleanCollapseGroup: React.FunctionComponent<CleanCollapseComponentProps> =
|
||||
(props) => {
|
||||
const { hostname, tab, state, onCookieCleanup } = props;
|
||||
return (
|
||||
<div
|
||||
className="row justify-content-center collapse"
|
||||
id="cleanCollapse"
|
||||
role="group"
|
||||
style={{
|
||||
alignItems: 'center',
|
||||
backgroundColor: 'rgba(0, 0, 0, 0.05)',
|
||||
borderBottom: '1px solid rgba(0, 0, 0, 0.1)',
|
||||
padding: '4px 4px 8px 4px',
|
||||
}}
|
||||
>
|
||||
<div className="btn-group-vertical">
|
||||
<CleanDataButton
|
||||
btnColor="btn-warning"
|
||||
onClick={async () => {
|
||||
onCookieCleanup({
|
||||
greyCleanup: false,
|
||||
ignoreOpenTabs: true,
|
||||
});
|
||||
return true;
|
||||
}}
|
||||
title={browser.i18n.getMessage('cookieCleanupIgnoreOpenTabsText')}
|
||||
text={browser.i18n.getMessage('cleanIgnoringOpenTabsText')}
|
||||
/>
|
||||
<button
|
||||
aria-disabled={true}
|
||||
className="px-2 btn btn-light btn-block text-danger font-weight-bold"
|
||||
disabled={true}
|
||||
type="button"
|
||||
>
|
||||
{browser.i18n.getMessage('cleanupActionsBypass')}
|
||||
</button>
|
||||
<CleanDataButton siteData="All" hostname={hostname} tab={tab} />
|
||||
<CleanDataButton
|
||||
altColor
|
||||
siteData={SiteDataType.CACHE}
|
||||
hostname={hostname}
|
||||
/>
|
||||
<CleanDataButton
|
||||
onClick={async () => {
|
||||
return await clearCookiesForThisDomain(state, tab);
|
||||
}}
|
||||
title={browser.i18n.getMessage('manualCleanSiteDataCookiesDomain', [
|
||||
hostname,
|
||||
])}
|
||||
text={browser.i18n.getMessage('manualCleanSiteDataCookies')}
|
||||
/>
|
||||
<CleanDataButton
|
||||
altColor
|
||||
siteData={SiteDataType.INDEXEDDB}
|
||||
hostname={hostname}
|
||||
/>
|
||||
<CleanDataButton
|
||||
onClick={async () => {
|
||||
return await clearLocalStorageForThisDomain(state, tab);
|
||||
}}
|
||||
siteData={SiteDataType.LOCALSTORAGE}
|
||||
hostname={hostname}
|
||||
/>
|
||||
<CleanDataButton
|
||||
altColor
|
||||
siteData={SiteDataType.PLUGINDATA}
|
||||
hostname={hostname}
|
||||
/>
|