Merge pull request #940 from dancerfly/hotfix/onetimepaymentform-missing-token

Made OneTimePaymentForm properly handle missing tokens in post_clean

Author: harrislapiroff

brambling/forms/orders.py

@@ -392,26 +392,27 @@ def __init__(self, order, *args, **kwargs):
             del self.fields['save_card']
 
     def _post_clean(self):
-        kwargs = {
-            'amount': self.amount,
-            'event': self.order.event,
-            'order': self.order,
-        }
-        try:
-            if self.cleaned_data.get('save_card'):
-                self.card = self.add_card(self.cleaned_data['token'])
-                self._charge = stripe_charge(self.card.id, customer=self.customer, **kwargs)
-            else:
-                self._charge = stripe_charge(self.cleaned_data['token'], **kwargs)
-                self.card = self._charge.source
-        except stripe.error.CardError, e:
-            self.add_error(None, e.message)
-        except stripe.error.APIError, e:
-            self.add_error(None, STRIPE_API_ERROR)
-        except stripe.error.InvalidRequestError, e:
-            self.add_error(None, e.message)
-        except InvalidAmountException, e:
-            self.add_error(None, e.message)
+        if 'token' in self.cleaned_data:
+            kwargs = {
+                'amount': self.amount,
+                'event': self.order.event,
+                'order': self.order,
+            }
+            try:
+                if self.cleaned_data.get('save_card'):
+                    self.card = self.add_card(self.cleaned_data['token'])
+                    self._charge = stripe_charge(self.card.id, customer=self.customer, **kwargs)
+                else:
+                    self._charge = stripe_charge(self.cleaned_data['token'], **kwargs)
+                    self.card = self._charge.source
+            except stripe.error.CardError, e:
+                self.add_error(None, e.message)
+            except stripe.error.APIError, e:
+                self.add_error(None, STRIPE_API_ERROR)
+            except stripe.error.InvalidRequestError, e:
+                self.add_error(None, e.message)
+            except InvalidAmountException, e:
+                self.add_error(None, e.message)
 
     def save(self):
         if self.cleaned_data.get('save_card'):

brambling/tests/functional/test_order_forms.py

@@ -199,6 +199,14 @@ def test_handles_invalidrequesterror(self, stripe_charge):
         self.assertTrue(form.errors)
         self.assertEqual(form.errors['__all__'], [error_message])
 
+    @patch('brambling.forms.orders.stripe_charge')
+    def test_handles_missing_token(self, stripe_charge):
+        form = OneTimePaymentForm(order=self.order, amount=Decimal('42.15'),
+                                  data={}, user=self.person)
+        self.assertTrue(form.is_bound)
+        self.assertTrue(form.errors)
+        self.assertEqual(form.errors['token'], [OneTimePaymentForm.base_fields['token'].error_messages['required']])
+
 
 class SavedCardPaymentFormTestCase(TestCase):