From 81a38a577bb8ab464ab0359c82a462504dafb6c7 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Thu, 17 Jul 2025 22:37:58 -0700
Subject: [PATCH 1/4] GUACAMOLE-2088: Add missing "AND" for MySQL/MariaDB
 "DELETE" query.

---
 .../apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml
index 1c521e8d4..8e82bfe19 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml
@@ -291,7 +291,6 @@
     <delete id="delete">
         DELETE FROM guacamole_entity
         WHERE
-            type = 'USER_GROUP'
             <choose>
                 <when test="caseSensitivity.caseSensitiveGroupNames()">
                     name = #{identifier,jdbcType=VARCHAR}
@@ -300,6 +299,7 @@
                     LOWER(name) = LOWER(#{identifier,jdbcType=VARCHAR})
                 </otherwise>
             </choose>
+            AND type = 'USER_GROUP'
     </delete>
 
     <!-- Insert single group -->

From 4a28e44f2e8fd64d5e0f10282ef1854bbe87dfe4 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 3 Sep 2025 12:24:20 -0700
Subject: [PATCH 2/4] GUACAMOLE-2088: Correct typo in MySQL reference to method
 name ("case", not "caes").

---
 .../auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml
index e589a8501..bba8d9be3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml
@@ -96,7 +96,7 @@
             guacamole_entity.type = 'USER_GROUP'
             AND
             <choose>
-                <when test="caseSensitivity.caesSensitiveGroupNames()">
+                <when test="caseSensitivity.caseSensitiveGroupNames()">
                     guacamole_entity.name
                 </when>
                 <otherwise>

From 439c8a53843f1131d36d41dbcd2a5ca06d1c5404 Mon Sep 17 00:00:00 2001
From: abrown38 <abrown38@ed.ac.uk>
Date: Mon, 30 Mar 2026 11:02:55 +0100
Subject: [PATCH 3/4] fix bug when auth token is undefined

---
 .../frontend/src/app/storage/services/localStorageService.js    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js b/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js
index a8c68460e..3d20b933c 100644
--- a/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js
+++ b/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js
@@ -121,6 +121,8 @@ angular.module('storage').provider('localStorageService', [function localStorage
 
         // Pull and parse value from internal storage, if present
         var data = storedItems[key];
+	if (!data || data === "undefined")
+    	    return null;
         if (data)
             return JSON.parse(data);
 

From 4950688a7871bfa67da4a2c394d622eb22e02100 Mon Sep 17 00:00:00 2001
From: adam <adam@adbraun.lol>
Date: Mon, 13 Apr 2026 15:13:55 +0100
Subject: [PATCH 4/4] fix indentation

---
 .../frontend/src/app/storage/services/localStorageService.js  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js b/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js
index 3d20b933c..1ce9ae397 100644
--- a/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js
+++ b/guacamole/src/main/frontend/src/app/storage/services/localStorageService.js
@@ -121,8 +121,8 @@ angular.module('storage').provider('localStorageService', [function localStorage
 
         // Pull and parse value from internal storage, if present
         var data = storedItems[key];
-	if (!data || data === "undefined")
-    	    return null;
+        if (!data || data === "undefined")
+            return null;
         if (data)
             return JSON.parse(data);