Skip to content

Commit b5a71f9

Browse files
committed
Have change password link point to server
1 parent 43817ca commit b5a71f9

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

django/hydroserver/settings.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@ def _url_origin(url):
7272
USE_X_FORWARDED_HOST = True
7373
PROXY_BASE_URL = config("PROXY_BASE_URL", "http://127.0.0.1:8000")
7474
APP_CLIENT_URL = config("APP_CLIENT_URL", default=PROXY_BASE_URL)
75+
ACCOUNT_SERVER_URL = config(
76+
"ACCOUNT_SERVER_URL",
77+
default=(
78+
"http://127.0.0.1:8000" if DEPLOYMENT_BACKEND == "dev" else PROXY_BASE_URL
79+
),
80+
)
7581

7682
LOAD_DEFAULT_DATA = config("LOAD_DEFAULT_DATA", default=False, cast=bool)
7783

@@ -284,8 +290,10 @@ def _url_origin(url):
284290

285291
HEADLESS_FRONTEND_URLS = {
286292
"account_confirm_email": f"{PROXY_BASE_URL}/verify-email/{{key}}",
287-
"account_reset_password_from_key": f"{PROXY_BASE_URL}/reset-password/{{key}}",
288-
"account_reset_password": f"{PROXY_BASE_URL}/reset-password",
293+
"account_reset_password_from_key": (
294+
f"{ACCOUNT_SERVER_URL}/accounts/password/reset/key/{{key}}/"
295+
),
296+
"account_reset_password": f"{ACCOUNT_SERVER_URL}/accounts/password/reset/",
289297
"account_signup": f"{PROXY_BASE_URL}/sign-up",
290298
}
291299

django/tests/iam/test_account_adapter.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import pytest
44
from allauth.core.context import request_context
55
from allauth.account.adapter import DefaultAccountAdapter
6+
from django.conf import settings
67
from django.contrib import messages
78
from django.contrib.messages import get_messages
89
from django.contrib.messages.storage.fallback import FallbackStorage
@@ -218,3 +219,12 @@ def fake_add_message(self, request, level, **kwargs):
218219
queued_messages = list(get_messages(request))
219220
assert len(queued_messages) == 1
220221
assert str(queued_messages[0]) == "queued"
222+
223+
224+
def test_headless_password_reset_urls_target_server_origin():
225+
assert settings.HEADLESS_FRONTEND_URLS["account_reset_password"] == (
226+
f"{settings.ACCOUNT_SERVER_URL}/accounts/password/reset/"
227+
)
228+
assert settings.HEADLESS_FRONTEND_URLS["account_reset_password_from_key"] == (
229+
f"{settings.ACCOUNT_SERVER_URL}/accounts/password/reset/key/{{key}}/"
230+
)

0 commit comments

Comments
 (0)