2nd pass on oauth, making more generic

realms/modules/auth/oauth/models.py

@@ -5,38 +5,28 @@ from ..models import BaseUser
 
 oauth = OAuth()
 
+users = {}
 
-class OAuthUser(BaseUser):
+providers = {
-    # OAuth remote app
+    'twitter': {
-    remote_app = None
+        'oauth': dict(
-
-
-class TwitterUser(OAuthUser):
-
-    def __init__(self, id_, username, email=None):
-        self.id = id_
-        self.username = username
-        self.email = email
-
-    @classmethod
-    def app(cls):
-        if cls.remote_app:
-            return cls.remote_app
-
-        cls.remote_app = oauth.remote_app(
-            'twitter',
             base_url='https://api.twitter.com/1/',
             request_token_url='https://api.twitter.com/oauth/request_token',
             access_token_url='https://api.twitter.com/oauth/access_token',
-            authorize_url='https://api.twitter.com/oauth/authenticate',
+            authorize_url='https://api.twitter.com/oauth/authenticate')
-            consumer_key=config.OAUTH['twitter']['key'],
+    }
-            consumer_secret=config.OAUTH['twitter']['secret'])
+}
-        return cls.remote_app
 
-    @staticmethod
+
-    def load_user(*args, **kwargs):
+class User(BaseUser):
-        return TwitterUser(args[0])
+
+    @classmethod
+    def get_app(cls, provider):
+        return oauth.remote_app(provider,
+                                consumer_key=config.OAUTH.get(provider, {}).get('key'),
+                                consumer_secret=config.OAUTH.get(provider, {}).get('secret'),
+                                **providers[provider]['oauth'])
 
     @staticmethod
     def login_form():
-        return render_template('auth/oauth/twitter.html')
+        pass

realms/modules/auth/oauth/views.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, url_for, request, flash, redirect, session
-from .models import TwitterUser
+from .models import User
 
 blueprint = Blueprint('auth.oauth', __name__)
 
@@ -8,23 +8,23 @@ def oauth_failed(next_url):
     flash('You denied the request to sign in.')
     return redirect(next_url)
 
-@blueprint.route("/login/twitter")
+
-def login_twitter():
+@blueprint.route("/login/oauth/<provider>")
-    return TwitterUser.app().authorize(callback=url_for('twitter_callback',
+def oauth_login(provider):
+    return User.get_app(provider).authorize(callback=url_for('oauth_callback', provider=provider,
         next=request.args.get('next') or request.referrer or None))
 
-@blueprint.route('/login/twitter/callback')
+
-def twitter_callback():
+@blueprint.route('/login/oauth/<provider>/callback')
+def oauth_callback(provider):
     next_url = request.args.get('next') or url_for('index')
-    resp = TwitterUser.app().authorized_response()
+    resp = User.get_app(provider).authorized_response()
     if resp is None:
         return oauth_failed(next_url)
 
-    session['twitter_token'] = (
+    session[provider + '_token'] = (
         resp['oauth_token'],
         resp['oauth_token_secret']
     )
-    session['twitter_user'] = resp['screen_name']
 
-    flash('You were signed in as %s' % resp['screen_name'])
     return redirect(next_url)