darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 08:16:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing tests, and resend invites endpoint.

Browse Source 
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
This commit is contained in:
Cliff Hill
2024-11-01 12:12:04 -04:00
parent fc09e70579
commit b532ce8959
3 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/sign_in.py
View File

@@ -109,7 +109,7 @@ def _do_login_dot_gov(): # $ pragma: no cover
raise Exception(f"Could not login with login.gov {login_gov_error}") raise Exception(f"Could not login with login.gov {login_gov_error}")
elif code and state: elif code and state:
state_key = f"login-state-{unquote(state)}" state_key = f"login-state-{unquote(state)}"
stored_state = redis_client.get(state_key).decode("utf8") stored_state = unquote(redis_client.get(state_key).decode("utf8"))
if state != stored_state: if state != stored_state:
current_app.logger.error(f"State Error: {state} != {stored_state}") current_app.logger.error(f"State Error: {state} != {stored_state}")
abort(403) abort(403)

22
app/notify_client/invite_api_client.py
View File

@@ -88,7 +88,27 @@ class InviteApiClient(NotifyAdminAPIClient):
self.post(url=f"/service/{service_id}/invite/{invited_user_id}", data=data) self.post(url=f"/service/{service_id}/invite/{invited_user_id}", data=data)
def resend_invite(self, service_id, invited_user_id): def resend_invite(self, service_id, invited_user_id):
self.post(url=f"/service/{service_id}/invite/{invited_user_id}/resend", data={}) # make and store the state
state = generate_token(
str(request.remote_addr),
current_app.config["SECRET_KEY"],
current_app.config["DANGEROUS_SALT"],
)
state_key = f"login-state-{unquote(state)}"
redis_client.set(state_key, state)
# make and store the nonce
nonce = secrets.token_urlsafe()
nonce_key = f"login-nonce-{unquote(nonce)}"
redis_client.set(nonce_key, nonce)
data = {
"nonce": nonce,
"state": state,
}
self.post(
url=f"/service/{service_id}/invite/{invited_user_id}/resend", data=data
)
@cache.delete("service-{service_id}") @cache.delete("service-{service_id}")
@cache.delete("user-{invited_user_id}") @cache.delete("user-{invited_user_id}")

21
tests/app/notify_client/test_invite_client.py
View File

@@ -1,5 +1,7 @@
from unittest.mock import ANY from unittest.mock import ANY
from flask import current_app
from app import invite_api_client from app import invite_api_client
@@ -10,7 +12,6 @@ def test_client_creates_invite(
sample_invite, sample_invite,
): ):
mocker.patch("app.notify_client.current_user") mocker.patch("app.notify_client.current_user")
mocker.patch("flask.request")
mock_post = mocker.patch( mock_post = mocker.patch(
"app.invite_api_client.post", "app.invite_api_client.post",
@@ -38,15 +39,23 @@ def test_client_creates_invite(
fake_state = "0987654321" fake_state = "0987654321"
mock_token_urlsafe.return_value = fake_nonce mock_token_urlsafe.return_value = fake_nonce
mock_generate_token = mocker.patch("notifications_utils.url_safe_token.generate_token") mock_generate_token = mocker.patch(
"app.notify_client.invite_api_client.generate_token"
)
mock_generate_token.return_value = fake_state mock_generate_token.return_value = fake_state
invite_api_client.create_invite( with current_app.test_request_context("/whatever"):
"12345", "67890", "test@example.com", {"send_messages"}, "sms_auth", [fake_uuid] invite_api_client.create_invite(
) "12345",
"67890",
"test@example.com",
{"send_messages"},
"sms_auth",
[fake_uuid],
)
mock_post.assert_called_once_with( mock_post.assert_called_once_with(
url="/service/{}/invite".format("67890"), url=f"/service/{"67890"}/invite",
data={ data={
"auth_type": "sms_auth", "auth_type": "sms_auth",
"email_address": "test@example.com", "email_address": "test@example.com",