Reduce UI complexity

Providing both the "Enter Verification Token" and the "Send
Verification Email" elements of the same user interface seems to
confuse users.

This commit ensures that the system will provide one or the other, but
not both, depending on whether or not there is a pending verification
token present for the user.

2 files changed, 100 insertions, 67 deletions

diff --git a/gn_auth/auth/authorisation/users/views.py b/gn_auth/auth/authorisation/users/views.py
index 0922e1e..8559696 100644
--- a/gn_auth/auth/authorisation/users/views.py
+++ b/gn_auth/auth/authorisation/users/views.py
@@ -313,14 +313,29 @@ def list_all_users() -> Response:
 def handle_unverified():
     """Handle case where user tries to login but is unverified"""
     form = request_json()
+    email = request.args["email"]
     # TODO: Maybe have a GN2_URI setting here?
     #       or pass the client_id here?
+    with (db.connection(current_app.config["AUTH_DB"]) as conn,
+          db.cursor(conn) as cursor):
+        cursor.execute(
+            "DELETE FROM user_verification_codes WHERE expires <= ?",
+            (int(datetime.now().timestamp()),))
+        cursor.execute(
+            "SELECT u.user_id, u.email, uvc.* FROM users AS u "
+            "INNER JOIN user_verification_codes AS uvc "
+            "ON u.user_id=uvc.user_id "
+            "WHERE u.email=?",
+            (email,))
+        token_found = bool(cursor.fetchone())
+
     return render_template(
         "users/unverified-user.html",
-        email=request.args["email"],
+        email=email,
         response_type=request.args["response_type"],
         client_id=request.args["client_id"],
-        redirect_uri=request.args["redirect_uri"])
+        redirect_uri=request.args["redirect_uri"],
+        token_found=token_found)
 
 @users.route("/send-verification", methods=["POST"])
 def send_verification_code():
diff --git a/gn_auth/templates/users/unverified-user.html b/gn_auth/templates/users/unverified-user.html
index 0ce141d..5005555 100644
--- a/gn_auth/templates/users/unverified-user.html
+++ b/gn_auth/templates/users/unverified-user.html
@@ -7,69 +7,87 @@
 {%block content%}
 {{flash_messages()}}
 
-<h1>Verify Your E-Mail</h1>
-
-<form id="frm-email-verification" method="POST"
-      action="{{url_for('oauth2.users.verify_user')}}">
-  <legend>Email Verification</legend>
-
-  <p>In order to reduce the number of bots we have to deal with, we no longer
-    allow sign-in with users who have not verified their accounts.</p>
-
-  <p>We know this is annoying &mdash; especially if you already have an account,
-    and have been using it just fine &mdash; however, we have found that without
-    this check in place, we will get overrun by silly bots, which will ruin
-    every user's experience.</p>
-
-  <p>
-    Do bear with us, enter the verification code you received via email below:
-  </p>
-
-  <input type="hidden" name="email" value="{{email}}" />
-  <input type="hidden" name="response_type" value="{{response_type}}" />
-  <input type="hidden" name="client_id" value="{{client_id}}" />
-  <input type="hidden" name="redirect_uri" value="{{redirect_uri}}" />
-
-  <fieldset class="form-group">
-    <label for="txt-verification-code" class="form-label">
-      Verification Code</label>
-    <input id="txt-verification-code" name="verificationcode" type="text"
-           required="required" class="form-control"
-           placeholder="Enter your verification code here." />
-  </fieldset>
-
-  <fieldset>
-    <input type="submit" value="Verify Email Address" class="btn btn-primary" />
-  </fieldset>
-</form>
-
-<h2>Send Verification Code</h2>
-
-<form id="frm-send-verification-code" method="POST"
-      action="{{url_for('oauth2.users.send_verification_code')}}">
-  <legend>Send Verification Code</legend>
-
-  <p>If you have not received a verification code, or your code is already
-    expired, provide <strong>your GeneNetwork</strong> password and
-    click the "<em>Send Verification Code</em>" button below and we will send
-    you a new verification code.</p>
-
-  <input type="hidden" name="user_email" value="{{email}}" />
-  <input type="hidden" name="response_type" value="{{response_type}}" />
-  <input type="hidden" name="client_id" value="{{client_id}}" />
-  <input type="hidden" name="redirect_uri" value="{{redirect_uri}}" />
-
-  <fieldset class="form-group">
-    <label class="form-label">Email</label>
-    <label class="form-control">{{email}}</label>
-  </fieldset>
-
-  <fieldset class="form-group">
-    <label for="txt-password" class="form-label">Password</label>
-    <input id="txt-password" name="user_password" type="password"
-           placeholder="Enter your GeneNetwork password"
-           class="form-control" />
-  </fieldset>
-  <input type="submit" value="Send Verification Code" class="btn btn-danger" />
-</form>
+<div class="container-fluid">
+  <div class="row"><h1>Verify Your E-Mail</h1></div>
+
+  {%if token_found:%}
+  <div class="row">
+    <form id="frm-email-verification" method="POST"
+          action="{{url_for('oauth2.users.verify_user')}}">
+      <legend>Email Verification</legend>
+
+      <p>Your email is not verified. We do require that you do.</p>
+
+      <p>Since you are seeing this, it means an email was sent to you with a
+        verification token, that you are expected to provide below. Please do that
+        and click the "<em>Verify Email Address</em>" button to verify your
+        account.</p>
+
+      <input type="hidden" name="email" value="{{email}}" />
+      <input type="hidden" name="response_type" value="{{response_type}}" />
+      <input type="hidden" name="client_id" value="{{client_id}}" />
+      <input type="hidden" name="redirect_uri" value="{{redirect_uri}}" />
+
+      <fieldset class="form-group">
+        <label for="txt-verification-code" class="form-label">
+          Verification Code</label>
+        <input id="txt-verification-code" name="verificationcode" type="text"
+               required="required" class="form-control"
+               placeholder="Enter your verification code here." />
+      </fieldset>
+
+      <fieldset>
+        <input type="submit" value="Verify Email Address" class="btn btn-primary" />
+      </fieldset>
+    </form>
+  </div>
+  {%else:%}
+  <div class="row">
+    <form id="frm-send-verification-code" method="POST"
+          action="{{url_for('oauth2.users.send_verification_code')}}">
+      <legend>Send Verification Code</legend>
+
+      <p>Provide your password below, and we will send you a verification password
+        to your email.</p>
+      <p>You are seeing this page because:</p>
+      <ol type="a">
+        <li>You already had an existing account.<br />
+          In this case, you will need to request a verification code by
+          providing your email below and clicking the
+          "<em>Send Verification Code</em>" button.<br />
+          We will send you an email with both:
+          <ol type="1">
+            <li>a link you can click to verify your email, <strong>and</strong>
+            </li>
+            <li>a token to copy and paste if you choose not to follow the link.
+            </li>
+          </ol>
+        </li>
+        <li>You registered your account recently, but did not verify it within the
+          time period allocated for that. In this case, simply request a new
+          verification email below, and follow the link, or copy and paste the
+          token in the email we send you.</li>
+      </ol>
+
+      <input type="hidden" name="user_email" value="{{email}}" />
+      <input type="hidden" name="response_type" value="{{response_type}}" />
+      <input type="hidden" name="client_id" value="{{client_id}}" />
+      <input type="hidden" name="redirect_uri" value="{{redirect_uri}}" />
+
+      <fieldset class="form-group">
+        <label class="form-label">Email</label>
+        <label class="form-control">{{email}}</label>
+      </fieldset>
+
+      <fieldset class="form-group">
+        <label for="txt-password" class="form-label">Password</label>
+        <input id="txt-password" name="user_password" type="password"
+               placeholder="Enter your GeneNetwork password"
+               class="form-control" />
+      </fieldset>
+      <input type="submit" value="Send Verification Code" class="btn btn-danger" />
+    </form>
+  </div>
+  {%endif%}
+</div>
 {%endblock%}