engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

users: make AuthUser propert a method, and allow override of params.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-08-03 20:17:46 +02:00
parent d86be7d432
commit ee0e7c21f8
13 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/api/tests/test_get_repos.py
View file

@ -116,7 +116,7 @@ class TestGetRepos(object):
response = api_call(self.app, params)
user = User.get_by_username(self.TEST_USER_LOGIN)
allowed_repos = user.AuthUser.permissions['repositories']
allowed_repos = user.AuthUser().permissions['repositories']
result = []
for repo in RepoModel().get_all():

4
rhodecode/apps/admin/views/permissions.py
View file

@ -309,7 +309,7 @@ class AdminPermissionsView(BaseAppView):
c.active = 'perms'
c.user = User.get_default_user(refresh=True)
c.perm_user = c.user.AuthUser
c.perm_user = c.user.AuthUser()
return self._get_template_context(c)
@LoginRequired()
@ -324,7 +324,7 @@ class AdminPermissionsView(BaseAppView):
c.active = 'auth_token_access'
c.user = User.get_default_user(refresh=True)
c.perm_user = c.user.AuthUser
c.perm_user = c.user.AuthUser()
mapper = self.request.registry.queryUtility(IRoutesMapper)
c.view_data = []

2
rhodecode/apps/login/tests/test_register_captcha.py
View file

@ -60,7 +60,7 @@ class TestRegisterCaptcha(object):
])
def test_get_captcha_data(self, private_key, public_key, expected, db,
request_stub, user_util):
request_stub.user = user_util.create_user().AuthUser
request_stub.user = user_util.create_user().AuthUser()
request_stub.matched_route = AttributeDict({'name': 'login'})
login_view = LoginView(mock.Mock(), request_stub)

4
rhodecode/apps/login/views.py
View file

@ -231,7 +231,7 @@ class LoginView(BaseAppView):
register_message = settings.get('rhodecode_register_message') or ''
captcha = self._get_captcha_data()
auto_active = 'hg.register.auto_activate' in User.get_default_user()\
.AuthUser.permissions['global']
.AuthUser().permissions['global']
render_ctx = self._get_template_context(c)
render_ctx.update({
@ -252,7 +252,7 @@ class LoginView(BaseAppView):
def register_post(self):
captcha = self._get_captcha_data()
auto_active = 'hg.register.auto_activate' in User.get_default_user()\
.AuthUser.permissions['global']
.AuthUser().permissions['global']
register_form = RegisterForm()()
try:

2
rhodecode/apps/repository/tests/test_repo_summary.py
View file

@ -317,7 +317,7 @@ def summary_view(context_stub, request_stub, user_util):
"""
request_stub.matched_route = AttributeDict(name='test_view')
request_stub.user = user_util.create_user().AuthUser
request_stub.user = user_util.create_user().AuthUser()
request_stub.db_repo = user_util.create_repo()
view = RepoSummaryView(context=context_stub, request=request_stub)

2
rhodecode/authentication/plugins/auth_crowd.py
View file

@ -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):

2
rhodecode/authentication/plugins/auth_headers.py
View file

@ -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):

2
rhodecode/authentication/plugins/auth_jasig_cas.py
View file

@ -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):

2
rhodecode/authentication/plugins/auth_ldap.py
View file

@ -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):

2
rhodecode/authentication/plugins/auth_rhodecode.py
View file

@ -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(

2
rhodecode/authentication/plugins/auth_token.py
View file

@ -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(

5
rhodecode/model/db.py
View file

@ -743,13 +743,12 @@ class User(Base, BaseModel):
def is_admin(self):
return self.admin
@property
def AuthUser(self):
def AuthUser(self, **kwargs):
"""
Returns instance of AuthUser for this user
"""
from rhodecode.lib.auth import AuthUser
return AuthUser(user_id=self.user_id, username=self.username)
return AuthUser(user_id=self.user_id, username=self.username, **kwargs)
@hybrid_property
def user_data(self):

2
rhodecode/tests/auth_external_test.py
View file

@ -56,7 +56,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):