Creating and updating apps now works.

r2/r2/controllers/api.py

@@ -2820,27 +2820,55 @@ class ApiController(RedditController):
 
     @validatedForm(VUser(),
                    VModhash(),
-                   client=VOAuth2ClientDeveloper(),
                    name=VRequired('name', errors.NO_TEXT),
-                   about_url=VSanitizedUrl(),
-                   icon_url=VSanitizedUrl(),
+                   about_url=VSanitizedUrl('about_url'),
+                   icon_url=VSanitizedUrl('icon_url'),
                    redirect_uri=VUrl('redirect_uri', allow_self=False))
-    def POST_updateapp(self, form, jquery, client, name, description, about_url, icon_url, redirect_uri):
-        if not form.has_error():
-            clinet.name = name
+    def POST_updateapp(self, form, jquery, name, about_url, icon_url, redirect_uri):
+        if (form.has_errors('name', errors.NO_TEXT) |
+            form.has_errors('redirect_uri', errors.BAD_URL, errors.NO_URL)):
+            return
+
+        description = request.post.get('description', '')
+
+        client_id = request.post.get('client_id')
+        if client_id:
+            # client_id was specified, updating existing OAuth2Client
+            client = OAuth2Client.get_token(client_id)
+            if not client:
+                form.set_html('.status', _('invalid client id'))
+                return
+            if getattr(client, 'deleted', False):
+                form.set_html('.status', _('cannot update deleted app'))
+                return
+            if not client.has_developer(c.user):
+                form.set_html('.status', _('app does not belong to you'))
+                return
+
+            client.name = name
             client.description = description
-            client.about_url = about_url
-            client.icon_url = icon_url
+            client.about_url = about_url or ''
+            client.icon_url = icon_url or ''
             client.redirect_uri = redirect_uri
             client._commit()
             form.set_html('.status', _('application updated'))
+        else:
+            # client_id was omitted or empty, creating new OAuth2Client
+            client = OAuth2Client._new(name=name,
+                                       description=description,
+                                       about_url=about_url or '',
+                                       icon_url=icon_url or '',
+                                       redirect_uri=redirect_uri)
+            client._commit()
+            client.add_developer(c.user)
+            form.set_html('.status', _('application created'))
 
     @validatedForm(VUser(),
                    VModhash(),
                    client=VOAuth2ClientDeveloper(),
                    account=VExistingUnameNotSelf('name'))
     def POST_adddeveloper(self, form, jquery, client, account):
-        if not form.has_error():
+        if client and not form.has_error('name'):
             client.add_developer(account)
             form.set_html('.status', _('developer added'))
 
@@ -2849,7 +2877,7 @@ class ApiController(RedditController):
                    client=VOAuth2ClientDeveloper(),
                    account=VExistingUnameNotSelf('name'))
     def POST_removedeveloper(self, form, jquery, client, account):
-        if not form.has_error():
+        if client and not form.has_error('name'):
             client.remove_developer(account)
             form.set_html('.status', _('developer removed'))
 
@@ -2857,7 +2885,6 @@ class ApiController(RedditController):
                 VModhash(),
                 client=VOAuth2ClientDeveloper())
     def POST_deleteapp(self, client):
-        if not client:
-            abort(403)
-        client.deleted = True
-        client._commit()
+        if client:
+            client.deleted = True
+            client._commit()

r2/r2/controllers/validator/validator.py

@@ -114,7 +114,14 @@ class Validator(object):
                 else:
                     val = self.default
                 a.append(val)
-        return self.run(*a)
+        try:
+            return self.run(*a)
+        except TypeError, e:
+            if str(e).startswith('run() takes'):
+                # Prepend our class name so we know *which* run()
+                raise TypeError('%s.%s' % (type(self).__name__, str(e)))
+            else:
+                raise
 
 
 def build_arg_list(fn, env):
@@ -1846,7 +1853,7 @@ class VOAuth2ClientID(VRequired):
 
 class VOAuth2ClientDeveloper(VOAuth2ClientID):
     def run(self, client_id):
-        client = super(VOAuth2ClientDeveloper)
+        client = super(VOAuth2ClientDeveloper, self).run(client_id)
         if not client or not client.has_developer(c.user):
             return self.error()
         return client

r2/r2/templates/prefapps.html

@@ -1,3 +1,5 @@
+<%namespace file="utils.html" import="error_field"/>
+
 %if thing.my_apps:
   <h1>${_("authorized applications")}</h1>
 
@@ -19,7 +21,10 @@
   <h1>${_("developed applications")}</h1>
 
   %for app in thing.developed_apps:
-    <form method="post" action="/api/updateapp" class="pretty-form">
+    <form method="post" action="/api/updateapp" class="pretty-form" id="update-app-${app._id}"
+     onsubmit="${"return post_form(this, 'updateapp', function(x) {return '%s'})" % _("updating...")}">
+      <input type="hidden" name="uh" value="${c.modhash}" />
+      <input type="hidden" name="client_id" value="${app._id}" />
       <table class="preftable">
         <tr>
           <th>${_("client id")}</th>
@@ -33,6 +38,7 @@
           <th>${_("name")}</th>
           <td class="prefright">
             <input name="name" value="${app.name}">
+            ${error_field("NO_TEXT", "name")}
           </td>
         </tr>
         <tr>
@@ -45,18 +51,22 @@
           <th>${_("about url")}</th>
           <td class="prefright">
             <input name="about_url" value="${app.about_url}">
+            ${error_field("BAD_URL", "about_url")}
           </td>
         </tr>
         <tr>
           <th>${_("icon url")}</th>
           <td class="prefright">
             <input name="icon_url" value="${app.icon_url}">
+            ${error_field("BAD_URL", "icon_url")}
           </td>
         </tr>
         <tr>
           <th>${_("redirect uri")}</th>
           <td class="prefright">
             <input name="redirect_uri" value="${app.redirect_uri}">
+            ${error_field("NO_URL", "redirect_uri")}
+            ${error_field("BAD_URL", "redirect_uri")}
           </td>
         </tr>
         <tr>
@@ -64,8 +74,8 @@
           <td class="prefright">
             %for dev in app._developers:
               <p>${dev.name}
-                %if False:
-                  (that's you!)
+                %if c.user == dev:
+                  <span>(that's you!)</span>
                 %else:
                   <a href="#">remove</a>
                 %endif
@@ -77,6 +87,7 @@
       </table>
       <input type="submit" value="update app">
       <a href="#">delete app</a>
+      <span class="status"></span>
     </form>
   %endfor
   <p><a href="#">create another app...</a></p>
@@ -86,13 +97,15 @@
 
 <div>
   <h1>${_("create application")}</h1>
-  <form method="post" action="/api/updateapp" class="pretty-form">
+  <form method="post" action="/api/updateapp" class="pretty-form" id="create-app"
+   onsubmit="${"return post_form(this, 'updateapp', function(x) {return '%s'})" % _("creating...")}">
     <input type="hidden" name="uh" value="${c.modhash}" />
     <table class="content preftable">
       <tr>
         <th>${_("name")}</th>
         <td class="prefright">
           <input name="name">
+          ${error_field("NO_TEXT", "name")}
         </td>
       </tr>
       <tr>
@@ -105,21 +118,26 @@
         <th>${_("about url")}</th>
         <td class="prefright">
           <input name="about_url">
+          ${error_field("BAD_URL", "about_url")}
         </td>
       </tr>
       <tr>
         <th>${_("icon url")}</th>
         <td class="prefright">
           <input name="icon_url">
+          ${error_field("BAD_URL", "icon_url")}
         </td>
       </tr>
       <tr>
         <th>${_("redirect uri")}</th>
         <td class="prefright">
           <input name="redirect_uri">
+          ${error_field("NO_URL", "redirect_uri")}
+          ${error_field("BAD_URL", "redirect_uri")}
         </td>
       </tr>
     </table>
     <input type="submit" value="create app">
+    <span class="status"></span>
   </form>
 </div>