feat: support iCloud in China #47

gutenye · 2024-01-18T04:07:24Z

Closes #34

Chinese iCloud uses a different domain (icloud.com.cn) instead of (icloud.com), this PR aims to support it.

Test Plan

You need a Chinese Apple ID
Login https://www.icloud.com.cn/
Everything works as expected
Login https://www.icloud.com
It works as before

gutenye · 2024-01-24T03:34:37Z

@dedoussis, would you care to review when you have time?

dedoussis · 2024-01-28T01:25:51Z

Hi @gutenye, thanks for putting together this fix!

Have pushed a large change in the extension which affects your PR. Would you be happy with fixing this branch to be compatible with the changes I introduced? If not, I can pick this up and rebase the implementation to what's currently in master.

gutenye · 2024-01-29T11:03:23Z

Rebased, I'm not able to test it because npm start failed with CSS errors

dedoussis

Really appreciate the effort of re-implementing this on top of my recent changes.

Requested some refactoring changes to align this with the existing patterns of the code base.

I'd suggest that we don't read browser storage from within the ICloudClient, and instead pass the setupUrl as a constructor parameter. This will also require changes in the Popup and Options components.

Also, would you mind sharing the build errors you got?

dedoussis · 2024-01-29T16:37:39Z

src/iCloudClient.ts

 class ICloudClient {
  public webservices?: Record<ServiceName, { url: string; status: string }>;
+  private country: Country


Suggested change

private country: Country

private setupUrl: string

dedoussis · 2024-01-29T16:38:27Z

src/iCloudClient.ts

 class ICloudClient {
  public webservices?: Record<ServiceName, { url: string; status: string }>;
+  private country: Country

  constructor(webservices?: ICloudClient['webservices']) {


Suggested change

constructor(webservices?: ICloudClient['webservices']) {

constructor(setupUrl: string, webservices?: ICloudClient['webservices']) {

dedoussis · 2024-01-29T16:39:46Z

src/iCloudClient.ts

@@ -47,6 +56,7 @@ class ICloudClient {

  public async isAuthenticated(): Promise<boolean> {
    try {
+      this.country = await getBrowserStorageValue<Country>(COUNTRY_KEYS) || 'default'


I'd like to keep the ICloudClient class agnostic of the browser context it runs on. Let's not have it access browser specific APIs (such us the storage one).

dedoussis · 2024-01-29T16:40:00Z

src/iCloudClient.ts

@@ -57,7 +67,7 @@ class ICloudClient {
  public async validateToken(): Promise<void> {
    const { webservices } = (await this.request(
      'POST',
-      `${ICloudClient.setupUrl}/validate`
+      `${ICloudClient.setupUrl[this.country]}/validate`


Suggested change

`${ICloudClient.setupUrl[this.country]}/validate`

`${ICloudClient.setupUrl}/validate`

dedoussis · 2024-01-29T16:40:14Z

src/iCloudClient.ts

@@ -71,7 +81,7 @@ class ICloudClient {
    options: { trust: boolean } = { trust: false }
  ): Promise<void> {
    const { trust } = options;
-    await this.request('POST', `${ICloudClient.setupUrl}/logout`, {
+    await this.request('POST', `${ICloudClient.setupUrl[this.country]}/logout`, {


Suggested change

await this.request('POST', `${ICloudClient.setupUrl[this.country]}/logout`, {

await this.request('POST', `${ICloudClient.setupUrl}/logout`, {

dedoussis · 2024-01-29T16:53:12Z

src/webRequestUtils.ts

      modifiedHeaders.push({
        name: 'Referer',
-        value: 'https://www.icloud.com/',
+        value: `https://www.icloud.com${suffix}/`,


Suggested change

value: `https://www.icloud.com${suffix}/`,

value: `https://www.icloud.${tld}/`,

dedoussis · 2024-01-29T16:53:22Z

src/webRequestUtils.ts

      });
      modifiedHeaders.push({
        name: 'Origin',
-        value: 'https://www.icloud.com',
+        value: `https://www.icloud.com${suffix}`,


Suggested change

value: `https://www.icloud.com${suffix}`,

value: `https://www.icloud.${tld}`,

dedoussis · 2024-01-29T16:56:32Z

src/iCloudClient.ts


  constructor(webservices?: ICloudClient['webservices']) {
    this.webservices = webservices;
+    this.country = 'default'


Suggested change

this.country = 'default'

this.setupUrl = setupUrl

dedoussis · 2024-01-29T17:04:03Z

src/pages/Background/index.ts

+    const country = Object.entries(ICloudClient.setupUrl).find((entries) => url.startsWith(`${entries[1]}/accountLogin`))?.[0];
+    await setBrowserStorageValue(COUNTRY_KEYS, country);


Suggested change

const country = Object.entries(ICloudClient.setupUrl).find((entries) => url.startsWith(`${entries[1]}/accountLogin`))?.[0];

await setBrowserStorageValue(COUNTRY_KEYS, country);

const setupUrl = new URL(url).hostname.split("/accountLogin")[0]

const client = new ICloudClient(setupUrl);

Also, instead of storing the setupUrl value here, we can do it as part of performAuthSideEffects.

dedoussis · 2024-01-29T17:50:14Z

src/storage.ts

@@ -2,6 +2,7 @@ import browser from 'webextension-polyfill';

 export const POPUP_STATE_STORAGE_KEYS = ['iCloudHmePopupState'];
 export const OPTIONS_STORAGE_KEYS = ['iCloudHmeOptions'];
+export const COUNTRY_KEYS = ['country'];


Suggested change

export const COUNTRY_KEYS = ['country'];

export const ICLOUD_CLIENT_STATE = ['iCloudClientState'];

storing an object of type:

{setupUrl: string}

gutenye · 2024-01-30T01:54:45Z

@dedoussis I got this error on the main branch when run npm run start, how do I fix it?

ERROR in ./src/pages/Popup/index.css
Module build failed (from ./node_modules/mini-css-extract-plugin/dist/loader.js):
HookWebpackError: Module build failed (from ./node_modules/postcss-loader/dist/cjs.js):
Error: PostCSS received undefined instead of CSS string

dedoussis-stripe · 2024-01-30T21:11:09Z

@gutenye I think the issue is related to the node version you're using. Try using node 18.

dedoussis · 2024-02-05T00:20:42Z

@gutenye given the complexity of the change, I took a stab at implementing support for CN: #52

However, I don't have a CN iCloud account to test this. Would you be able to test my branch using your account?

gutenye mentioned this pull request Jan 18, 2024

Can‘t use china id #34

Open

gutenye added 2 commits January 29, 2024 18:49

feat: support Chinese iCloud

047cb5e

use url

869d0ee

gutenye force-pushed the icloud-cn branch from 0c6a8fe to 869d0ee Compare January 29, 2024 10:49

fix lint

7b83ac1

remove log

0c39c01

dedoussis requested changes Jan 29, 2024

View reviewed changes

gutenye closed this Feb 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support iCloud in China #47

feat: support iCloud in China #47

gutenye commented Jan 18, 2024

gutenye commented Jan 24, 2024

dedoussis commented Jan 28, 2024 •

edited

Loading

gutenye commented Jan 29, 2024

dedoussis left a comment

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

dedoussis Jan 29, 2024

gutenye commented Jan 30, 2024

dedoussis-stripe commented Jan 30, 2024

dedoussis commented Feb 5, 2024

	constructor(webservices?: ICloudClient['webservices']) {
	constructor(setupUrl: string, webservices?: ICloudClient['webservices']) {

	`${ICloudClient.setupUrl[this.country]}/validate`
	`${ICloudClient.setupUrl}/validate`

	await this.request('POST', `${ICloudClient.setupUrl[this.country]}/logout`, {
	await this.request('POST', `${ICloudClient.setupUrl}/logout`, {

	value: `https://www.icloud.com${suffix}/`,
	value: `https://www.icloud.${tld}/`,

	value: `https://www.icloud.com${suffix}`,
	value: `https://www.icloud.${tld}`,

		const country = Object.entries(ICloudClient.setupUrl).find((entries) => url.startsWith(`${entries[1]}/accountLogin`))?.[0];
		await setBrowserStorageValue(COUNTRY_KEYS, country);

	export const COUNTRY_KEYS = ['country'];
	export const ICLOUD_CLIENT_STATE = ['iCloudClientState'];

feat: support iCloud in China #47

feat: support iCloud in China #47

Conversation

gutenye commented Jan 18, 2024

Test Plan

gutenye commented Jan 24, 2024

dedoussis commented Jan 28, 2024 • edited Loading

gutenye commented Jan 29, 2024

dedoussis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gutenye commented Jan 30, 2024

dedoussis-stripe commented Jan 30, 2024

dedoussis commented Feb 5, 2024

dedoussis commented Jan 28, 2024 •

edited

Loading