Merge pull request #1968 from kili-technology/lab-3898-others

chore(LAB-3898): remove deprecated user fields

Author: josselinbuils

src/kili/adapters/kili_api_gateway/user/mappers.py

@@ -11,7 +11,6 @@ def user_where_mapper(filters: UserFilter) -> Dict:
     """Build the GraphQL UserWhere variable to be sent in an operation."""
     return {
         "activated": filters.activated,
-        "apiKey": filters.api_key,
         "email": filters.email,
         "id": filters.id,
         "idIn": filters.id_in,

src/kili/adapters/kili_api_gateway/user/operations.py

@@ -16,7 +16,7 @@ def get_current_user_query(fragment: str) -> str:
     """Return the GraphQL current user query."""
     return f"""
       query me {{
-          data: me {{
+          data: viewer {{
               {fragment}
           }}
       }}

src/kili/domain/user.py

@@ -17,7 +17,6 @@ class UserFilter:
 
     id: Optional[UserId]
     activated: Optional[bool] = None
-    api_key: Optional[str] = None
     email: Optional[str] = None
     id_in: Optional[List[UserId]] = None
     organization_id: Optional["OrganizationId"] = None

src/kili/presentation/client/user.py

@@ -25,7 +25,6 @@ class UserClientMethods(BaseClientMethods):
     @overload
     def users(
         self,
-        api_key: Optional[str] = None,
         email: Optional[str] = None,
         organization_id: Optional[str] = None,
         fields: ListOrTuple[str] = ("email", "id", "firstname", "lastname"),
@@ -40,7 +39,6 @@ def users(
     @overload
     def users(
         self,
-        api_key: Optional[str] = None,
         email: Optional[str] = None,
         organization_id: Optional[str] = None,
         fields: ListOrTuple[str] = ("email", "id", "firstname", "lastname"),
@@ -55,7 +53,6 @@ def users(
     @typechecked
     def users(
         self,
-        api_key: Optional[str] = None,
         email: Optional[str] = None,
         organization_id: Optional[str] = None,
         fields: ListOrTuple[str] = ("email", "id", "firstname", "lastname"),
@@ -69,7 +66,6 @@ def users(
         """Get a generator or a list of users given a set of criteria.
 
         Args:
-            api_key: Query an user by its API Key
             email: Email of the user
             organization_id: Identifier of the user's organization
             fields: All the fields to request among the possible fields for the users.
@@ -94,7 +90,6 @@ def users(
 
         users_gen = UserUseCases(self.kili_api_gateway).list_users(
             filters=UserFilter(
-                api_key=api_key,
                 email=email,
                 organization_id=OrganizationId(organization_id) if organization_id else None,
                 activated=None,
@@ -113,22 +108,19 @@ def users(
     def count_users(
         self,
         organization_id: Optional[str] = None,
-        api_key: Optional[str] = None,
         email: Optional[str] = None,
     ) -> int:
         """Get user count based on a set of constraints.
 
         Args:
             organization_id: Identifier of the user's organization.
-            api_key: Filter by API Key.
             email: Filter by email.
 
         Returns:
             The number of organizations with the parameters provided.
         """
         return UserUseCases(self.kili_api_gateway).count_users(
             UserFilter(
-                api_key=api_key,
                 email=email,
                 organization_id=OrganizationId(organization_id) if organization_id else None,
                 activated=None,
@@ -191,7 +183,6 @@ def update_password(
             user_filter=UserFilter(
                 email=email,
                 activated=None,
-                api_key=None,
                 id=None,
                 id_in=None,
                 organization_id=None,
@@ -227,7 +218,6 @@ def update_properties_in_user(
             user_filter=UserFilter(
                 email=email,
                 activated=None,
-                api_key=None,
                 id=None,
                 id_in=None,
                 organization_id=None,

tests/integration/adapters/kili_api_gateway/test_user.py

@@ -43,7 +43,6 @@ def test_given_kili_gateway_when_querying_users_list_it_calls_proper_resolver(
         {
             "where": {
                 "activated": None,
-                "apiKey": None,
                 "email": None,
                 "id": "fake_user_id",
                 "idIn": None,
@@ -72,7 +71,6 @@ def test_given_kili_gateway_when_querying_count_users_it_calls_proper_resolver(
         {
             "where": {
                 "activated": None,
-                "apiKey": None,
                 "email": None,
                 "id": "fake_user_id",
                 "idIn": None,
@@ -163,7 +161,6 @@ def test_given_kili_gateway_when_updating_user_it_calls_proper_resolver(
             },
             "where": {
                 "activated": None,
-                "apiKey": None,
                 "email": None,
                 "id": "fake_user_id",
                 "idIn": None,