Move user attribute storage into session functions

Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>

2 files changed, 20 insertions, 7 deletions

diff --git a/ipsilon/login/common.py b/ipsilon/login/common.py
index acd6d94..5470626 100755
--- a/ipsilon/login/common.py
+++ b/ipsilon/login/common.py
@@ -44,12 +44,7 @@ class LoginManagerBase(PluginObject, Log):
         if not ref:
             ref = cherrypy.config.get('base.mount', "") + '/'
 
-        session.login(username)
-
-        # Save additional data provided by the login manager
-        if userdata:
-            for key in userdata:
-                session.save_data('user', key, userdata[key])
+        session.login(username, userdata)
 
         raise cherrypy.HTTPRedirect(ref)
 
diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 84f1818..9dc0d65 100755
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -102,6 +102,7 @@ class User(object):
 class UserSession(Log):
     def __init__(self):
         self.user = self.get_data('user', 'name')
+        self.userattrs = self.get_user_attrs()
 
     def get_user(self):
         return User(self.user)
@@ -112,7 +113,7 @@ class UserSession(Log):
         else:
             self.nuke_data('user')
 
-    def login(self, username):
+    def login(self, username, userattrs=None):
         if self.user == username:
             return
 
@@ -121,6 +122,11 @@ class UserSession(Log):
         self.save_data('user', 'name', username)
         self.user = username
 
+        # Save additional data provided by the login manager
+        self.nuke_data('userattrs')
+        if userattrs:
+            self.save_user_attrs(userattrs)
+
         cherrypy.log('LOGIN SUCCESSFUL: %s' % username)
 
     def logout(self, user):
@@ -134,6 +140,18 @@ class UserSession(Log):
         # Destroy current session in all cases
         cherrypy.lib.sessions.expire()
 
+    def get_user_attrs(self):
+        userattrs = dict()
+        if 'userattrs' in cherrypy.session:
+            userattrs = cherrypy.session['userattrs']
+        return userattrs
+
+    def save_user_attrs(self, userattrs):
+        cherrypy.session['userattrs'] = userattrs
+        cherrypy.session.save()
+        self._debug('Saved user attrs')
+        self.userattrs = userattrs
+
     def save_data(self, facility, name, data):
         """ Save named data in the session so it can be retrieved later """
         if facility not in cherrypy.session: