From e382ca74ccdd321cea213ea4f5f28cc57b0de52f Mon Sep 17 00:00:00 2001 From: "bbaetz%acm.org" Date: Sat, 7 Jun 2003 03:36:46 +0000 Subject: [PATCH] Bug 205463 - Tokens aren't canceled after a successful login. patch by 'Randall M! Gee', r=bbaetz, a=justdave git-svn-id: svn://10.0.0.236/trunk@143414 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/Bugzilla/Auth/DB.pm | 2 +- mozilla/webtools/bugzilla/Bugzilla/Token.pm | 2 +- mozilla/webtools/bugzilla/Token.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/DB.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/DB.pm index 55e4bc7c020..ffc49fbf71e 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Auth/DB.pm +++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/Bugzilla/Token.pm b/mozilla/webtools/bugzilla/Bugzilla/Token.pm index 97d2da41d93..400d7d4fc09 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Token.pm +++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/Token.pm b/mozilla/webtools/bugzilla/Token.pm index 97d2da41d93..400d7d4fc09 100644 --- a/mozilla/webtools/bugzilla/Token.pm +++ b/mozilla/webtools/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); } }