fix: 修改认证自动分配角色为downapp/logined
- 机构类型从'*'改为'downapp' - 角色名从'downappuser'改为'logined' - 角色id改为独立生成不再使用dappid
This commit is contained in:
parent
e142f4b84e
commit
e089df99f7
22
dapi/dapi.py
22
dapi/dapi.py
@ -84,28 +84,30 @@ async def apikey_user(sor, apikey, client_ip, request):
|
|||||||
return user.id
|
return user.id
|
||||||
|
|
||||||
async def ensure_downappuser_role_and_assign(sor, userid, dappid):
|
async def ensure_downappuser_role_and_assign(sor, userid, dappid):
|
||||||
"""确保downappuser角色存在(id=dappid),并分配给用户"""
|
"""确保downapp/logined角色存在,并分配给用户"""
|
||||||
try:
|
try:
|
||||||
# 检查角色是否存在,不存在则创建
|
# 检查角色是否存在,不存在则创建
|
||||||
roles = await sor.R('role', {'id': dappid})
|
roles = await sor.R('role', {'orgtypeid': 'downapp', 'name': 'logined'})
|
||||||
if not roles:
|
if not roles:
|
||||||
|
roleid = getID()
|
||||||
await sor.C('role', {
|
await sor.C('role', {
|
||||||
'id': dappid,
|
'id': roleid,
|
||||||
'name': 'downappuser',
|
'name': 'logined',
|
||||||
'orgtypeid': '*'
|
'orgtypeid': 'downapp'
|
||||||
})
|
})
|
||||||
debug(f'created downappuser role: {dappid}')
|
debug(f'created logined role (downapp): {roleid}')
|
||||||
|
else:
|
||||||
|
roleid = roles[0].id
|
||||||
|
|
||||||
# 检查用户是否已有该角色
|
# 检查用户是否已有该角色
|
||||||
existing = await sor.R('userrole', {'userid': userid, 'roleid': dappid})
|
existing = await sor.R('userrole', {'userid': userid, 'roleid': roleid})
|
||||||
if not existing:
|
if not existing:
|
||||||
from appPublic.uniqueID import getID
|
|
||||||
await sor.C('userrole', {
|
await sor.C('userrole', {
|
||||||
'id': getID(),
|
'id': getID(),
|
||||||
'userid': userid,
|
'userid': userid,
|
||||||
'roleid': dappid
|
'roleid': roleid
|
||||||
})
|
})
|
||||||
debug(f'assigned downappuser role {dappid} to user {userid}')
|
debug(f'assigned logined role {roleid} (downapp) to user {userid}')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
exception(f'ensure_downappuser_role_and_assign error: {e}')
|
exception(f'ensure_downappuser_role_and_assign error: {e}')
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user