Merge branch 'newlodel' of git.labocleo.org:lodel2 into newlodel

lodel/auth/session.py

@@ -11,7 +11,20 @@ class SessionStore(ABC):
 
     expiration_limit = 900
 
-    # === ABSTRACT METHODS === #
+    ## @brief Generates a session unique ID
+    # @param cls
+    # @return str
+    @classmethod
+    def generate_new_sid(cls):
+        return uuid1()
+
+    ## @brief Creates a new session
+    # @param content dict : session content (default: {})
+    # @return str
+    def create_new_session(self, content={}):
+        sid = self.__class__.generate_new_sid()
+        self.save_session(sid, content)
+        return sid
 
     ## @brief Destroys a session
     # @param sid str : session id
@@ -26,12 +39,6 @@ class SessionStore(ABC):
     def read_session(self, sid):
         return {}
 
-    ## @brief lists all the sessions ids
-    # @return list
-    @abstractmethod
-    def list_all_sessions(self):
-        return []
-
     ## @brief saves a session to a file
     # @param sid str : session id
     # @param session dict : content to be saved
@@ -39,6 +46,19 @@ class SessionStore(ABC):
     def save_session(self, sid, session):
         pass
 
+    ## @brief lists all the sessions ids
+    # @return list
+    @abstractmethod
+    def list_all_sessions(self):
+        return []
+
+    ## @brief cleans the session store's by destroying the expired sessions
+    def clean(self):
+        sessions_list = self.list_all_sessions()
+        for sid in sessions_list:
+            if self.has_session_expired(sid):
+                self.delete_session(sid)
+
     ## @brief checks if a session exists
     # @param sid str : session id
     # @return bool
@@ -53,23 +73,6 @@ class SessionStore(ABC):
     def get_session_last_modified(self, sid):
         pass
 
-    # === IMPLEMENTED METHODS === #
-
-    ## @brief Generates a session unique ID
-    # @param cls
-    # @return str
-    @classmethod
-    def generate_new_sid(cls):
-        return uuid1()
-
-    ## @brief Creates a new session
-    # @param content dict : session content (default: {})
-    # @return str
-    def create_new_session(self, content={}):
-        sid = self.__class__.generate_new_sid()
-        self.save_session(sid, content)
-        return sid
-
     ## @brief checks if a session has expired
     # @param sid str: session id
     # @return bool
@@ -79,13 +82,6 @@ class SessionStore(ABC):
         now_timestamp = get_utc_timestamp()
         return now_timestamp > expiration_timestamp
 
-    ## @brief cleans the session store's by destroying the expired sessions
-    def clean(self):
-        sessions_list = self.list_all_sessions()
-        for sid in sessions_list:
-            if self.has_session_expired(sid):
-                self.delete_session(sid)
-
     ## @brief updates a session's content
     # @param sid str : session's id
     # @param content dict : items to update with their new value