usermanager, mod_authz_*: Merge mod_authz_config and mod_authz_internal into the latter

1 files changed, 7 insertions, 1 deletions

diff --git a/plugins/mod_authz_config.lua b/plugins/mod_authz_internal.lua
index 41b8d9f0..0f6e4873 100644
--- a/plugins/mod_authz_config.lua
+++ b/plugins/mod_authz_internal.lua
@@ -1,11 +1,15 @@
 local normalize = require "util.jid".prep;
 local admin_jids = module:get_option_inherited_set("admins", {}) / normalize;
 local host = module.host;
+local role_store = module:open_store("roles");
 
 local admin_role = { ["prosody:admin"] = true };
 
 function get_user_roles(user)
-	return get_jid_roles(user.."@"..host);
+	if admin_jids:contains(user.."@"..host) then
+		return admin_role;
+	end
+	return role_store:get(user);
 end
 
 function get_jid_roles(jid)
@@ -14,3 +18,5 @@ function get_jid_roles(jid)
 	end
 	return nil;
 end
+
+