From 0fcfc9335ff9a424863bbb3b4fccdd0b8d92198a Mon Sep 17 00:00:00 2001
From: Rich Lott / Artful Robot <code.commits@artfulrobot.uk>
Date: Wed, 28 Jun 2023 15:44:33 +0100
Subject: [PATCH] standalone: implement session logout at /civicrm/logout

---
 .../CRM/Standaloneusers/Page/Login.php        | 10 ++++++
 .../CRM/Standaloneusers/Page/Login.tpl        | 34 +++++++++++++++++--
 .../xml/Menu/standaloneusers.xml              |  5 +++
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/ext/standaloneusers/CRM/Standaloneusers/Page/Login.php b/ext/standaloneusers/CRM/Standaloneusers/Page/Login.php
index 1c43cf2e33..4c17752a97 100644
--- a/ext/standaloneusers/CRM/Standaloneusers/Page/Login.php
+++ b/ext/standaloneusers/CRM/Standaloneusers/Page/Login.php
@@ -14,4 +14,14 @@ class CRM_Standaloneusers_Page_Login extends CRM_Core_Page {
     parent::run();
   }
 
+  /**
+   * Log out.
+   */
+  public function logout() {
+    // Same as CRM_Authx_Page_AJAX::logout()
+    _authx_uf()->logoutSession();
+    // Dump them back on the log-IN page.
+    CRM_Utils_System::redirect('/civicrm/login?justLoggedOut');
+  }
+
 }
diff --git a/ext/standaloneusers/templates/CRM/Standaloneusers/Page/Login.tpl b/ext/standaloneusers/templates/CRM/Standaloneusers/Page/Login.tpl
index 99a000fda8..3a50bfd7a2 100644
--- a/ext/standaloneusers/templates/CRM/Standaloneusers/Page/Login.tpl
+++ b/ext/standaloneusers/templates/CRM/Standaloneusers/Page/Login.tpl
@@ -72,6 +72,7 @@
     --text-colour: #222;
     --text-size: 0.9rem;
     --error-colour: #a00;
+    --success-colour: #86c66c;
     --label-colour: #464354;
     --background-colour: rgb(242,242,237);
     --box-border: 0 transparent solid;
@@ -87,6 +88,7 @@
     --button-padding: .4rem 1.6rem;
     --button-text-colour: #fff;
     --button-background: #2c98ed;
+    --button-text-shadow: none;
 }
 
 /* Ffresh
@@ -183,7 +185,7 @@ a:hover, a:focus {
 }
 #crm-container.standalone-entry .btn {
     display: inline-block;
-    margin-bottom: 0;
+    margin:0;
     text-align: center;
     vertical-align: middle;
     touch-action: manipulation;
@@ -197,6 +199,7 @@ a:hover, a:focus {
     border-radius: var(--roundness);
     font-family: var(--font-family);
     box-shadow: var(--button-shadow);
+    text-shadow: var(--button-text-shadow);
 }
 #crm-container.standalone-entry .btn:hover,
 #crm-container.standalone-entry .btn:focus {
@@ -211,6 +214,17 @@ a:hover, a:focus {
     color: var(--error-colour);
     margin: 1rem 0;
 }
+
+
+#loggedOutNotice {
+  text-align: center;
+  font-weight: bold;
+  padding: var(--box-padding);
+  background-color: var(--success-colour);
+  margin: 1rem 0;
+  border-radius: var(--box-roundness);
+}
+
 @media  (min-width: 768px) {
     #crm-container.standalone-entry {
         width: 60vw;
@@ -228,6 +242,7 @@ a:hover, a:focus {
 <div id="crm-container" class="crm-container standalone-entry">
   <div class="mid-block">
     <img src="{$logoUrl}" alt="logo for CiviCRM, with an intersecting blue and green triangle">
+    <div class="message info" style="display:none;" id="loggedOutNotice">You have been logged out.</div>
     <form>
       <div>
         <label for="exampleInputEmail1" class="form-label">Username</label>
@@ -238,16 +253,29 @@ a:hover, a:focus {
         <input type="password" class="form-control" id="passwordInput">
       </div>
       <div id="error" style="display:none;" class="form-alert">Your username and password do not match</div>
-      <div class="flex"><button id="loginSubmit" type="submit" class="btn btn-secondary crm-button">Submit</button><a href="request.html">Forgotten password?</a></div>
+      <div class="flex">
+      <a href="request.html">Forgotten password?</a>
+      <button id="loginSubmit" type="submit" class="btn btn-secondary crm-button">Submit</button>
+      </div>
     </form>
   </div>
 </div>
 {literal}
 <script>
 document.addEventListener('DOMContentLoaded', () => {
+
   const submitBtn = document.getElementById('loginSubmit'),
         username = document.getElementById('usernameInput'),
-        password = document.getElementById('passwordInput');
+        password = document.getElementById('passwordInput'),
+        loggedOutNotice = document.getElementById('loggedOutNotice');
+
+  if (window.location.search === '?justLoggedOut') {
+    loggedOutNotice.style.display = '';
+    console.log("successful logout");
+  }
+  else {
+    console.log("no successful logout");
+    }
 
   submitBtn.addEventListener('click', async e => {
     e.preventDefault();
diff --git a/ext/standaloneusers/xml/Menu/standaloneusers.xml b/ext/standaloneusers/xml/Menu/standaloneusers.xml
index db747f15cb..e82ee26f44 100644
--- a/ext/standaloneusers/xml/Menu/standaloneusers.xml
+++ b/ext/standaloneusers/xml/Menu/standaloneusers.xml
@@ -6,4 +6,9 @@
     <title>Login</title>
     <access_arguments>*always allow*</access_arguments>
   </item>
+  <item>
+    <path>civicrm/logout</path>
+    <page_callback>CRM_Standaloneusers_Page_Login::logout</page_callback>
+    <access_arguments>*always allow*</access_arguments>
+  </item>
 </menu>
-- 
2.25.1