Merge pull request #7 from QualiSystemsLab/token-login-fix

fixed token bug

Author: katzy687

src/cloudshell/sandbox_rest/sandbox_api.py

@@ -47,6 +47,7 @@ def __init__(
         self.login()
 
     def login(self, user="", password="", token="", domain="") -> None:
+        """ Called from init - can also be used to refresh session with credentials """
         self.user = user or self.user
         self.password = password or self.password
         self.token = token or self.token
@@ -55,10 +56,10 @@ def login(self, user="", password="", token="", domain="") -> None:
         if not self.domain:
             raise ValueError("Domain must be passed to login")
 
-        if not self.token and self.user and self.password:
+        if not self.token:
+            if not self.user or not self.password:
+                raise ValueError("Login requires Token or Username / Password")
             self.token = self._get_token_with_credentials(self.user, self.password, self.domain)
-        else:
-            raise ValueError("Login requires Token or Username / Password")
 
         self._set_auth_header_on_session()
 

tests/conftest.py

@@ -12,11 +12,13 @@ def admin_session() -> SandboxRestApiSession:
     admin_api = SandboxRestApiSession(
         host=CLOUDSHELL_SERVER, username=CLOUDSHELL_ADMIN_USER, password=CLOUDSHELL_ADMIN_PASSWORD, domain=CLOUDSHELL_DOMAIN
     )
+    print(f"Admin session started. Token: {admin_api.token}")
     with admin_api:
         yield admin_api
         time.sleep(3)
-        print("admin session token revoked")
-        print(f"total requests: {admin_api.rest_service.request_counter}")
+
+    print("admin session token revoked")
+    print(f"total requests: {admin_api.rest_service.request_counter}")
 
 
 @pytest.fixture(scope="session")

tests/test_api_no_sandbox.py

@@ -3,22 +3,27 @@
 Live Cloudshell server is still a dependency
 """
 import common
+import constants
+import env_settings
 import pytest
-from constants import DEFAULT_EMPTY_BLUEPRINT
 
 from cloudshell.sandbox_rest.sandbox_api import SandboxRestApiSession
 
 
 @pytest.fixture(scope="module")
 def api_token(admin_session: SandboxRestApiSession):
     token = admin_session.get_token_for_target_user("admin")
+    print(f"Get User token response: '{token}'")
     return token
 
 
-def test_delete_token(admin_session: SandboxRestApiSession, api_token: str):
-    assert isinstance(api_token, str)
-    print(f"Token response: '{api_token}'")
-    admin_session.delete_token(api_token)
+def test_login_with_token(api_token):
+    new_api = SandboxRestApiSession(host=env_settings.CLOUDSHELL_SERVER, token=api_token)
+    print(f"\nnew api token: {new_api.token}")
+    sandbox_res = new_api.get_sandboxes()
+    assert isinstance(sandbox_res, list)
+    new_api.delete_token(new_api.token)
+    print("new api token deleted")
 
 
 def test_get_sandboxes(admin_session: SandboxRestApiSession):
@@ -36,7 +41,7 @@ def test_get_blueprints(admin_session: SandboxRestApiSession):
 
 
 def test_get_default_blueprint(admin_session: SandboxRestApiSession):
-    bp_res = admin_session.get_blueprint_details(DEFAULT_EMPTY_BLUEPRINT)
+    bp_res = admin_session.get_blueprint_details(constants.DEFAULT_EMPTY_BLUEPRINT)
     common.random_sleep()
     assert isinstance(bp_res, dict)
     bp_name = bp_res["name"]