fix: new AppleID auth with srp #972
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
twcurrie
reviewed
Oct 25, 2024
src/pyicloud_ipd/base.py
Outdated
| params={"isRememberMeEnabled": "true"}, | ||
| data=json.dumps(data), | ||
| headers=headers, | ||
| ) | ||
| if response.status_code == 401: | ||
| raise PyiCloudAPIResponseException(response.status_code) |
There was a problem hiding this comment.
Suggested change
| raise PyiCloudAPIResponseException(response.status_code) | |
| raise PyiCloudAPIResponseException(response.text , str(response.status_code)) |
PyiCloudAPIResponseException takes two parameters, both must be strings to pass type checks.
response is a Response object.
twcurrie
reviewed
Oct 25, 2024
src/pyicloud_ipd/base.py
Outdated
| try: | ||
| response = self.session.post("%s/signin/init" % self.AUTH_ENDPOINT, data=json.dumps(data), headers=headers) | ||
| if response.status_code == 401: | ||
| raise PyiCloudAPIResponseException(response.status_code) |
There was a problem hiding this comment.
Suggested change
| raise PyiCloudAPIResponseException(response.status_code) | |
| raise PyiCloudAPIResponseException(response.text , str(response.status_code)) |
Similar as below
twcurrie
reviewed
Oct 25, 2024
| input="0\n654321\n", | ||
| ) | ||
| assert result.exit_code == 0 | ||
| shutil.copytree(cookie_master_path, cookie_dir) |
There was a problem hiding this comment.
Does this change have to be done in the following files as well?
There was a problem hiding this comment.
Yes, @AndreyNikiforov mentioned that he will fix it. I will then rebase this branch and the tests should pass.
There was a problem hiding this comment.
Rebased. Also fixed CodeQL and type check warnings. Now this PR is ready.
iowk
force-pushed
the
issue-970
branch
2 times, most recently
from
1a1b8de to
3d97c20
Compare
AndreyNikiforov
merged commit d796f99
into
icloud-photos-downloader:master
378 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #970