Bug 205463 - Tokens aren't canceled after a successful login.

patch by 'Randall M! Gee', r=bbaetz, a=justdave

diff --git a/Bugzilla/Auth/DB.pm b/Bugzilla/Auth/DB.pm
index 55e4bc7c020d105db29cce7d3c351dd814c58ced..ffc49fbf71e8fcdde853b77a36d5e1116aa3a689 100644 (file)
--- a/Bugzilla/Auth/DB.pm
+++ b/Bugzilla/Auth/DB.pm
@@ -71,7 +71,7 @@ sub authenticate {
     # Now we know that the user has logged in successfully,
     # so delete any password tokens for them
     require Token;
-    Token::DeletePasswordTokens("user logged in");
+    Token::DeletePasswordTokens($userid, "user_logged_in");
 
     # The user may have had their account disabled
     return (AUTH_DISABLED, $userid, $disabledtext)

diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 97d2da41d93ad5abb7f52ca8cdbdfb12d73f741a..400d7d4fc09a621a8039d9a7bf47b65ddb78d22e 100644 (file)
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -246,7 +246,7 @@ sub DeletePasswordTokens {
                             "WHERE userid=? AND tokentype='password'");
     $sth->execute($userid);
     while (my $token = $sth->fetchrow_array) {
-        Token::Cancel($token, "user_logged_in");
+        Token::Cancel($token, $reason);
     }
 }
 

diff --git a/Token.pm b/Token.pm
index 97d2da41d93ad5abb7f52ca8cdbdfb12d73f741a..400d7d4fc09a621a8039d9a7bf47b65ddb78d22e 100644 (file)
--- a/Token.pm
+++ b/Token.pm
@@ -246,7 +246,7 @@ sub DeletePasswordTokens {
                             "WHERE userid=? AND tokentype='password'");
     $sth->execute($userid);
     while (my $token = $sth->fetchrow_array) {
-        Token::Cancel($token, "user_logged_in");
+        Token::Cancel($token, $reason);
     }
 }