Round out confirmation form for zero and ∞

js/gratipay/packages.js

@@ -4,27 +4,21 @@ Gratipay.packages.post = function(e) {
     e.preventDefault();
     var $this = $(this);
     var action = 'add-email-and-claim-package';
-    var $inputs = $('input, button');
-    var $selection = $('input[name=email]:checked');
-    var address = $selection.val();
-    var package_id = $selection.parent().parent().data('package-id');
+    var package_id = $('input[name=package_id]').val();
+    var email = $('input[name=email]:checked').val();
 
+    var $inputs = $('input, button');
     $inputs.prop('disabled', true);
 
     $.ajax({
         url: '/~' + Gratipay.username + '/emails/modify.json',
         type: 'POST',
-        data: {action: action, address: address, package_id: package_id},
+        data: {action: action, address: email, package_id: package_id},
         dataType: 'json',
         success: function (msg) {
             if (msg) {
                 Gratipay.notification(msg, 'success');
             }
-            if (action == 'add-email') {
-                $('input.add-email').val('');
-                setTimeout(function(){ window.location.reload(); }, 3000);
-                return;
-            }
             $inputs.prop('disabled', false);
         },
         error: [

scss/components/listing.scss

@@ -1,3 +1,9 @@
+.sorry {
+    text-align: center;
+    font: normal 12px/15px $Ideal;
+    color: $medium-gray;
+}
+
 table.listing {
     width: 100%;
 

scss/pages/search.scss

@@ -16,12 +16,6 @@
         }
     }
 
-    .sorry {
-        text-align: center;
-        font: normal 12px/15px $Ideal;
-        color: $medium-gray;
-    }
-
     h2 {
         margin-top: 4em;
         &:first-of-type {

tests/py/test_www_npm_package.py

@@ -18,4 +18,19 @@ def test_auth_gets_send_confirmation_page_from_unclaimed(self):
         self.make_participant('bob', claimed_time='now')
         body = self.client.GET('/on/npm/foo/', auth_as='bob').body
         assert 'npm/foo</a> has not been claimed' in body
-        assert 'with one of these email addresses' in body
+        assert 'using any email address' in body
+        assert '[email protected]' in body
+
+    def test_auth_gets_multiple_options_if_present(self):
+        self.make_package('npm', 'bar', 'Bar', ['[email protected]', '[email protected]'])
+        self.make_participant('bob', claimed_time='now')
+        body = self.client.GET('/on/npm/bar/', auth_as='bob').body
+        assert 'using any email address' in body
+        assert '[email protected]' in body
+        assert '[email protected]' in body
+
+    def test_auth_gets_something_if_no_emails(self):
+        self.make_package('npm', 'bar', 'Bar', [])
+        self.make_participant('bob', claimed_time='now')
+        body = self.client.GET('/on/npm/bar/', auth_as='bob').body
+        assert "didn&#39;t find any email addresses" in body

tests/ttw/test_package_claiming.py

@@ -4,14 +4,25 @@
 from gratipay.testing import BrowserHarness
 
 
-class Tests(BrowserHarness):
+class TestSendConfirmationLink(BrowserHarness):
 
-    def test_sending_a_confirmation_email_appears_to_work(self):
-        self.make_package()
+    def check(self, choice=0):
         self.make_participant('bob', claimed_time='now')
         self.sign_in('bob')
         self.visit('/on/npm/foo/')
-        self.css('input[type=radio]')[0].click()
+        self.css('input[type=radio]')[choice].click()
         self.css('button')[0].click()
         assert self.has_element('.notification.notification-success', 1)
-        assert self.has_text('Check [email protected] for a confirmation email.')
+        assert self.has_text('Check [email protected] for a confirmation link.')
+
+    def test_appears_to_work(self):
+        self.make_package()
+        self.check()
+
+    def test_works_when_there_are_multiple_addresses(self):
+        self.make_package(emails=['[email protected]', '[email protected]'])
+        self.check()
+
+    def test_can_send_to_second_email(self):
+        self.make_package(emails=['[email protected]', '[email protected]'])
+        self.check(choice=1)

www/on/npm/%package/index.html.spt

@@ -12,6 +12,7 @@ banner = package_name
 page_id = "on-npm-foo"
 suppress_sidebar = True
 url = 'https://npmjs.com/package/' + package.name
+nemails = len(package.emails)
 [---]
 {% extends "templates/base.html" %}
 
@@ -47,15 +48,22 @@ url = 'https://npmjs.com/package/' + package.name
     <p>{{ _('Gratipay helps companies and others pay for open source.') }}
     <a href="/about/">{{ _("Learn more") }}</a></p>
 {% else %}
-    <p>{{ _('Is this yours? You can claim it on Gratipay with one of these email addresses:')
-         }}</p>
-
-    <ul data-package-id="{{ package.id }}">
+    <p>{{ _( 'Is this yours? You can claim it on Gratipay using any email address {a}on file{_a} in the maintainers field in the npm registry.'
+           , a=('<a href="https://registry.npmjs.com/' + package.name + '">')|safe
+           , _a='</a>'|safe
+            ) }}
+    {% if nemails == 0 %}
+    <p class="sorry">{{ _("Sorry, we didn't find any email addresses on file.") }}</p>
+    {% else %}
+    <input type="hidden" name="package_id" value="{{ package.id }}">
+    <ul>
         {% for i, email in enumerate(package.emails) %}
-        <li><input type="radio" name="email" value="{{ email }}" id="email-{{i}}">
+        <li><input type="radio" name="email" value="{{ email }}" id="email-{{i}}"
+                   {% if i == 0 %}checked{% endif %}>
             <label for="email-{{ i }}">{{ email }}</a></li>
         {% endfor %}
     </ul>
-    <button type="submit" class="send">{{ _('Send confirmation link') }}</button>
+    <button type="submit" class="send selected">{{ _('Send confirmation link') }}</button>
+    {% endif %}
 {% endif %}
 {% endblock %}

www/~/%username/emails/modify.json.spt

@@ -41,7 +41,7 @@ elif action == 'add-email-and-claim-package':
     package_id = request.body['package_id']
     package = Package.from_id(package_id)
     package.send_confirmation_email(address)
-    msg = _("Check {email_address} for a confirmation email.", email_address=address)
+    msg = _("Check {email} for a confirmation link.", email=address)
 else:
     raise Response(400, 'unknown action "%s"' % action)