4 files changed, 12 insertions, 9 deletions
diff --git a/mediagoblin/plugins/oauth/README.rst b/mediagoblin/plugins/oauth/README.rst
index 405a67e2..753b180f 100644
--- a/mediagoblin/plugins/oauth/README.rst
+++ b/mediagoblin/plugins/oauth/README.rst
@@ -7,6 +7,10 @@
     Development has been entirely focused on Making It Work(TM). Use this
     plugin with caution.
 
+    Additionally, this and the API may break... consider it pre-alpha.
+    There's also a known issue that the OAuth client doesn't do
+    refresh tokens so this might result in issues for users.
+
 The OAuth plugin enables third party web applications to authenticate as one or
 more GNU MediaGoblin users in a safe way in order retrieve, create and update
 content stored on the GNU MediaGoblin instance.
diff --git a/mediagoblin/plugins/oauth/forms.py b/mediagoblin/plugins/oauth/forms.py
index 2a956dad..d0a4e9b8 100644
--- a/mediagoblin/plugins/oauth/forms.py
+++ b/mediagoblin/plugins/oauth/forms.py
@@ -23,10 +23,9 @@ from mediagoblin.tools.translate import fake_ugettext_passthrough as _
 
 
 class AuthorizationForm(wtforms.Form):
-    client_id = wtforms.HiddenField(_(u'Client ID'),
-            [wtforms.validators.Required()])
-    next = wtforms.HiddenField(_(u'Next URL'),
-            [wtforms.validators.Required()])
+    client_id = wtforms.HiddenField(u'',
+                                    validators=[wtforms.validators.Required()])
+    next = wtforms.HiddenField(u'', validators=[wtforms.validators.Required()])
     allow = wtforms.SubmitField(_(u'Allow'))
     deny = wtforms.SubmitField(_(u'Deny'))
 
diff --git a/mediagoblin/plugins/oauth/templates/oauth/authorize.html b/mediagoblin/plugins/oauth/templates/oauth/authorize.html
index 647fa41f..8a00c925 100644
--- a/mediagoblin/plugins/oauth/templates/oauth/authorize.html
+++ b/mediagoblin/plugins/oauth/templates/oauth/authorize.html
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -#}
 {% extends "mediagoblin/base.html" %}
-{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+{% import "mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
 <form action="{{ request.urlgen('mediagoblin.plugins.oauth.authorize_client') }}"
diff --git a/mediagoblin/plugins/oauth/views.py b/mediagoblin/plugins/oauth/views.py
index c7b2a332..ea45c209 100644
--- a/mediagoblin/plugins/oauth/views.py
+++ b/mediagoblin/plugins/oauth/views.py
@@ -45,11 +45,11 @@ def register_client(request):
 
     if request.method == 'POST' and form.validate():
         client = OAuthClient()
-        client.name = unicode(request.form['name'])
-        client.description = unicode(request.form['description'])
-        client.type = unicode(request.form['type'])
+        client.name = unicode(form.name.data)
+        client.description = unicode(form.description.data)
+        client.type = unicode(form.type.data)
         client.owner_id = request.user.id
-        client.redirect_uri = unicode(request.form['redirect_uri'])
+        client.redirect_uri = unicode(form.redirect_uri.data)
 
         client.generate_identifier()
         client.generate_secret()