Merge branch 'master' into bees

endpoints/api/__init__.py

@@ -28,8 +28,8 @@ api_bp = Blueprint('api', __name__)
 api = Api()
 api.init_app(api_bp)
 api.decorators = [csrf_protect,
-                  process_oauth,
-                  crossdomain(origin='*', headers=['Authorization', 'Content-Type'])]
+                  crossdomain(origin='*', headers=['Authorization', 'Content-Type']),
+                  process_oauth]
 
 
 class ApiException(Exception):
@@ -91,6 +91,7 @@ def handle_api_error(error):
   if error.error_type is not None:
     response.headers['WWW-Authenticate'] = ('Bearer error="%s" error_description="%s"' %
                                             (error.error_type, error.error_description))
+
   return response
 
 
@@ -195,6 +196,7 @@ def query_param(name, help_str, type=reqparse.text_type, default=None,
       'default': default,
       'choices': choices,
       'required': required,
+      'location': ('args')
     })
     return func
   return add_param