Bug 1097813: backport upstream bug 1001462 to bmo/4.2 to fix issue with using tokens with webservice rest api

3 files changed, 4 insertions, 3 deletions

diff --git a/Bugzilla/Auth/Login.pm b/Bugzilla/Auth/Login.pm
index 7e03778b3..09830da25 100644
--- a/Bugzilla/Auth/Login.pm
+++ b/Bugzilla/Auth/Login.pm
@@ -17,7 +17,6 @@
 package Bugzilla::Auth::Login;
 
 use strict;
-use fields qw(_login_token);
 
 # Determines whether or not a user can logout. It's really a subroutine,
 # but we implement it here as a constant. Override it in subclasses if
diff --git a/Bugzilla/Auth/Login/Cookie.pm b/Bugzilla/Auth/Login/Cookie.pm
index 62a6c58a9..e3b86d384 100644
--- a/Bugzilla/Auth/Login/Cookie.pm
+++ b/Bugzilla/Auth/Login/Cookie.pm
@@ -17,7 +17,9 @@
 
 package Bugzilla::Auth::Login::Cookie;
 use strict;
+
 use base qw(Bugzilla::Auth::Login);
+use fields qw(_login_token);
 
 use Bugzilla::Constants;
 use Bugzilla::Util;
diff --git a/Bugzilla/Auth/Persist/Cookie.pm b/Bugzilla/Auth/Persist/Cookie.pm
index c1d133772..a064a231a 100644
--- a/Bugzilla/Auth/Persist/Cookie.pm
+++ b/Bugzilla/Auth/Persist/Cookie.pm
@@ -36,8 +36,6 @@ use Bugzilla::Constants;
 use Bugzilla::Util;
 use Bugzilla::Token;
 
-use Bugzilla::Auth::Login::Cookie qw(login_token);
-
 use List::Util qw(first);
 
 sub new {
@@ -102,6 +100,8 @@ sub persist_login {
     $cgi->send_cookie(-name => 'Bugzilla_logincookie',
                       -value => $login_cookie,
                       %cookieargs);
+
+    return $login_cookie;
 }
 
 sub logout {