From 29034222ca16c29e9301b769802a2e49446e9075 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Fri, 10 Feb 2017 14:12:04 -0200 Subject: [#907] Add login status to session --- service/pixelated/resources/session.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'service/pixelated/resources/session.py') diff --git a/service/pixelated/resources/session.py b/service/pixelated/resources/session.py index 9ade8d29..84f2ebeb 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,26 @@ 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_completed(self): + 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) -- cgit v1.2.3 From 8639b2ce3fa922cdb0871235d3791ab0fb65e810 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Fri, 10 Feb 2017 15:38:03 -0200 Subject: [#907] Encapsulate user_uuid on login complete with @akanim --- service/pixelated/resources/session.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'service/pixelated/resources/session.py') diff --git a/service/pixelated/resources/session.py b/service/pixelated/resources/session.py index 84f2ebeb..5f48a090 100644 --- a/service/pixelated/resources/session.py +++ b/service/pixelated/resources/session.py @@ -41,7 +41,8 @@ class PixelatedSession(object): def login_started(self): self.login_status = 'started' - def login_completed(self): + def login_completed(self, user_uuid): + self.user_uuid = user_uuid self.login_status = 'completed' def login_error(self): -- cgit v1.2.3 From 0edf2078caf98be00bcd48846acec563df630616 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Mon, 13 Feb 2017 12:54:59 -0200 Subject: [#907] Rename successful login variables and methods --- service/pixelated/resources/session.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service/pixelated/resources/session.py') diff --git a/service/pixelated/resources/session.py b/service/pixelated/resources/session.py index 5f48a090..5dfa52e6 100644 --- a/service/pixelated/resources/session.py +++ b/service/pixelated/resources/session.py @@ -41,7 +41,7 @@ class PixelatedSession(object): def login_started(self): self.login_status = 'started' - def login_completed(self, user_uuid): + def login_successful(self, user_uuid): self.user_uuid = user_uuid self.login_status = 'completed' -- cgit v1.2.3