Refactoring the code

- Use Flask blueprint
- Split model and views into smaller parts
- Bug fixes
- API adjustment

powerdnsadmin/services/__init__.py

@@ -0,0 +1,4 @@
+from .base import authlib_oauth_client
+
+def init_app(app):
+    authlib_oauth_client.init_app(app)

powerdnsadmin/services/base.py

@@ -0,0 +1,3 @@
+from authlib.flask.client import OAuth
+
+authlib_oauth_client = OAuth()

powerdnsadmin/services/github.py

@@ -0,0 +1,42 @@
+from flask import request, session, redirect, url_for, current_app
+
+from .base import authlib_oauth_client
+from ..models.setting import Setting
+
+
+def github_oauth():
+    if not Setting().get('github_oauth_enabled'):
+        return None
+
+    def fetch_github_token():
+        return session.get('github_token')
+
+    def update_token(token):
+        session['google_token'] = token
+        return token
+
+    github = authlib_oauth_client.register(
+        'github',
+        client_id=Setting().get('github_oauth_key'),
+        client_secret=Setting().get('github_oauth_secret'),
+        request_token_params={'scope': Setting().get('github_oauth_scope')},
+        api_base_url=Setting().get('github_oauth_api_url'),
+        request_token_url=None,
+        access_token_url=Setting().get('github_oauth_token_url'),
+        authorize_url=Setting().get('github_oauth_authorize_url'),
+        client_kwargs={'scope': Setting().get('github_oauth_scope')},
+        fetch_token=fetch_github_token,
+        update_token=update_token)
+
+    @current_app.route('/github/authorized')
+    def github_authorized():
+        session['github_oauthredir'] = url_for('.github_authorized',
+                                               _external=True)
+        token = github.authorize_access_token()
+        if token is None:
+            return 'Access denied: reason=%s error=%s' % (
+                request.args['error'], request.args['error_description'])
+        session['github_token'] = (token)
+        return redirect(url_for('index.login'))
+
+    return github

powerdnsadmin/services/google.py

@@ -0,0 +1,44 @@
+from flask import request, session, redirect, url_for, current_app
+
+from .base import authlib_oauth_client
+from ..models.setting import Setting
+
+
+def google_oauth():
+    if not Setting().get('google_oauth_enabled'):
+        return None
+
+    def fetch_google_token():
+        return session.get('google_token')
+
+    def update_token(token):
+        session['google_token'] = token
+        return token
+
+    google = authlib_oauth_client.register(
+        'google',
+        client_id=Setting().get('google_oauth_client_id'),
+        client_secret=Setting().get('google_oauth_client_secret'),
+        api_base_url=Setting().get('google_base_url'),
+        request_token_url=None,
+        access_token_url=Setting().get('google_token_url'),
+        authorize_url=Setting().get('google_authorize_url'),
+        client_kwargs={'scope': Setting().get('google_oauth_scope')},
+        fetch_token=fetch_google_token,
+        update_token=update_token)
+
+    @current_app.route('/google/authorized')
+    def google_authorized():
+        session['google_oauthredir'] = url_for(
+            '.google_authorized', _external=True)
+        token = google.authorize_access_token()
+        if token is None:
+            return 'Access denied: reason=%s error=%s' % (
+                request.args['error_reason'],
+                request.args['error_description']
+            )
+        session['google_token'] = (token)
+        return redirect(url_for('index.login'))
+
+    return google
+

powerdnsadmin/services/oidc.py

@@ -0,0 +1,41 @@
+from flask import request, session, redirect, url_for, current_app
+
+from .base import authlib_oauth_client
+from ..models.setting import Setting
+
+
+def oidc_oauth():
+    if not Setting().get('oidc_oauth_enabled'):
+        return None
+
+    def fetch_oidc_token():
+        return session.get('oidc_token')
+
+    def update_token(token):
+        session['google_token'] = token
+        return token
+
+    oidc = authlib_oauth_client.register(
+        'oidc',
+        client_id=Setting().get('oidc_oauth_key'),
+        client_secret=Setting().get('oidc_oauth_secret'),
+        api_base_url=Setting().get('oidc_oauth_api_url'),
+        request_token_url=None,
+        access_token_url=Setting().get('oidc_oauth_token_url'),
+        authorize_url=Setting().get('oidc_oauth_authorize_url'),
+        client_kwargs={'scope': Setting().get('oidc_oauth_scope')},
+        fetch_token=fetch_oidc_token,
+        update_token=update_token)
+
+    @current_app.route('/oidc/authorized')
+    def oidc_authorized():
+        session['oidc_oauthredir'] = url_for('.oidc_authorized',
+                                             _external=True)
+        token = oidc.authorize_access_token()
+        if token is None:
+            return 'Access denied: reason=%s error=%s' % (
+                request.args['error'], request.args['error_description'])
+        session['oidc_token'] = (token)
+        return redirect(url_for('index.login'))
+
+    return oidc