Merge "Pass login token when using action=login"

amabojoshua1 · Jan 27, 2024 · 0af6739 · 0af6739
2 parents bbb1a78 + c939a60
commit 0af6739
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pywikibot/login.py b/pywikibot/login.py
@@ -348,19 +348,21 @@ def _login_parameters(self, *, botpassword: bool = False
         if botpassword:
             self.action = 'login'
         else:
-            token = self.site.tokens['login']
             self.action = 'clientlogin'
 
         # prepare default login parameters
         parameters = {'action': self.action,
                       self.keyword('user'): self.login_name,
                       self.keyword('password'): self.password}
 
+        if self.action == 'login':
+            parameters['lgtoken'] = self.site.tokens['login']
+
         if self.action == 'clientlogin':
             # clientlogin requires non-empty loginreturnurl
             parameters['loginreturnurl'] = 'https://example.com'
             parameters['rememberMe'] = '1'
-            parameters['logintoken'] = token
+            parameters['logintoken'] = self.site.tokens['login']
 
         if self.site.family.ldapDomain:
             parameters[self.keyword('ldap')] = self.site.family.ldapDomain