add support for a passwordless login token

[ikiwiki.git] / IkiWiki / Plugin / passwordauth.pm

diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm
index c167f52b5c2d11586325cfc1d51a9a3825614f9e..6a5153efd0d3be38add31947238182862aa9cc02 100644 (file)
--- a/IkiWiki/Plugin/passwordauth.pm
+++ b/IkiWiki/Plugin/passwordauth.pm
@@ -96,6 +96,12 @@ sub setpassword ($$;$) {
        else {
                IkiWiki::userinfo_set($user, $field, $password);
        }
        else {
                IkiWiki::userinfo_set($user, $field, $password);
        }

+
+       # Setting the password clears any passwordless login token.
+       if ($field ne 'passwordless') {
+               IkiWiki::userinfo_set($user, "cryptpasswordless", "");
+               IkiWiki::userinfo_set($user, "passwordless", "");
+       }

 }
 
 sub formbuilder_setup (@) {
 }
 
 sub formbuilder_setup (@) {