fix: cleanup

Author: mattylight22

Makefile

@@ -1,3 +1,7 @@
+clean:
+	docker compose down --volumes --remove-orphans || true && \
+	docker image prune -a --force || true
+
 format:
 	docker build --target=format -t package:format -f dockerfile . && \
 	docker run --rm \
@@ -18,7 +22,7 @@ lint:
 		package:lint
 	docker rmi package:lint || true
 
-test:
+test: clean
 	docker compose run test_runner; \
 	EXIT_CODE=$$?; \
 	docker compose down; \

fastapi_clerk_auth/__init__.py

@@ -151,22 +151,16 @@ async def __call__(self, request: Request) -> Optional[HTTPAuthorizationCredenti
         scheme, credentials = get_authorization_scheme_param(authorization)
         if not (authorization and scheme and credentials):
             if self.auto_error:
-                raise HTTPException(status_code=HTTP_403_FORBIDDEN, detail="Not Authenticated")
+                raise HTTPException(status_code=HTTP_403_FORBIDDEN, detail="Forbidden")
             return None
         if scheme.lower() != "bearer":
             if self.auto_error:
-                raise HTTPException(
-                    status_code=HTTP_403_FORBIDDEN,
-                    detail="Invalid Authentication Credentials",
-                )
+                raise HTTPException(status_code=HTTP_403_FORBIDDEN, detail="Forbidden")
             return None
 
         decoded_token: dict | None = self._decode_token(token=credentials)
         if not decoded_token and self.auto_error:
-            raise HTTPException(
-                status_code=HTTP_403_FORBIDDEN,
-                detail="Invalid Authentication Credentials",
-            )
+            raise HTTPException(status_code=HTTP_403_FORBIDDEN, detail="Forbidden")
         response = HTTPAuthorizationCredentials(scheme=scheme, credentials=credentials, decoded=decoded_token)
         if self.add_state:
             request.state.clerk_auth = response

tests/test_package.py

@@ -13,6 +13,18 @@ def test_protected_route_access_granted(jwt_token):
     assert response.status_code == 200
 
 
+def test_protected_route_access_granted_decoded(jwt_token):
+    response = requests.get("http://mock_api_server:8001/protected", headers={"Authorization": f"Bearer {jwt_token}"})
+    assert response.status_code == 200
+    assert "user" in response.json()
+    assert response.json()["user"]["sub"] == "1234567890"
+
+
 def test_protected_route_access_denied():
     response = requests.get("http://mock_api_server:8001/protected")
     assert response.status_code == 403
+
+
+def test_protected_route_access_denied_bad_token(jwt_token):
+    response = requests.get("http://mock_api_server:8001/protected", headers={"Authorization": f"Bearer {jwt_token}invalid"})
+    assert response.status_code == 403