Added config defaults for userid and access_token

Author: allmightyspiff

SoftLayer/API.py

@@ -226,13 +226,15 @@ def employee_client(username=None,
     if access_token is None:
         access_token = settings.get('access_token')
 
-    user_id = settings.get('user_id')
+    user_id = settings.get('userid')
 
     # Assume access_token is valid for now, user has logged in before at least.
     if access_token and user_id:
         auth = slauth.EmployeeAuthentication(user_id, access_token)
         return EmployeeClient(auth=auth, transport=transport)
     else:
+        # This is for logging in mostly.
+        LOGGER.info("No access_token or userid found in settings, creating a No Auth client for now.")
         return EmployeeClient(auth=None, transport=transport)
 
 
@@ -670,7 +672,7 @@ def authenticate_with_password(self, username, password, security_token=None):
 
 
         self.settings['softlayer']['access_token'] = auth_result['hash']
-        self.settings['softlayer']['userId'] = str(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)
@@ -691,8 +693,6 @@ def authenticate_with_hash(self, userId, access_token):
     def refresh_token(self, userId, auth_token):
         """Refreshes the login token"""
 
-        self.auth = None
-
         # Go directly to base client, to avoid infite loop if the token is super expired.
         auth_result = BaseClient.call(self, 'SoftLayer_User_Employee', 'refreshEncryptedToken', auth_token, id=userId)
         if len(auth_result) > 1:
@@ -719,7 +719,7 @@ def call(self, service, method, *args, **kwargs):
             return BaseClient.call(self, service, method, *args, **kwargs)
         except exceptions.SoftLayerAPIError as ex:
             if ex.faultCode == "SoftLayer_Exception_EncryptedToken_Expired":
-                userId = self.settings['softlayer'].get('userId')
+                userId = self.settings['softlayer'].get('userid')
                 access_token = self.settings['softlayer'].get('access_token')
                 LOGGER.warning("Token has expired, trying to refresh. %s", ex.faultString)
                 self.refresh_token(userId, access_token)

SoftLayer/config.py

@@ -59,6 +59,8 @@ def get_client_settings_config_file(**kwargs):  # pylint: disable=inconsistent-r
         'endpoint_url': '',
         'timeout': '0',
         'proxy': '',
+        'userid': '',
+        'access_token': ''
     })
     config.read(config_files)
 
@@ -69,6 +71,8 @@ def get_client_settings_config_file(**kwargs):  # pylint: disable=inconsistent-r
             'proxy': config.get('softlayer', 'proxy'),
             'username': config.get('softlayer', 'username'),
             'api_key': config.get('softlayer', 'api_key'),
+            'userid': config.get('softlayer', 'userid'),
+            'access_token': config.get('softlayer', 'access_token'),
         }
 
 
@@ -109,6 +113,8 @@ def get_config(config_file=None):
         config['softlayer']['endpoint_url'] = ''
         config['softlayer']['api_key'] = ''
         config['softlayer']['timeout'] = '0'
+        config['softlayer']['userid'] = ''
+        config['softlayer']['access_tokne'] = ''
 
     return config