CLI: Fix error with setting api_key using mwdb login (#92)

CERT-Polska · Apr 4, 2023 · 66dab43 · 66dab43
1 parent a5777f6
commit 66dab43
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/mwdblib/__version__.py b/mwdblib/__version__.py
@@ -1 +1 @@
-__version__ = "4.3.1"
+__version__ = "4.3.2"
diff --git a/mwdblib/api/api.py b/mwdblib/api/api.py
@@ -167,6 +167,8 @@ def set_api_key(self, api_key: str) -> None:
         self.set_auth_token(api_key)
         # Store credentials in API options
         self.options.api_key = api_key
+        if self.auth_token is not None:
+            self.options.username = self.auth_token.username
 
     def logout(self) -> None:
         """

diff --git a/mwdblib/cli/login.py b/mwdblib/cli/login.py
@@ -37,7 +37,7 @@ def login_command(ctx, mwdb, username, password, via_api_key, api_key):
             mwdb.login(username, password)
         else:
             # Set API key and check if it's correct
-            mwdb.set_api_key(api_key)
+            mwdb.api.set_api_key(api_key)
             mwdb.api.get("auth/validate")
     except (InvalidCredentialsError, NotAuthenticatedError) as e:
         click.echo("Error: Login failed - {}".format(str(e)), err=True)