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

fix: check user existence and register user/org if missing using rbac functions

Browse Source
This commit is contained in:
yumoqing 2026-05-12 18:46:02 +08:00
parent e7193933ae
commit 59c321d941
1 changed files with 68 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
wwwroot/usersync/index.dspy
View File

@ -1,26 +1,18 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
"""用户同步接口 - POST方式同步单个或批量用户到dapi模块并返回apikey""" """用户同步接口 - 检查用户是否存在，不存在则参照 register.dspy 逻辑创建用户和机构"""
from datetime import datetime from datetime import datetime
from appPublic.dictObject import DictObject
# 获取参数
action = params_kw.get('action', 'batch') action = params_kw.get('action', 'batch')
dappid = params_kw.get('dappid', '') dappid = params_kw.get('dappid', '')
# 参数验证
if not dappid: if not dappid:
return json.dumps({ return json.dumps({'status': 'error', 'message': 'dappid参数必填'}, ensure_ascii=False)
'status': 'error',
'message': 'dappid参数必填'
}, ensure_ascii=False)
# 获取数据库连接
dbname = get_module_dbname('dapi') dbname = get_module_dbname('dapi')
db = DBPools() db = DBPools()
# 检查dapi模块是否提供了create_user_apikey函数
create_apikey_func = create_user_apikey
async with db.sqlorContext(dbname) as sor: async with db.sqlorContext(dbname) as sor:
if action == 'single': if action == 'single':
user_data = params_kw.get('user', {}) user_data = params_kw.get('user', {})
@ -28,58 +20,59 @@ async with db.sqlorContext(dbname) as sor:
user_orgid = user_data.get('orgid', '') user_orgid = user_data.get('orgid', '')
if not user_id or not user_orgid: if not user_id or not user_orgid:
return json.dumps({ return json.dumps({'status': 'error', 'message': 'user.id和user.orgid必填'}, ensure_ascii=False)
'status': 'error',
'message': 'user.id和user.orgid参数必填'
}, ensure_ascii=False)
# 确保机构存在 # 1. 检查用户是否存在
org = await sor.R('organization', {'id': user_orgid}) users = await sor.R('users', {'id': user_id})
if not org:
await sor.C('organization', {'id': user_orgid, 'orgname': user_data.get('name', user_data.get('username', user_id))})
await sor.C('orgtypes', {'id': getID(), 'orgid': user_orgid, 'orgtypeid': 'customer'})
# 确保用户存在 if not users:
usr = await sor.R('users', {'id': user_id}) # 用户不存在，执行注册逻辑
if not usr: # 确保机构存在
await sor.C('users', { orgs = await sor.R('organization', {'id': user_orgid})
'id': user_id, if not orgs:
'orgid': user_orgid, org_name = user_data.get('name', user_data.get('username', user_id))
'username': user_data.get('username', user_id), await create_org(sor, DictObject(id=user_orgid, orgname=org_name))
'name': user_data.get('name', ''), debug(f"Created org: {user_orgid}")
'email': user_data.get('email', ''),
'password': password_encode(user_data.get('password', '111111')) # 创建用户
}) pwd = user_data.get('password', '111111')
ns = DictObject(
# 创建apikey id=user_id,
if create_apikey_func: orgid=user_orgid,
result = await create_apikey_func( username=user_data.get('username', user_id),
sor, dappid, user_id, user_orgid, name=user_data.get('name', ''),
**{k: v for k, v in user_data.items() if k not in ['id', 'orgid']} email=user_data.get('email', ''),
password=password_encode(pwd),
created_at=timestampstr(),
login_fail_count=0
) )
await create_user(sor, ns)
debug(f"Created user: {user_id}")
# 2. 处理 Apikey
if create_user_apikey:
result = await create_user_apikey(sor, dappid, user_id, user_orgid, **{k: v for k, v in user_data.items() if k not in ['id', 'orgid']})
return json.dumps(result, ensure_ascii=False) return json.dumps(result, ensure_ascii=False)
# 手动创建apikey existing_key = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid})
existing = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid}) if existing_key:
if existing:
f = get_serverenv('password_decode') f = get_serverenv('password_decode')
apikey = f(existing[0].apikey) apikey = f(existing_key[0].apikey)
return json.dumps({'status': 'success', 'data': [{'user_id': user_id, 'apikey': apikey, 'status': 'existing'}]}, ensure_ascii=False) return json.dumps({'status': 'success', 'data': [{'user_id': user_id, 'apikey': apikey, 'status': 'existing'}]}, ensure_ascii=False)
apikey_id = getID()
apikey_value = getID() apikey_value = getID()
ns = { ns_key = {
'id': apikey_id, 'dappid': dappid, 'dorgid': user_orgid, 'duserid': user_id, 'id': getID(), 'dappid': dappid, 'dorgid': user_orgid, 'duserid': user_id,
'orgid': user_orgid, 'userid': user_id, 'apikey': password_encode(apikey_value), 'orgid': user_orgid, 'userid': user_id, 'apikey': password_encode(apikey_value),
'enabled': '1', 'created_at': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31' 'enabled': '1', 'created_at': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31'
} }
await sor.C('downapikey', ns) await sor.C('downapikey', ns_key)
return json.dumps({'status': 'success', 'data': [{'user_id': user_id, 'apikey': apikey_value, 'status': 'created'}]}, ensure_ascii=False) return json.dumps({'status': 'success', 'data': [{'user_id': user_id, 'apikey': apikey_value, 'status': 'created'}]}, ensure_ascii=False)
elif action == 'batch': elif action == 'batch':
users_list = params_kw.get('users', []) users_list = params_kw.get('users', [])
if not users_list: if not users_list:
return json.dumps({'status': 'error', 'message': 'users参数必填（用户对象数组）'}, ensure_ascii=False) return json.dumps({'status': 'error', 'message': 'users必填'}, ensure_ascii=False)
result_data = [] result_data = []
for user_data in users_list: for user_data in users_list:
@ -87,53 +80,45 @@ async with db.sqlorContext(dbname) as sor:
user_orgid = user_data.get('orgid', '') user_orgid = user_data.get('orgid', '')
if not user_id or not user_orgid: if not user_id or not user_orgid:
result_data.append({'user_id': user_id, 'status': 'error', 'message': 'user.id和user.orgid必填'}) result_data.append({'user_id': user_id, 'status': 'error', 'message': 'id/orgid必填'})
continue continue
# 确保机构存在 # 1. 检查/创建用户
org = await sor.R('organization', {'id': user_orgid}) users = await sor.R('users', {'id': user_id})
if not org: if not users:
await sor.C('organization', {'id': user_orgid, 'orgname': user_data.get('name', user_data.get('username', user_id))}) orgs = await sor.R('organization', {'id': user_orgid})
await sor.C('orgtypes', {'id': getID(), 'orgid': user_orgid, 'orgtypeid': 'customer'}) if not orgs:
org_name = user_data.get('name', user_data.get('username', user_id))
# 确保用户存在 await create_org(sor, DictObject(id=user_orgid, orgname=org_name))
usr = await sor.R('users', {'id': user_id})
if not usr: pwd = user_data.get('password', '111111')
await sor.C('users', { ns = DictObject(
'id': user_id, 'orgid': user_orgid, id=user_id, orgid=user_orgid,
'username': user_data.get('username', user_id), 'name': user_data.get('name', ''), username=user_data.get('username', user_id),
'email': user_data.get('email', ''), 'password': password_encode(user_data.get('password', '111111')) name=user_data.get('name', ''), email=user_data.get('email', ''),
}) password=password_encode(pwd), created_at=timestampstr(), login_fail_count=0
# 创建apikey
if create_apikey_func:
result = await create_apikey_func(
sor, dappid, user_id, user_orgid,
**{k: v for k, v in user_data.items() if k not in ['id', 'orgid']}
) )
result_data.append({ await create_user(sor, ns)
'user_id': user_id, 'username': user_data.get('username', ''), debug(f"Batch created user: {user_id}")
'apikey': result.get('apikey', ''), 'status': result.get('message', 'created'),
'result_status': result.get('status') # 2. 处理 Apikey
}) if create_user_apikey:
result = await create_user_apikey(sor, dappid, user_id, user_orgid, **{k: v for k, v in user_data.items() if k not in ['id', 'orgid']})
result_data.append({'user_id': user_id, 'apikey': result.get('apikey', ''), 'status': result.get('status')})
else: else:
existing = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid}) existing_key = await sor.R('downapikey', {'dappid': dappid, 'duserid': user_id, 'dorgid': user_orgid})
if existing: if existing_key:
f = get_serverenv('password_decode') f = get_serverenv('password_decode')
apikey = f(existing[0].apikey) apikey = f(existing_key[0].apikey)
result_data.append({'user_id': user_id, 'apikey': apikey, 'status': 'existing'}) result_data.append({'user_id': user_id, 'apikey': apikey, 'status': 'existing'})
else: else:
apikey_id = getID()
apikey_value = getID() apikey_value = getID()
ns = { ns_key = {
'id': apikey_id, 'dappid': dappid, 'dorgid': user_orgid, 'duserid': user_id, 'id': getID(), 'dappid': dappid, 'dorgid': user_orgid, 'duserid': user_id,
'orgid': user_orgid, 'userid': user_id, 'apikey': password_encode(apikey_value), 'orgid': user_orgid, 'userid': user_id, 'apikey': password_encode(apikey_value),
'enabled': '1', 'created_at': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31' 'enabled': '1', 'created_at': datetime.now().strftime('%Y-%m-%d'), 'expired_date': '9999-12-31'
} }
await sor.C('downapikey', ns) await sor.C('downapikey', ns_key)
result_data.append({'user_id': user_id, 'apikey': apikey_value, 'status': 'created'}) result_data.append({'user_id': user_id, 'apikey': apikey_value, 'status': 'created'})
return json.dumps({'status': 'success', 'data': result_data, 'total': len(result_data)}, ensure_ascii=False) return json.dumps({'status': 'success', 'data': result_data}, ensure_ascii=False)
else:
return json.dumps({'status': 'error', 'message': 'action参数必须是single或batch'}, ensure_ascii=False)