icloud-photos-downloader · AndreyNikiforov · Sep 7, 2025 · Sep 5, 2025 · Sep 5, 2025
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,5 @@ node_modules/
 .cookies/
 
 .claude/
+
+*.har
diff --git a/src/pyicloud_ipd/base.py b/src/pyicloud_ipd/base.py
@@ -295,13 +295,13 @@ def authenticate(self) -> None:
         """
 
         login_successful = False
-        if self.session_data.get("session_token"):
-            LOGGER.debug("Checking session token validity")
-            try:
-                self.data = self._validate_token()
-                login_successful = True
-            except PyiCloudAPIResponseException:
-                LOGGER.debug("Invalid authentication token, will log in from scratch.")
+        # if self.session_data.get("session_token"):
+        # LOGGER.debug("Checking session token validity")
+        try:
+            self.data = self._validate_token()
+            login_successful = True
+        except PyiCloudAPIResponseException:
+            LOGGER.debug("Invalid authentication token, will log in from scratch.")
 
         if not login_successful:
             password = self.password_provider()

diff --git a/tests/test_authentication.py b/tests/test_authentication.py
@@ -321,9 +321,10 @@ def test_failed_auth_503_watch(self) -> None:
         self.assertEqual(
             2,
             result.output.count("Apple iCloud is temporary refusing to serve icloudpd"),
+            "refusing message",
         )
         self.assertEqual(2, result.output.count("Waiting for 1 sec..."))
-        # self.assertTrue("Can't overwrite existing cassette" in str(context.exception))
+        self.assertTrue("Can't overwrite existing cassette" in str(result.exception))
         self.assertEqual(result.exit_code, 1, "exit code")
 
     def test_connection_error(self) -> None:

diff --git a/tests/vcr_cassettes/2fa_flow_invalid_code.yml b/tests/vcr_cassettes/2fa_flow_invalid_code.yml
@@ -1,4 +1,67 @@
 interactions:
+- request:
+    body: 'null'
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Connection: ['keep-alive']
+      Content-Length: ['4']
+      Origin: ['https://www.icloud.com']
+      Referer: ['https://www.icloud.com/']
+      User-Agent: ['Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36']
+    method: POST
+    uri: https://setup.icloud.com/setup/ws/1/validate
+  response:
+    body: 
+      string: !!python/unicode '
+        {
+          "success": false,
+          "requestInfo": [
+            {
+              "country": "US",
+              "timeZone": "PST",
+              "region": "CA"
+            }
+          ],
+          "configBag": {
+              "urls": {
+                  "accountLoginUI": "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountLogin": "https://setup.icloud.com/setup/ws/1/accountLogin",
+                  "accountRepairUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!repair",
+                  "downloadICloudTerms": "https://setup.icloud.com/setup/ws/1/downloadLiteTerms",
+                  "repairDone": "https://setup.icloud.com/setup/ws/1/repairDone",
+                  "accountCreate": "https://setup.icloud.com/setup/ws/1/createLiteAccount",
+                  "getICloudTerms": "https://setup.icloud.com/setup/ws/1/getTerms",
+                  "vettingUrlForPhone": "https://id.apple.com/IDMSEmailVetting/vetSharePhone",
+                  "accountCreateUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!create",
+                  "accountVerifyUI": "https://id.apple.com/identity?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountAuthorizeUI": "https://idmsa.apple.com/appleauth/auth/authorize/signin?client_id=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "vettingUrlForEmail": "https://id.apple.com/IDMSEmailVetting/vetShareEmail",
+                  "eventGatewayV1": "https://gateway.icloud.com/rsvp/events/v1"
+              },
+              "accountCreateEnabled": true
+          },
+          "error": "Missing X-APPLE-WEBAUTH-TOKEN cookie"
+        }'
+    headers:
+      Access-Control-Allow-Credentials: ['true']
+      Access-Control-Allow-Origin: ['https://www.icloud.com']
+      Cache-Control: ['no-cache, no-store, private']
+      Connection: ['keep-alive']
+      Content-Type: ['application/json; charset=UTF-8']
+      Date: ['Wed, 13 Dec 2023 05:06:31 GMT']
+      Server: ['AppleHttpServer/78689afb4479']
+      Strict-Transport-Security: ['max-age=31536000; includeSubDomains']
+      X-Apple-Edge-Response-Time: ['501']
+      X-Apple-Request-UUID: ['12345678-1234-1234-1234-123456789012']
+      X-Responding-Instance: ['setupservice:33200401:mr55p32ic-qukt01202301:7001:2404B363:5934c9004de5']
+      access-control-expose-headers: ['X-Apple-Request-UUID,Via']
+      content-length: ['5758']
+      via: ['via-123456789012345678901234567890']
+      x-apple-user-partition: ['32']
+    status:
+      code: 421
+      message: Misdirected Request
 - request:
     body: !!python/unicode '{"accountName": "jdoe@gmail.com", "protocols": ["s2k", "s2k_fo"]}'
     headers:

diff --git a/tests/vcr_cassettes/2fa_flow_valid_code.yml b/tests/vcr_cassettes/2fa_flow_valid_code.yml
@@ -1,4 +1,67 @@
 interactions:
+- request:
+    body: 'null'
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Connection: ['keep-alive']
+      Content-Length: ['4']
+      Origin: ['https://www.icloud.com']
+      Referer: ['https://www.icloud.com/']
+      User-Agent: ['Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36']
+    method: POST
+    uri: https://setup.icloud.com/setup/ws/1/validate
+  response:
+    body: 
+      string: !!python/unicode '
+        {
+          "success": false,
+          "requestInfo": [
+            {
+              "country": "US",
+              "timeZone": "PST",
+              "region": "CA"
+            }
+          ],
+          "configBag": {
+              "urls": {
+                  "accountLoginUI": "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountLogin": "https://setup.icloud.com/setup/ws/1/accountLogin",
+                  "accountRepairUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!repair",
+                  "downloadICloudTerms": "https://setup.icloud.com/setup/ws/1/downloadLiteTerms",
+                  "repairDone": "https://setup.icloud.com/setup/ws/1/repairDone",
+                  "accountCreate": "https://setup.icloud.com/setup/ws/1/createLiteAccount",
+                  "getICloudTerms": "https://setup.icloud.com/setup/ws/1/getTerms",
+                  "vettingUrlForPhone": "https://id.apple.com/IDMSEmailVetting/vetSharePhone",
+                  "accountCreateUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!create",
+                  "accountVerifyUI": "https://id.apple.com/identity?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountAuthorizeUI": "https://idmsa.apple.com/appleauth/auth/authorize/signin?client_id=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "vettingUrlForEmail": "https://id.apple.com/IDMSEmailVetting/vetShareEmail",
+                  "eventGatewayV1": "https://gateway.icloud.com/rsvp/events/v1"
+              },
+              "accountCreateEnabled": true
+          },
+          "error": "Missing X-APPLE-WEBAUTH-TOKEN cookie"
+        }'
+    headers:
+      Access-Control-Allow-Credentials: ['true']
+      Access-Control-Allow-Origin: ['https://www.icloud.com']
+      Cache-Control: ['no-cache, no-store, private']
+      Connection: ['keep-alive']
+      Content-Type: ['application/json; charset=UTF-8']
+      Date: ['Wed, 13 Dec 2023 05:06:31 GMT']
+      Server: ['AppleHttpServer/78689afb4479']
+      Strict-Transport-Security: ['max-age=31536000; includeSubDomains']
+      X-Apple-Edge-Response-Time: ['501']
+      X-Apple-Request-UUID: ['12345678-1234-1234-1234-123456789012']
+      X-Responding-Instance: ['setupservice:33200401:mr55p32ic-qukt01202301:7001:2404B363:5934c9004de5']
+      access-control-expose-headers: ['X-Apple-Request-UUID,Via']
+      content-length: ['5758']
+      via: ['via-123456789012345678901234567890']
+      x-apple-user-partition: ['32']
+    status:
+      code: 421
+      message: Misdirected Request
 - request:
     body: !!python/unicode '{"accountName": "jdoe@gmail.com", "protocols": ["s2k", "s2k_fo"]}'
     headers:

diff --git a/tests/vcr_cassettes/2fa_flow_valid_code_zero_lead.yml b/tests/vcr_cassettes/2fa_flow_valid_code_zero_lead.yml
@@ -1,4 +1,67 @@
 interactions:
+- request:
+    body: 'null'
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Connection: ['keep-alive']
+      Content-Length: ['4']
+      Origin: ['https://www.icloud.com']
+      Referer: ['https://www.icloud.com/']
+      User-Agent: ['Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36']
+    method: POST
+    uri: https://setup.icloud.com/setup/ws/1/validate
+  response:
+    body: 
+      string: !!python/unicode '
+        {
+          "success": false,
+          "requestInfo": [
+            {
+              "country": "US",
+              "timeZone": "PST",
+              "region": "CA"
+            }
+          ],
+          "configBag": {
+              "urls": {
+                  "accountLoginUI": "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountLogin": "https://setup.icloud.com/setup/ws/1/accountLogin",
+                  "accountRepairUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!repair",
+                  "downloadICloudTerms": "https://setup.icloud.com/setup/ws/1/downloadLiteTerms",
+                  "repairDone": "https://setup.icloud.com/setup/ws/1/repairDone",
+                  "accountCreate": "https://setup.icloud.com/setup/ws/1/createLiteAccount",
+                  "getICloudTerms": "https://setup.icloud.com/setup/ws/1/getTerms",
+                  "vettingUrlForPhone": "https://id.apple.com/IDMSEmailVetting/vetSharePhone",
+                  "accountCreateUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!create",
+                  "accountVerifyUI": "https://id.apple.com/identity?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountAuthorizeUI": "https://idmsa.apple.com/appleauth/auth/authorize/signin?client_id=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "vettingUrlForEmail": "https://id.apple.com/IDMSEmailVetting/vetShareEmail",
+                  "eventGatewayV1": "https://gateway.icloud.com/rsvp/events/v1"
+              },
+              "accountCreateEnabled": true
+          },
+          "error": "Missing X-APPLE-WEBAUTH-TOKEN cookie"
+        }'
+    headers:
+      Access-Control-Allow-Credentials: ['true']
+      Access-Control-Allow-Origin: ['https://www.icloud.com']
+      Cache-Control: ['no-cache, no-store, private']
+      Connection: ['keep-alive']
+      Content-Type: ['application/json; charset=UTF-8']
+      Date: ['Wed, 13 Dec 2023 05:06:31 GMT']
+      Server: ['AppleHttpServer/78689afb4479']
+      Strict-Transport-Security: ['max-age=31536000; includeSubDomains']
+      X-Apple-Edge-Response-Time: ['501']
+      X-Apple-Request-UUID: ['12345678-1234-1234-1234-123456789012']
+      X-Responding-Instance: ['setupservice:33200401:mr55p32ic-qukt01202301:7001:2404B363:5934c9004de5']
+      access-control-expose-headers: ['X-Apple-Request-UUID,Via']
+      content-length: ['5758']
+      via: ['via-123456789012345678901234567890']
+      x-apple-user-partition: ['32']
+    status:
+      code: 421
+      message: Misdirected Request
 - request:
     body: !!python/unicode '{"accountName": "jdoe@gmail.com", "protocols": ["s2k", "s2k_fo"]}'
     headers:

diff --git a/tests/vcr_cassettes/2sa_flow_invalid_code.yml b/tests/vcr_cassettes/2sa_flow_invalid_code.yml
@@ -1,4 +1,67 @@
 interactions:
+- request:
+    body: 'null'
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Connection: ['keep-alive']
+      Content-Length: ['4']
+      Origin: ['https://www.icloud.com']
+      Referer: ['https://www.icloud.com/']
+      User-Agent: ['Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36']
+    method: POST
+    uri: https://setup.icloud.com/setup/ws/1/validate
+  response:
+    body: 
+      string: !!python/unicode '
+        {
+          "success": false,
+          "requestInfo": [
+            {
+              "country": "US",
+              "timeZone": "PST",
+              "region": "CA"
+            }
+          ],
+          "configBag": {
+              "urls": {
+                  "accountLoginUI": "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountLogin": "https://setup.icloud.com/setup/ws/1/accountLogin",
+                  "accountRepairUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!repair",
+                  "downloadICloudTerms": "https://setup.icloud.com/setup/ws/1/downloadLiteTerms",
+                  "repairDone": "https://setup.icloud.com/setup/ws/1/repairDone",
+                  "accountCreate": "https://setup.icloud.com/setup/ws/1/createLiteAccount",
+                  "getICloudTerms": "https://setup.icloud.com/setup/ws/1/getTerms",
+                  "vettingUrlForPhone": "https://id.apple.com/IDMSEmailVetting/vetSharePhone",
+                  "accountCreateUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!create",
+                  "accountVerifyUI": "https://id.apple.com/identity?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountAuthorizeUI": "https://idmsa.apple.com/appleauth/auth/authorize/signin?client_id=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "vettingUrlForEmail": "https://id.apple.com/IDMSEmailVetting/vetShareEmail",
+                  "eventGatewayV1": "https://gateway.icloud.com/rsvp/events/v1"
+              },
+              "accountCreateEnabled": true
+          },
+          "error": "Missing X-APPLE-WEBAUTH-TOKEN cookie"
+        }'
+    headers:
+      Access-Control-Allow-Credentials: ['true']
+      Access-Control-Allow-Origin: ['https://www.icloud.com']
+      Cache-Control: ['no-cache, no-store, private']
+      Connection: ['keep-alive']
+      Content-Type: ['application/json; charset=UTF-8']
+      Date: ['Wed, 13 Dec 2023 05:06:31 GMT']
+      Server: ['AppleHttpServer/78689afb4479']
+      Strict-Transport-Security: ['max-age=31536000; includeSubDomains']
+      X-Apple-Edge-Response-Time: ['501']
+      X-Apple-Request-UUID: ['12345678-1234-1234-1234-123456789012']
+      X-Responding-Instance: ['setupservice:33200401:mr55p32ic-qukt01202301:7001:2404B363:5934c9004de5']
+      access-control-expose-headers: ['X-Apple-Request-UUID,Via']
+      content-length: ['5758']
+      via: ['via-123456789012345678901234567890']
+      x-apple-user-partition: ['32']
+    status:
+      code: 421
+      message: Misdirected Request
 - request:
     body: !!python/unicode '{"accountName": "jdoe@gmail.com", "protocols": ["s2k", "s2k_fo"]}'
     headers:

diff --git a/tests/vcr_cassettes/2sa_flow_valid_code.yml b/tests/vcr_cassettes/2sa_flow_valid_code.yml
@@ -1,4 +1,67 @@
 interactions:
+- request:
+    body: 'null'
+    headers:
+      Accept: ['*/*']
+      Accept-Encoding: ['gzip, deflate']
+      Connection: ['keep-alive']
+      Content-Length: ['4']
+      Origin: ['https://www.icloud.com']
+      Referer: ['https://www.icloud.com/']
+      User-Agent: ['Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36']
+    method: POST
+    uri: https://setup.icloud.com/setup/ws/1/validate
+  response:
+    body: 
+      string: !!python/unicode '
+        {
+          "success": false,
+          "requestInfo": [
+            {
+              "country": "US",
+              "timeZone": "PST",
+              "region": "CA"
+            }
+          ],
+          "configBag": {
+              "urls": {
+                  "accountLoginUI": "https://idmsa.apple.com/appleauth/auth/signin?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountLogin": "https://setup.icloud.com/setup/ws/1/accountLogin",
+                  "accountRepairUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!repair",
+                  "downloadICloudTerms": "https://setup.icloud.com/setup/ws/1/downloadLiteTerms",
+                  "repairDone": "https://setup.icloud.com/setup/ws/1/repairDone",
+                  "accountCreate": "https://setup.icloud.com/setup/ws/1/createLiteAccount",
+                  "getICloudTerms": "https://setup.icloud.com/setup/ws/1/getTerms",
+                  "vettingUrlForPhone": "https://id.apple.com/IDMSEmailVetting/vetSharePhone",
+                  "accountCreateUI": "https://appleid.apple.com/widget/account/?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d#!create",
+                  "accountVerifyUI": "https://id.apple.com/identity?widgetKey=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "accountAuthorizeUI": "https://idmsa.apple.com/appleauth/auth/authorize/signin?client_id=d39ba9916b7251055b22c7f910e2ea796ee65e98b2ddecea8f5dde8d9d1a815d",
+                  "vettingUrlForEmail": "https://id.apple.com/IDMSEmailVetting/vetShareEmail",
+                  "eventGatewayV1": "https://gateway.icloud.com/rsvp/events/v1"
+              },
+              "accountCreateEnabled": true
+          },
+          "error": "Missing X-APPLE-WEBAUTH-TOKEN cookie"
+        }'
+    headers:
+      Access-Control-Allow-Credentials: ['true']
+      Access-Control-Allow-Origin: ['https://www.icloud.com']
+      Cache-Control: ['no-cache, no-store, private']
+      Connection: ['keep-alive']
+      Content-Type: ['application/json; charset=UTF-8']
+      Date: ['Wed, 13 Dec 2023 05:06:31 GMT']
+      Server: ['AppleHttpServer/78689afb4479']
+      Strict-Transport-Security: ['max-age=31536000; includeSubDomains']
+      X-Apple-Edge-Response-Time: ['501']
+      X-Apple-Request-UUID: ['12345678-1234-1234-1234-123456789012']
+      X-Responding-Instance: ['setupservice:33200401:mr55p32ic-qukt01202301:7001:2404B363:5934c9004de5']
+      access-control-expose-headers: ['X-Apple-Request-UUID,Via']
+      content-length: ['5758']
+      via: ['via-123456789012345678901234567890']
+      x-apple-user-partition: ['32']
+    status:
+      code: 421
+      message: Misdirected Request
 - request:
     body: !!python/unicode '{"accountName": "jdoe@gmail.com", "protocols": ["s2k", "s2k_fo"]}'
     headers:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,5 @@ node_modules/
		.cookies/

		.claude/

		*.har