refactor to provide function for preverified emails (bug 1074519)

mkt/account/tests/test_views.py

@@ -771,7 +771,7 @@ def test_fxa_user(self):
 
 
 class TestPreverify(RestOAuth):
-    @patch('mkt.account.views.get_token_expiry', lambda: 1400000000)
+    @patch('mkt.account.utils.get_token_expiry', lambda td: 1400000000)
     def test_preverify(self):
         res = self.client.post(reverse('fxa-preverify'))
         eq_(res.status_code, 200)

mkt/account/urls.py

@@ -2,18 +2,18 @@
 
 from mkt.users import views
 
-from mkt.account.views import (fxa_preverify, fxa_preverify_key, AccountView,
-                               AccountInfoView, FeedbackView, FxALoginView,
-                               InstalledView, LoginView, LogoutView,
-                               NewsletterView, PermissionsView)
+from mkt.account.views import (fxa_preverify_view, fxa_preverify_key,
+                               AccountView, AccountInfoView, FeedbackView,
+                               FxALoginView, InstalledView, LoginView,
+                               LogoutView, NewsletterView, PermissionsView)
 
 
 drf_patterns = patterns('',
     url('^feedback/$', FeedbackView.as_view(), name='account-feedback'),
     url('^installed/mine/$', InstalledView.as_view(), name='installed-apps'),
     url('^login/$', LoginView.as_view(), name='account-login'),
     url('^fxa-login/$', FxALoginView.as_view(), name='fxa-account-login'),
-    url('^fxa-preverify/$', fxa_preverify, name='fxa-preverify'),
+    url('^fxa-preverify/$', fxa_preverify_view, name='fxa-preverify'),
     url('^fxa-preverify-key/$', fxa_preverify_key, name='fxa-preverify-key'),
     url('^logout/$', LogoutView.as_view(), name='account-logout'),
     url('^newsletter/$', NewsletterView.as_view(), name='account-newsletter'),

mkt/account/utils.py

@@ -1,5 +1,12 @@
+import datetime
+import time
+
 from django import http
+from django.conf import settings
+from django.core.urlresolvers import reverse
 
+from jwkest.jws import JWS
+from jwkest.jwk import RSAKey, import_rsa_key_from_file
 from tower import ugettext_lazy as _lazy
 
 import amo
@@ -12,6 +19,32 @@
 from mkt.webapps.views import BaseFilter
 
 
+PREVERIFY_KEY = RSAKey(key=import_rsa_key_from_file(
+    settings.PREVERIFIED_ACCOUNT_KEY))
+
+
+def get_token_expiry(expiry):
+    expire_time = datetime.datetime.now() + expiry
+    return time.mktime(expire_time.timetuple())
+
+
+def fxa_preverify_token(user, expiry):
+    """
+    Takes a user and a timedelta and generates a preverify token for FxA OAuth.
+    See https://github.com/mozilla/fxa-auth-server/blob/master/docs/api.md#preverifytoken
+    for details.
+    """
+    msg = {
+        'exp': get_token_expiry(expiry),
+        'aud': settings.FXA_AUTH_SERVER,
+        'sub': user.email,
+        'typ': 'mozilla/fxa/preVerifyToken/v1'
+    }
+    jws = JWS(msg, cty='JWT', alg='RS256',
+              jku=reverse('fxa-preverify-key'))
+    return jws.sign_compact([PREVERIFY_KEY])
+
+
 class PurchasesFilter(BaseFilter):
     opts = (('purchased', _lazy(u'Purchase Date')),
             ('price', _lazy(u'Price')),

mkt/account/views.py

@@ -2,21 +2,18 @@
 import hashlib
 import hmac
 import json
-import time
 import uuid
 
 from django import http
 from django.conf import settings
 from django.contrib import auth
 from django.contrib.auth.signals import user_logged_in
-from django.core.urlresolvers import reverse
 
 import basket
 import commonware.log
 from django_browserid import get_audience
 from django_statsd.clients import statsd
-from jwkest.jws import JWS
-from jwkest.jwk import RSAKey, import_rsa_key_from_file
+
 from rest_framework import status
 from rest_framework.decorators import (authentication_classes,
                                        permission_classes)
@@ -35,8 +32,8 @@
 from mkt.account.serializers import (AccountSerializer, AccountInfoSerializer,
                                      FeedbackSerializer, FxALoginSerializer,
                                      LoginSerializer, NewsletterSerializer,
-
                                      PermissionsSerializer)
+from mkt.account.utils import PREVERIFY_KEY, fxa_preverify_token
 from mkt.api.authentication import (RestAnonymousAuthentication,
                                     RestOAuthAuthentication,
                                     RestSharedSecretAuthentication)
@@ -217,35 +214,17 @@ def create_action(self, request, serializer):
         return data
 
 
-def get_token_expiry():
-    expiry = datetime.datetime.now() + datetime.timedelta(minutes=10)
-    return time.mktime(expiry.timetuple())
-
-
-PREVERIFY_KEY = RSAKey(key=import_rsa_key_from_file(
-    settings.PREVERIFIED_ACCOUNT_KEY))
-
-
 @cors_api_view(['POST'])
 @authentication_classes([RestOAuthAuthentication,
                          RestSharedSecretAuthentication])
 @permission_classes([IsAuthenticated])
-def fxa_preverify(request):
-    # See https://github.com/mozilla/fxa-auth-server/blob/master/docs/api.md#preverifytoken
-    # for details.
+def fxa_preverify_view(request):
     if not request.user.is_verified:
         return Response("User's email is not verified", status=403)
 
-    msg = {
-        'exp': get_token_expiry(),
-        'aud': settings.FXA_AUTH_SERVER,
-        'sub': request.user.email,
-        'typ': 'mozilla/fxa/preVerifyToken/v1'
-    }
-    jws = JWS(msg, cty='JWT', alg='RS256',
-              jku=reverse('fxa-preverify-key'))
-    return http.HttpResponse(jws.sign_compact([PREVERIFY_KEY]),
-                             content_type='application/jwt')
+    return http.HttpResponse(
+        fxa_preverify_token(request.user, datetime.timedelta(minutes=10)),
+        content_type='application/jwt')
 
 
 def fxa_preverify_key(request):