users: make AuthUser propert a method, and allow override of params.
This commit is contained in:
parent
d86be7d432
commit
ee0e7c21f8
13 changed files with 16 additions and 17 deletions
|
|
@ -223,7 +223,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
|
|||
return True
|
||||
|
||||
def user_activation_state(self):
|
||||
def_user_perms = User.get_default_user().AuthUser.permissions['global']
|
||||
def_user_perms = User.get_default_user().AuthUser().permissions['global']
|
||||
return 'hg.extern_activate.auto' in def_user_perms
|
||||
|
||||
def auth(self, userobj, username, password, settings, **kwargs):
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
|
|||
return True
|
||||
|
||||
def user_activation_state(self):
|
||||
def_user_perms = User.get_default_user().AuthUser.permissions['global']
|
||||
def_user_perms = User.get_default_user().AuthUser().permissions['global']
|
||||
return 'hg.extern_activate.auto' in def_user_perms
|
||||
|
||||
def _clean_username(self, username):
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
|
|||
return True
|
||||
|
||||
def user_activation_state(self):
|
||||
def_user_perms = User.get_default_user().AuthUser.permissions['global']
|
||||
def_user_perms = User.get_default_user().AuthUser().permissions['global']
|
||||
return 'hg.extern_activate.auto' in def_user_perms
|
||||
|
||||
def auth(self, userobj, username, password, settings, **kwargs):
|
||||
|
|
|
|||
|
|
@ -374,7 +374,7 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
|
|||
return True
|
||||
|
||||
def user_activation_state(self):
|
||||
def_user_perms = User.get_default_user().AuthUser.permissions['global']
|
||||
def_user_perms = User.get_default_user().AuthUser().permissions['global']
|
||||
return 'hg.extern_activate.auto' in def_user_perms
|
||||
|
||||
def try_dynamic_binding(self, username, password, current_args):
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ class RhodeCodeAuthPlugin(RhodeCodeAuthPluginBase):
|
|||
return "rhodecode"
|
||||
|
||||
def user_activation_state(self):
|
||||
def_user_perms = User.get_default_user().AuthUser.permissions['global']
|
||||
def_user_perms = User.get_default_user().AuthUser().permissions['global']
|
||||
return 'hg.register.auto_activate' in def_user_perms
|
||||
|
||||
def allows_authentication_from(
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ class RhodeCodeAuthPlugin(RhodeCodeAuthPluginBase):
|
|||
return "authtoken"
|
||||
|
||||
def user_activation_state(self):
|
||||
def_user_perms = User.get_default_user().AuthUser.permissions['global']
|
||||
def_user_perms = User.get_default_user().AuthUser().permissions['global']
|
||||
return 'hg.register.auto_activate' in def_user_perms
|
||||
|
||||
def allows_authentication_from(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue