In configure we do not need to set_config()

[cascardo/ipsilon.git] / ipsilon / util / user.py

diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 84f1818..3a4962d 100755 (executable)
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipsilon.util.data import Store
+from ipsilon.util.data import UserStore
 from ipsilon.util.log import Log
 import cherrypy
 
@@ -39,8 +39,8 @@ class User(object):
             self.name = username
 
     def _get_user_data(self, username):
-        store = Store()
-        return store.get_user_preferences(username)
+        store = UserStore()
+        return store.load_user_preferences(username)
 
     def reset(self):
         self.name = None
@@ -55,7 +55,7 @@ class User(object):
     @property
     def is_admin(self):
         if 'is_admin' in self._userdata:
-            if self._userdata['is_admin'] == '1':
+            if str(self._userdata['is_admin']) == '1':
                 return True
         return False
 
@@ -98,10 +98,19 @@ class User(object):
         # TODO: implement setting sites via the user object ?
         raise AttributeError
 
+    def save_plugin_data(self, plugin, data):
+        store = UserStore()
+        store.save_plugin_data(plugin, self.name, data)
+
+    def load_plugin_data(self, plugin):
+        store = UserStore()
+        return store.load_plugin_data(plugin, self.name)
+
 
 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 +121,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 +130,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 +148,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: