# HG changeset patch # User Marcin Kuzminski # Date 2017-08-03 19:39:48 # Node ID 6219530b76bb76c13f66ca7dd3fbc77d39f0bfbf # Parent 2561e1103b02834d5edffc1e1a2d5e9ff20b6fa6 auth: XHRRequired decorator is no longer required. - was replaced by xhr=True view config of pyramid diff --git a/rhodecode/controllers/admin/user_groups.py b/rhodecode/controllers/admin/user_groups.py --- a/rhodecode/controllers/admin/user_groups.py +++ b/rhodecode/controllers/admin/user_groups.py @@ -43,7 +43,7 @@ from rhodecode.lib.utils import jsonify from rhodecode.lib.utils2 import safe_unicode, str2bool, safe_int from rhodecode.lib.auth import ( LoginRequired, NotAnonymous, HasUserGroupPermissionAnyDecorator, - HasPermissionAnyDecorator, XHRRequired) + HasPermissionAnyDecorator) from rhodecode.lib.base import BaseController, render from rhodecode.model.permission import PermissionModel from rhodecode.model.scm import UserGroupList diff --git a/rhodecode/lib/auth.py b/rhodecode/lib/auth.py --- a/rhodecode/lib/auth.py +++ b/rhodecode/lib/auth.py @@ -1339,28 +1339,6 @@ class NotAnonymous(object): return func(*fargs, **fkwargs) -class XHRRequired(object): - # TODO(marcink): remove this in favor of the predicates in pyramid routes - - def __call__(self, func): - return get_cython_compat_decorator(self.__wrapper, func) - - def _get_request(self): - return get_request(self) - - def __wrapper(self, func, *fargs, **fkwargs): - from pylons.controllers.util import abort - request = self._get_request() - - log.debug('Checking if request is XMLHttpRequest (XHR)') - xhr_message = 'This is not a valid XMLHttpRequest (XHR) request' - - if not request.is_xhr: - abort(400, detail=xhr_message) - - return func(*fargs, **fkwargs) - - class PermsDecorator(object): """ Base class for controller decorators, we extract the current user from