proof of concept for refresh Token

Author: allmightyspiff

SoftLayer/API.py

@@ -665,7 +665,7 @@ def authenticate_with_password(self, username, password, security_token=None):
 
 
         self.settings['softlayer']['access_token'] = auth_result['hash']
-        self.settings['softlayer']['userId'] = auth_result['userId']
+        self.settings['softlayer']['userId'] = str(auth_result['userId'])
         # self.settings['softlayer']['refresh_token'] = tokens['refresh_token']
 
         config.write_config(self.settings, self.config_file)
@@ -708,7 +708,7 @@ def call(self, service, method, *args, **kwargs):
                 raise ex
 
     def __repr__(self):
-        return "IAMClient(transport=%r, auth=%r)" % (self.transport, self.auth)
+        return "EmployeeClient(transport=%r, auth=%r)" % (self.transport, self.auth)
 
 class Service(object):
     """A SoftLayer Service.

SoftLayer/CLI/login.py

@@ -28,10 +28,36 @@ def cli(env):
     username: Set this in either the softlayer config, or SL_USER ENV variable 
     password: Set this in SL_PASSWORD env variable. You will be prompted for them otherwise.
     """
-    settings = config.get_config(config_file=env.config_file)
-    username = settings.get('username') or os.environ.get('SLCLI_USER')
+    config_settings = config.get_config(config_file=env.config_file)
+    settings = config_settings['softlayer']
+    username = settings.get('username') or os.environ.get('SLCLI_USER', None)
     password = os.environ.get('SLCLI_PASSWORD', '')
-    yubi = 123456
+    yubi = None
+#    client = EmployeeClient(config_file=env.config_file)
+    client = env.client
+
+    # Might already be logged in, try and refresh token
+    if settings.get('access_token') and settings.get('userid'):
+        client.authenticate_with_hash(settings.get('userid'), settings.get('access_token'))
+        try:
+            employee = client.call('SoftLayer_User_Employee', 'getObject', id=settings.get('userid'), mask="mask[id,username]")
+            print(employee)
+            refresh = client.call('SoftLayer_User_Employee', 'refreshEncryptedToken', settings.get('access_token'), id=settings.get('userid'))
+            print("REFRESH:\n{}\n".format(refresh))
+            # we expect 2 results, a hash and a timeout 
+            if len(refresh) > 1:
+                for returned_data in refresh:
+                    # Access tokens should be 188 characters, but just incase.
+                    if len(returned_data) > 180:
+                        settings['access_token'] = returned_data
+            else:
+                raise Exception("Got unexpected data. Expected 2 properties: {}".format(refresh))
+            config_settings['softlayer'] = settings
+            config.write_config(config_settings, env.config_file)
+            return
+        except Exception as ex:
+            print("Error with Hash, try with password: {}".format(ex))
+
 
     url = settings.get('endpoint_url') or consts.API_EMPLOYEE_ENDPOINT
     click.echo("URL: {}".format(url))
@@ -41,11 +67,12 @@ def cli(env):
     if password is None:
         password = env.getpass("Password: ")
     click.echo("Password: {}".format(censor_password(password)))
-    # yubi = input("Yubi: ")
+    yubi = input("Yubi: ")
 
-    client = EmployeeClient(config_file=env.config_file)
+    
     try:
-        client.authenticate_with_password(username, password, yubi)
+        result = client.authenticate_with_password(username, password, str(yubi))
+        print(result)
     except Exception as e:
         click.echo("EXCEPTION: {}".format(e))
 

islcli

@@ -0,0 +1,10 @@
+#!python
+import re
+import sys
+
+from SoftLayer.CLI.core import main
+
+if __name__ == '__main__':
+    sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+   # print("arvs[0] = %s" % sys.argv[0])
+    sys.exit(main())