Move AUTH modules into common auth package

Author: naumvd95

kqueen_ui/auth.py

@@ -1,10 +1,23 @@
 from itsdangerous import URLSafeTimedSerializer
 from flask import current_app as app
 from kqueen_ui.api import get_kqueen_client
+from kqueen_ui.config import current_config
 
 import logging
 
 logger = logging.getLogger('kqueen_ui')
+config = current_config()
+
+AUTH_MODULES = {
+    "local": {
+        "label": "Local",
+        "notify": config.get("LOCAL_AUTH_NOTIFY")
+    },
+    "ldap": {
+        "label": "LDAP",
+        "notify": config.get("LDAP_AUTH_NOTIFY")
+    }
+}
 
 
 def authenticate(username, password):

kqueen_ui/blueprints/manager/views.py

@@ -4,7 +4,7 @@
 from flask import Blueprint, current_app as app, flash, jsonify, redirect, render_template, request, session, url_for
 from flask_babel import format_datetime
 from kqueen_ui.api import get_kqueen_client
-from kqueen_ui.config.auth import AuthModules
+from kqueen_ui.auth import AUTH_MODULES
 from kqueen_ui.auth import generate_confirmation_token
 from kqueen_ui.blueprints.ui.utils import generate_password, sanitize_resource_metadata
 from kqueen_ui.generic_views import KQueenView
@@ -171,33 +171,31 @@ class MemberCreate(KQueenView):
     def handle(self, organization_id):
         form_cls = MemberCreateForm
 
-        modules = AuthModules()
-        auth_options = modules.__dict__
-        logger.debug('Available Auth options {}'.format(auth_options))
-
-        if auth_options:
-            auth_choices = []
-            for name, options in auth_options.items():
-                choice = (name, options.get('label', name))
-                auth_choices.append(choice)
-            field_kw = {
-                'auth_method': {
-                    'type': 'select',
-                    'label': 'Authentication Method',
-                    'choices': auth_choices,
-                    'validators': {
-                        'required': True
-                    }
+        logger.debug('Available Auth options {}'.format(AUTH_MODULES))
+
+        auth_choices = []
+        for name, options in AUTH_MODULES.items():
+            choice = (name, options.get('label', name))
+            auth_choices.append(choice)
+        field_kw = {
+            'auth_method': {
+                'type': 'select',
+                'label': 'Authentication Method',
+                'choices': auth_choices,
+                'validators': {
+                    'required': True
                 }
             }
-            form_cls.append_fields(field_kw)
+        }
+
+        form_cls.append_fields(field_kw)
         form = form_cls()
         if form.validate_on_submit():
             auth_method = 'local'
             notify = True
             if hasattr(form, 'auth_method'):
                 auth_method = form.auth_method.data
-                notify = auth_options.get(auth_method, {}).get('notify', True)
+                notify = AUTH_MODULES.get(auth_method, {}).get('notify', True)
             password = ''
             active = True
             if auth_method == 'local':

kqueen_ui/blueprints/ui/views.py

@@ -3,7 +3,7 @@
                    render_template, request, session, url_for)
 from flask_babel import format_datetime
 from kqueen_ui.api import get_kqueen_client
-from kqueen_ui.config.auth import AuthModules
+from kqueen_ui.auth import AUTH_MODULES
 from kqueen_ui.auth import authenticate, confirm_token, generate_confirmation_token
 from kqueen_ui.generic_views import KQueenView
 from kqueen_ui.utils.email import EmailMessage
@@ -201,35 +201,30 @@ class UserInvite(KQueenView):
     def handle(self):
         form_cls = UserInviteForm
 
-        modules = AuthModules()
-
-        auth_options = modules.__dict__
-
-        if auth_options:
-            auth_choices = []
-            for name, options in auth_options.items():
-                choice = (name, options.get('label', name))
-                auth_choices.append(choice)
-            field_kw = {
-                'auth_method': {
-                    'type': 'select',
-                    'label': 'Authentication Method',
-                    'choices': auth_choices,
-                    'validators': {
-                        'required': True
-                    }
+        auth_choices = []
+        for name, options in AUTH_MODULES.items():
+            choice = (name, options.get('label', name))
+            auth_choices.append(choice)
+        field_kw = {
+            'auth_method': {
+                'type': 'select',
+                'label': 'Authentication Method',
+                'choices': auth_choices,
+                'validators': {
+                    'required': True
                 }
             }
-            form_cls.append_fields(field_kw)
+        }
 
+        form_cls.append_fields(field_kw)
         form = form_cls()
         if form.validate_on_submit():
             organization = 'Organization:{}'.format(session['user']['organization']['id'])
             auth_method = 'local'
             notify = True
             if hasattr(form, 'auth_method'):
                 auth_method = form.auth_method.data
-                notify = auth_options.get(auth_method, {}).get('notify', True)
+                notify = AUTH_MODULES.get(auth_method, {}).get('notify', True)
             password = ''
             active = True
             if auth_method == 'local':

kqueen_ui/config/auth.py

@@ -59,7 +59,6 @@ class BaseConfig:
     # Authentication choices
     LDAP_AUTH_NOTIFY = False
     LOCAL_AUTH_NOTIFY = True
-    AUTH_OPTIONS = {}
 
     @classmethod
     def get(cls, name, default=None):

kqueen_ui/config/base.py

@@ -2,7 +2,7 @@
 
 
 class Config(BaseConfig):
-    DEBUG = False
+    DEBUG = True
     LOG_CONFIG = 'kqueen_ui/utils/logger_config.yml'
 
     # CSRF settings