From 0f6324786cab2df8588481c11946028d7e9ac9b2 Mon Sep 17 00:00:00 2001 From: Jace Browning Date: Sat, 5 Jan 2019 13:18:06 -0500 Subject: [PATCH] Extract username from session --- pylast/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pylast/__init__.py b/pylast/__init__.py index fd367ef1..9e11daee 100644 --- a/pylast/__init__.py +++ b/pylast/__init__.py @@ -201,10 +201,10 @@ def __init__( self.last_call_time = 0 self.limit_rate = False - # Load session_key from authentication token if provided + # Load session_key and username from authentication token if provided if token and not self.session_key: sk_gen = SessionKeyGenerator(self) - self.session_key = sk_gen.get_web_auth_session_key(url=None, token=token) + self.session_key, self.username = sk_gen.get_web_auth_session_key(url=None, token=token) # Generate a session_key if necessary if ( @@ -988,7 +988,7 @@ class SessionKeyGenerator: b. sg = SessionKeyGenerator(network) c. url = sg.get_web_auth_url() d. Ask the user to open the URL and authorize you, and wait for it. - e. session_key = sg.get_web_auth_session_key(url) + e. session_key, username = sg.get_web_auth_session_key(url) 2) Username and Password Authentication: a. network = get_*_network(API_KEY, API_SECRET) b. username = raw_input("Please enter your username: ") @@ -1062,7 +1062,9 @@ def get_web_auth_session_key(self, url, token=""): doc = request.execute() - return doc.getElementsByTagName("key")[0].firstChild.data + session_key = doc.getElementsByTagName("key")[0].firstChild.data + username = doc.getElementsByTagName("name")[0].firstChild.data + return session_key, username def get_session_key(self, username, password_hash): """