From dc22a81c0f5d16921be0d7a530eb754b8a355f51 Mon Sep 17 00:00:00 2001
From: Julian Gallimore <julian@mactwister.com>
Date: Tue, 21 Nov 2023 14:43:50 +0100
Subject: [PATCH] Inform unverified users trying to authorise with oauth

---
 .../authorizations/unverified.html.erb        | 33 +++++++++++++++++++
 config/initializers/doorkeeper.rb             |  8 +++--
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 app/views/doorkeeper/authorizations/unverified.html.erb

diff --git a/app/views/doorkeeper/authorizations/unverified.html.erb b/app/views/doorkeeper/authorizations/unverified.html.erb
new file mode 100644
index 00000000..0fb6d8ce
--- /dev/null
+++ b/app/views/doorkeeper/authorizations/unverified.html.erb
@@ -0,0 +1,33 @@
+<header class="page-header" role="banner">
+  <div class="text-center">
+    <%= link_to root_path do %>
+        <%= image_tag ("logo.svg"), :alt => "fablabs.io" %>
+    <% end %>
+  </div>
+  <h1 class="mt-3">Your Account is Unverified</h1>
+</header>
+
+<main role="main">
+  <p>
+    Please check your inbox <strong><%= current_user.email %></strong> and validate your email address.
+  </p>
+
+  <div class="actions">
+    <p class="mb-4 text-center text-info">
+      It may take a few minutes to reach you. Before we send another, have you checked your spam folder?
+    </p>
+    
+    <%= link_to "Resend Verification Code", resend_verification_email_path, class: "btn btn-success btn-lg btn-block" %>
+
+    <p class="mt-4 text-center text-info">
+      If these steps do not work for you, please write to administrators at:&nbsp;<a href="mailto:webmasters@fablabs.io">webmasters@fablabs.io</a>
+    </p>
+  </div>
+</main>
+
+<!---
+Please check your inbox
+  strong current_user.email
+  and validate your email address.
+   confirm: ""
+-->
\ No newline at end of file
diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index 9ca7352c..91735ced 100644
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -10,10 +10,12 @@
 
   # This block will be called to check whether the resource owner is authenticated or not.
   resource_owner_authenticator do
-    if current_user and current_user.verified?
-      current_user
-    else
+    if !current_user
       redirect_to(signin_url(goto: request.fullpath))
+    elsif current_user.unverified?
+      render 'doorkeeper/authorizations/unverified'
+    else
+      current_user
     end
   end