mod_saslauth, mod_auth_cyrus, util.sasl_cyrus: Moved cyrus account provisioning check...

[prosody.git] / plugins / mod_register.lua

diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index be1be0aebecb1dca7c28a74df66e74af49ff8c90..25f47a9ed1ce43034199564c7e51b0105646744d 100644 (file)
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -12,7 +12,7 @@ local st = require "util.stanza";
 local datamanager = require "util.datamanager";
 local usermanager_user_exists = require "core.usermanager".user_exists;
 local usermanager_create_user = require "core.usermanager".create_user;
-local datamanager_store = require "util.datamanager".store;
+local usermanager_set_password = require "core.usermanager".set_password;
 local os_time = os.time;
 local nodeprep = require "util.encodings".stringprep.nodeprep;
 
@@ -34,7 +34,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
                                local username, host = session.username, session.host;
                                --session.send(st.error_reply(stanza, "cancel", "not-allowed"));
                                --return;
-                               usermanager_create_user(username, nil, host); -- Disable account
+                               usermanager_set_password(username, nil, host); -- Disable account
                                -- FIXME the disabling currently allows a different user to recreate the account
                                -- we should add an in-memory account block mode when we have threading
                                session.send(st.reply(stanza));
@@ -45,7 +45,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
                                -- TODO datamanager should be able to delete all user data itself
                                datamanager.store(username, host, "vcard", nil);
                                datamanager.store(username, host, "private", nil);
-                               datamanager.store(username, host, "offline", nil);
+                               datamanager.list_store(username, host, "offline", nil);
                                local bare = username.."@"..host;
                                for jid, item in pairs(roster) do
                                        if jid and jid ~= "pending" then
@@ -58,6 +58,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
                                        end
                                end
                                datamanager.store(username, host, "roster", nil);
+                               datamanager.store(username, host, "privacy", nil);
                                datamanager.store(username, host, "accounts", nil); -- delete accounts datastore at the end
                                module:log("info", "User removed their account: %s@%s", username, host);
                                module:fire_event("user-deregistered", { username = username, host = host, source = "mod_register", session = session });
@@ -69,7 +70,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
                                        username = nodeprep(table.concat(username));
                                        password = table.concat(password);
                                        if username == session.username then
-                                               if usermanager_create_user(username, password, session.host) then -- password change -- TODO is this the right way?
+                                               if usermanager_set_password(username, password, session.host) then
                                                        session.send(st.reply(stanza));
                                                else
                                                        -- TODO unable to write file, file may be locked, etc, what's the correct error?