push get_permission_url through solitude for submit (bug 773452)

Andy McKay · Andy McKay · commit 58048b7f80ee · 2012-07-17T13:39:08.000-07:00
diff --git a/mkt/developers/tests/test_views_paypal.py b/mkt/developers/tests/test_views_paypal.py
@@ -2,8 +2,6 @@
 from nose.tools import eq_
 from pyquery import PyQuery as pq
 
-import waffle
-
 from addons.models import Addon
 import amo
 import amo.tests
@@ -158,6 +156,15 @@ def test_later_solitude(self, flag_is_active, client):
         eq_(client.patch_seller_paypal.call_args[1]['data']['paypal_id'],
             'a@a.com')
 
+    @mock.patch('mkt.developers.views.client')
+    def test_bounce_solitude(self, client):
+        self.create_flag(name='solitude-payments')
+        url = 'http://foo.com'
+        client.post_permission_url.return_value = {'token': url}
+        self.webapp.update(premium_type=amo.ADDON_PREMIUM, paypal_id='a@.com')
+        res = self.client.post(self.webapp.get_dev_url('paypal_setup_bounce'))
+        eq_(pq(res.content)('section.primary a.button').attr('href'), url)
+
 
 class TestPaypalResponse(amo.tests.TestCase):
     fixtures = ['base/apps', 'base/users', 'webapps/337141-steamcube']
diff --git a/mkt/developers/views.py b/mkt/developers/views.py
@@ -25,6 +25,7 @@
 import amo.utils
 from amo import messages
 from amo.decorators import json_view, login_required, post_required, write
+from amo.helpers import absolutify, urlparams
 from amo.utils import escape_all
 from amo.urlresolvers import reverse
 from addons import forms as addon_forms
@@ -312,10 +313,18 @@ def paypal_setup_bounce(request, addon_id, addon, webapp):
     if not addon.paypal_id:
         messages.error(request, 'We need a PayPal email before continuing.')
         return redirect(addon.get_dev_url('paypal_setup'))
-    paypal_url = paypal.get_permission_url(addon, 'management',
-                                        ['REFUND',
-                                         'ACCESS_BASIC_PERSONAL_DATA',
-                                         'ACCESS_ADVANCED_PERSONAL_DATA'])
+
+    dest = 'submission'
+    perms = ['REFUND', 'ACCESS_BASIC_PERSONAL_DATA',
+             'ACCESS_ADVANCED_PERSONAL_DATA']
+    if waffle.flag_is_active(request, 'solitude-payments'):
+        url = addon.get_dev_url('acquire_refund_permission')
+        url = absolutify(urlparams(url, dest=dest))
+        result = client.post_permission_url(data={'scope': perms, 'url': url})
+        paypal_url = result['token']
+    # TODO(solitude): remove this.
+    else:
+        paypal_url = paypal.get_permission_url(addon, dest, perms)
 
     return jingo.render(request,
                         'developers/payments/paypal-details-request.html',
diff --git a/mkt/submit/tests/test_views.py b/mkt/submit/tests/test_views.py
@@ -937,8 +937,17 @@ def test_paypal_solitude(self, flag_is_active, client):
         eq_(client.create_seller_paypal.call_args[0][0], self.webapp)
         eq_(client.patch_seller_paypal.call_args[1]['data']['paypal_id'],
             'foo@bar.com')
+        client.post_permissions_url.return_value = {'token': 'http://foo/'}
         self.assertRedirects(res, self.get_url('payments.bounce'))
 
+    @mock.patch('mkt.submit.views.client')
+    def test_bounce_solitude(self, client):
+        self.create_flag(name='solitude-payments')
+        url = 'http://foo.com'
+        client.post_permission_url.return_value = {'token': url}
+        res = self.client.post(self.get_url('payments.bounce'))
+        eq_(pq(res.content)('section.primary a.button').attr('href'), url)
+
     def test_no_paypal(self):
         self.webapp.update(premium_type=amo.ADDON_PREMIUM)
         res = self.client.post(self.get_url('payments.paypal'),
diff --git a/mkt/submit/views.py b/mkt/submit/views.py
@@ -10,6 +10,7 @@
 
 import amo
 from amo.decorators import login_required
+from amo.helpers import absolutify, urlparams
 from amo.urlresolvers import reverse
 from addons.forms import CategoryFormSet, DeviceTypeForm
 from addons.models import Addon, AddonUser
@@ -224,10 +225,18 @@ def payments_paypal(request, addon_id, addon):
 @dev_required
 @submit_step('payments')
 def payments_bounce(request, addon_id, addon):
-    paypal_url = paypal.get_permission_url(addon, 'submission',
-                                           ['REFUND',
-                                            'ACCESS_BASIC_PERSONAL_DATA',
-                                            'ACCESS_ADVANCED_PERSONAL_DATA'])
+    dest = 'submission'
+    perms = ['REFUND', 'ACCESS_BASIC_PERSONAL_DATA',
+             'ACCESS_ADVANCED_PERSONAL_DATA']
+    if waffle.flag_is_active(request, 'solitude-payments'):
+        url = addon.get_dev_url('acquire_refund_permission')
+        url = absolutify(urlparams(url, dest=dest))
+        result = client.post_permission_url(data={'scope': perms, 'url': url})
+        paypal_url = result['token']
+    #TODO(solitude): remove these
+    else:
+        paypal_url = paypal.get_permission_url(addon, dest, perms)
+
     return jingo.render(request, 'submit/payments-bounce.html', {
                         'step': 'payments',
                         'paypal_url': paypal_url,
