From 08ea891350349e1336b049bbbf76f7b9c691a0ce Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Barrois?= <raphael.barrois@polytechnique.org>
Date: Fri, 29 Mar 2013 00:45:40 +0100
Subject: [PATCH] Update django_authgroupex version.

---
 requirements.txt      | 4 ++--
 xnet/settings/base.py | 8 ++++++--
 xnet/settings/dev.py  | 5 +++++
 xnet/urls.py          | 5 +----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4e5feee..ed615e6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-https://www.djangoproject.com/download/1.5c1/tarball/#egg=Django
-django_authgroupex
+Django>=1.5.0
+django_authgroupex>=0.2.1
 django-xworkflows
 django-crispy-forms
 pil
diff --git a/xnet/settings/base.py b/xnet/settings/base.py
index 99e7fc7..f0d34d6 100644
--- a/xnet/settings/base.py
+++ b/xnet/settings/base.py
@@ -8,8 +8,12 @@ ROOT_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
 def read_pass(name):
     fname = os.path.join(ROOT_DIR, 'private', name)
-    with open(fname, 'r') as f:
-        return f.readline().strip()
+    try:
+        with open(fname, 'r') as f:
+            return f.readline().strip()
+    except (OSError, IOError) as e:
+        print("Unable to read %s: %s" % (fname, e))
+        return ''
 
 ADMINS = (
     # ('Your Name', 'your_email@example.com'),
diff --git a/xnet/settings/dev.py b/xnet/settings/dev.py
index 2ad4b73..bc984d0 100644
--- a/xnet/settings/dev.py
+++ b/xnet/settings/dev.py
@@ -3,6 +3,11 @@ from .base import *
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
+# Enable fake authentication.
+AUTHGROUPEX_FAKE = True
+AUTHGROUPEX_KEY = 'Just_for_dev'
+AUTHGROUPEX_ENDPOINT = 'authgroupex:fake_endpoint'
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
diff --git a/xnet/urls.py b/xnet/urls.py
index 64dee2a..a76a9f4 100644
--- a/xnet/urls.py
+++ b/xnet/urls.py
@@ -1,9 +1,6 @@
 from django.conf import settings
 from django.conf.urls import patterns, include, url
 
-import django_authgroupex
-authgroupex_view = django_authgroupex.AuthGroupeXUniqueView()
-
 from django.contrib import admin
 admin.autodiscover()
 # Use authgroupex login on admin site
@@ -12,7 +9,7 @@ admin.site.login_template = 'xnet/admin_login.html'
 urlpatterns = patterns('',
     url(r'media/(?P<path>.*)', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}),
     url(r'^$', 'xnet.site.views.home', name='home'),
-    url(r'^xorgauth/', authgroupex_view.login_view, name='xorgauth'),
+    url(r'^xorgauth/', include('django_authgroupex.urls', namespace='authgroupex')),
     url(r'^groups/', include('xnet.accounts.urls', namespace='accounts')),
     url(r'^events/', include('xnet.events.urls', namespace='events')),
     url(r'^admin/', include(admin.site.urls)),
-- 
2.1.4