projects
/
cascardo
/
ipsilon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move user attribute storage into session functions
[cascardo/ipsilon.git]
/
ipsilon
/
login
/
common.py
diff --git
a/ipsilon/login/common.py
b/ipsilon/login/common.py
index
a576345
..
5470626
100755
(executable)
--- a/
ipsilon/login/common.py
+++ b/
ipsilon/login/common.py
@@
-17,6
+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/>.
# 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.log import Log
from ipsilon.util.page import Page
from ipsilon.util.user import UserSession
from ipsilon.util.plugin import PluginLoader, PluginObject
from ipsilon.util.page import Page
from ipsilon.util.user import UserSession
from ipsilon.util.plugin import PluginLoader, PluginObject
@@
-24,7
+25,7
@@
from ipsilon.util.plugin import PluginInstaller
import cherrypy
import cherrypy
-class LoginManagerBase(PluginObject):
+class LoginManagerBase(PluginObject
, Log
):
def __init__(self):
super(LoginManagerBase, self).__init__()
def __init__(self):
super(LoginManagerBase, self).__init__()
@@
-43,12
+44,7
@@
class LoginManagerBase(PluginObject):
if not ref:
ref = cherrypy.config.get('base.mount', "") + '/'
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)
raise cherrypy.HTTPRedirect(ref)
@@
-68,10
+64,6
@@
class LoginManagerBase(PluginObject):
raise cherrypy.HTTPRedirect(ref)
raise cherrypy.HTTPRedirect(ref)
- def _debug(self, fact):
- if cherrypy.config.get('debug', False):
- cherrypy.log(fact)
-
def get_tree(self, site):
raise NotImplementedError
def get_tree(self, site):
raise NotImplementedError