fix #39 feat: make the configuration of password change work

decentfox · Jul 17, 2023 · e971cb4 · e971cb4
1 parent 3652b1b
commit e971cb4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/freeauth-admin/src/freeauth/admin/auth/endpoints.py b/freeauth-admin/src/freeauth/admin/auth/endpoints.py
@@ -207,6 +207,7 @@ async def sign_up_with_code(
         mobile=body.account if code_type == FreeauthCodeType.SMS else None,
         email=body.account if code_type == FreeauthCodeType.EMAIL else None,
         hashed_password=get_password_hash(password),
+        reset_pwd_on_next_login=settings.change_pwd_after_first_login_enabled,
         client_info=client_info,
     )
     token = await auth_app.create_access_token(response, user.id)

diff --git a/freeauth-ext/fastapi-ext/src/freeauth/ext/fastapi_ext/app.py b/freeauth-ext/fastapi-ext/src/freeauth/ext/fastapi_ext/app.py
@@ -193,7 +193,7 @@ async def dependency(
                 raise HTTPException(
                     status_code=HTTPStatus.UNAUTHORIZED,
                     detail=dict(
-                        reset_pwd_on_next_login="首次登录之前请更改密码"
+                        reset_pwd_on_next_login="首次登录时需重新设置密码"
                     ),
                 )
 

diff --git a/freeauth-ext/fastapi-ext/tests/test_app.py b/freeauth-ext/fastapi-ext/tests/test_app.py
@@ -59,6 +59,7 @@ async def user_sign_up(
             mobile=faker.phone_number(),
             email=faker.email(),
             hashed_password="",
+            reset_pwd_on_next_login=False,
             client_info=ci,
         )
         token = await auth_app.create_access_token(response, user.id)

diff --git a/src/freeauth/db/auth/auth_qry_async_edgeql.py b/src/freeauth/db/auth/auth_qry_async_edgeql.py
@@ -588,6 +588,7 @@ async def sign_up(
     email: str | None = None,
     mobile: str | None = None,
     hashed_password: str,
+    reset_pwd_on_next_login: bool,
     client_info: str,
 ) -> SignInResult:
     return await executor.query_single(
@@ -599,6 +600,7 @@ async def sign_up(
             email := <optional str>$email,
             mobile := <optional str>$mobile,
             hashed_password := <str>$hashed_password,
+            reset_pwd_on_next_login := <bool>$reset_pwd_on_next_login,
             client_info := (
                 <tuple<client_ip: str, user_agent: json>><json>$client_info
             ),
@@ -608,7 +610,8 @@ async def sign_up(
                     username := username,
                     email := email,
                     mobile := mobile,
-                    hashed_password := hashed_password
+                    hashed_password := hashed_password,
+                    reset_pwd_on_next_login := reset_pwd_on_next_login
                 }
             ),
             audit_log := (
@@ -643,6 +646,7 @@ async def sign_up(
         email=email,
         mobile=mobile,
         hashed_password=hashed_password,
+        reset_pwd_on_next_login=reset_pwd_on_next_login,
         client_info=client_info,
     )
 

diff --git a/src/freeauth/db/auth/auth_qry_edgeql.py b/src/freeauth/db/auth/auth_qry_edgeql.py
@@ -588,6 +588,7 @@ def sign_up(
     email: str | None = None,
     mobile: str | None = None,
     hashed_password: str,
+    reset_pwd_on_next_login: bool,
     client_info: str,
 ) -> SignInResult:
     return executor.query_single(
@@ -599,6 +600,7 @@ def sign_up(
             email := <optional str>$email,
             mobile := <optional str>$mobile,
             hashed_password := <str>$hashed_password,
+            reset_pwd_on_next_login := <bool>$reset_pwd_on_next_login,
             client_info := (
                 <tuple<client_ip: str, user_agent: json>><json>$client_info
             ),
@@ -608,7 +610,8 @@ def sign_up(
                     username := username,
                     email := email,
                     mobile := mobile,
-                    hashed_password := hashed_password
+                    hashed_password := hashed_password,
+                    reset_pwd_on_next_login := reset_pwd_on_next_login
                 }
             ),
             audit_log := (
@@ -643,6 +646,7 @@ def sign_up(
         email=email,
         mobile=mobile,
         hashed_password=hashed_password,
+        reset_pwd_on_next_login=reset_pwd_on_next_login,
         client_info=client_info,
     )
 

diff --git a/src/freeauth/db/auth/queries/sign_up.edgeql b/src/freeauth/db/auth/queries/sign_up.edgeql
@@ -5,6 +5,7 @@ with
     email := <optional str>$email,
     mobile := <optional str>$mobile,
     hashed_password := <str>$hashed_password,
+    reset_pwd_on_next_login := <bool>$reset_pwd_on_next_login,
     client_info := (
         <tuple<client_ip: str, user_agent: json>><json>$client_info
     ),
@@ -14,7 +15,8 @@ with
             username := username,
             email := email,
             mobile := mobile,
-            hashed_password := hashed_password
+            hashed_password := hashed_password,
+            reset_pwd_on_next_login := reset_pwd_on_next_login
         }
     ),
     audit_log := (