From 73d03cd48c39782a1f0a1821579e188bbb186cdd Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 3 Jul 2013 04:11:03 -0500 Subject: [PATCH] auth.get_or_create_user(login=False) --- VERSION | 2 +- gluon/tools.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index 6fabaeea..0e4243a1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.03.03.59.49 +Version 2.6.0-development+timestamp.2013.07.03.04.10.20 diff --git a/gluon/tools.py b/gluon/tools.py index 592de93c..c3bdfeb1 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -1751,7 +1751,7 @@ class Auth(object): description=str(description % vars), origin=origin, user_id=user_id) - def get_or_create_user(self, keys, update_fields=['email']): + def get_or_create_user(self, keys, update_fields=['email'], login=True): """ Used for alternate login methods: If the user exists already then password is updated. @@ -1791,7 +1791,7 @@ class Auth(object): guess = keys.get('email', 'anonymous').split('@')[0] keys['first_name'] = keys.get('username', guess) user_id = table_user.insert(**table_user._filter_fields(keys)) - user = self.user = table_user[user_id] + user = table_user[user_id] print user if self.settings.create_user_groups: group_id = self.add_group( @@ -1799,6 +1799,8 @@ class Auth(object): self.add_membership(group_id, user_id) if self.settings.everybody_group_id: self.add_membership(self.settings.everybody_group_id, user_id) + if login: + self.user = user return user def basic(self, basic_auth_realm=False):