From b44993f2fa7a7c916ccb1f8ad3ffac108ebb4ce3 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Sun, 16 Oct 2022 23:15:22 +0200
Subject: [PATCH] Fix logout race condition (#3578)

---
 application/hooks/method_hook.php       |  2 +-
 application/views/partial/header.php    |  2 +-
 application/views/partial/header_js.php | 17 ++++++++++++++++-
 docker-compose.dev.yml                  |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/application/hooks/method_hook.php b/application/hooks/method_hook.php
index e00aada8d..fd20620bf 100644
--- a/application/hooks/method_hook.php
+++ b/application/hooks/method_hook.php
@@ -5,7 +5,7 @@ function validate_method()
 
     $url = $_SERVER['REQUEST_URI'];
 
-    $post_required = preg_match('/\/(save|delete*|remove*)\/?\d*?/', $url);
+    $post_required = preg_match('/\/(logout|save|delete*|remove*)\/?\d*?/', $url);
 
     if($post_required && $_SERVER["REQUEST_METHOD"] != "POST" && empty($_POST))
     {
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index d6207f1d0..5754b9833 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -110,7 +110,7 @@
 				<div class="navbar-right" style="margin:0">
 					<?php echo anchor('home/change_password/'.$user_info->person_id, $user_info->first_name . ' ' . $user_info->last_name, array('class' => 'modal-dlg', 'data-btn-submit' => $this->lang->line('common_submit'), 'title' => $this->lang->line('employees_change_password'))); ?>
 					<?php echo '  |  ' . ($this->input->get('debug') == 'true' ? $this->session->userdata('session_sha1') . '  |  ' : ''); ?>
-					<a href="#" onclick="$.post('<?php echo site_url('home/logout'); ?>');"><?php echo $this->lang->line('login_logout');?></a>
+					<a href="javascript:void(0);" id="logout"><?php echo $this->lang->line('login_logout');?></a>
 				</div>
 
 				<div class="navbar-center" style="text-align:center">
diff --git a/application/views/partial/header_js.php b/application/views/partial/header_js.php
index b27c5532e..ab9ba547a 100644
--- a/application/views/partial/header_js.php
+++ b/application/views/partial/header_js.php
@@ -47,8 +47,23 @@
 
 		return ajax.apply(this, arguments);
 	};
-
+    
 	$(document).ajaxComplete(setup_csrf_token);
+	$(document).ready(function(){
+		$("#logout").click(function(event) {
+			event.preventDefault();
+			$.ajax({
+				url: "<?php echo site_url('home/logout'); ?>", 
+				data: { 
+					"<?php echo $this->security->get_csrf_token_name(); ?>": csrf_token()
+				},
+				success: function() {
+					window.location.href = '<?php echo site_url(); ?>';
+				},
+				method: "POST"
+			});
+		});
+	});
 
 	var submit = $.fn.submit;
 
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 6444c5b92..e34358610 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,4 +1,4 @@
-version: '3.4'
+version: '3.7'
 
 volumes:
     uploads: