From 8a8459c30aff2f2a7cd8ba2cbd273cf040220191 Mon Sep 17 00:00:00 2001
From: Aaron Spencer <aaron.spencer@softwire.com>
Date: Wed, 31 May 2023 10:38:23 +0100
Subject: [PATCH] CLDC-2328: Button cleanup, user controller endpoint created

---
 app/controllers/users_controller.rb | 10 ++++++++--
 app/views/users/show.html.erb       | 29 +++++++++--------------------
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0c343b8c3..5d05c3b27 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4,9 +4,9 @@ class UsersController < ApplicationController
   include Helpers::Email
   include Modules::SearchFilter
 
-  before_action :authenticate_user!
+  before_action :authenticate_user!, except: %i[resend_invite]
   before_action :find_resource, except: %i[new create]
-  before_action :authenticate_scope!, except: %i[new]
+  before_action :authenticate_scope!, except: %i[new resend_invite]
 
   def index
     redirect_to users_organisation_path(current_user.organisation) unless current_user.support?
@@ -29,6 +29,12 @@ class UsersController < ApplicationController
     end
   end
 
+  def resend_invite
+    @user.send_confirmation_instructions
+    flash[:notice] = "Invitation sent"
+    render :show
+  end
+
   def show; end
 
   def dpo; end
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index c6b197b20..f1c8b1689 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -94,27 +94,16 @@
     <% end %>
 
     <div class="govuk-button-group">
-      <p>
-        <% if current_user.can_toggle_active?(@user) %>
-          <% if @user.active? %>
-            <%= govuk_button_link_to "Deactivate user", deactivate_user_path(@user), warning: true %>
-          <% else %>
-            <span class="app-!-colour-muted govuk-!-margin-right-2">
-              This user has been deactivated. <%= govuk_button_link_to "Reactivate user", reactivate_user_path(@user) %>
-            </span>
-          <% end %>
+      <% if current_user.can_toggle_active?(@user) %>
+        <% if @user.active? %>
+          <%= govuk_button_link_to "Deactivate user", deactivate_user_path(@user), warning: true %>
+          <%= govuk_button_link_to "Resend invite link", resend_invite_user_path(@user) %>
+        <% else %>
+          <span class="app-!-colour-muted govuk-!-margin-right-2">
+            This user has been deactivated. <%= govuk_button_link_to "Reactivate user", reactivate_user_path(@user) %>
+          </span>
         <% end %>
-
-        <% if current_user.can_toggle_active?(@user) %>
-          <% if @user.active? %>
-            <%= govuk_button_link_to "Resend invite link", resend_invite_user_path(@user) %>
-          <% else %>
-            <span class="app-!-colour-muted govuk-!-margin-right-2">
-              This user has been deactivated. <%= govuk_link_to "Reactivate user", "/users/#{@user.id}/reactivate" %>
-            </span>
-          <% end %>
-        <% end %>
-      </p>
+      <% end %>
     </div>
 
   </div>