# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1582461523 0
# Node ID 8f95308c3c4596f44fe0bfc66d2dd14cd4e2455c
# Parent  52c6dfa04dba2d4eaa5d858c9075fb25659df2bc
usermanager, mod_authz_*: Merge mod_authz_config and mod_authz_internal into the latter

diff -r 52c6dfa04dba -r 8f95308c3c45 core/usermanager.lua
--- a/core/usermanager.lua	Sat Feb 22 18:32:50 2020 +0100
+++ b/core/usermanager.lua	Sun Feb 23 12:38:43 2020 +0000
@@ -56,7 +56,7 @@
 local function initialize_host(host)
 	local host_session = hosts[host];
 
-	local authz_provider_name = config.get(host, "authorization") or "config";
+	local authz_provider_name = config.get(host, "authorization") or "internal";
 
 	local authz_mod = modulemanager.load(host, "authz_"..authz_provider_name);
 	host_session.authz = authz_mod or global_authz_provider;
diff -r 52c6dfa04dba -r 8f95308c3c45 plugins/mod_authz_config.lua
--- a/plugins/mod_authz_config.lua	Sat Feb 22 18:32:50 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-local normalize = require "util.jid".prep;
-local admin_jids = module:get_option_inherited_set("admins", {}) / normalize;
-local host = module.host;
-
-local admin_role = { ["prosody:admin"] = true };
-
-function get_user_roles(user)
-	return get_jid_roles(user.."@"..host);
-end
-
-function get_jid_roles(jid)
-	if admin_jids:contains(jid) then
-		return admin_role;
-	end
-	return nil;
-end
diff -r 52c6dfa04dba -r 8f95308c3c45 plugins/mod_authz_internal.lua
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/mod_authz_internal.lua	Sun Feb 23 12:38:43 2020 +0000
@@ -0,0 +1,22 @@
+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)
+	if admin_jids:contains(user.."@"..host) then
+		return admin_role;
+	end
+	return role_store:get(user);
+end
+
+function get_jid_roles(jid)
+	if admin_jids:contains(jid) then
+		return admin_role;
+	end
+	return nil;
+end
+
+