github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-13 00:32:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Plex.tv signin to /api/v2

Browse source
This commit is contained in:
JonnyWong16 2020-05-09 16:19:12 -07:00
parent eeff665680
commit e2c2f66e97
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plexpy/http_handler.py
View file

@ -73,12 +73,14 @@ class HTTPHandler(object):
def make_request(self, def make_request(self,
uri=None, uri=None,
headers=None, headers=None,
data=None,
request_type='GET', request_type='GET',
output_format='raw', output_format='raw',
return_type=False, return_type=False,
no_token=False, no_token=False,
timeout=None, timeout=None,
callback=None): callback=None,
**request_kwargs):
""" """
Handle the HTTP requests. Handle the HTTP requests.
@ -86,11 +88,13 @@ class HTTPHandler(object):
""" """
self.uri = str(uri) self.uri = str(uri)
self.data = data
self.request_type = request_type.upper() self.request_type = request_type.upper()
self.output_format = output_format.lower() self.output_format = output_format.lower()
self.return_type = return_type self.return_type = return_type
self.callback = callback self.callback = callback
self.timeout = timeout or self.timeout self.timeout = timeout or self.timeout
self.request_kwargs = request_kwargs
if self.request_type not in self.valid_request_types: if self.request_type not in self.valid_request_types:
logger.debug("HTTP request made but unsupported request type given.") logger.debug("HTTP request made but unsupported request type given.")
@ -149,7 +153,8 @@ class HTTPHandler(object):
def _http_requests_urllib3(self, url, session): def _http_requests_urllib3(self, url, session):
"""Request the data from the url""" """Request the data from the url"""
try: try:
r = session.request(self.request_type, url, headers=self.headers, timeout=self.timeout) r = session.request(self.request_type, url, headers=self.headers, fields=self.data,
timeout=self.timeout, **self.request_kwargs)
except IOError as e: except IOError as e:
if not self._silent: if not self._silent:
logger.warn("Failed to access uri endpoint %s with error %s" % (self.uri, e)) logger.warn("Failed to access uri endpoint %s with error %s" % (self.uri, e))

16
plexpy/plextv.py
View file

@ -164,16 +164,20 @@ class PlexTV(object):
headers=headers) headers=headers)
def get_plex_auth(self, output_format='raw'): def get_plex_auth(self, output_format='raw'):
uri = '/users/sign_in.xml' uri = '/api/v2/users/signin'
base64string = base64.b64encode(('%s:%s' % (self.username, self.password)).encode('utf-8')) headers = {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
headers = {'Content-Type': 'application/xml; charset=utf-8', 'Accept': 'application/xml'}
'Authorization': 'Basic %s' % base64string.decode('utf-8')} data = {'login': self.username,
'password': self.password,
'rememberMe': True}
request = self.request_handler.make_request(uri=uri, request = self.request_handler.make_request(uri=uri,
request_type='POST', request_type='POST',
headers=headers, headers=headers,
data=data,
output_format=output_format, output_format=output_format,
no_token=True) no_token=True,
encode_multipart=False)
return request return request
@ -184,7 +188,7 @@ class PlexTV(object):
try: try:
xml_head = plextv_response.getElementsByTagName('user') xml_head = plextv_response.getElementsByTagName('user')
if xml_head: if xml_head:
user = {'auth_token': xml_head[0].getAttribute('authenticationToken'), user = {'auth_token': xml_head[0].getAttribute('authToken'),
'user_id': xml_head[0].getAttribute('id') 'user_id': xml_head[0].getAttribute('id')
} }
else: else: