don't hit API when checking new account email-token

we currently store new account email verify tokens in the database, and
check against that to work out if they've expired. But we don't need to
do that, tokens have their own timing mechanism. So lets just use that,
and free up the database to do other things.

Also, standardised the forgot password, change email, and new account
email verification timeouts to all be an hour, from the config val
'EMAIL_EXPIRY_SECONDS'

app/main/views/new_password.py

@@ -1,20 +1,20 @@
+from datetime import datetime
 import json
 
 from flask import (render_template, url_for, redirect, flash, session, current_app)
 from itsdangerous import SignatureExpired
+from notifications_utils.url_safe_token import check_token
 
+from app import user_api_client
 from app.main import main
 from app.main.forms import NewPasswordForm
-from datetime import datetime
-from app import user_api_client
 
 
 @main.route('/new-password/<path:token>', methods=['GET', 'POST'])
 def new_password(token):
-    from notifications_utils.url_safe_token import check_token
     try:
         token_data = check_token(token, current_app.config['SECRET_KEY'], current_app.config['DANGEROUS_SALT'],
-                                 current_app.config['TOKEN_MAX_AGE_SECONDS'])
+                                 current_app.config['EMAIL_EXPIRY_SECONDS'])
     except SignatureExpired:
         flash('The link in the email we sent you has expired. Enter your email address to resend.')
         return redirect(url_for('.forgot_password'))

app/main/views/verify.py

@@ -50,34 +50,26 @@ def verify():
 @main.route('/verify-email/<token>')
 def verify_email(token):
     try:
-        token_data = check_token(token,
-                                 current_app.config['SECRET_KEY'],
-                                 current_app.config['DANGEROUS_SALT'],
-                                 current_app.config['EMAIL_EXPIRY_SECONDS'])
-
-        token_data = json.loads(token_data)
-        verified = user_api_client.check_verify_code(token_data['user_id'], token_data['secret_code'], 'email')
-        user = user_api_client.get_user(token_data['user_id'])
-        if not user:
-            abort(404)
-
-        if user.is_active:
-            flash("That verification link has expired.")
-            return redirect(url_for('main.sign_in'))
-
-        session['user_details'] = {"email": user.email_address, "id": user.id}
-        if verified[0]:
-            user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
-            return redirect('verify')
-        else:
-            if verified[1] == 'Code has expired':
-                flash("The link in the email we sent you has expired. We've sent you a new one.")
-                return redirect(url_for('main.resend_email_verification'))
-            else:
-                message = "There was a problem verifying your account. Error message: '{}'".format(verified[1])
-                flash(message)
-                return redirect(url_for('main.index'))
-
+        token_data = check_token(
+            token,
+            current_app.config['SECRET_KEY'],
+            current_app.config['DANGEROUS_SALT'],
+            current_app.config['EMAIL_EXPIRY_SECONDS']
+        )
     except SignatureExpired:
-        flash('The link in the email we sent you has expired')
+        flash("The link in the email we sent you has expired. We've sent you a new one.")
         return redirect(url_for('main.resend_email_verification'))
+
+    # token contains json blob of format: {'user_id': '...', 'secret_code': '...'} (secret_code is unused)
+    token_data = json.loads(token_data)
+    user = user_api_client.get_user(token_data['user_id'])
+    if not user:
+        abort(404)
+
+    if user.is_active:
+        flash("That verification link has expired.")
+        return redirect(url_for('main.sign_in'))
+
+    session['user_details'] = {"email": user.email_address, "id": user.id}
+    user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
+    return redirect('verify')