Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve logic when writing credentials to settings file

Browse source
This commit is contained in:
croneter 2021-01-09 17:00:18 +01:00
parent a648d8941a
commit 7cf8cb59f1
2 changed files with 8 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
resources/lib/plex_tv.py
View file

@ -35,18 +35,6 @@ class HomeUser(utils.AttributeDict):
return self.restricted == '1' return self.restricted == '1'
def homeuser_to_settings(user):
"""
Writes one HomeUser to the Kodi settings file
"""
utils.settings('myplexlogin', 'true')
utils.settings('plexLogin', user.title)
utils.settings('plexToken', user.authToken)
utils.settings('plexid', user.id)
utils.settings('plexAvatar', user.thumb)
utils.settings('plex_status', value=utils.lang(39227))
def switch_home_user(userid, pin, token, machine_identifier): def switch_home_user(userid, pin, token, machine_identifier):
""" """
Retrieves Plex home token for a Plex home user. Returns None if this fails Retrieves Plex home token for a Plex home user. Returns None if this fails
@ -59,8 +47,6 @@ def switch_home_user(userid, pin, token, machine_identifier):
Output: Output:
usertoken Might be empty strings if no token found usertoken Might be empty strings if no token found
for the machine_identifier that was chosen for the machine_identifier that was chosen
utils.settings('userid') and utils.settings('username') with new plex token
""" """
LOG.info('Switching to user %s', userid) LOG.info('Switching to user %s', userid)
url = 'https://plex.tv/api/home/users/%s/switch' % userid url = 'https://plex.tv/api/home/users/%s/switch' % userid
@ -79,16 +65,6 @@ def switch_home_user(userid, pin, token, machine_identifier):
username = xml.get('title', '') username = xml.get('title', '')
token = xml.get('authenticationToken', '') token = xml.get('authenticationToken', '')
# Write to settings file
utils.settings('username', username)
utils.settings('accessToken', token)
utils.settings('userid', xml.get('id', ''))
utils.settings('plex_restricteduser',
'true' if xml.get('restricted', '0') == '1'
else 'false')
app.CONN.restricted_user = True if \
xml.get('restricted', '0') == '1' else False
# Get final token to the PMS we've chosen # Get final token to the PMS we've chosen
url = 'https://plex.tv/api/resources?includeHttps=1' url = 'https://plex.tv/api/resources?includeHttps=1'
xml = DU().downloadUrl(url, xml = DU().downloadUrl(url,
@ -231,7 +207,11 @@ def sign_in_with_pin():
if xml is None: if xml is None:
return return
user = HomeUser(xml.attrib) user = HomeUser(xml.attrib)
homeuser_to_settings(user) utils.settings('myplexlogin', 'true')
utils.settings('plex_status', value=utils.lang(39227))
utils.settings('plexLogin', user.title)
utils.settings('plexid', user.id)
utils.settings('plexToken', user.authToken)
return user return user

3
resources/lib/service_entry.py
View file

@ -416,8 +416,11 @@ class Service(object):
utils.settings('username', value=username) utils.settings('username', value=username)
utils.settings('userid', value=user_id) utils.settings('userid', value=user_id)
utils.settings('accessToken', value=token) utils.settings('accessToken', value=token)
utils.settings('plex_restricteduser',
'true' if user.isManaged else 'false')
app.ACCOUNT.load() app.ACCOUNT.load()
app.ACCOUNT.set_authenticated() app.ACCOUNT.set_authenticated()
app.CONN.restricted_user = user.isManaged
return True return True
def ServiceEntryPoint(self): def ServiceEntryPoint(self):