From 649b1c50eed8bdf68a70c7eaa8321923d810a800 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Thu, 2 May 2024 00:01:40 +0200
Subject: [PATCH] Update to 2024-05-02 00:01

---
 roles/kimai/defaults/main.yml                     |  4 ++--
 roles/kimai/files/kimai_empty_authorization.patch | 11 -----------
 roles/kimai/tasks/install.yml                     |  6 ------
 roles/kimai/vars/RedHat-8.yml                     |  1 -
 roles/kimai/vars/RedHat-9.yml                     |  1 -
 5 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 roles/kimai/files/kimai_empty_authorization.patch

diff --git a/roles/kimai/defaults/main.yml b/roles/kimai/defaults/main.yml
index 5c59d7a..8200afe 100644
--- a/roles/kimai/defaults/main.yml
+++ b/roles/kimai/defaults/main.yml
@@ -5,12 +5,12 @@
 # You can set it to a number or a simple string (no special chars)
 kimai_id: 1
 # Kimai version to deploy
-kimai_version: '2.15.0'
+kimai_version: '2.16.0'
 
 # URL of the archive
 kimai_archive_url: https://github.com/kevinpapst/kimai2/archive/refs/tags/{{ kimai_version }}.tar.gz
 # Expected sha256 of the archive
-kimai_archive_sha256: f61c50d3d426922bc6533768ccfa51b428b82506c8fbade4534ff0daf6ccd334
+kimai_archive_sha256: c2c6d87e1099fc43b01f82a90c3a3523fe5da8aa180b0f0130e32c3e2e3820ef
 # Directory where kimai will be installed
 kimai_root_dir: /opt/kimai_{{ kimai_id }}
 # Should ansible handle upgrades or only initial install
diff --git a/roles/kimai/files/kimai_empty_authorization.patch b/roles/kimai/files/kimai_empty_authorization.patch
deleted file mode 100644
index 3d5c388..0000000
--- a/roles/kimai/files/kimai_empty_authorization.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/API/Authentication/ApiRequestMatcher.php.orig	2024-04-29 13:28:50.876284724 +0200
-+++ src/API/Authentication/ApiRequestMatcher.php	2024-04-29 13:29:14.366580152 +0200
-@@ -27,7 +27,7 @@
-         }
- 
-         // let's use this firewall if a Bearer token is set in the header
--        if ($request->headers->has('Authorization')) {
-+        if ($request->headers->has('Authorization') && $request->headers->get('Authorization') != "") {
-             return true;
- 	}
- 
diff --git a/roles/kimai/tasks/install.yml b/roles/kimai/tasks/install.yml
index 54b215e..e5461f0 100644
--- a/roles/kimai/tasks/install.yml
+++ b/roles/kimai/tasks/install.yml
@@ -59,12 +59,6 @@
       environment:
         COMPOSER_ALLOW_SUPERUSER: 1
 
-    - name: Fix empty Authorization header
-      patch:
-        src: kimai_empty_authorization.patch
-        dest: "{{ kimai_root_dir }}/app/src/API/Authentication/ApiRequestMatcher.php"
-        backup: true
-
   tags: kimai
 
 - import_tasks: ../includes/webapps_create_mysql_db.yml
diff --git a/roles/kimai/vars/RedHat-8.yml b/roles/kimai/vars/RedHat-8.yml
index 7bf2463..70e647e 100644
--- a/roles/kimai/vars/RedHat-8.yml
+++ b/roles/kimai/vars/RedHat-8.yml
@@ -7,4 +7,3 @@ kimai_packages:
   - acl
   - zstd
   - git
-  - patch
diff --git a/roles/kimai/vars/RedHat-9.yml b/roles/kimai/vars/RedHat-9.yml
index 7bf2463..70e647e 100644
--- a/roles/kimai/vars/RedHat-9.yml
+++ b/roles/kimai/vars/RedHat-9.yml
@@ -7,4 +7,3 @@ kimai_packages:
   - acl
   - zstd
   - git
-  - patch