Merge branch 'master' into makefile-tests

1 files changed, 16 insertions, 0 deletions

diff --git a/service/pixelated/resources/session.py b/service/pixelated/resources/session.py
index 9ade8d29..5dfa52e6 100644
--- a/service/pixelated/resources/session.py
+++ b/service/pixelated/resources/session.py
@@ -21,6 +21,7 @@ from twisted.web.server import Session
 
 class IPixelatedSession(Interface):
     user_uuid = Attribute('The uuid of the currently logged in user')
+    login_status = Attribute('The status during user login')
 
 
 class PixelatedSession(object):
@@ -28,12 +29,27 @@ class PixelatedSession(object):
 
     def __init__(self, session):
         self.user_uuid = None
+        self.login_status = None
 
     def is_logged_in(self):
         return self.user_uuid is not None
 
     def expire(self):
         self.user_uuid = None
+        self.login_status = None
+
+    def login_started(self):
+        self.login_status = 'started'
+
+    def login_successful(self, user_uuid):
+        self.user_uuid = user_uuid
+        self.login_status = 'completed'
+
+    def login_error(self):
+        self.login_status = 'error'
+
+    def check_login_status(self):
+        return self.login_status
 
 
 registerAdapter(PixelatedSession, Session, IPixelatedSession)