changes in SDK auth flow

Author: Narek Mkhitaryan

src/superannotate/lib/app/interface/base_interface.py

@@ -132,11 +132,11 @@ def get_mp_instance(self) -> Mixpanel:
         return Mixpanel(mp_token)
 
     @staticmethod
-    def get_default_payload(team_name, user_id):
+    def get_default_payload(team_name, user_email):
         return {
             "SDK": True,
             "Team": team_name,
-            "Team Owner": user_id,
+            "User Email": user_email,
             "Version": __version__,
             "Python version": platform.python_version(),
             "Python interpreter type": platform.python_implementation(),
@@ -207,13 +207,13 @@ def _track_method(self, args, kwargs, success: bool):
             function_name = self.function.__name__ if self.function else ""
             arguments = self.extract_arguments(self.function, *args, **kwargs)
             event_name, properties = self.default_parser(function_name, arguments)
-            user_id = client.controller.current_user.email
+            user_email = client.controller.current_user.email
             team_name = client.controller.team_data.name
 
             properties["Success"] = success
-            default = self.get_default_payload(team_name=team_name, user_id=user_id)
+            default = self.get_default_payload(team_name=team_name, user_email=user_email)
             self._track(
-                user_id,
+                user_email,
                 event_name,
                 {**default, **properties, **CONFIG.get_current_session().data},
             )

src/superannotate/lib/core/entities/project.py

@@ -169,7 +169,6 @@ class UserEntity(BaseModel):
     first_name: Optional[str]
     last_name: Optional[str]
     email: Optional[str]
-    picture: Optional[str]
     user_role: Optional[int]
 
     class Config:

src/superannotate/lib/core/usecases/projects.py

@@ -616,15 +616,13 @@ def __init__(self, service_provider: BaseServiceProvider, team_id: int):
         self._team_id = team_id
 
     def execute(self):
-        try:
-            response = self._service_provider.get_user(self._team_id)
-            if not response.ok:
-                raise AppException(response.error)
-            self._response.data = response.data
-        except Exception:
-            raise AppException(
+        response = self._service_provider.get_user(self._team_id)
+        if not response.ok:
+            self._response.errors = AppException(
                 "Unable to retrieve user data. Please verify your credentials."
-            ) from None
+            )
+        else:
+            self._response.data = response.data
         return self._response
 
 

src/superannotate/lib/infrastructure/controller.py

@@ -796,7 +796,7 @@ def __init__(self, config: ConfigEntity):
 
         self.service_provider = ServiceProvider(http_client)
         self._team = self.get_team().data
-        self._user = self.get_current_user().data
+        self._user = self.get_current_user()
         self.annotation_classes = AnnotationClassManager(self.service_provider)
         self.projects = ProjectManager(self.service_provider)
         self.folders = FolderManager(self.service_provider)
@@ -811,14 +811,6 @@ def __init__(self, config: ConfigEntity):
     def current_user(self):
         return self._user
 
-    @staticmethod
-    def validate_token(token: str):
-        try:
-            int(token.split("=")[-1])
-        except ValueError:
-            raise AppException("Invalid token.")
-        return token
-
     @property
     def user_id(self):
         if not self._user_id:
@@ -834,10 +826,13 @@ def get_team(self):
             service_provider=self.service_provider, team_id=self.team_id
         ).execute()
 
-    def get_current_user(self):
-        return usecases.GetCurrentUserUseCase(
+    def get_current_user(self) -> UserEntity:
+        response = usecases.GetCurrentUserUseCase(
             service_provider=self.service_provider, team_id=self.team_id
         ).execute()
+        if response.errors:
+            raise AppException(response.errors)
+        return response.data
 
     @property
     def team_data(self):

tests/integration/mixpanel/test_mixpanel_decorator.py

@@ -12,12 +12,14 @@
 from src.superannotate import SAClient
 
 
+sa = SAClient()
+
+
 class TestMixpanel(TestCase):
-    CLIENT = SAClient()
     BLANK_PAYLOAD = {
         "SDK": True,
-        "Team": CLIENT.get_team_metadata()["name"],
-        "Team Owner": CLIENT.controller.current_user.email,
+        "Team": sa.get_team_metadata()["name"],
+        "User Email": sa.controller.current_user.email,
         "Version": __version__,
         "Success": True,
         "Python version": platform.python_version(),
@@ -32,7 +34,7 @@ class TestMixpanel(TestCase):
     def setUpClass(cls) -> None:
         cls.tearDownClass()
         print(cls.PROJECT_NAME)
-        cls._project = cls.CLIENT.create_project(
+        cls._project = sa.create_project(
             cls.PROJECT_NAME, cls.PROJECT_DESCRIPTION, cls.PROJECT_TYPE
         )
 
@@ -42,10 +44,10 @@ def tearDownClass(cls) -> None:
 
     @classmethod
     def _safe_delete_project(cls, project_name):
-        projects = cls.CLIENT.search_projects(project_name, return_metadata=True)
+        projects = sa.search_projects(project_name, return_metadata=True)
         for project in projects:
             try:
-                cls.CLIENT.delete_project(project)
+                sa.delete_project(project)
             except Exception:
                 raise
 
@@ -64,9 +66,9 @@ def test_init(self, track_method):
 
     @patch("lib.app.interface.base_interface.Tracker._track")
     @patch("lib.core.usecases.GetTeamUseCase")
-    @patch("lib.core.usecases.GetCurrentUserUseCase")
+    @patch("lib.infrastructure.serviceprovider.ServiceProvider.get_user")
     def test_init_via_token(
-        self, get_current_user_use_case, get_team_use_case, track_method
+        self, get_user, get_team_use_case, track_method
     ):
         SAClient(token="test=3232")
         result = list(track_method.call_args)[0]
@@ -76,17 +78,17 @@ def test_init_via_token(
                 "sa_token": "True",
                 "config_path": "False",
                 "Team": get_team_use_case().execute().data.name,
-                "Team Owner": get_current_user_use_case().execute().data.email,
+                "User Email": get_user().data.email,
             }
         )
         assert result[1] == "__init__"
         assert payload == result[2]
 
     @patch("lib.app.interface.base_interface.Tracker._track")
     @patch("lib.core.usecases.GetTeamUseCase")
-    @patch("lib.core.usecases.GetCurrentUserUseCase")
+    @patch("lib.infrastructure.serviceprovider.ServiceProvider.get_user")
     def test_init_via_config_file(
-        self, get_current_user_use_case, get_team_use_case, track_method
+        self, get_user, get_team_use_case, track_method
     ):
         with tempfile.TemporaryDirectory() as config_dir:
             config_ini_path = f"{config_dir}/config.ini"
@@ -104,16 +106,16 @@ def test_init_via_config_file(
                         "sa_token": "False",
                         "config_path": "True",
                         "Team": get_team_use_case().execute().data.name,
-                        "Team Owner": get_current_user_use_case().execute().data.email,
+                        "User Email": get_user().data.email,
                     }
                 )
                 assert result[1] == "__init__"
                 assert payload == result[2]
 
     @patch("lib.app.interface.base_interface.Tracker._track")
     def test_get_team_metadata(self, track_method):
-        self.CLIENT.get_team_metadata()
-        team_owner = self.CLIENT.controller.current_user.email
+        sa.get_team_metadata()
+        team_owner = sa.controller.current_user.email
         result = list(track_method.call_args)[0]
         payload = self.default_payload
         assert result[0] == team_owner
@@ -128,7 +130,7 @@ def test_search_team_contributors(self, track_method):
             "last_name": "last_name",
             "return_metadata": False,
         }
-        self.CLIENT.search_team_contributors(**kwargs)
+        sa.search_team_contributors(**kwargs)
         result = list(track_method.call_args)[0]
         payload = self.default_payload
         payload.update(kwargs)
@@ -143,7 +145,7 @@ def test_search_projects(self, track_method):
             "status": "NotStarted",
             "return_metadata": False,
         }
-        self.CLIENT.search_projects(**kwargs)
+        sa.search_projects(**kwargs)
         result = list(track_method.call_args)[0]
         payload = self.default_payload
         payload.update(kwargs)
@@ -162,7 +164,7 @@ def test_create_project(self, track_method):
             "instructions_link": None,
         }
         try:
-            self.CLIENT.create_project(**kwargs)
+            sa.create_project(**kwargs)
         except AppException:
             pass
         result = list(track_method.call_args)[0]
@@ -190,10 +192,10 @@ def test_create_project_multi_thread(self, track_method):
                 "project_type": self.PROJECT_TYPE,
             }
             thread_1 = threading.Thread(
-                target=self.CLIENT.create_project, kwargs=kwargs_1
+                target=sa.create_project, kwargs=kwargs_1
             )
             thread_2 = threading.Thread(
-                target=self.CLIENT.create_project, kwargs=kwargs_2
+                target=sa.create_project, kwargs=kwargs_2
             )
             thread_1.start()
             thread_2.start()