bugfix

rbac/check_perm.py

@@ -14,6 +14,19 @@ from ahserver.auth_api import AuthAPI, user_login
 from ahserver.globalEnv import password_encode
 from ahserver.serverenv import ServerEnv, get_serverenv, set_serverenv
 
+async def get_org_users(orgid):
+	env = ServerEnv()
+	async with get_sor_context(env, 'rbac') as sor:
+		return await sor_get_org_users(sor, orgid)
+	return []
+
+async def sor_get_org_users(sor, orgid):
+	sql = "select * from users where orgid=${orgid}$"
+	recs = await sor.sqlExe(sql, {'orgid': orgid})
+	if len(recs):
+		return recs
+	return []
+
 async def get_user_roles(userid):
 	sql = "select b.orgtypeid, concat(b.orgtypeid, '.', b.name) as name from userrole a, role b where a.userid=${userid}$ and a.roleid = b.id"
 	db = DBPools()

rbac/init.py

@@ -1,6 +1,16 @@
 from ahserver.auth_api import AuthAPI
 from ahserver.serverenv import ServerEnv
-from rbac.check_perm import objcheckperm, get_user_roles, checkUserPassword, register_user, register_auth_method, create_org, create_user
+from rbac.check_perm import (
+	objcheckperm, 
+	get_org_users,
+	sor_get_org_users,
+	get_user_roles, 
+	checkUserPassword, 
+	register_user, 
+	register_auth_method, 
+	create_org, 
+	create_user
+)
 from rbac.set_role_perms import set_role_perm, set_role_perms
 from rbac.userperm import UserPermisions
 
@@ -21,5 +31,7 @@ def load_rbac():
 	env.set_role_perm = set_role_perm
 	env.set_role_perms = set_role_perms
 	env.register_auth_method = register_auth_method
+	env.get_org_users = get_org_users
+	env.sor_get_org_users = sor_get_org_users
 	env.get_owner_orgid = get_owner_orgid