diff --git a/rbac/init.py b/rbac/init.py index c37aa20..3ecec9e 100644 --- a/rbac/init.py +++ b/rbac/init.py @@ -5,8 +5,6 @@ from rbac.set_role_perms import set_role_perm, set_role_perms from rbac.userperm import UserPermisions async def get_owner_orgid(sor, orgid): - env = ServerEnv() - dbname = env.get_module_dbname() return '0' def load_rbac(): @@ -22,4 +20,3 @@ def load_rbac(): env.register_auth_method = register_auth_method env.get_owner_orgid = get_owner_orgid - diff --git a/wwwroot/user/register.dspy b/wwwroot/user/register.dspy index 0dae5ec..53c9a15 100644 --- a/wwwroot/user/register.dspy +++ b/wwwroot/user/register.dspy @@ -3,10 +3,11 @@ db = DBPools() dbname = get_module_dbname('rbac') async with db.sqlorContext(dbname) as sor: orgid = await register_user(sor, params_kw) - openCustomerAccounts = globals().get('openCustomerAccounts') - if get_owner_orgid and openCustomerAccounts: + try: ownerid = await get_owner_orgid(sor, orgid) - if openCustomerAccounts: - await openCustomerAccounts(sor, ownerid, orgid) + await openCustomerAccounts(sor, ownerid, orgid) + except Exception as e: + exception(f'{e}') + return UiMessage(title="Success", message="register success") return UiError(title='Error', message="register failed")