Fix token authentication bugs (#27)

Co-authored-by: Stephen Finucane <[email protected]>

Author: rossburton

pwclient/api.py

@@ -457,9 +457,8 @@ def _generate_headers(self, additional_headers=None):
         }
 
         if self._token:
-            pass
-
-        if self._username:
+            headers['Authorization'] = f"Token {self._token}"
+        elif self._username and self._password:
             credentials = base64.b64encode(
                 f'{self._username}:{self._password}'.encode('ascii')
             ).decode('ascii')

pwclient/shell.py

@@ -92,9 +92,12 @@ def main(argv=sys.argv[1:]):
     if action in auth_actions:
         if backend == 'rest':
             if not (
-                config.has_option(project_str, 'username')
-                and config.has_option(project_str, 'password')
-            ) or config.has_option(project_str, 'token'):
+                (
+                    config.has_option(project_str, 'username')
+                    and config.has_option(project_str, 'password')
+                )
+                or config.has_option(project_str, 'token')
+            ):
                 sys.stderr.write(
                     "The %s action requires authentication, but no "
                     "username/password or\n"