ldap uses it own views

1 files changed, 3 insertions, 19 deletions

diff --git a/mediagoblin/plugins/ldap/tools.py b/mediagoblin/plugins/ldap/tools.py
index 6134aaba..05cff5f9 100644
--- a/mediagoblin/plugins/ldap/tools.py
+++ b/mediagoblin/plugins/ldap/tools.py
@@ -17,16 +17,13 @@ import ldap
 import logging
 
 from mediagoblin import mg_globals
-from mediagoblin.db.models import User
-from mediagoblin.tools.response import redirect
 
 _log = logging.getLogger(__name__)
 
 
 class LDAP(object):
-    def __init__(self, request):
+    def __init__(self):
         self.ldap_settings = mg_globals.global_config['plugins']['mediagoblin.plugins.ldap']
-        self.request = request
 
     def _connect(self, server):
         _log.info('Connecting to {0}.'.format(server['LDAP_HOST']))
@@ -36,25 +33,12 @@ class LDAP(object):
     def login(self, username, password):
         for k, v in self.ldap_settings.iteritems():
             try:
-                import ipdb
-                ipdb.set_trace()
                 self._connect(v)
                 user_dn = v['USER_DN_TEMPLATE'].format(username=username)
                 self.conn.simple_bind_s(user_dn, password.encode('utf8'))
-                return self._get_or_create_user(username)
+                return username
 
             except ldap.LDAPError, e:
                 _log.info(e)
 
-        return None
-
-    def _get_or_create_user(self, username):
-        user = User.query.filter_by(
-            username=username).first()
-
-        if user:
-            return user
-
-        self.request.session['username'] = username
-        redirect(
-            self.request, 'mediagoblin.plugins.ldap.register')
+        return False