Skip to content

Commit c36da5e

Browse files
committed
AG-55338 Stop sending app_id while checking for filters updates
Squashed commit of the following: commit 058bebb Merge: d6808ab 97431e4 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Tue Jun 23 16:02:35 2026 +0300 Merge branch 'release/v5.5' into enhance/AG-55338 commit d6808ab Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 17:05:13 2026 +0300 update docs commit 780ea55 Merge: b5a8704 01840d9 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 17:02:59 2026 +0300 Merge branch 'release/v5.5' into enhance/AG-55338 commit b5a8704 Merge: 45b9548 befb052 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 17:02:23 2026 +0300 Merge branch 'enhance/AG-54740' into enhance/AG-55338 commit befb052 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 16:58:46 2026 +0300 add tests commit e377884 Merge: d6e4a76 04dd87c Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 16:21:02 2026 +0300 Merge branch 'release/v5.5' into enhance/AG-54740 commit 45b9548 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 16:06:31 2026 +0300 AG-55338 Stop sending app_id while checking for filters updates commit d6e4a76 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 15:06:49 2026 +0300 Add last checked time display in FiltersUpdate component commit b6ac332 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 13:59:19 2026 +0300 refactor commit bc3e316 Merge: e4f4713 7da1ce8 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 02:51:33 2026 +0300 Merge branch 'release/v5.5' into enhance/AG-54740 commit e4f4713 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Fri Jun 19 02:22:03 2026 +0300 refactoring commit aab6ffa Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Mon Jun 15 20:50:34 2026 +0300 fix tests commit c073c67 Merge: 4bc0f9d 1e56d94 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Mon Jun 15 18:40:53 2026 +0300 Merge branch 'release/v5.5' into enhance/AG-54740 commit 4bc0f9d Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Thu Jun 11 15:58:43 2026 +0300 revert update TSURLFILTER_REF to point to release/browser-extension-v5.5 commit 6645e75 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Thu Jun 11 15:57:40 2026 +0300 Update TSURLFILTER_REF to point to release/browser-extension-v5.5 commit 1930b3c Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Thu Jun 11 15:25:16 2026 +0300 add tests, refactoring commit 5977589 Author: Alexandr Zaitsev <a.zaitsev@adguard.com> Date: Thu Jun 11 14:42:58 2026 +0300 AG-54740 Add "last updated" field to Filters tab of mv3 extension
1 parent 97431e4 commit c36da5e

3 files changed

Lines changed: 25 additions & 26 deletions

File tree

Extension/src/background/utils/browser-utils.ts

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
* along with AdGuard Browser Extension. If not, see <http://www.gnu.org/licenses/>.
1919
*/
2020
import { Prefs } from '../prefs';
21-
import { appContext, AppContextKey } from '../storages/app';
2221
import { CHROME_EXTENSIONS_SETTINGS_URL } from '../../common/constants';
2322
import { logger } from '../../common/logger';
2423

@@ -29,35 +28,20 @@ import { Version } from './version';
2928
*/
3029
export class BrowserUtils {
3130
/**
32-
* Returns extension specified query params.
33-
* This method called on app metadata, i18n metadata and thankyou page url calculation.
31+
* Returns extension query params shared across filter metadata URLs and thankyou page.
3432
*
3533
* @see NetworkSettings#filtersMetadataUrl
3634
* @see NetworkSettings#filtersI18nMetadataUrl
3735
* @see PagesApi.openThankYouPage
3836
*
3937
* @returns Extension specified query params array.
40-
*
41-
* @throws Error if client id is undefined.
4238
*/
4339
public static getExtensionParams(): string[] {
44-
const persistedClientId = appContext.get(AppContextKey.ClientId);
45-
46-
if (typeof persistedClientId !== 'string') {
47-
throw new Error('client id is not found');
48-
}
49-
50-
const clientId = encodeURIComponent(persistedClientId);
51-
const locale = encodeURIComponent(Prefs.language);
52-
const version = encodeURIComponent(Prefs.version);
53-
const id = encodeURIComponent(Prefs.id);
54-
55-
const params: string[] = [];
56-
params.push(`v=${version}`);
57-
params.push(`cid=${clientId}`);
58-
params.push(`lang=${locale}`);
59-
params.push(`id=${id}`);
60-
return params;
40+
return [
41+
`v=${encodeURIComponent(Prefs.version)}`,
42+
`lang=${encodeURIComponent(Prefs.language)}`,
43+
`id=${encodeURIComponent(Prefs.id)}`,
44+
];
6145
}
6246

6347
/**

tests/src/background/api/ui/pages.test.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ import { SettingsApi } from '../../../../../Extension/src/background/api/setting
3434
import { FilterStateStorage } from '../../../../../Extension/src/background/storages/filter-state';
3535
import { GroupStateStorage } from '../../../../../Extension/src/background/storages/group-state';
3636
import { ForwardFrom } from '../../../../../Extension/src/common/forward';
37-
import { appContext, AppContextKey } from '../../../../../Extension/src/background/storages/app';
3837
import { browserStorage } from '../../../../../Extension/src/background/storages/shared-instances';
3938
import { TabsApi, WindowsApi } from '../../../../../Extension/src/common/api/extension';
4039

@@ -211,9 +210,6 @@ describe('PagesApi', () => {
211210
});
212211

213212
it('openThankYouPage produces a valid URL', async () => {
214-
// openThankYouPage requires a client ID to be set
215-
appContext.set(AppContextKey.ClientId, 'test-client-id');
216-
217213
await pagesApi.openThankYouPage();
218214

219215
const spy = vi.mocked(browser.tabs.create);

tests/src/background/utils/browser-utils.test.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,24 @@ describe('browserUtils', () => {
7979
});
8080
});
8181

82+
describe('getExtensionParams', () => {
83+
it('does not contain cid parameter', () => {
84+
const params = BrowserUtils.getExtensionParams();
85+
86+
const cidParam = params.find((p) => p.startsWith('cid='));
87+
expect(cidParam).toBeUndefined();
88+
});
89+
90+
it('returns only v, lang, and id', () => {
91+
const params = BrowserUtils.getExtensionParams();
92+
93+
const keys = params.map((p) => p.split('=')[0]);
94+
expect(keys).toContain('v');
95+
expect(keys).toContain('lang');
96+
expect(keys).toContain('id');
97+
expect(params).toHaveLength(3);
98+
});
99+
});
100+
82101
// TODO: cover other cases
83102
});

0 commit comments

Comments
 (0)