Port a few more repository methods to the new API interface.

endpoints/api/__init__.py

@@ -1,9 +1,9 @@
 import logging
+import json
 
-from flask import Blueprint, request
+from flask import Blueprint, request, make_response
 from flask.ext.restful import Resource, abort, Api, reqparse
 from flask.ext.restful.utils.cors import crossdomain
-from flask.ext.login import current_user
 from calendar import timegm
 from email.utils import formatdate
 from functools import partial, wraps
@@ -15,12 +15,15 @@ from auth.permissions import (ReadRepositoryPermission,
                               ModifyRepositoryPermission,
                               AdministerRepositoryPermission)
 from auth import scopes
+from auth.auth_context import get_authenticated_user
+from auth.auth import process_oauth
 
 
 logger = logging.getLogger(__name__)
 api_bp = Blueprint('api', __name__)
 api = Api(api_bp)
-api.decorators = [crossdomain(origin='*', headers=['Authorization'])]
+api.decorators = [process_oauth,
+                  crossdomain(origin='*', headers=['Authorization', 'Content-Type'])]
 
 
 def resource(*urls, **kwargs):
@@ -111,6 +114,8 @@ def require_repo_permission(permission_class, scope, allow_public=False):
     @add_method_metadata('oauth2_scope', scope)
     @wraps(func)
     def wrapped(self, namespace, repository, *args, **kwargs):
+      logger.debug('Checking permission %s for repo: %s/%s', permission_class, namespace,
+                   repository)
       permission = permission_class(namespace, repository)
       if (permission.can() or
           (allow_public and
@@ -126,23 +131,41 @@ require_repo_write = require_repo_permission(ModifyRepositoryPermission, scopes.
 require_repo_admin = require_repo_permission(AdministerRepositoryPermission, scopes.ADMIN_REPO)
 
 
+def require_scope(scope_object):
+  def wrapper(func):
+    @add_method_metadata('oauth2_scope', scope_object['scope'])
+    @wraps(func)
+    def wrapped(*args, **kwargs):
+      return func(*args, **kwargs)
+    return wrapped
+  return wrapper
+
+
 def validate_json_request(schema_name):
   def wrapper(func):
     @add_method_metadata('request_schema', schema_name)
     @wraps(func)
-    def wrapped(self, namespace, repository, *args, **kwargs):
+    def wrapped(self, *args, **kwargs):
       schema = self.schemas[schema_name]
       try:
         validate(request.get_json(), schema)
-        return func(self, namespace, repository, *args, **kwargs)
+        return func(self, *args, **kwargs)
       except ValidationError as ex:
         abort(400, message=ex.message)
     return wrapped
   return wrapper
 
 
+def request_error(exception=None, **kwargs):
+  data = kwargs.copy()
+  if exception:
+    data['message'] = exception.message
+
+  return json.dumps(data), 400
+
+
 def log_action(kind, user_or_orgname, metadata={}, repo=None):
-  performer = current_user.db_user()
+  performer = get_authenticated_user()
   model.log_action(kind, user_or_orgname, performer=performer, ip=request.remote_addr,
                    metadata=metadata, repository=repo)