Change function name for readability

pybossa/api/api_base.py

@@ -32,7 +32,7 @@
 from werkzeug.exceptions import NotFound, Unauthorized, Forbidden
 from pybossa.util import jsonpify, crossdomain
 from pybossa.core import ratelimits
-from pybossa.auth import ensure_authorized
+from pybossa.auth import ensure_authorized_to
 from pybossa.hateoas import Hateoas
 from pybossa.ratelimit import ratelimit
 from pybossa.error import ErrorStatus
@@ -91,7 +91,7 @@ def get(self, oid):
 
         """
         try:
-            ensure_authorized('read', self.__class__)
+            ensure_authorized_to('read', self.__class__)
             query = self._db_query(oid)
             json_response = self._create_json_response(query, oid)
             return Response(json_response, mimetype='application/json')
@@ -108,15 +108,15 @@ def _create_json_response(self, query_result, oid):
         for item in query_result:
             try:
                 items.append(self._create_dict_from_model(item))
-                ensure_authorized('read', item)
+                ensure_authorized_to('read', item)
             except (Forbidden, Unauthorized):
                 # Remove last added item, as it is 401 or 403
                 items.pop()
             except Exception as ex: # pragma: no cover
                 print ex
                 raise
         if oid:
-            ensure_authorized('read', query_result[0])
+            ensure_authorized_to('read', query_result[0])
             items = items[0]
         return json.dumps(items)
 
@@ -197,7 +197,7 @@ def _create_instance_from_request(self, data):
         data = self.hateoas.remove_links(data)
         inst = self.__class__(**data)
         self._update_object(inst)
-        ensure_authorized('create', inst)
+        ensure_authorized_to('create', inst)
         self._validate_instance(inst)
         return inst
 
@@ -232,7 +232,7 @@ def _delete_instance(self, oid):
         inst = getattr(repo, query_func)(oid)
         if inst is None:
             raise NotFound
-        ensure_authorized('delete', inst)
+        ensure_authorized_to('delete', inst)
         self._log_changes(inst, None)
         delete_func = repos[self.__class__.__name__]['delete']
         getattr(repo, delete_func)(inst)
@@ -270,7 +270,7 @@ def _update_instance(self, oid):
         existing = getattr(repo, query_func)(oid)
         if existing is None:
             raise NotFound
-        ensure_authorized('update', existing)
+        ensure_authorized_to('update', existing)
         data = json.loads(request.data)
         # Remove hateoas links
         data = self.hateoas.remove_links(data)

pybossa/api/token.py

@@ -29,7 +29,7 @@
 from pybossa.util import jsonpify
 from pybossa.ratelimit import ratelimit
 from api_base import APIBase, error
-from pybossa.auth import ensure_authorized
+from pybossa.auth import ensure_authorized_to
 
 class TokenAPI(APIBase):
 
@@ -45,7 +45,7 @@ class TokenAPI(APIBase):
     @ratelimit(limit=300, per=15 * 60)
     def get(self, token):
         try:
-            ensure_authorized('read', self._resource_name, token=token)
+            ensure_authorized_to('read', self._resource_name, token=token)
             user_tokens = self._get_all_tokens()
             if token:
                 response = self._get_token(token, user_tokens)

pybossa/auth/__init__.py

@@ -62,7 +62,7 @@ def is_authorized(user, action, resource, **kwargs):
     return auth.can(user, action, resource, **kwargs)
 
 
-def ensure_authorized(action, resource, **kwargs):
+def ensure_authorized_to(action, resource, **kwargs):
     authorized = is_authorized(current_user, action, resource, **kwargs)
     if authorized is False:
         if current_user.is_anonymous():

pybossa/view/account.py

@@ -46,7 +46,7 @@
 from pybossa.util import get_user_signup_method
 from pybossa.cache import users as cached_users
 from pybossa.cache import apps as cached_apps
-from pybossa.auth import ensure_authorized
+from pybossa.auth import ensure_authorized_to
 from pybossa.jobs import send_mail
 from pybossa.core import user_repo
 
@@ -409,7 +409,7 @@ def update_profile(name):
     user = user_repo.get_by_name(name)
     if not user:
         return abort(404)
-    ensure_authorized('update', user)
+    ensure_authorized_to('update', user)
     show_passwd_form = True
     if user.twitter_user_id or user.google_user_id or user.facebook_user_id:
         show_passwd_form = False
@@ -691,7 +691,7 @@ def reset_api_key(name):
     user = user_repo.get_by_name(name)
     if not user:
         return abort(404)
-    ensure_authorized('update', user)
+    ensure_authorized_to('update', user)
     title = ("User: %s · Settings"
              "- Reset API KEY") % current_user.fullname
     user.api_key = model.make_uuid()

pybossa/view/admin.py

@@ -33,7 +33,7 @@
 from pybossa.util import admin_required, UnicodeWriter
 from pybossa.cache import apps as cached_apps
 from pybossa.cache import categories as cached_cat
-from pybossa.auth import ensure_authorized
+from pybossa.auth import ensure_authorized_to
 from pybossa.core import project_repo, user_repo
 import json
 from StringIO import StringIO
@@ -79,7 +79,7 @@ def featured(app_id=None):
         else:
             app = project_repo.get(app_id)
             if app:
-                ensure_authorized('update', app)
+                ensure_authorized_to('update', app)
                 if request.method == 'POST':
                     if app.featured is True:
                         msg = "App.id %s already featured" % app_id
@@ -116,7 +116,7 @@ def users(user_id=None):
     if request.method == 'POST' and form.user.data:
         query = form.user.data
         found = [user for user in user_repo.search_by_name(query) if user.id != current_user.id]
-        [ensure_authorized('update', found_user) for found_user in found]
+        [ensure_authorized_to('update', found_user) for found_user in found]
         if not found:
             flash("<strong>Ooops!</strong> We didn't find a user "
                   "matching your query: <strong>%s</strong>" % form.user.data)
@@ -197,7 +197,7 @@ def add_admin(user_id=None):
         if user_id:
             user = user_repo.get(user_id)
             if user:
-                ensure_authorized('update', user)
+                ensure_authorized_to('update', user)
                 user.admin = True
                 user_repo.update(user)
                 return redirect(url_for(".users"))
@@ -218,7 +218,7 @@ def del_admin(user_id=None):
         if user_id:
             user = user_repo.get(user_id)
             if user:
-                ensure_authorized('update', user)
+                ensure_authorized_to('update', user)
                 user.admin = False
                 user_repo.update(user)
                 return redirect(url_for('.users'))
@@ -240,10 +240,10 @@ def categories():
     """List Categories"""
     try:
         if request.method == 'GET':
-            ensure_authorized('read', Category)
+            ensure_authorized_to('read', Category)
             form = CategoryForm()
         if request.method == 'POST':
-            ensure_authorized('create', Category)
+            ensure_authorized_to('create', Category)
             form = CategoryForm(request.form)
             if form.validate():
                 slug = form.name.data.lower().replace(" ", "")
@@ -280,7 +280,7 @@ def del_category(id):
         category = project_repo.get_category(id)
         if category:
             if len(cached_cat.get_all()) > 1:
-                ensure_authorized('delete', category)
+                ensure_authorized_to('delete', category)
                 if request.method == 'GET':
                     return render_template('admin/del_category.html',
                                            title=gettext('Delete Category'),
@@ -314,7 +314,7 @@ def update_category(id):
     try:
         category = project_repo.get_category(id)
         if category:
-            ensure_authorized('update', category)
+            ensure_authorized_to('update', category)
             form = CategoryForm(obj=category)
             form.populate_obj(category)
             if request.method == 'GET':