darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-07-17 13:09:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3286 from alphagov/bump-utils-fix-placeholder-bug

Browse Source 
Bump utils to bring in fix for optional placeholder bug
This commit is contained in:
Pea Tyczynska
2021-07-09 11:24:42 +01:00
committed by GitHub
parent 18bb1c2ac4 c28e9451d4
commit 96f34bbd45
9 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/__init__.py
View File

@@ -7,7 +7,6 @@ from time import monotonic
from celery import current_task
from flask import (
_request_ctx_stack,
current_app,
g,
has_request_context,
@@ -69,8 +68,8 @@ metrics = GDSMetrics()
notification_provider_clients = NotificationProviderClients()
api_user = LocalProxy(lambda: _request_ctx_stack.top.api_user)
authenticated_service = LocalProxy(lambda: _request_ctx_stack.top.authenticated_service)
api_user = LocalProxy(lambda: g.api_user)
authenticated_service = LocalProxy(lambda: g.authenticated_service)
CONCURRENT_REQUESTS = Gauge(
'concurrent_web_request_count',

6
app/authentication/auth.py
View File

@@ -1,6 +1,6 @@
import uuid
from flask import _request_ctx_stack, current_app, g, request
from flask import current_app, g, request
from gds_metrics import Histogram
from notifications_python_client.authentication import (
decode_jwt_token,
@@ -140,8 +140,8 @@ def requires_auth():
raise AuthError("Invalid token: API key revoked", 403, service_id=service.id, api_key_id=api_key.id)
g.service_id = service.id
_request_ctx_stack.top.authenticated_service = service
_request_ctx_stack.top.api_user = api_key
g.api_user = api_key
g.authenticated_service = service
current_app.logger.info('API authorised for service {} with api key {}, using issuer {} for URL: {}'.format(
service.id,