Merge pull request auth0-samples#37 from auth0-samples/alexisluque-patch-1

Replace deprecated library. Fix auth0-samples#36

Author: aaguiarz

01-Login/requirements.txt

@@ -1,5 +1,5 @@
 flask
 python-dotenv
 requests
-flask-oauthlib
+authlib
 six

01-Login/server.py

@@ -3,16 +3,16 @@
 from functools import wraps
 import json
 from os import environ as env
+from werkzeug.exceptions import HTTPException
 
 from dotenv import load_dotenv, find_dotenv
 from flask import Flask
 from flask import jsonify
 from flask import redirect
 from flask import render_template
-from flask import request
 from flask import session
 from flask import url_for
-from flask_oauthlib.client import OAuth
+from authlib.flask.client import OAuth
 from six.moves.urllib.parse import urlencode
 import requests
 
@@ -26,49 +26,35 @@
 AUTH0_CLIENT_ID = env.get(constants.AUTH0_CLIENT_ID)
 AUTH0_CLIENT_SECRET = env.get(constants.AUTH0_CLIENT_SECRET)
 AUTH0_DOMAIN = env.get(constants.AUTH0_DOMAIN)
+AUTH0_BASE_URL = 'https://' + AUTH0_DOMAIN
 AUTH0_AUDIENCE = env.get(constants.AUTH0_AUDIENCE)
 if AUTH0_AUDIENCE is '':
- AUTH0_AUDIENCE = 'https://' + AUTH0_DOMAIN + '/userinfo'
+ AUTH0_AUDIENCE = AUTH0_BASE_URL + '/userinfo'
 
-APP = Flask(__name__, static_url_path='/public', static_folder='./public')
-APP.secret_key = constants.SECRET_KEY
-APP.debug = True
+app = Flask(__name__, static_url_path='/public', static_folder='./public')
+app.secret_key = constants.SECRET_KEY
+app.debug = True
 
 
-# Format error response and append status code.
-class AuthError(Exception):
- def __init__(self, error, status_code):
- self.error = error
- self.status_code = status_code
-
-
-@APP.errorhandler(AuthError)
+@app.errorhandler(Exception)
 def handle_auth_error(ex):
- response = jsonify(ex.error)
- response.status_code = ex.status_code
+ response = jsonify(message=str(ex))
+ response.status_code = (ex.code if isinstance(ex, HTTPException) else 500)
  return response
 
 
-@APP.errorhandler(Exception)
-def handle_auth_error(ex):
- response = jsonify(message=ex.message)
- return response
+oauth = OAuth(app)
 
-oauth = OAuth(APP)
-
-
-auth0 = oauth.remote_app(
+auth0 = oauth.register(
  'auth0',
- consumer_key=AUTH0_CLIENT_ID,
- consumer_secret=AUTH0_CLIENT_SECRET,
- request_token_params={
+ client_id=AUTH0_CLIENT_ID,
+ client_secret=AUTH0_CLIENT_SECRET,
+ api_base_url=AUTH0_BASE_URL,
+ access_token_url=AUTH0_BASE_URL + '/oauth/token',
+ authorize_url=AUTH0_BASE_URL + '/authorize',
+ client_kwargs={
  'scope': 'openid profile',
- 'audience': AUTH0_AUDIENCE
  },
- base_url='https://%s' % AUTH0_DOMAIN,
- access_token_method='POST',
- access_token_url='/oauth/token',
- authorize_url='/authorize',
 )
 
 
@@ -78,23 +64,21 @@ def decorated(*args, **kwargs):
  if constants.PROFILE_KEY not in session:
  return redirect('/login')
  return f(*args, **kwargs)
+
  return decorated
 
 
 # Controllers API
-@APP.route('/')
+@app.route('/')
 def home():
  return render_template('home.html')
 
 
-@APP.route('/callback')
+@app.route('/callback')
 def callback_handling():
- resp = auth0.authorized_response()
- if resp is None:
- raise AuthError({'code': request.args['error'],
- 'description': request.args['error_description']}, 401)
+ resp = auth0.authorize_access_token()
 
- url = 'https://' + AUTH0_DOMAIN + '/userinfo'
+ url = AUTH0_BASE_URL + '/userinfo'
  headers = {'authorization': 'Bearer ' + resp['access_token']}
  resp = requests.get(url, headers=headers)
  userinfo = resp.json()
@@ -110,19 +94,19 @@ def callback_handling():
  return redirect('/dashboard')
 
 
-@APP.route('/login')
+@app.route('/login')
 def login():
- return auth0.authorize(callback=AUTH0_CALLBACK_URL)
+ return auth0.authorize_redirect(redirect_uri=AUTH0_CALLBACK_URL, audience=AUTH0_AUDIENCE)
 
 
-@APP.route('/logout')
+@app.route('/logout')
 def logout():
  session.clear()
  params = {'returnTo': url_for('home', _external=True), 'client_id': AUTH0_CLIENT_ID}
- return redirect(auth0.base_url + '/v2/logout?' + urlencode(params))
+ return redirect(auth0.api_base_url + '/v2/logout?' + urlencode(params))
 
 
-@APP.route('/dashboard')
+@app.route('/dashboard')
 @requires_auth
 def dashboard():
  return render_template('dashboard.html',
@@ -131,4 +115,4 @@ def dashboard():
 
 
 if __name__ == "__main__":
- APP.run(host='0.0.0.0', port=env.get('PORT', 3000))
+ app.run(host='0.0.0.0', port=env.get('PORT', 3000))