Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Complete fix for WSJ login logic change

Browse Source
This commit is contained in:
Kovid Goyal 2019-08-14 20:52:07 +05:30
parent ac9f1fc2d9
commit 7460a12a4b
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
recipes/wsj.recipe
View File

@ -112,6 +112,7 @@ class WSJ(BasicNewsRecipe):
'sso': 'true', 'sso': 'true',
'tenant': 'sso', 'tenant': 'sso',
'_intstate': 'deprecated', '_intstate': 'deprecated',
'connection': 'DJldap',
} }
for k in 'scope connection nonce state ui_locales ns protocol redirect_uri'.split(): for k in 'scope connection nonce state ui_locales ns protocol redirect_uri'.split():
if k in query: if k in query:
@ -135,7 +136,12 @@ class WSJ(BasicNewsRecipe):
'X-Remote-User': self.username 'X-Remote-User': self.username
}, data=request_query) }, data=request_query)
self.log('Sending login request...') self.log('Sending login request...')
try:
res = br.open(rq) res = br.open(rq)
except Exception as err:
if hasattr(err, 'read'):
raise Exception('Login request failed with error: {} and body: {}'.format(err, err.read().decode('utf-8', 'replace')))
raise
if res.code != 200: if res.code != 200:
raise ValueError('Failed to login, check your username and password') raise ValueError('Failed to login, check your username and password')
br.select_form(nr=0) br.select_form(nr=0)

6
recipes/wsj_free.recipe
View File

@ -112,6 +112,7 @@ class WSJ(BasicNewsRecipe):
'sso': 'true', 'sso': 'true',
'tenant': 'sso', 'tenant': 'sso',
'_intstate': 'deprecated', '_intstate': 'deprecated',
'connection': 'DJldap',
} }
for k in 'scope connection nonce state ui_locales ns protocol redirect_uri'.split(): for k in 'scope connection nonce state ui_locales ns protocol redirect_uri'.split():
if k in query: if k in query:
@ -135,7 +136,12 @@ class WSJ(BasicNewsRecipe):
'X-Remote-User': self.username 'X-Remote-User': self.username
}, data=request_query) }, data=request_query)
self.log('Sending login request...') self.log('Sending login request...')
try:
res = br.open(rq) res = br.open(rq)
except Exception as err:
if hasattr(err, 'read'):
raise Exception('Login request failed with error: {} and body: {}'.format(err, err.read().decode('utf-8', 'replace')))
raise
if res.code != 200: if res.code != 200:
raise ValueError('Failed to login, check your username and password') raise ValueError('Failed to login, check your username and password')
br.select_form(nr=0) br.select_form(nr=0)