Drop usage of self._debug and use self.debug instead

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

diff --git a/ipsilon/util/user.py b/ipsilon/util/user.py
index 5a8f159..aaab947 100644 (file)
--- a/ipsilon/util/user.py
+++ b/ipsilon/util/user.py
@@ -121,6 +121,8 @@ class UserSession(Log):
 
     def login(self, username, userattrs=None):
         if self.user == username:
+            if userattrs and not self.get_user_attrs():
+                self.save_user_attrs(userattrs)
             return
 
         # REMOTE_USER changed, replace user
@@ -154,17 +156,30 @@ class UserSession(Log):
 
     def save_user_attrs(self, userattrs):
         cherrypy.session['userattrs'] = userattrs
-        cherrypy.session.save()
-        self._debug('Saved user attrs')
+        self.debug('Saved user attrs')
         self.userattrs = userattrs
 
+    def _get_provider_attr_name(self, provider):
+        return '%s_data' % provider
+
+    def get_provider_data(self, provider):
+        attr = self._get_provider_attr_name(provider)
+        data = None
+        if attr in cherrypy.session:
+            data = cherrypy.session[attr]
+        return data
+
+    def save_provider_data(self, provider, data):
+        attr = self._get_provider_attr_name(provider)
+        cherrypy.session[attr] = data
+        self.debug('Saved %s provider data' % provider)
+
     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:
             cherrypy.session[facility] = dict()
         cherrypy.session[facility][name] = data
-        cherrypy.session.save()
-        self._debug('Saved session data named [%s:%s]' % (facility, name))
+        self.debug('Saved session data named [%s:%s]' % (facility, name))
 
     def get_data(self, facility, name):
         """ Get named data in the session if available """
@@ -182,8 +197,7 @@ class UserSession(Log):
                 return
             cherrypy.session[facility][name] = None
             del cherrypy.session[facility][name]
-            self._debug('Nuked session data named [%s:%s]' % (facility, name))
+            self.debug('Nuked session data named [%s:%s]' % (facility, name))
         else:
             del cherrypy.session[facility]
-            self._debug('Nuked session facility [%s]' % (facility,))
-        cherrypy.session.save()
+            self.debug('Nuked session facility [%s]' % (facility,))