ravenscroftj
/
micropub-flask-gitea
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4 from martymcguire/master 

Updates for micropub.rocks auth support
This commit is contained in:
Kyle Mahan 2017-03-13 08:21:45 -07:00 committed by GitHub
parent 9ac8c44761 9f7bc5530b
commit 794d95c624
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flask_micropub.py
View File

@ -135,6 +135,7 @@ class MicropubClient:
'me': me, 'me': me,
'client_id': self.client_id, 'client_id': self.client_id,
'redirect_uri': redirect_url, 'redirect_uri': redirect_url,
'response_type': 'code',
'state': '{}|{}'.format(csrf_token, state or ''), 'state': '{}|{}'.format(csrf_token, state or ''),
} }
if scope: if scope:
@ -205,7 +206,10 @@ class MicropubClient:
'Flask-Micropub: auth response: %d - %s', response.status_code, 'Flask-Micropub: auth response: %d - %s', response.status_code,
response.text) response.text)
rdata = parse_qs(response.text) try:
rdata = dict((k,[v]) for (k,v) in response.json().items())
except ValueError:
rdata = parse_qs(response.text)
if response.status_code < 200 or response.status_code >= 300: if response.status_code < 200 or response.status_code >= 300:
error_vals = rdata.get('error') error_vals = rdata.get('error')
error_descs = rdata.get('error_description') error_descs = rdata.get('error_description')
@ -258,6 +262,7 @@ class MicropubClient:
'redirect_uri': redirect_uri, 'redirect_uri': redirect_uri,
'client_id': self.client_id, 'client_id': self.client_id,
'state': wrapped_state, 'state': wrapped_state,
'grant_type': 'authorization_code',
} }
flask.current_app.logger.debug( flask.current_app.logger.debug(
'Flask-Micropub: requesting access token from: %s, data: %s', 'Flask-Micropub: requesting access token from: %s, data: %s',
@ -274,7 +279,10 @@ class MicropubClient:
error='bad response from token endpoint: {}' error='bad response from token endpoint: {}'
.format(token_response)) .format(token_response))
tdata = parse_qs(token_response.text) try:
tdata = dict((k,[v]) for (k,v) in token_response.json().items())
except ValueError:
tdata = parse_qs(token_response.text)
if 'access_token' not in tdata: if 'access_token' not in tdata:
return AuthResponse( return AuthResponse(
me=me, me=me,