simono41/pyicloud
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added service specific log in

Browse source
This commit is contained in:
Niccolò Zapponi 2020-12-09 08:03:19 +00:00
parent 285a114a64
commit 9190c62a80
No known key found for this signature in database
GPG key ID: 328B304DC670A51E
1 changed files with 38 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
pyicloud/base.py
View file

@ -260,7 +260,7 @@ class PyiCloudService(object):
self._files = None
self._photos = None
def authenticate(self, force_refresh=False):
def authenticate(self, force_refresh=False, service=None):
"""
Handles authentication, and persists cookies so that
subsequent logins will not cause additional e-mails from Apple.
@ -273,10 +273,19 @@ class PyiCloudService(object):
req = self.session.post("%s/validate" % self.SETUP_ENDPOINT, data="null")
LOGGER.debug("Session token is still valid")
self.data = req.json()
LOGGER.debug(req.json())
login_successful = True
except PyiCloudAPIResponseException:
LOGGER.debug("Invalid authentication token, will log in from scratch.")
if not login_successful and service != None:
LOGGER.debug("Authenticating as %s for %s" % (self.user["accountName"], service))
try:
self._authenticate_with_credentials_service(service)
login_successful = True
except:
LOGGER.debug("Could not log into service. Attempting brand new login.")
if not login_successful:
LOGGER.debug("Authenticating as %s" % self.user["accountName"])
@ -302,6 +311,11 @@ class PyiCloudService(object):
data=json.dumps(data),
headers=headers,
)
LOGGER.debug(req.headers)
try:
LOGGER.debug(req.json())
except:
LOGGER.debug(req)
except PyiCloudAPIResponseException as error:
msg = "Invalid email/password combination."
raise PyiCloudFailedLoginException(msg, error)
@ -325,11 +339,33 @@ class PyiCloudService(object):
req = self.session.post(
"%s/accountLogin" % self.SETUP_ENDPOINT, data=json.dumps(data)
)
self.data = req.json()
except PyiCloudAPIResponseException as error:
msg = "Invalid authentication token."
raise PyiCloudFailedLoginException(msg, error)
def _authenticate_with_credentials_service(self, service):
"""Authenticate to a specific service using credentials."""
data = {
"appName": service,
"apple_id": self.user["accountName"],
"password": self.user["password"]
}
try:
req = self.session.post(
"%s/accountLogin" % self.SETUP_ENDPOINT, data=json.dumps(data)
)
self.data = req.json()
LOGGER.debug(req.headers)
try:
LOGGER.debug(req.json())
except:
LOGGER.debug(req)
except PyiCloudAPIResponseException as error:
msg = "Invalid email/password combination."
raise PyiCloudFailedLoginException(msg, error)
def _get_auth_headers(self, overrides=None):
headers = {