Added separate ToS page (bug 1209226)

apps/devhub/templates/devhub/addons/submit/start.html

@@ -1,31 +1,11 @@
 {% extends "devhub/addons/submit/base.html" %}
 
+
 {% block title %}{{ dev_page_title(_('Step 1'), addon) }}{% endblock %}
 
 {% block primary %}
 <h3>{{ _('Step 1. Getting Started') }}</h3>
 
-<p>
-{% trans %}
-  Before starting, please read and accept our Firefox Add-on
-  Distribution Agreement. It also links to our Privacy Notice
-  which explains how we handle your information.
-{% endtrans %}
-</p>
-<div id="agreement-container">
-  {% include 'amo/developer_agreement.html' %}
-</div>
-<div id="agreement-extra-links">
-  <a href="{{ url('devhub.docs', 'policies/agreement') }}">
-    {{ _('Printable Version') }}</a>
-</div>
-<div class="submit-buttons">
-  <form method="post">
-    {{ csrf() }}
-    <button id="accept-agreement" type="submit">
-      {{ _('I Accept this Agreement') }}
-    </button>
-  {{ _('or <a href="{0}">Cancel</a>')|f(url('devhub.index')) }}
-  </form>
-</div>
+{% include "devhub/agreement.html" %}
+
 {% endblock %}

apps/devhub/templates/devhub/agreement.html

@@ -0,0 +1,24 @@
+<p>
+{% trans %}
+  Before starting, please read and accept our Firefox Add-on
+  Distribution Agreement. It also links to our Privacy Notice
+  which explains how we handle your information.
+{% endtrans %}
+</p>
+<div id="agreement-container">
+  {% include 'amo/developer_agreement.html' %}
+</div>
+<div id="agreement-extra-links">
+  <a href="{{ url('devhub.docs', 'policies/agreement') }}">
+    {{ _('Printable Version') }}</a>
+</div>
+<div class="submit-buttons">
+  <form method="post">
+    {{ csrf() }}
+    <button id="accept-agreement" type="submit">
+      {{ _('I Accept this Agreement') }}
+    </button>
+  {{ _('or <a href="{0}">Cancel</a>')|f(url('devhub.index')) }}
+  </form>
+</div>
+

apps/devhub/templates/devhub/api/agreement.html

@@ -0,0 +1,21 @@
+{% extends "devhub/base.html" %}
+
+{% set title = _('Firefox Add-on Distribution Agreement') %}
+
+{% block title %}
+{{ dev_page_title(title) }}
+{% endblock %}
+
+{% block content %}
+
+{% set page_title = _('Firefox Add-on Distribution Agreement') %}
+<header>
+  {{ dev_breadcrumbs(items=[(None, page_title)]) }}
+  <h2 class="is_addon">{{ title }}</h2>
+</header>
+
+<section class="addon-submission-process" role="main">
+  {% include "devhub/agreement.html" %}
+</section>
+{% endblock content %}
+

apps/devhub/tests/test_views.py

@@ -5,6 +5,7 @@
 from datetime import datetime, timedelta
 from decimal import Decimal
 
+from django import http
 from django.conf import settings
 from django.core.files.storage import default_storage as storage
 from django.core.files import temp
@@ -1112,6 +1113,7 @@ class TestSubmitBase(amo.tests.TestCase):
     def setUp(self):
         super(TestSubmitBase, self).setUp()
         assert self.client.login(username='del@icio.us', password='password')
+        self.user = UserProfile.objects.get(email='del@icio.us')
         self.addon = self.get_addon()
 
     def get_addon(self):
@@ -1124,9 +1126,25 @@ def get_step(self):
         return SubmitStep.objects.get(addon=self.get_addon())
 
 
-class TestSubmitStep1(TestSubmitBase):
+class TestAgreement(TestSubmitBase):
+    def test_agreement_first(self):
+        with mock.patch('devhub.views.render_agreement') as mock_submit:
+            mock_submit.return_value = http.HttpResponse("Okay")
+            self.client.get(reverse('devhub.api_key_agreement'))
+        assert mock_submit.called
+
+    def test_agreement_second(self):
+        self.user.update(read_dev_agreement=None)
+
+        response = self.client.post(reverse('devhub.api_key_agreement'),
+                                    follow=True)
+
+        self.assertRedirects(response, reverse('devhub.api_key'))
+
 
+class TestSubmitStep1(TestSubmitBase):
     def test_step1_submit(self):
+        self.user.update(read_dev_agreement=None)
         response = self.client.get(reverse('devhub.submit.1'))
         eq_(response.status_code, 200)
         doc = pq(response.content)
@@ -1141,12 +1159,16 @@ def test_step1_submit(self):
 
     def test_read_dev_agreement_set(self):
         """Store current date when the user agrees with the user agreement."""
-        response = self.client.get(reverse('devhub.submit.1'))
-        previous = response.context['user'].read_dev_agreement
+        self.user.update(read_dev_agreement=None)
 
         response = self.client.post(reverse('devhub.submit.1'), follow=True)
         user = response.context['user']
-        assert user.read_dev_agreement != previous
+        self.assertCloseToNow(user.read_dev_agreement)
+
+    def test_read_dev_agreement_skip(self):
+        # The current user fixture has already read the agreement so we skip
+        response = self.client.get(reverse('devhub.submit.1'))
+        self.assertRedirects(response, reverse('devhub.submit.2'))
 
 
 class TestSubmitStep2(amo.tests.TestCase):
@@ -1156,15 +1178,18 @@ class TestSubmitStep2(amo.tests.TestCase):
     def setUp(self):
         super(TestSubmitStep2, self).setUp()
         self.client.login(username='regular@mozilla.com', password='password')
+        self.user = UserProfile.objects.get(email='regular@mozilla.com')
 
-    def test_step_2_with_cookie(self):
+    def test_step_2_seen(self):
         r = self.client.post(reverse('devhub.submit.1'))
         self.assertRedirects(r, reverse('devhub.submit.2'))
         r = self.client.get(reverse('devhub.submit.2'))
         eq_(r.status_code, 200)
 
-    def test_step_2_no_cookie(self):
+    def test_step_2_not_seen(self):
         # We require a cookie that gets set in step 1.
+        self.user.update(read_dev_agreement=None)
+
         r = self.client.get(reverse('devhub.submit.2'), follow=True)
         self.assertRedirects(r, reverse('devhub.submit.1'))
 
@@ -1856,6 +1881,7 @@ class TestSubmitSteps(amo.tests.TestCase):
     def setUp(self):
         super(TestSubmitSteps, self).setUp()
         assert self.client.login(username='del@icio.us', password='password')
+        self.user = UserProfile.objects.get(email='del@icio.us')
 
     def assert_linked(self, doc, numbers):
         """Check that the nth <li> in the steps list is a link."""
@@ -1875,6 +1901,7 @@ def assert_highlight(self, doc, num):
         eq_(len(pq('.current', lis)), 1)
 
     def test_step_1(self):
+        self.user.update(read_dev_agreement=None)
         r = self.client.get(reverse('devhub.submit.1'))
         eq_(r.status_code, 200)
 
@@ -1899,6 +1926,7 @@ def test_all_done(self):
         self.assertRedirects(r, reverse('devhub.submit.7', args=['a3615']))
 
     def test_menu_step_1(self):
+        self.user.update(read_dev_agreement=None)
         doc = pq(self.client.get(reverse('devhub.submit.1')).content)
         self.assert_linked(doc, [1])
         self.assert_highlight(doc, 1)

apps/devhub/urls.py

@@ -153,6 +153,12 @@
     url('^addon/submit/1$', views.submit, name='devhub.submit.1'),
     url('^addon/submit/2$', views.submit_addon, name='devhub.submit.2'),
 
+    # Submission API
+    url('^addon/submit/agreement/$', views.api_key_agreement,
+        name='devhub.api_key_agreement'),
+
+    url('^addon/api/key/$', views.api_key, name='devhub.api_key'),
+
     # Standalone validator:
     url('^addon/validate/?$', views.validate_addon,
         name='devhub.validate_addon'),

apps/devhub/views.py

@@ -64,7 +64,6 @@
 
 
 # We use a session cookie to make sure people see the dev agreement.
-DEV_AGREEMENT_COOKIE = 'yes-I-read-the-dev-agreement'
 
 MDN_BASE = 'https://developer.mozilla.org/Add-ons'
 
@@ -1387,19 +1386,14 @@ def _step_url(step):
 @login_required
 @submit_step(1)
 def submit(request, step):
-    if request.method == 'POST':
-        request.user.update(read_dev_agreement=now())
-        response = redirect(_step_url(2))
-        response.set_cookie(DEV_AGREEMENT_COOKIE)
-        return response
-
-    return render(request, 'devhub/addons/submit/start.html', {'step': step})
+    return render_agreement(request, 'devhub/addons/submit/start.html',
+                            _step_url(2), step)
 
 
 @login_required
 @submit_step(2)
 def submit_addon(request, step):
-    if DEV_AGREEMENT_COOKIE not in request.COOKIES:
+    if request.user.read_dev_agreement is None:
         return redirect(_step_url(1))
     form = forms.NewAddonForm(
         request.POST or None,
@@ -1735,3 +1729,26 @@ def docs(request, doc_name=None):
 def search(request):
     query = request.GET.get('q', '')
     return render(request, 'devhub/devhub_search.html', {'query': query})
+
+
+def api_key_agreement(request):
+    next_step = reverse('devhub.api_key')
+    return render_agreement(request, 'devhub/api/agreement.html', next_step)
+
+
+def render_agreement(request, template, next_step, step=None):
+    if request.method == 'POST':
+        request.user.update(read_dev_agreement=now())
+        return redirect(next_step)
+
+    if request.user.read_dev_agreement is None:
+        return render(request, template,
+                      {'step': step})
+    else:
+        response = redirect(next_step)
+        return response
+
+
+def api_key(request):
+    """TODO: this is simply a stub to be filled in at a later date"""
+    return http.HttpResponse('Ok')