From: bbaetz%acm.org <>
Date: Sat, 7 Jun 2003 10:36:43 +0000 (+0000)
Subject: Bug 205463 - Tokens aren't canceled after a successful login.
X-Git-Tag: bugzilla-2.17.5~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32800e0c6b377a253c01454ce6b1b6a9b45eeb8;p=thirdparty%2Fbugzilla.git

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 55e4bc7c02..ffc49fbf71 100644
--- 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 97d2da41d9..400d7d4fc0 100644
--- 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 97d2da41d9..400d7d4fc0 100644
--- 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);
     }
 }