[DOP-23165] Change /auth/callback response to 204

Author: dolfinus

data_rentgen/server/api/v1/router/auth.py

@@ -62,8 +62,7 @@ async def auth_callback(
     )
     request.session["access_token"] = code_grant["access_token"]
     request.session["refresh_token"] = code_grant["refresh_token"]
-
-    return {}
+    return Response(status_code=204)
 
 
 @router.get("/logout")

data_rentgen/server/providers/auth/base_provider.py

@@ -109,5 +109,5 @@ async def logout(
         self,
         user: User,
         refresh_token: str,
-    ) -> Any | None:
+    ) -> None:
         """This method should implement user logout logic"""

data_rentgen/server/providers/auth/dummy_provider.py

@@ -79,7 +79,7 @@ async def get_token_authorization_code_grant(
         msg = "Authorization code grant is not supported by DummyAuthProvider."
         raise NotImplementedError(msg)
 
-    async def logout(self, user: User, refresh_token: str):
+    async def logout(self, user: User, refresh_token: str | None) -> None:
         msg = "Logout method is not implemented for DummyAuthProvider."
         raise NotImplementedError(msg)
 

data_rentgen/server/providers/auth/keycloak_provider.py

@@ -128,9 +128,13 @@ async def redirect_to_auth(self) -> NoReturn:
             details=auth_url,
         )
 
-    async def logout(self, user: User, refresh_token: str) -> bytes | None:
+    async def logout(self, user: User, refresh_token: str | None) -> None:
+        if not refresh_token:
+            logger.debug("No refresh token found in session.")
+            return
+
         try:
-            return await self.keycloak_openid.a_logout(refresh_token)
+            await self.keycloak_openid.a_logout(refresh_token)
         except KeycloakOperationError as err:
             msg = f"Can't logout user: {user.name}"
             logger.debug("%s. Error: %s", msg, err)

tests/test_server/test_auth/test_keycloak_auth.py

@@ -147,8 +147,7 @@ async def test_keycloak_auth_callback(
         )
 
     assert response.cookies.get("session"), caplog.text  # cookie is set
-    assert response.status_code == 200, response.json()
-    assert response.json() == {}
+    assert response.status_code == 204, response.json()
 
 
 @pytest.mark.parametrize(