99import re
1010
1111import pytest
12+ from fastapi_users .jwt import generate_jwt
13+ from sqlalchemy import select
14+ from users .manager import UserManager
15+ from users .models import User
1216
1317
1418class TestInviteFlow :
@@ -64,9 +68,9 @@ async def test_accept_invite_with_stale_token_fails(self, anon_client):
6468
6569 @pytest .mark .anyio
6670 async def test_accept_invite_weak_password_fails (
67- self , admin_client , anon_client , captured_mail
71+ self , admin_client , anon_client , captured_mail , users_app
6872 ):
69- """Weak password during accept-invite should return 400 ."""
73+ """Rejected passwords leave the durable invitation usable for a retry (#763) ."""
7074 await admin_client .post (
7175 "/api/users/admin/invite" ,
7276 json = {"email" : "weakpw@example.com" },
@@ -79,13 +83,34 @@ async def test_accept_invite_weak_password_fails(
7983 ).text ,
8084 ).group (1 )
8185
86+ async with users_app .state .sm .db .session_factory () as db :
87+ user = await db .scalar (select (User ).where (User .email == "weakpw@example.com" ))
88+ original_password = user .hashed_password
89+ user_id = user .id
90+
8291 resp = await anon_client .post (
8392 "/api/users/auth/accept-invite" ,
8493 json = {"token" : token , "password" : "short" },
8594 )
8695 assert resp .status_code == 400
8796 detail = resp .json ()["detail" ]
88- assert "INVALID_PASSWORD" in detail or "password" in detail .lower ()
97+ assert detail .startswith ("INVALID_PASSWORD:" )
98+
99+ async with users_app .state .sm .db .session_factory () as db :
100+ user = await db .get (User , user_id )
101+ assert user .is_verified is False
102+ assert user .hashed_password == original_password
103+
104+ resp = await anon_client .post (
105+ "/api/users/auth/accept-invite" ,
106+ json = {"token" : token , "password" : "FreshSecure1!" },
107+ )
108+ assert resp .status_code == 204 , resp .text
109+
110+ async with users_app .state .sm .db .session_factory () as db :
111+ user = await db .get (User , user_id )
112+ assert user .is_verified is True
113+ assert user .hashed_password != original_password
89114
90115 @pytest .mark .anyio
91116 async def test_invited_user_cannot_login_before_accepting (self , admin_client , anon_client ):
@@ -101,3 +126,90 @@ async def test_invited_user_cannot_login_before_accepting(self, admin_client, an
101126 data = {"username" : "waiting@example.com" , "password" : "anything" },
102127 )
103128 assert resp .status_code in (400 ,)
129+
130+ @pytest .mark .anyio
131+ async def test_accept_invite_hooks_see_password_and_verification_together (
132+ self , admin_client , anon_client , captured_mail , users_app , monkeypatch
133+ ):
134+ """Both hooks run in order, after the complete acceptance is durable."""
135+ await admin_client .post ("/api/users/admin/invite" , json = {"email" : "hooks@example.com" })
136+ token = re .search (r"token=(\S+)" , captured_mail .to ("hooks@example.com" )[- 1 ].text ).group (1 )
137+ seen = []
138+
139+ async def after_verify (manager , user , request ):
140+ async with users_app .state .sm .db .session_factory () as db :
141+ durable = await db .get (User , user .id )
142+ assert durable .is_verified is True
143+ assert manager .password_helper .verify_and_update (
144+ "FreshSecure1!" , durable .hashed_password
145+ )[0 ]
146+ seen .append ("verify" )
147+
148+ async def after_update (manager , user , changes , request ):
149+ assert changes == {"password" : "FreshSecure1!" , "full_name" : "Invitee" }
150+ seen .append ("update" )
151+
152+ monkeypatch .setattr (UserManager , "on_after_verify" , after_verify )
153+ monkeypatch .setattr (UserManager , "on_after_update" , after_update )
154+ resp = await anon_client .post (
155+ "/api/users/auth/accept-invite" ,
156+ json = {"token" : token , "password" : "FreshSecure1!" , "full_name" : " Invitee " },
157+ )
158+ assert resp .status_code == 204 , resp .text
159+ assert seen == ["verify" , "update" ]
160+
161+ @pytest .mark .anyio
162+ @pytest .mark .parametrize (
163+ "claims, lifetime" ,
164+ [
165+ ({}, - 1 ),
166+ ({"aud" : "fastapi-users:reset" }, 3600 ),
167+ ({"sub" : "not-a-uuid" }, 3600 ),
168+ ({"sub" : "00000000-0000-0000-0000-000000000000" }, 3600 ),
169+ ({"email" : "missing@example.com" }, 3600 ),
170+ ({"email" : None }, 3600 ),
171+ ({"sub" : None }, 3600 ),
172+ ],
173+ )
174+ async def test_accept_invite_rejects_invalid_claims (
175+ self , admin_client , anon_client , captured_mail , users_app , claims , lifetime
176+ ):
177+ """Only a current verify token matching both account ID and email can write."""
178+ resp = await admin_client .post (
179+ "/api/users/admin/invite" , json = {"email" : "claims@example.com" }
180+ )
181+ token = generate_jwt (
182+ {
183+ "sub" : resp .json ()["id" ],
184+ "email" : "claims@example.com" ,
185+ "aud" : UserManager .verification_token_audience ,
186+ ** claims ,
187+ },
188+ users_app .state .users .settings .verification_token_secret ,
189+ lifetime ,
190+ )
191+ resp = await anon_client .post (
192+ "/api/users/auth/accept-invite" , json = {"token" : token , "password" : "FreshSecure1!" }
193+ )
194+ assert resp .status_code == 400 , resp .text
195+ assert resp .json ()["detail" ] == "INVITE_BAD_TOKEN"
196+
197+ @pytest .mark .anyio
198+ async def test_rejected_password_fires_no_hooks (
199+ self , admin_client , anon_client , captured_mail , monkeypatch
200+ ):
201+ """Neither lifecycle hook runs for an acceptance that writes nothing."""
202+ await admin_client .post ("/api/users/admin/invite" , json = {"email" : "nohooks@example.com" })
203+ token = re .search (r"token=(\S+)" , captured_mail .to ("nohooks@example.com" )[- 1 ].text ).group (1 )
204+ seen = []
205+
206+ async def record (* args , ** kwargs ):
207+ seen .append (args )
208+
209+ monkeypatch .setattr (UserManager , "on_after_verify" , record )
210+ monkeypatch .setattr (UserManager , "on_after_update" , record )
211+ resp = await anon_client .post (
212+ "/api/users/auth/accept-invite" , json = {"token" : token , "password" : "short" }
213+ )
214+ assert resp .status_code == 400
215+ assert seen == []
0 commit comments