Merge branch 'master' of git.nordu.net:pwman

3 files changed, 6 insertions, 5 deletions

diff --git a/src/apps/changepw/views.py b/src/apps/changepw/views.py
index c3fb090..0c620fd 100644
--- a/src/apps/changepw/views.py
+++ b/src/apps/changepw/views.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.decorators import login_required
 from apps.changepw.models import ChangePasswordForm
+from apps.fedlogin.views import fedlogin
 from django.http import HttpResponse
 from django.shortcuts import render
 import random
@@ -67,6 +68,7 @@ def index(request):
     '''
     Greets the user and presents the choices available.
     '''
+    fedlogin(request) # XXX Hack to force db update
     username = _get_username(request)
     try:
         full_name = request.user.get_full_name()
diff --git a/src/pwman/urls.py b/src/pwman/urls.py
index 49a24c7..272fdfe 100644
--- a/src/pwman/urls.py
+++ b/src/pwman/urls.py
@@ -24,10 +24,10 @@ from apps.fedlogin.views import fedlogout, fedlogin
 urlpatterns = [
 
     #Fedlogin
-    url(r'^sso/accounts/login/$', login, {'template_name': 'login.html'}, 'login'),
-    url(r'^sso/accounts/logout/$', fedlogout, name='logout'),
-    url(r'^sso/accounts/login-federated/$', fedlogin, name='loginfed'),
-    url(r'^sso/pwman/', include('apps.changepw.urls')),
+    url(r'^accounts/login/$', login, {'template_name': 'login.html'}, 'login'),
+    url(r'^accounts/logout/$', fedlogout, name='logout'),
+    url(r'^accounts/login-federated/$', fedlogin, name='loginfed'),
+    url(r'^pwman/', include('apps.changepw.urls')),
     # Uncomment the admin/doc line below to enable admin documentation:
     # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
diff --git a/src/tmp b/src/tmp
deleted file mode 100755
index ccd59ed..0000000
--- a/src/tmp
+++ /dev/null
@@ -1 +0,0 @@
-Shaimet4ahW2