archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Remove Flask-OAuthlib and oauth_blender_id from Pillar

Browse Source 
We switch completely to a rauth-based approach, allowing multiple providers for authentication.
This commit is contained in:
Francesco Siddi
2017-08-18 18:34:10 +02:00
parent 6e9a539d61
commit 6b3e523036
6 changed files with 34 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pillar/api/blender_id.py
View File

@@ -9,7 +9,8 @@ import logging
import requests
from bson import tz_util
from flask import Blueprint, request, current_app, jsonify
from rauth import OAuth2Session
from flask import Blueprint, request, current_app, jsonify, session
from requests.adapters import HTTPAdapter
from pillar.api.utils import authentication
@@ -175,23 +176,26 @@ def fetch_blenderid_user() -> dict:
bid_url = '%s/api/user' % blender_id_endpoint()
log.debug('Fetching user info from %s', bid_url)
try:
bid_resp = current_app.oauth_blender_id.get(bid_url)
client_id = current_app.config['OAUTH_CREDENTIALS']['blender-id']['id']
client_secret = current_app.config['OAUTH_CREDENTIALS']['blender-id']['secret']
oauth_session = OAuth2Session(
client_id, client_secret, access_token=session['blender_id_oauth_token'])
bid_resp = oauth_session.get(bid_url)
except httplib2.HttpLib2Error:
log.exception('Error getting %s from BlenderID', bid_url)
return {}
if bid_resp.status != 200:
log.warning('Error %i from BlenderID %s: %s', bid_resp.status, bid_url, bid_resp.data)
if bid_resp.status_code != 200:
log.warning('Error %i from BlenderID %s: %s', bid_resp.status_code, bid_url, bid_resp.data)
return {}
if not bid_resp.data:
if not bid_resp.json():
log.warning('Empty data returned from BlenderID %s', bid_url)
return {}
log.debug('BlenderID returned %s', bid_resp.data)
return bid_resp.data
log.debug('BlenderID returned %s', bid_resp.json())
return bid_resp.json()
def setup_app(app, url_prefix):