yumoqing/rbac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert: restore phone_login.dspy to original (API used by other systems)

Browse Source
This commit is contained in:
yumoqing 2026-05-29 11:37:39 +08:00
parent cf186a632b
commit e65fddbe61
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wwwroot/phone_login.dspy
View File

@ -21,12 +21,7 @@ if params_kw.key is None:
"message": "需要短信验证key" "message": "需要短信验证key"
} }
} }
f = await sms_engine.check_sms_code(params_kw.key, params_kw.sms_code)
# First check (no selected_id): verify code but don't consume it yet
# (multi-account flow needs the code to remain valid for the second call)
# Second check (with selected_id): verify and consume the code
mark_used = bool(params_kw.selected_id)
f = await sms_engine.check_sms_code(params_kw.key, params_kw.sms_code, mark_used=mark_used)
if not f: if not f:
return { return {
"status": "error", "status": "error",
@ -49,9 +44,7 @@ try:
if recs: if recs:
if len(recs) == 1: if len(recs) == 1:
r = recs[0] r = recs[0]
# Single account: code already verified, now mark as used # Update last_login atomically (standard SQL, no DB-specific functions)
if not mark_used:
await sms_engine.check_sms_code(params_kw.key, params_kw.sms_code, mark_used=True)
now_str = timestampstr() now_str = timestampstr()
await sor.sqlExe(""" await sor.sqlExe("""
UPDATE users UPDATE users
@ -60,6 +53,7 @@ try:
WHERE id = ${id}$ WHERE id = ${id}$
""", {'id': r.id, 'now': now_str}) """, {'id': r.id, 'now': now_str})
await remember_user(r.id, username=r.username, userorgid=r.orgid) await remember_user(r.id, username=r.username, userorgid=r.orgid)
debug(f'here')
return { return {
"status": "ok", "status": "ok",
"data":{ "data":{
@ -77,6 +71,7 @@ try:
WHERE id = ${id}$ WHERE id = ${id}$
""", {'id': r.id, 'now': now_str}) """, {'id': r.id, 'now': now_str})
await remember_user(r.id, username=r.username, userorgid=r.orgid) await remember_user(r.id, username=r.username, userorgid=r.orgid)
debug(f'here')
return { return {
"status": "ok", "status": "ok",
"data":{ "data":{
@ -84,16 +79,17 @@ try:
} }
} }
else: else:
debug(f'here')
return { return {
"status": "choose", "status": "choose",
"data": { "data": {
"key": params_kw.key,
"users": recs "users": recs
} }
} }
d = await register_user(sor, udata) d = await register_user(sor, udata)
if d['status'] == 'error': if d['status'] == 'error':
debug(f'here, {d}')
return d return d
try: try:
ownerid = await get_owner_orgid(sor, orgid) ownerid = await get_owner_orgid(sor, orgid)
@ -101,11 +97,9 @@ try:
except Exception as e: except Exception as e:
exception(f'{e}') exception(f'{e}')
# New user registered: code already verified, mark as used
if not mark_used:
await sms_engine.check_sms_code(params_kw.key, params_kw.sms_code, mark_used=True)
r = d['data']['user'] r = d['data']['user']
await remember_user(r.id, username=r.username, userorgid=r.orgid) await remember_user(r.id, username=r.username, userorgid=r.orgid)
debug(f'here')
return { return {
"status": "ok", "status": "ok",
"data":{ "data":{