- modified/improved session handling

git-svn-id: https://svn.spreadspace.org/mur.sat@89 7de4ea59-55d0-425e-a1af-a3118ea81d4c

1 files changed, 5 insertions, 9 deletions

diff --git a/tools/mmd/MmdSession.py b/tools/mmd/MmdSession.py
index 2dda34e..84230c6 100644
--- a/tools/mmd/MmdSession.py
+++ b/tools/mmd/MmdSession.py
@@ -3,6 +3,7 @@ Session class for MURSAT1 Mission Dashboard
 """
 from cgi import parse_qs, escape
 from MmdDb import Db
+from MmdUser import User
 import time
 
 # session timeout set to 10 minutes (600 seconds)
@@ -12,15 +13,15 @@ class Session:
 
   def __init__ (self, session_id):
     self.session_id = session_id
-    self.email = 'Anonymous'
     self.status = 'anon'
     self.headers = []
     self.db = Db ()
+    self.user = User ()
     s = self.db.sessionFind (session_id)
     if not s:
-      self.db.sessionInit (self.session_id, self.email, int (time.strftime ('%s')) + timeout)
+      self.db.sessionInit (self.session_id, self.user.email, int (time.strftime ('%s')) + timeout, self.status)
     else:
-      self.email = s['email']
+      self.user.load (s['email'])
       self.status = s['status']
 
   def addHeader (self, header):
@@ -29,16 +30,11 @@ class Session:
   def update (self):
     self.db.sessionUpdate (self.session_id, int (time.strftime ('%s')) + timeout)
 
-  def setEmail (self, email = 'Anonymous'):
-    self.email = email
-    self.db.sessionSetEmail (self.session_id, self.email)
-
   def setStatus (self, status = 'anon'):
     self.status = status
     self.db.sessionSetStatus (self.session_id, self.status)
 
-  def authenticate (self, user):
-    self.setEmail (user.email)
+  def authenticate (self):
     self.setStatus ('auth')
 
   def valid (self):