From 92c09243ef049328065fdb6eaa3d78d3f4aaa345 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 21 Aug 2024 12:42:20 +0300
Subject: [PATCH 1/2] Fix transactionalCache.getOrFetchFromDB

---
 .../org/thingsboard/server/cache/TbTransactionalCache.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/cache/src/main/java/org/thingsboard/server/cache/TbTransactionalCache.java b/common/cache/src/main/java/org/thingsboard/server/cache/TbTransactionalCache.java
index 89e6754d19..765c82a8db 100644
--- a/common/cache/src/main/java/org/thingsboard/server/cache/TbTransactionalCache.java
+++ b/common/cache/src/main/java/org/thingsboard/server/cache/TbTransactionalCache.java
@@ -53,7 +53,7 @@ public interface TbTransactionalCache<K extends Serializable, V extends Serializ
         if (putToCache) {
             return getAndPutInTransaction(key, dbCall, cacheNullValue);
         } else {
-            TbCacheValueWrapper<V> cacheValueWrapper = get(key);
+            TbCacheValueWrapper<V> cacheValueWrapper = get(key, true);
             if (cacheValueWrapper != null) {
                 return cacheValueWrapper.get();
             }
@@ -92,7 +92,7 @@ public interface TbTransactionalCache<K extends Serializable, V extends Serializ
         if (putToCache) {
             return getAndPutInTransaction(key, dbCall, cacheValueToResult, dbValueToCacheValue, cacheNullValue);
         } else {
-            TbCacheValueWrapper<V> cacheValueWrapper = get(key);
+            TbCacheValueWrapper<V> cacheValueWrapper = get(key, true);
             if (cacheValueWrapper != null) {
                 var cacheValue = cacheValueWrapper.get();
                 return cacheValue == null ? null : cacheValueToResult.apply(cacheValue);

From ef93522df08e214d4336a09a092d8d01e90afc87 Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Wed, 21 Aug 2024 15:56:24 +0300
Subject: [PATCH 2/2] UI: Fix MenuId enum 2fa -> two_fa

---
 ui-ngx/src/app/core/services/menu.models.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/core/services/menu.models.ts b/ui-ngx/src/app/core/services/menu.models.ts
index d11b28a97f..28ebbfaf79 100644
--- a/ui-ngx/src/app/core/services/menu.models.ts
+++ b/ui-ngx/src/app/core/services/menu.models.ts
@@ -76,7 +76,7 @@ export enum MenuId {
   mobile_app_settings = 'mobile_app_settings',
   security_settings = 'security_settings',
   security_settings_general = 'security_settings_general',
-  two_fa = '2fa',
+  two_fa = 'two_fa',
   oauth2 = 'oauth2',
   audit_log = 'audit_log',
   alarms = 'alarms',