Merge lp:~canonical-isd-hackers/canonical-identity-provider/web_api-captchas into lp:~canonical-isd-hackers/canonical-identity-provider/web_api

[David Owen]

=== modified file 'identityprovider/webservice/models.py'
--- identityprovider/webservice/models.py	2011-01-20 21:27:57 +0000
+++ identityprovider/webservice/models.py	2011-02-01 18:39:15 +0000
@@ -352,17 +352,7 @@
 
 class CaptchaSet(make_set('BaseCaptchaSet', 'captchas', ICaptchaSet,
                           Captcha, 'id')):
-    def new(self):
-        request = get_current_browser_request()
-        try:
-            return CaptchaModel.new().serialize()
-        except NewCaptchaError, e:
-            request.environment['oops-dump'] = True
-            logging.warning(e.traceback)
-            logging.warning("Failed to connect to reCaptcha server")
-            # TODO: Some better return here?
-            return e.dummy
-
+    pass
 
 
 class SSOWebServiceRootResource(RootResource):

=== added file 'identityprovider/webservice/urlinfo.py'
--- identityprovider/webservice/urlinfo.py	1970-01-01 00:00:00 +0000
+++ identityprovider/webservice/urlinfo.py	2011-02-01 18:39:15 +0000
@@ -0,0 +1,4 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+CAPTCHAS_VIEW = "api_captchas"

=== modified file 'identityprovider/webservice/urls.py'
--- identityprovider/webservice/urls.py	2011-02-01 18:39:14 +0000
+++ identityprovider/webservice/urls.py	2011-02-01 18:39:15 +0000
@@ -7,7 +7,10 @@
 from piston.resource import Resource
 
 from . import views
+from urlinfo import *
 
 
 urlpatterns = patterns('identityprovider.webservice.views',
-    (r'^$', views.root))
+    (r'^$', views.root),
+    url(r'^captchas', views.CaptchasHandler(), name=CAPTCHAS_VIEW),
+)

=== modified file 'identityprovider/webservice/views.py'
--- identityprovider/webservice/views.py	2011-02-01 18:39:14 +0000
+++ identityprovider/webservice/views.py	2011-02-01 18:39:15 +0000
@@ -3,7 +3,11 @@
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import (
+    HttpResponse,
+    HttpResponseRedirect,
+    HttpResponseNotAllowed,
+)
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.utils.translation import ugettext as _
@@ -13,11 +17,13 @@
 import simplejson as json
 
 from identityprovider.auth import basic_authenticate, oauth_authenticate
-from identityprovider.models.captcha import Captcha
+from identityprovider.models.captcha import Captcha, NewCaptchaError
+from urlinfo import *
 
 
 def is_wadl_request(request):
-    wadl_accept = set(['application/vnd.sun.wadl+xml', 'application/vd.sun.wadl+xml'])
+    wadl_accept = set(['application/vnd.sun.wadl+xml',
+                       'application/vd.sun.wadl+xml'])
     accept = set([s.strip() for s in request.META['HTTP_ACCEPT'].split(',')])
     return not accept.isdisjoint(wadl_accept)
 
@@ -42,8 +48,66 @@
 
     return JsonResponse({
         "registrations_collection_link": "http://openid.launchpad.dev/api/1.0/registration",
-        "captchas_collection_link": "http://openid.launchpad.dev/api/1.0/captchas",
+        "captchas_collection_link": api_reverse(request, CAPTCHAS_VIEW),
         "validations_collection_link": "http://openid.launchpad.dev/api/1.0/validation",
         "authentications_collection_link": "http://openid.launchpad.dev/api/1.0/authentications",
-        "resource_type_link": api_reverse(request, root, fragment="#service-root"),
+        "resource_type_link": api_reverse(
+            request, root, fragment="#service-root"),
         "accounts_collection_link": "http://openid.launchpad.dev/api/1.0/accounts"})
+
+
+#    def get(request, unique_id):
+#        """Retrieve a captcha by its ID."""
+
+#class CaptchaSet(make_set('BaseCaptchaSet', 'captchas', ICaptchaSet,
+#                          Captcha, 'id')):
+
+
+class NotAllowed(Exception):
+    pass
+
+
+class JsonHandler(object):
+
+    def _not_allowed(self, request):
+        raise NotAllowed()
+
+    delete = _not_allowed
+    get = _not_allowed
+    post = _not_allowed
+    put = _not_allowed
+
+    verbs = ["delete", "get", "post", "put"]
+
+    def __call__(self, request):
+        method = request.method.lower()
+        if method in self.verbs:
+            try:
+                return JsonResponse(getattr(self, method)(request))
+            except NotAllowed:
+                pass
+        allowed = [v.upper() for v in self.verbs
+                   if getattr(self, v) != self._not_allowed]
+        return HttpResponseNotAllowed(allowed)
+
+
+class CaptchasHandler(JsonHandler):
+
+    def get(self, request):
+        # Theoretically, this should be returning lists of captchas.
+        # I don't think it's actually used, though.
+        return {
+            "total_size": 0,
+            "start": None,
+            "resource_type_link": api_reverse(
+                request, root, fragment="#captchas"),
+            "entries": []}
+
+    def post(self, request):
+        try:
+            return Captcha.new().serialize()
+        except NewCaptchaError, e:
+            logging.warning(e.traceback)
+            logging.warning("Failed to connect to reCaptcha server")
+            # TODO: Some better return here?
+            return e.dummy

=== modified file 'identityprovider/wsgi.py'
--- identityprovider/wsgi.py	2011-02-01 18:39:14 +0000
+++ identityprovider/wsgi.py	2011-02-01 18:39:15 +0000
@@ -90,6 +90,7 @@
 
     dispatch = WSGIDispatch(
         [(r'^/api/1.0/?$', django),
+         (r'^/api/1.0/captchas', django),
          (r'^/api/1.0', api)],
         django)