bugfix
This commit is contained in:
parent
fdabfc2261
commit
a460c0b888
@ -38,65 +38,74 @@ ns = {
|
|||||||
"user_status": "0"
|
"user_status": "0"
|
||||||
}
|
}
|
||||||
udata = DictObject(**ns)
|
udata = DictObject(**ns)
|
||||||
async with get_sor_context(request._run_ns, 'rbac') as sor:
|
try:
|
||||||
recs = await sor.R('users', {'mobile': params_kw.cellphone})
|
async with get_sor_context(request._run_ns, 'rbac') as sor:
|
||||||
if recs:
|
recs = await sor.R('users', {'mobile': params_kw.cellphone})
|
||||||
if len(recs) == 1:
|
if recs:
|
||||||
r = recs[0]
|
if len(recs) == 1:
|
||||||
# Update last_login atomically (standard SQL, no DB-specific functions)
|
r = recs[0]
|
||||||
now_str = timestampstr()
|
# Update last_login atomically (standard SQL, no DB-specific functions)
|
||||||
await sor.sqlExe("""
|
now_str = timestampstr()
|
||||||
UPDATE users
|
await sor.sqlExe("""
|
||||||
SET last_login = ${now}$, login_fail_count = 0,
|
UPDATE users
|
||||||
last_login_fail = NULL
|
SET last_login = ${now}$, login_fail_count = 0,
|
||||||
WHERE id = ${id}$
|
last_login_fail = NULL
|
||||||
""", {'id': r.id, 'now': now_str})
|
WHERE id = ${id}$
|
||||||
await remember_user(r.id, username=r.username, userorgid=r.orgid)
|
""", {'id': r.id, 'now': now_str})
|
||||||
return {
|
await remember_user(r.id, username=r.username, userorgid=r.orgid)
|
||||||
"status": "ok",
|
return {
|
||||||
"data":{
|
"status": "ok",
|
||||||
"user": r
|
"data":{
|
||||||
}
|
"user": r
|
||||||
}
|
}
|
||||||
if params_kw.selected_id:
|
}
|
||||||
for r in recs:
|
if params_kw.selected_id:
|
||||||
if r.id == params_kw.selected_id:
|
for r in recs:
|
||||||
now_str = timestampstr()
|
if r.id == params_kw.selected_id:
|
||||||
await sor.sqlExe("""
|
now_str = timestampstr()
|
||||||
UPDATE users
|
await sor.sqlExe("""
|
||||||
SET last_login = ${now}$, login_fail_count = 0,
|
UPDATE users
|
||||||
last_login_fail = NULL
|
SET last_login = ${now}$, login_fail_count = 0,
|
||||||
WHERE id = ${id}$
|
last_login_fail = NULL
|
||||||
""", {'id': r.id, 'now': now_str})
|
WHERE id = ${id}$
|
||||||
await remember_user(r.id, username=r.username, userorgid=r.orgid)
|
""", {'id': r.id, 'now': now_str})
|
||||||
return {
|
await remember_user(r.id, username=r.username, userorgid=r.orgid)
|
||||||
"status": "ok",
|
return {
|
||||||
"data":{
|
"status": "ok",
|
||||||
"user": r
|
"data":{
|
||||||
}
|
"user": r
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
return {
|
||||||
|
"status": "choose",
|
||||||
|
"data": {
|
||||||
|
"users": recs
|
||||||
}
|
}
|
||||||
else:
|
|
||||||
return {
|
|
||||||
"status": "choose",
|
|
||||||
"data": {
|
|
||||||
"users": recs
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
d = await register_user(sor, udata)
|
d = await register_user(sor, udata)
|
||||||
if d['status'] == 'error':
|
if d['status'] == 'error':
|
||||||
return d
|
return d
|
||||||
try:
|
try:
|
||||||
ownerid = await get_owner_orgid(sor, orgid)
|
ownerid = await get_owner_orgid(sor, orgid)
|
||||||
await openCustomerAccounts(sor, ownerid, orgid)
|
await openCustomerAccounts(sor, ownerid, orgid)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
exception(f'{e}')
|
exception(f'{e}')
|
||||||
|
|
||||||
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)
|
||||||
return {
|
return {
|
||||||
"status": "ok",
|
"status": "ok",
|
||||||
"data":{
|
"data":{
|
||||||
"user": r
|
"user": r
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
except Exception as e:
|
||||||
|
exception(f'Error happend{e}')
|
||||||
|
return {
|
||||||
|
"status": "error",
|
||||||
|
"data":{
|
||||||
|
"message": f"{e}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user