bugfix
This commit is contained in:
parent
5b2945921f
commit
ce90af0b81
@ -17,7 +17,7 @@ async def get_user_roles(userid):
|
|||||||
sql = "select concat(b.orgtypeid, '.', b.name) as name from userrole a, role b where a.userid=${userid}$ and a.roleid = b.id"
|
sql = "select concat(b.orgtypeid, '.', b.name) as name from userrole a, role b where a.userid=${userid}$ and a.roleid = b.id"
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
roles = []
|
roles = []
|
||||||
dbname = await get_dbname()
|
dbname = get_dbname()
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
recs = await sor.sqlExe(sql, {'userid':userid})
|
recs = await sor.sqlExe(sql, {'userid':userid})
|
||||||
if len(recs) < 1:
|
if len(recs) < 1:
|
||||||
@ -82,14 +82,15 @@ async def register_user(sor, ns):
|
|||||||
await create_user(sor, ns)
|
await create_user(sor, ns)
|
||||||
return id
|
return id
|
||||||
|
|
||||||
async def get_dbname():
|
def get_dbname():
|
||||||
rf = RegisterFunction()
|
f = get_serverenv('get_module_dbname')
|
||||||
dbname = await rf.exe('get_module_dbname', 'rbac')
|
if f i None:
|
||||||
return dbname
|
return None
|
||||||
|
return f('rbac')
|
||||||
|
|
||||||
async def checkUserPassword(request, username, password):
|
async def checkUserPassword(request, username, password):
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
dbname = await get_dbname()
|
dbname = get_dbname()
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql = "select * from users where username=${username}$ and password=${password}$"
|
sql = "select * from users where username=${username}$ and password=${password}$"
|
||||||
recs = await sor.sqlExe(sql, {'username':username, 'password':password})
|
recs = await sor.sqlExe(sql, {'username':username, 'password':password})
|
||||||
@ -134,7 +135,7 @@ right join userrole c on b.roleid = c.roleid
|
|||||||
where c.userid = ${userid}$
|
where c.userid = ${userid}$
|
||||||
"""
|
"""
|
||||||
|
|
||||||
dbname = await get_dbname()
|
dbname = get_dbname()
|
||||||
db = DBPools()
|
db = DBPools()
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
if userid is None:
|
if userid is None:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user