[teachable] Skip login when already logged in (closes #22572)

This commit is contained in:
Sergey M․ 2019-10-02 02:03:22 +07:00
parent 2906631e12
commit 74bc299453
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D

View file

@ -48,6 +48,16 @@ def _login(self, site):
'https://%s/sign_in' % site, None,
'Downloading %s login page' % site)
def is_logged(webpage):
return any(re.search(p, webpage) for p in (
r'class=["\']user-signout',
r'<a[^>]+\bhref=["\']/sign_out',
r'Log\s+[Oo]ut\s*<'))
if is_logged(login_page):
self._logged_in = True
return
login_url = compat_str(urlh.geturl())
login_form = self._hidden_inputs(login_page)
@ -78,10 +88,7 @@ def _login(self, site):
'Go to https://%s/ and accept.' % (site, site), expected=True)
# Successful login
if any(re.search(p, response) for p in (
r'class=["\']user-signout',
r'<a[^>]+\bhref=["\']/sign_out',
r'>\s*Log out\s*<')):
if is_logged(response):
self._logged_in = True
return