From e7e435a633cb88af042090c3890763860b3ea9a6 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 20 Sep 2011 17:58:03 +0200
Subject: removed UserMappingMiddleware

---
 coip/middleware.py | 27 ---------------------------
 coip/settings.py   |  1 -
 2 files changed, 28 deletions(-)
 delete mode 100644 coip/middleware.py

diff --git a/coip/middleware.py b/coip/middleware.py
deleted file mode 100644
index 82d371e..0000000
--- a/coip/middleware.py
+++ /dev/null
@@ -1,27 +0,0 @@
-'''
-Created on Dec 13, 2010
-
-@author: leifj
-'''
-from django.core.exceptions import ImproperlyConfigured
-from coip.apps.userprofile.models import UserProfile
-
-class UserMappingMiddleware(object):
-    '''
-    Middleware for supporting merged and mapped user identities
-    '''
-
-    def process_request(self,request):
-        try:
-            username = request.META['REMOTE_USER']
-        except KeyError:
-            return
-        
-        qs = UserProfile.objects.filter(user__username=username,primary=True)
-        if qs:
-            profile = qs[0]
-            username = profile.identifier
-
-        request.META['REMOTE_USER'] = username
-            
-            
\ No newline at end of file
diff --git a/coip/settings.py b/coip/settings.py
index 10ff8e3..ac51ddb 100644
--- a/coip/settings.py
+++ b/coip/settings.py
@@ -74,7 +74,6 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'coip.middleware.UserMappingMiddleware',
     'django.contrib.auth.middleware.RemoteUserMiddleware',
     #'django.middleware.cache.FetchFromCacheMiddleware'
 )
-- 
cgit v1.1