X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=authosm%2Fviews.py;h=f82f4dd04fdaf0f448a30da23ceb4da7bdfdc501;hb=d3e9f5c6b209bf4ee742f1781364f5dc4103539d;hp=f97e8e1c2c6c9e6f03c1c37438526a78462c6b6f;hpb=099364f3465712ac0232f9535ee15b3b5f902fa9;p=osm%2FLW-UI.git

diff --git a/authosm/views.py b/authosm/views.py
index f97e8e1..f82f4dd 100644
--- a/authosm/views.py
+++ b/authosm/views.py
@@ -30,18 +30,24 @@ def user_login(request):
         print request.POST.get('password')
         next_page = request.POST.get('next')
         next_page = urllib.unquote(next_page).decode('iso-8859-2')
-        user = authenticate(username=request.POST.get('username'),
-                            password=request.POST.get('password'),
-                            project_id=request.POST.get('project_id'))
+        try:
+            user = authenticate(username=request.POST.get('username'),
+                                password=request.POST.get('password'),
+                                project_id=request.POST.get('project_id'))
+        except Exception as e:
+            print e
+            res = HttpResponseRedirect('/auth')
+            res.set_cookie('logout_reason', '', max_age=10)
+            return res
 
         if user and user.is_active:
-            if user.is_authenticated():
+            if user.is_authenticated:
                 login(request, user)
-                print next_page
+                request.session['projects'] = user.get_projects()
                 if next_page == "" or next_page is None:
                     return HttpResponseRedirect('/home')
                 else:
                     return HttpResponseRedirect(next_page)
         else:
             error_message = 'Login failed!'
-    return render(request, 'login.html', {'error_message':error_message, 'collapsed_sidebar': False})
+    return render(request, 'login.html', {'error_message': error_message, 'collapsed_sidebar': False})