fix: Returned the right scope for pilots

Author: Robin-Van-de-Merghel

diracx-logic/src/diracx/logic/auth/pilot.py

@@ -29,7 +29,7 @@ async def add_pilot_credentials(pilot_id: int, pilot_db: PilotAgentsDB) -> str:
 
 
 def generate_pilot_scope(pilot: dict) -> str:
-    return f"vo:{pilot['VO']}"
+    return f"vo:{pilot['VO']} property:GenericPilot property:LimitedDelegation"
 
 
 async def try_login(

extensions/gubbins/gubbins-client/src/gubbins/client/_generated/aio/operations/_operations.py

@@ -837,7 +837,7 @@ async def complete_authorization_flow(
     @distributed_trace_async
     async def pilot_login(
         self, *, pilot_job_reference: str, pilot_secret: str, **kwargs: Any
-    ) -> Any:
+    ) -> _models.TokenResponse:
         """Pilot Login.
 
         Endpoint without policy, the pilot uses only its secret.
@@ -846,8 +846,8 @@ async def pilot_login(
         :paramtype pilot_job_reference: str
         :keyword pilot_secret: Required.
         :paramtype pilot_secret: str
-        :return: any
-        :rtype: any
+        :return: TokenResponse
+        :rtype: ~_generated.models.TokenResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
@@ -861,7 +861,7 @@ async def pilot_login(
         _headers = kwargs.pop("headers", {}) or {}
         _params = kwargs.pop("params", {}) or {}
 
-        cls: ClsType[Any] = kwargs.pop("cls", None)
+        cls: ClsType[_models.TokenResponse] = kwargs.pop("cls", None)
 
         _request = build_auth_pilot_login_request(
             pilot_job_reference=pilot_job_reference,
@@ -886,23 +886,27 @@ async def pilot_login(
             )
             raise HttpResponseError(response=response)
 
-        deserialized = self._deserialize("object", pipeline_response.http_response)
+        deserialized = self._deserialize(
+            "TokenResponse", pipeline_response.http_response
+        )
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
     @distributed_trace_async
-    async def refresh_pilot_tokens(self, *, refresh_token: str, **kwargs: Any) -> Any:
+    async def refresh_pilot_tokens(
+        self, *, refresh_token: str, **kwargs: Any
+    ) -> _models.TokenResponse:
         """Refresh Pilot Tokens.
 
         Endpoint where a pilot can exchange a refresh token against a token.
 
         :keyword refresh_token: Required.
         :paramtype refresh_token: str
-        :return: any
-        :rtype: any
+        :return: TokenResponse
+        :rtype: ~_generated.models.TokenResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
@@ -916,7 +920,7 @@ async def refresh_pilot_tokens(self, *, refresh_token: str, **kwargs: Any) -> An
         _headers = kwargs.pop("headers", {}) or {}
         _params = kwargs.pop("params", {}) or {}
 
-        cls: ClsType[Any] = kwargs.pop("cls", None)
+        cls: ClsType[_models.TokenResponse] = kwargs.pop("cls", None)
 
         _request = build_auth_refresh_pilot_tokens_request(
             refresh_token=refresh_token,
@@ -940,7 +944,9 @@ async def refresh_pilot_tokens(self, *, refresh_token: str, **kwargs: Any) -> An
             )
             raise HttpResponseError(response=response)
 
-        deserialized = self._deserialize("object", pipeline_response.http_response)
+        deserialized = self._deserialize(
+            "TokenResponse", pipeline_response.http_response
+        )
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore

extensions/gubbins/gubbins-client/src/gubbins/client/_generated/operations/_operations.py

@@ -1517,7 +1517,7 @@ def complete_authorization_flow(
     @distributed_trace
     def pilot_login(
         self, *, pilot_job_reference: str, pilot_secret: str, **kwargs: Any
-    ) -> Any:
+    ) -> _models.TokenResponse:
         """Pilot Login.
 
         Endpoint without policy, the pilot uses only its secret.
@@ -1526,8 +1526,8 @@ def pilot_login(
         :paramtype pilot_job_reference: str
         :keyword pilot_secret: Required.
         :paramtype pilot_secret: str
-        :return: any
-        :rtype: any
+        :return: TokenResponse
+        :rtype: ~_generated.models.TokenResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
@@ -1541,7 +1541,7 @@ def pilot_login(
         _headers = kwargs.pop("headers", {}) or {}
         _params = kwargs.pop("params", {}) or {}
 
-        cls: ClsType[Any] = kwargs.pop("cls", None)
+        cls: ClsType[_models.TokenResponse] = kwargs.pop("cls", None)
 
         _request = build_auth_pilot_login_request(
             pilot_job_reference=pilot_job_reference,
@@ -1566,23 +1566,27 @@ def pilot_login(
             )
             raise HttpResponseError(response=response)
 
-        deserialized = self._deserialize("object", pipeline_response.http_response)
+        deserialized = self._deserialize(
+            "TokenResponse", pipeline_response.http_response
+        )
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
 
         return deserialized  # type: ignore
 
     @distributed_trace
-    def refresh_pilot_tokens(self, *, refresh_token: str, **kwargs: Any) -> Any:
+    def refresh_pilot_tokens(
+        self, *, refresh_token: str, **kwargs: Any
+    ) -> _models.TokenResponse:
         """Refresh Pilot Tokens.
 
         Endpoint where a pilot can exchange a refresh token against a token.
 
         :keyword refresh_token: Required.
         :paramtype refresh_token: str
-        :return: any
-        :rtype: any
+        :return: TokenResponse
+        :rtype: ~_generated.models.TokenResponse
         :raises ~azure.core.exceptions.HttpResponseError:
         """
         error_map: MutableMapping = {
@@ -1596,7 +1600,7 @@ def refresh_pilot_tokens(self, *, refresh_token: str, **kwargs: Any) -> Any:
         _headers = kwargs.pop("headers", {}) or {}
         _params = kwargs.pop("params", {}) or {}
 
-        cls: ClsType[Any] = kwargs.pop("cls", None)
+        cls: ClsType[_models.TokenResponse] = kwargs.pop("cls", None)
 
         _request = build_auth_refresh_pilot_tokens_request(
             refresh_token=refresh_token,
@@ -1620,7 +1624,9 @@ def refresh_pilot_tokens(self, *, refresh_token: str, **kwargs: Any) -> Any:
             )
             raise HttpResponseError(response=response)
 
-        deserialized = self._deserialize("object", pipeline_response.http_response)
+        deserialized = self._deserialize(
+            "TokenResponse", pipeline_response.http_response
+        )
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore