darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-20 23:41:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Store the service we have used to authenticate the client API user against the request.

Browse Source 
We can then use this later - saving an extra DB query on every client facing API call

- Note this doesn't affect admin calls which do not use the service from the api key, but use the one passed as part of the URL path.
This commit is contained in:
Martyn Inglis
2017-05-05 15:19:57 +01:00
parent 61eb8cd625
commit 0c160c3419
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/authentication/auth.py
View File

@@ -5,7 +5,7 @@ from sqlalchemy.orm.exc import NoResultFound
from notifications_python_client.authentication import decode_jwt_token, get_token_issuer from notifications_python_client.authentication import decode_jwt_token, get_token_issuer
from notifications_python_client.errors import TokenDecodeError, TokenExpiredError, TokenIssuerError from notifications_python_client.errors import TokenDecodeError, TokenExpiredError, TokenIssuerError
from app.dao.services_dao import dao_fetch_service_by_id from app.dao.services_dao import dao_fetch_service_by_id_with_api_keys
class AuthError(Exception): class AuthError(Exception):
@@ -59,7 +59,7 @@ def requires_auth():
client = __get_token_issuer(auth_token) client = __get_token_issuer(auth_token)
try: try:
service = dao_fetch_service_by_id(client) service = dao_fetch_service_by_id_with_api_keys(client)
except DataError: except DataError:
raise AuthError("Invalid token: service id is not the right data type", 403) raise AuthError("Invalid token: service id is not the right data type", 403)
except NoResultFound: except NoResultFound:
@@ -81,7 +81,9 @@ def requires_auth():
raise AuthError("Invalid token: API key revoked", 403) raise AuthError("Invalid token: API key revoked", 403)
g.service_id = api_key.service_id g.service_id = api_key.service_id
_request_ctx_stack.top.authenticated_service = service
_request_ctx_stack.top.api_user = api_key _request_ctx_stack.top.api_user = api_key
return return
else: else:
# service has API keys, but none matching the one the user provided # service has API keys, but none matching the one the user provided