From 7a2ea2b2b42e439e0f34a9d594688c5c508afe58 Mon Sep 17 00:00:00 2001
From: "J. A. Messias" <jantunesmessias@gmail.com>
Date: Thu, 14 Nov 2024 09:00:27 -0300
Subject: [PATCH] WIP

---
 integration_test/app_test.dart                |  12 +-
 lib/backend/api_requests/api_calls.dart       | 203 +++++++++---------
 .../firebase_messaging_service.dart           |   2 +-
 .../notifications/notification_service.dart   |   8 +-
 ..._arrow_linked_locals_component_widget.dart |  16 +-
 .../local_profile_component_model.dart        |   4 +-
 .../local_profile_component_widget.dart       |   2 +-
 .../menu_component/menu_component_model.dart  |  14 +-
 .../schedule_visit_detail_model.dart          |   6 +-
 ...p_arrow_linked_locals_component_model.dart |   8 +-
 ...cation_modal_template_component_model.dart |   6 +-
 .../change_pass_widget.dart                   |   2 +-
 ...item_details_template_component_model.dart |   6 +-
 .../provisional_schedule_template_model.dart  |  10 +-
 ...siter_vistor_template_component_model.dart |   6 +-
 .../sign_up_template_component_widget.dart    |   2 +-
 .../view_visit_detail_model.dart              |   6 +-
 ...search_modal_template_component_model.dart |   6 +-
 lib/flutter_flow/nav/nav.dart                 |  14 +-
 lib/main.dart                                 |  10 +-
 .../acess_history_page_model.dart             |   6 +-
 .../fast_pass_page/fast_pass_page_widget.dart |  10 +-
 lib/pages/home_page/home_page_model.dart      |  10 +-
 .../liberation_history_model.dart             |   6 +-
 .../message_history_page_model.dart           |   6 +-
 .../package_order_page.dart                   |   2 +-
 lib/pages/pets_page/pets_history_screen.dart  |   8 +-
 lib/pages/pets_page/pets_page_model.dart      |   8 +-
 .../preferences_settings_model.dart           |  42 ++--
 .../qr_code_page/qr_code_page_model.dart      |   4 +-
 .../qr_code_page/qr_code_page_widget.dart     |   2 +-
 .../reception_page/reception_page_model.dart  |   3 +-
 .../reception_page/reception_page_widget.dart |   2 +-
 .../reservation_page_widget.dart              |  11 +-
 .../schedule_complete_visit_page_model.dart   |   6 +-
 .../visit_history_page_widget.dart            |  14 +-
 .../welcome_page/welcome_page_widget.dart     |   6 +-
 lib/shared/helpers/base_storage.dart          |   8 +-
 lib/shared/helpers/database_storage.dart      |  44 ++++
 lib/shared/helpers/sqlite_storage.dart        | 180 ----------------
 lib/shared/helpers/storage_helper.dart        | 135 +++++++++---
 .../authentication_service.dart               |  28 +--
 .../services/license/license_service.dart     | 146 ++++++++-----
 .../localization/localization_service.dart    |  74 +++----
 .../services/sqlite/sqlite_service.dart       |  64 ++++++
 lib/shared/utils/share_util.dart              |   4 +-
 46 files changed, 589 insertions(+), 583 deletions(-)
 create mode 100644 lib/shared/helpers/database_storage.dart
 delete mode 100644 lib/shared/helpers/sqlite_storage.dart
 create mode 100644 lib/shared/services/sqlite/sqlite_service.dart

diff --git a/integration_test/app_test.dart b/integration_test/app_test.dart
index f8ab2568..8706e9a0 100644
--- a/integration_test/app_test.dart
+++ b/integration_test/app_test.dart
@@ -14,8 +14,8 @@ void main() {
 
   group('Initialization', () {
     group('Navigation', () {
-      setUpAll(() async => await initializeApp().then(
-          (_) async => await StorageHelper().set(SecureStorageKey.isLogged.value, 'false', Storage.SecureStorage)));
+      setUpAll(() async =>
+          await initializeApp().then((_) async => await StorageHelper().s(SecureStorageKey.isLogged.value, 'false')));
       testWidgets('Test Welcome', (WidgetTester tester) async {
         widget = tester;
         await _testWelcome();
@@ -26,16 +26,16 @@ void main() {
   });
   group('Authentication', () {
     group('Sign in', () {
-      setUpAll(() async => await initializeApp().then(
-          (_) async => await StorageHelper().set(SecureStorageKey.isLogged.value, 'false', Storage.SecureStorage)));
+      setUpAll(() async =>
+          await initializeApp().then((_) async => await StorageHelper().s(SecureStorageKey.isLogged.value, 'false')));
       testWidgets('Test Sign In', (WidgetTester tester) async {
         widget = tester;
         await _testSignIn();
       });
     });
     group('Sign up', () {
-      setUpAll(() async => await initializeApp().then(
-          (_) async => await StorageHelper().set(SecureStorageKey.isLogged.value, 'false', Storage.SecureStorage)));
+      setUpAll(() async =>
+          await initializeApp().then((_) async => await StorageHelper().s(SecureStorageKey.isLogged.value, 'false')));
       testWidgets('Test Sign Up', (WidgetTester tester) async {
         widget = tester;
         await _testSignUp();
diff --git a/lib/backend/api_requests/api_calls.dart b/lib/backend/api_requests/api_calls.dart
index 9d4484f8..bc0c68d4 100644
--- a/lib/backend/api_requests/api_calls.dart
+++ b/lib/backend/api_requests/api_calls.dart
@@ -92,9 +92,9 @@ class TestCall {
 class GetLicense {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
 
     return ApiManager.instance.makeApiCall(
       callName: 'getLicense',
@@ -120,12 +120,11 @@ class GetLicense {
   }
 }
 
-
 class UnregisterDevice {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
 
     return ApiManager.instance.makeApiCall(
       callName: 'unregisterDevice',
@@ -152,9 +151,9 @@ class UnregisterDevice {
 class DeletePet {
   Future<ApiCallResponse> call({final int? petID = 0}) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'excluirPet';
 
     return ApiManager.instance.makeApiCall(
@@ -197,9 +196,9 @@ class UpdatePet {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'atualizarPet';
 
     return ApiManager.instance.makeApiCall(
@@ -243,9 +242,9 @@ class GetPets {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'consultaPets';
 
     return ApiManager.instance.makeApiCall(
@@ -277,9 +276,9 @@ class GetPetPhoto {
   Future<ApiCallResponse> call({final int? petId}) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'consultaFotoPet';
 
     return ApiManager.instance.makeApiCall(
@@ -320,9 +319,9 @@ class RegisterPet {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'cadastrarPet';
 
     return ApiManager.instance.makeApiCall(
@@ -365,9 +364,9 @@ class BuscaEnconcomendas {
     final String? adresseeType,
     final String? status,
   }) async {
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'getEncomendas';
 
     final String baseUrl = PhpGroup.getBaseUrl();
@@ -409,9 +408,9 @@ class CancelaVisita {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'cancelaVisita';
 
     return ApiManager.instance.makeApiCall(
@@ -443,8 +442,8 @@ class CancelaVisita {
 
 class DeleteAccount {
   Future<ApiCallResponse> call() async {
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
 
     final String baseUrl = PhpGroup.getBaseUrl();
     return ApiManager.instance.makeApiCall(
@@ -475,9 +474,9 @@ class ChangePanic {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'updVisitado';
 
     return ApiManager.instance.makeApiCall(
@@ -511,9 +510,9 @@ class ChangePass {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'updVisitado';
 
     return ApiManager.instance.makeApiCall(
@@ -547,9 +546,9 @@ class RespondeVinculo {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
 
     return ApiManager.instance.makeApiCall(
       callName: 'respondeVinculo',
@@ -581,9 +580,9 @@ class ChangeNotifica {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'updVisitado';
 
     return ApiManager.instance.makeApiCall(
@@ -615,10 +614,10 @@ class UpdateIDE {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String newIde = (await StorageHelper().get(SQLiteStorageKey.userDevUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
+    final String newIde = (await StorageHelper().g(SQLiteStorageKey.userDevUUID.value)) ?? '';
     const String atividade = 'updVisitado';
 
     return ApiManager.instance.makeApiCall(
@@ -650,9 +649,9 @@ class UpdToken {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String token = (await StorageHelper().get(SecureStorageKey.token.value, Storage.SecureStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String token = (await StorageHelper().g(SecureStorageKey.token.value)) ?? '';
 
     return ApiManager.instance.makeApiCall(
       callName: 'updToken',
@@ -679,12 +678,11 @@ class UpdToken {
 class LoginCall {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String email = (await StorageHelper().get(SecureStorageKey.email.value, Storage.SecureStorage)) ?? '';
-    final String password = (await StorageHelper().get(SecureStorageKey.password.value, Storage.SecureStorage)) ?? '';
-    final String type = (await StorageHelper().get(SecureStorageKey.deviceType.value, Storage.SecureStorage)) ?? '';
-    final String description =
-        (await StorageHelper().get(SecureStorageKey.deviceDescription.value, Storage.SecureStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String email = (await StorageHelper().g(SecureStorageKey.email.value)) ?? '';
+    final String password = (await StorageHelper().g(SecureStorageKey.password.value)) ?? '';
+    final String type = (await StorageHelper().g(SecureStorageKey.deviceType.value)) ?? '';
+    final String description = (await StorageHelper().g(SecureStorageKey.deviceDescription.value)) ?? '';
     late final String token;
     try {
       token = await FirebaseMessagingService.getToken();
@@ -767,9 +765,9 @@ class ChangePasswordCall {
     required final String psswd,
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
 
     return ApiManager.instance.makeApiCall(
       callName: 'changePassword',
@@ -828,8 +826,8 @@ class GetLocalsCall {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage) ?? '';
-    final String userUUID = await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage) ?? '';
+    final String devUUID = await StorageHelper().g(SQLiteStorageKey.devUUID.value) ?? '';
+    final String userUUID = await StorageHelper().g(SQLiteStorageKey.userUUID.value) ?? '';
 
     return ApiManager.instance.makeApiCall(
       callName: 'getLocals',
@@ -868,9 +866,9 @@ class PostScheduleVisitorCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'putVisitante';
 
     return ApiManager.instance.makeApiCall(
@@ -923,9 +921,9 @@ class PostScheduleVisitCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'putVisita';
 
     return ApiManager.instance.makeApiCall(
@@ -977,9 +975,9 @@ class GetScheduleVisitCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'getVisitas';
 
     return ApiManager.instance.makeApiCall(
@@ -1251,9 +1249,9 @@ class GetDadosCall {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'getDados';
 
     return ApiManager.instance.makeApiCall(
@@ -1484,9 +1482,9 @@ class GetVisitorByDocCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'getVisitante';
 
     return ApiManager.instance.makeApiCall(
@@ -1538,9 +1536,9 @@ class GetFotoVisitanteCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'getFotoVisitante';
 
     return ApiManager.instance.makeApiCall(
@@ -1577,9 +1575,9 @@ class PostProvVisitSchedulingCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'putAgendamentoProv';
 
     return ApiManager.instance.makeApiCall(
@@ -1626,9 +1624,9 @@ class GetVisitsCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'getVisitas';
 
     return ApiManager.instance.makeApiCall(
@@ -1889,9 +1887,9 @@ class DeleteVisitCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'cancelaVisita';
 
     return ApiManager.instance.makeApiCall(
@@ -1932,10 +1930,10 @@ class GetPessoasLocalCall {
   Future<ApiCallResponse> call() async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String ownerUUID = (await StorageHelper().get(SQLiteStorageKey.ownerUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String ownerUUID = (await StorageHelper().g(SQLiteStorageKey.ownerUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
 
     return ApiManager.instance.makeApiCall(
       callName: 'getPessoasLocal',
@@ -1998,9 +1996,9 @@ class RespondeSolicitacaoCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'respondeSolicitacao';
 
     return ApiManager.instance.makeApiCall(
@@ -2048,9 +2046,9 @@ class GetAccessCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'getAcessos';
 
     return ApiManager.instance.makeApiCall(
@@ -2297,10 +2295,9 @@ class GetLiberationsCall {
     final StreamController<ApiCallResponse> controller = StreamController();
 
     Future.microtask(() async {
-      final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-      final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-      final String cliUUID =
-          (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+      final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+      final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+      final String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
       const String atividade = 'getSolicitacoes';
 
       try {
@@ -2490,9 +2487,9 @@ class GetMessagesCall {
   }) async {
     final String baseUrl = PhpGroup.getBaseUrl();
 
-    final String devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    final String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    final String userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    final String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     const String atividade = 'getMensagens';
 
     return ApiManager.instance.makeApiCall(
diff --git a/lib/backend/notifications/firebase_messaging_service.dart b/lib/backend/notifications/firebase_messaging_service.dart
index 1fa9864e..7dc5fd4f 100644
--- a/lib/backend/notifications/firebase_messaging_service.dart
+++ b/lib/backend/notifications/firebase_messaging_service.dart
@@ -43,7 +43,7 @@ class FirebaseMessagingService {
       final String? deviceToken = await _firebaseMessaging.getToken();
 
       if (deviceToken != null) {
-        await StorageHelper().set(SecureStorageKey.token.value, deviceToken, Storage.SecureStorage);
+        await StorageHelper().s(SecureStorageKey.token.value, deviceToken);
         final ApiCallResponse? response;
 
         response = await PhpGroup.updToken.call();
diff --git a/lib/backend/notifications/notification_service.dart b/lib/backend/notifications/notification_service.dart
index b15eb326..f97f7a63 100644
--- a/lib/backend/notifications/notification_service.dart
+++ b/lib/backend/notifications/notification_service.dart
@@ -15,7 +15,7 @@ import 'package:hub/shared/utils/dialog_util.dart';
 Future<void> onMessageReceived(Map<String, dynamic> payload, String? extra, String? handleClick) async {
   final localId = jsonDecode(payload['local']!)['CLI_ID'];
 
-  final cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+  final cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
 
   answersRequest(
       {required BuildContext context,
@@ -239,7 +239,7 @@ Future<void> onMessageReceived(Map<String, dynamic> payload, String? extra, Stri
 
       break;
     case 'enroll_cond':
-      await StorageHelper().set(SecureStorageKey.haveLocal.value, 'true', Storage.SecureStorage);
+      await StorageHelper().s(SecureStorageKey.haveLocal.value, 'true');
       StorageHelper().context!.go('/homePage');
       break;
     default:
@@ -271,11 +271,11 @@ class NotificationService {
 
     await AwesomeNotifications().isNotificationAllowed().then((isAllowed) async {
       final bool requestOSnotification =
-          (await StorageHelper().get(SQLiteStorageKey.requestOSNotification.value, Storage.SQLiteStorage)) == 'true';
+          (await StorageHelper().g(SQLiteStorageKey.requestOSNotification.value)) == 'true';
 
       if (requestOSnotification == false) {
         if (isAllowed == false) {
-          await StorageHelper().set(SQLiteStorageKey.requestOSNotification.value, 'true', Storage.SQLiteStorage);
+          await StorageHelper().s(SQLiteStorageKey.requestOSNotification.value, 'true');
           await AwesomeNotifications().requestPermissionToSendNotifications();
         }
       }
diff --git a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
index e5ebe5e3..b9a930ed 100644
--- a/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
+++ b/lib/components/organism_components/bottom_arrow_linked_locals_component/bottom_arrow_linked_locals_component_widget.dart
@@ -105,9 +105,9 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
         if (isEnabled) {
           final local = locals[0];
 
-          await StorageHelper().set(SQLiteStorageKey.clientName.value, local['CLI_NOME'], Storage.SQLiteStorage);
-          await StorageHelper().set(SQLiteStorageKey.clientUUID.value, local['CLI_ID'], Storage.SQLiteStorage);
-          await StorageHelper().set(SQLiteStorageKey.ownerUUID.value, local['CLU_OWNER_ID'], Storage.SQLiteStorage);
+          await StorageHelper().s(SQLiteStorageKey.clientName.value, local['CLI_NOME']);
+          await StorageHelper().s(SQLiteStorageKey.clientUUID.value, local['CLI_ID']);
+          await StorageHelper().s(SQLiteStorageKey.ownerUUID.value, local['CLU_OWNER_ID']);
 
           context.pop();
           return widget.response;
@@ -137,7 +137,7 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
 
   Future<dynamic> _fetchResponseLink(String status, String cliID) async {
     try {
-      await StorageHelper().set(SQLiteStorageKey.clientUUID.value, cliID, Storage.SQLiteStorage);
+      await StorageHelper().s(SQLiteStorageKey.clientUUID.value, cliID);
       var response = await PhpGroup.resopndeVinculo.call(tarefa: status);
 
       if (response.jsonBody['error'] == false) {
@@ -147,7 +147,7 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
               .getVariableText(ptText: "Vínculo Ativado com Sucesso", enText: "Link Activated Successfully")
         };
       } else {
-        await StorageHelper().set(SQLiteStorageKey.clientUUID.value, '', Storage.SQLiteStorage);
+        await StorageHelper().s(SQLiteStorageKey.clientUUID.value, '');
         return response.jsonBody;
       }
     } catch (e, s) {
@@ -195,9 +195,9 @@ class _BottomArrowLinkedLocalsComponentWidgetState extends State<BottomArrowLink
       statusHashMap: [_statusHashMap(local)],
       onTapCardItemAction: () async {
         if (local['CLU_STATUS'] == 'A') {
-          await StorageHelper().set(SQLiteStorageKey.clientUUID.value, local['CLI_ID'], Storage.SQLiteStorage);
-          await StorageHelper().set(SQLiteStorageKey.clientName.value, local['CLI_NOME'], Storage.SQLiteStorage);
-          await StorageHelper().set(SQLiteStorageKey.ownerUUID.value, local['CLU_OWNER_ID'], Storage.SQLiteStorage);
+          await StorageHelper().s(SQLiteStorageKey.clientUUID.value, local['CLI_ID']);
+          await StorageHelper().s(SQLiteStorageKey.clientName.value, local['CLI_NOME']);
+          await StorageHelper().s(SQLiteStorageKey.ownerUUID.value, local['CLU_OWNER_ID']);
 
           context.pop(true);
           return true;
diff --git a/lib/components/organism_components/local_profile_component/local_profile_component_model.dart b/lib/components/organism_components/local_profile_component/local_profile_component_model.dart
index aec1deda..1f9aee8d 100644
--- a/lib/components/organism_components/local_profile_component/local_profile_component_model.dart
+++ b/lib/components/organism_components/local_profile_component/local_profile_component_model.dart
@@ -18,8 +18,8 @@ class LocalProfileComponentModel extends FlutterFlowModel<LocalProfileComponentW
   }
 
   Future<void> getData() async {
-    cliName = (await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    cliName = (await StorageHelper().g(SQLiteStorageKey.clientName.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     setStateCallback?.call();
   }
 
diff --git a/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart b/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart
index 2ea21dd2..2b47bcc0 100644
--- a/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart
+++ b/lib/components/organism_components/local_profile_component/local_profile_component_widget.dart
@@ -97,7 +97,7 @@ class _LocalProfileComponentWidgetState extends State<LocalProfileComponentWidge
                         hoverColor: Colors.transparent,
                         highlightColor: Colors.transparent,
                         onTap: () async {
-                          await StorageHelper().set(SQLiteStorageKey.clientUUID.value, '', Storage.SQLiteStorage);
+                          await StorageHelper().s(SQLiteStorageKey.clientUUID.value, '');
                           await LocalizationService.processLocals(context).whenComplete(() => onUpdate());
                         },
                         child: ClipRRect(
diff --git a/lib/components/organism_components/menu_component/menu_component_model.dart b/lib/components/organism_components/menu_component/menu_component_model.dart
index 106dbf6c..7b1579f8 100644
--- a/lib/components/organism_components/menu_component/menu_component_model.dart
+++ b/lib/components/organism_components/menu_component/menu_component_model.dart
@@ -60,8 +60,7 @@ class MenuComponentModel extends FlutterFlowModel<MenuComponentWidget> {
   }
 
   Future openDeliverySchedule(BuildContext context) async {
-    final bool isProvisional =
-        await StorageHelper().get(SQLiteStorageKey.provisional.value, Storage.SQLiteStorage) == 'true';
+    final bool isProvisional = await StorageHelper().g(SQLiteStorageKey.provisional.value) == 'true';
     if (isProvisional == true) {
       context.push(
         '/deliverySchedule',
@@ -79,8 +78,7 @@ class MenuComponentModel extends FlutterFlowModel<MenuComponentWidget> {
   }
 
   Future openProvisionalSchedule(BuildContext context) async {
-    final isProvisional =
-        await StorageHelper().get(SQLiteStorageKey.provisional.value, Storage.SQLiteStorage) == 'true';
+    final isProvisional = await StorageHelper().g(SQLiteStorageKey.provisional.value) == 'true';
     if (isProvisional == true) {
       context.push(
         '/provisionalSchedule',
@@ -98,7 +96,7 @@ class MenuComponentModel extends FlutterFlowModel<MenuComponentWidget> {
   }
 
   Future openFastPassSchedule(BuildContext context) async {
-    final isWpp = await StorageHelper().get(SQLiteStorageKey.whatsapp.value, Storage.SQLiteStorage) == 'true';
+    final isWpp = await StorageHelper().g(SQLiteStorageKey.whatsapp.value) == 'true';
     if (isWpp) {
       context.push(
         '/fastPassPage',
@@ -207,7 +205,7 @@ class MenuComponentModel extends FlutterFlowModel<MenuComponentWidget> {
   }
 
   Future openMyOrders(BuildContext context) async {
-    final isWpp = await StorageHelper().get(SQLiteStorageKey.whatsapp.value, Storage.SQLiteStorage) == 'true';
+    final isWpp = await StorageHelper().g(SQLiteStorageKey.whatsapp.value) == 'true';
     ;
     if (isWpp) {
       context.push(
@@ -226,7 +224,7 @@ class MenuComponentModel extends FlutterFlowModel<MenuComponentWidget> {
   }
 
   Future openReservations(BuildContext context) async {
-    final isWpp = await StorageHelper().get(SQLiteStorageKey.whatsapp.value, Storage.SQLiteStorage) == 'true';
+    final isWpp = await StorageHelper().g(SQLiteStorageKey.whatsapp.value) == 'true';
     ;
     if (isWpp) {
       context.push(
@@ -343,7 +341,7 @@ class MenuComponentModel extends FlutterFlowModel<MenuComponentWidget> {
   }
 
   Future openPetsRegister(BuildContext context) async {
-    bool isPet = await StorageHelper().get(SQLiteStorageKey.pets.value, Storage.SQLiteStorage) == 'true';
+    bool isPet = await StorageHelper().g(SQLiteStorageKey.pets.value) == 'true';
     ;
     if (isPet) {
       context.push(
diff --git a/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart b/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart
index f65158fa..81050e87 100644
--- a/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart
+++ b/lib/components/organism_components/schedule_visit_detail/schedule_visit_detail_model.dart
@@ -56,9 +56,9 @@ class ScheduleVisitDetailModel extends FlutterFlowModel<ScheduleVisitDetailWidge
   }
 
   Future<void> initDB() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
   }
 
   @override
diff --git a/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart b/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart
index b1733956..c808f15d 100644
--- a/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart
+++ b/lib/components/organism_components/up_arrow_linked_locals_component/up_arrow_linked_locals_component_model.dart
@@ -16,10 +16,10 @@ class UpArrowLinkedLocalsComponentModel extends FlutterFlowModel<UpArrowLinkedLo
   }
 
   Future<void> initDB() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliName = (await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
+    cliName = (await StorageHelper().g(SQLiteStorageKey.clientName.value)) ?? '';
   }
 
   @override
diff --git a/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart b/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart
index 1de0af97..b076651b 100644
--- a/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart
+++ b/lib/components/templates_components/access_notification_modal_template_component/access_notification_modal_template_component_model.dart
@@ -32,9 +32,9 @@ class AccessNotificationModalTemplateComponentModel
   }
 
   Future<void> initDB() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
   }
 
   @override
diff --git a/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart b/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart
index 90395b06..bb0d3126 100644
--- a/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart
+++ b/lib/components/templates_components/change_passs_qr_code_pass_key_template_component/change_pass_widget.dart
@@ -49,7 +49,7 @@ class _PassKeyTemplateWidgetState extends State<PassKeyTemplateWidget> {
   }
 
   Future<void> _initialize() async {
-    _accessPass = await StorageHelper().get(SecureStorageKey.accessPass.value, Storage.SecureStorage) ?? '';
+    _accessPass = await StorageHelper().g(SecureStorageKey.accessPass.value) ?? '';
   }
 
   @override
diff --git a/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart b/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart
index 26e45baa..9bf42aee 100644
--- a/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart
+++ b/lib/components/templates_components/liberation_history_item_details_template_component/liberation_history_item_details_template_component_model.dart
@@ -27,9 +27,9 @@ class LiberationHistoryItemDetailsTemplateComponentModel
   void initState(BuildContext context) {}
 
   Future<void> initDatabase() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     ;
   }
 
diff --git a/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart b/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart
index 7c86e00d..41a8c60e 100644
--- a/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart
+++ b/lib/components/templates_components/provisional_schedule_template/provisional_schedule_template_model.dart
@@ -138,12 +138,12 @@ class ScheduleProvisionalVisitPageModel extends FlutterFlowModel<ScheduleProvisi
   }
 
   Future<void> init() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     ;
-    cliName = (await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage)) ?? '';
-    ownerUUID = (await StorageHelper().get(SQLiteStorageKey.ownerUUID.value, Storage.SQLiteStorage)) ?? '';
+    cliName = (await StorageHelper().g(SQLiteStorageKey.clientName.value)) ?? '';
+    ownerUUID = (await StorageHelper().g(SQLiteStorageKey.ownerUUID.value)) ?? '';
     setState?.call();
   }
 }
diff --git a/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart b/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart
index 44b53bb8..0aaecec6 100644
--- a/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart
+++ b/lib/components/templates_components/regisiter_vistor_template_component/regisiter_vistor_template_component_model.dart
@@ -129,9 +129,9 @@ class RegisiterVistorTemplateComponentModel extends FlutterFlowModel<RegisiterVi
   }
 
   Future<void> initializeDatabase() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     ;
   }
 
diff --git a/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart b/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart
index 61787f05..332234e6 100644
--- a/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart
+++ b/lib/components/templates_components/sign_up_template_component/sign_up_template_component_widget.dart
@@ -91,7 +91,7 @@ class _SignUpTemplateComponentWidgetState extends State<SignUpTemplateComponentW
   }
 
   Future<void> _initialize() async {
-    _deviceType = (await StorageHelper().get(SecureStorageKey.deviceType.value, Storage.SecureStorage)) ?? '';
+    _deviceType = (await StorageHelper().g(SecureStorageKey.deviceType.value)) ?? '';
   }
 
   @override
diff --git a/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart b/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart
index 5113e702..ae428c74 100644
--- a/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart
+++ b/lib/components/templates_components/view_visit_detail/view_visit_detail_model.dart
@@ -37,9 +37,9 @@ class ViewVisitDetailModel extends FlutterFlowModel<ViewVisitDetailWidget> {
   }
 
   Future<void> initializeDatabase() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     ;
   }
 
diff --git a/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart b/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart
index eb9d3806..4c9ef4c0 100644
--- a/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart
+++ b/lib/components/templates_components/visitor_search_modal_template_component/visitor_search_modal_template_component_model.dart
@@ -35,9 +35,9 @@ class VisitorSearchModalTemplateComponentModel extends FlutterFlowModel<VisitorS
   }
 
   Future<void> initDatabase() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     ;
   }
 
diff --git a/lib/flutter_flow/nav/nav.dart b/lib/flutter_flow/nav/nav.dart
index f891b962..fe46ac17 100644
--- a/lib/flutter_flow/nav/nav.dart
+++ b/lib/flutter_flow/nav/nav.dart
@@ -80,16 +80,10 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) {
         builder: (context, _) {
           return FutureBuilder<Widget>(
             future: () async {
-              final bool isLogged =
-                  await StorageHelper().get(SecureStorageKey.isLogged.value, Storage.SecureStorage) == 'true';
-              final bool haveLocal =
-                  await StorageHelper().get(SecureStorageKey.haveLocal.value, Storage.SecureStorage) == 'true';
-              final bool haveUserUUID =
-                  (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage))?.isNotEmpty ??
-                      false;
-              final bool haveDevUUID =
-                  (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage))?.isNotEmpty ??
-                      false;
+              final bool isLogged = await StorageHelper().g(SecureStorageKey.isLogged.value) == 'true';
+              final bool haveLocal = await StorageHelper().g(SecureStorageKey.haveLocal.value) == 'true';
+              final bool haveUserUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value))?.isNotEmpty ?? false;
+              final bool haveDevUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value))?.isNotEmpty ?? false;
 
               if (isLogged && haveDevUUID && haveUserUUID) {
                 return haveLocal ? const HomePageWidget() : const ReceptionPageWidget();
diff --git a/lib/main.dart b/lib/main.dart
index 7fcd9d7b..b864eb60 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -83,7 +83,7 @@ Future<void> _initializeFlutterFlow() async {
 
 Future<void> _foregroundHandlerMessage(RemoteMessage message) async {
   if (message.data['click_action'] == 'enroll_cond') {
-    await StorageHelper().set(SecureStorageKey.haveLocal.value, 'true', Storage.SecureStorage);
+    await StorageHelper().s(SecureStorageKey.haveLocal.value, 'true');
     StorageHelper().context?.go('/homePage');
   }
 
@@ -97,7 +97,7 @@ Future<void> _foregroundHandlerMessage(RemoteMessage message) async {
 
 Future<void> _backgroundHandlerMessage(RemoteMessage message) async {
   if (message.data['click_action'] == 'enroll_cond') {
-    await StorageHelper().set(SecureStorageKey.haveLocal.value, 'true', Storage.SecureStorage);
+    await StorageHelper().s(SecureStorageKey.haveLocal.value, 'true');
     StorageHelper().context?.go('/homePage');
   }
 }
@@ -226,7 +226,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
     FirebaseMessaging.onMessage.listen(_foregroundHandlerMessage);
     FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) async {
       if (message.data['click_action'] == 'enroll_cond') {
-        await StorageHelper().set(SecureStorageKey.haveLocal.value, 'true', Storage.SecureStorage);
+        await StorageHelper().s(SecureStorageKey.haveLocal.value, 'true');
         log('onMessageOpenedApp');
       } else {
         onMessageReceived(message.data, message.notification!.body, message.data['click_action']);
@@ -235,7 +235,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
     FirebaseMessaging.instance.getInitialMessage().then((message) async {
       if (message != null) {
         if (message.data['click_action'] == 'enroll_cond') {
-          await StorageHelper().set(SecureStorageKey.haveLocal.value, 'true', Storage.SecureStorage);
+          await StorageHelper().s(SecureStorageKey.haveLocal.value, 'true');
           log('getInitialMessage');
         }
       }
@@ -281,7 +281,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
     if (state == AppLifecycleState.detached) {
       await LocalizationService.processLocals(context);
       FirebaseMessagingService().updateDeviceToken();
-    } 
+    }
   }
 
   @override
diff --git a/lib/pages/acess_history_page/acess_history_page_model.dart b/lib/pages/acess_history_page/acess_history_page_model.dart
index e42c0cf5..eb2fc0c1 100644
--- a/lib/pages/acess_history_page/acess_history_page_model.dart
+++ b/lib/pages/acess_history_page/acess_history_page_model.dart
@@ -33,9 +33,9 @@ class AcessHistoryPageModel extends FlutterFlowModel<AccessHistoryScreen> {
   }
 
   Future<void> initDatabase() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
   }
 
   @override
diff --git a/lib/pages/fast_pass_page/fast_pass_page_widget.dart b/lib/pages/fast_pass_page/fast_pass_page_widget.dart
index c713c0a8..fc06c01c 100644
--- a/lib/pages/fast_pass_page/fast_pass_page_widget.dart
+++ b/lib/pages/fast_pass_page/fast_pass_page_widget.dart
@@ -23,11 +23,11 @@ class _FastPassPageWidgetState extends State<FastPassPageWidget> {
   late InAppWebViewController _controllerIOS;
 
   Future<Map<String, String>> initVariables() async {
-    final email = (await StorageHelper().get(hub.SecureStorageKey.email.value, hub.Storage.SecureStorage)) ?? '';
-    final name = (await StorageHelper().get(hub.SQLiteStorageKey.userName.value, hub.Storage.SQLiteStorage)) ?? '';
-    final devUUID = (await StorageHelper().get(hub.SQLiteStorageKey.devUUID.value, hub.Storage.SQLiteStorage)) ?? '';
-    final userUUID = (await StorageHelper().get(hub.SQLiteStorageKey.userUUID.value, hub.Storage.SQLiteStorage)) ?? '';
-    final cliUUID = (await StorageHelper().get(hub.SQLiteStorageKey.clientUUID.value, hub.Storage.SQLiteStorage)) ?? '';
+    final email = (await StorageHelper().g(hub.SecureStorageKey.email.value)) ?? '';
+    final name = (await StorageHelper().g(hub.SQLiteStorageKey.userName.value)) ?? '';
+    final devUUID = (await StorageHelper().g(hub.SQLiteStorageKey.devUUID.value)) ?? '';
+    final userUUID = (await StorageHelper().g(hub.SQLiteStorageKey.userUUID.value)) ?? '';
+    final cliUUID = (await StorageHelper().g(hub.SQLiteStorageKey.clientUUID.value)) ?? '';
     const createdAt = '0000-00-00 00:00:00';
     final url = 'https://hub.freaccess.com.br/hub/fast-pass/$cliUUID';
     final freUserData =
diff --git a/lib/pages/home_page/home_page_model.dart b/lib/pages/home_page/home_page_model.dart
index dad2a7fe..bfa6dafa 100644
--- a/lib/pages/home_page/home_page_model.dart
+++ b/lib/pages/home_page/home_page_model.dart
@@ -24,11 +24,11 @@ class HomePageModel extends FlutterFlowModel<HomePageWidget> {
   late MessageWellComponentModel messageWellComponentModel;
 
   Future<void> _initVariable() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
-    userName = (await StorageHelper().get(SQLiteStorageKey.userName.value, Storage.SQLiteStorage)) ?? '';
-    userEmail = (await StorageHelper().get(SecureStorageKey.email.value, Storage.SecureStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
+    userName = (await StorageHelper().g(SQLiteStorageKey.userName.value)) ?? '';
+    userEmail = (await StorageHelper().g(SecureStorageKey.email.value)) ?? '';
   }
 
   @override
diff --git a/lib/pages/liberation_history/liberation_history_model.dart b/lib/pages/liberation_history/liberation_history_model.dart
index d0ff3638..a6296804 100644
--- a/lib/pages/liberation_history/liberation_history_model.dart
+++ b/lib/pages/liberation_history/liberation_history_model.dart
@@ -36,9 +36,9 @@ class LiberationHistoryModel extends FlutterFlowModel<LiberationHistoryWidget> {
   }
 
   Future<void> init() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
   }
 
   Future answersRequest(
diff --git a/lib/pages/message_history_page/message_history_page_model.dart b/lib/pages/message_history_page/message_history_page_model.dart
index e8fdacbc..bb6852d0 100644
--- a/lib/pages/message_history_page/message_history_page_model.dart
+++ b/lib/pages/message_history_page/message_history_page_model.dart
@@ -39,9 +39,9 @@ class MessageHistoryPageModel extends FlutterFlowModel<MessageHistoryPageWidget>
   }
 
   Future<void> init() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
   }
 
   @override
diff --git a/lib/pages/package_order_page/package_order_page.dart b/lib/pages/package_order_page/package_order_page.dart
index d480b952..b7412d3f 100644
--- a/lib/pages/package_order_page/package_order_page.dart
+++ b/lib/pages/package_order_page/package_order_page.dart
@@ -64,7 +64,7 @@ class _PackageOrderPage extends State<PackageOrderPage> {
   }
 
   Future<void> initDatabase() async {
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
   }
 
   @override
diff --git a/lib/pages/pets_page/pets_history_screen.dart b/lib/pages/pets_page/pets_history_screen.dart
index 917a041d..74249fb2 100644
--- a/lib/pages/pets_page/pets_history_screen.dart
+++ b/lib/pages/pets_page/pets_history_screen.dart
@@ -229,10 +229,10 @@ class _PetsHistoryScreenState extends State<PetsHistoryScreen> with TickerProvid
           }
       ],
       onTapCardItemAction: () async {
-        final devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-        final userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-        final cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
-        final cliName = (await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage)) ?? '';
+        final devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+        final userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+        final cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
+        final cliName = (await StorageHelper().g(SQLiteStorageKey.clientName.value)) ?? '';
         await showDialog(
           useSafeArea: true,
           context: context,
diff --git a/lib/pages/pets_page/pets_page_model.dart b/lib/pages/pets_page/pets_page_model.dart
index d0e5b3f5..94bf39b9 100644
--- a/lib/pages/pets_page/pets_page_model.dart
+++ b/lib/pages/pets_page/pets_page_model.dart
@@ -144,10 +144,10 @@ class PetsPageModel extends FlutterFlowModel<PetsPageWidget> {
     textControllerObservation = TextEditingController();
 
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      devUUID = await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage) ?? '';
-      userUUID = await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage) ?? '';
-      cliUUID = await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage) ?? '';
-      petAmountRegister = await StorageHelper().get(SQLiteStorageKey.petAmount.value, Storage.SQLiteStorage) ?? '';
+      devUUID = await StorageHelper().g(SQLiteStorageKey.devUUID.value) ?? '';
+      userUUID = await StorageHelper().g(SQLiteStorageKey.userUUID.value) ?? '';
+      cliUUID = await StorageHelper().g(SQLiteStorageKey.clientUUID.value) ?? '';
+      petAmountRegister = await StorageHelper().g(SQLiteStorageKey.petAmount.value) ?? '';
     });
   }
 
diff --git a/lib/pages/preferences_settings_page/preferences_settings_model.dart b/lib/pages/preferences_settings_page/preferences_settings_model.dart
index 2b57ed67..af8623bf 100644
--- a/lib/pages/preferences_settings_page/preferences_settings_model.dart
+++ b/lib/pages/preferences_settings_page/preferences_settings_model.dart
@@ -23,11 +23,11 @@ class PreferencesPageModel with ChangeNotifier {
   late bool isPanic = false;
 
   Future<void> _initialize() async {
-    isFingerprint = await StorageHelper().get(SQLiteStorageKey.fingerprint.value, Storage.SQLiteStorage) == 'true';
-    isPerson = await StorageHelper().get(SQLiteStorageKey.person.value, Storage.SQLiteStorage) == 'true';
-    isNotify = await StorageHelper().get(SQLiteStorageKey.notify.value, Storage.SQLiteStorage) == 'true';
-    isAccess = await StorageHelper().get(SQLiteStorageKey.access.value, Storage.SQLiteStorage) == 'true';
-    isPanic = await StorageHelper().get(SQLiteStorageKey.panic.value, Storage.SQLiteStorage) == 'true';
+    isFingerprint = await StorageHelper().g(SQLiteStorageKey.fingerprint.value) == 'true';
+    isPerson = await StorageHelper().g(SQLiteStorageKey.person.value) == 'true';
+    isNotify = await StorageHelper().g(SQLiteStorageKey.notify.value) == 'true';
+    isAccess = await StorageHelper().g(SQLiteStorageKey.access.value) == 'true';
+    isPanic = await StorageHelper().g(SQLiteStorageKey.panic.value) == 'true';
     notifyListeners();
   }
 
@@ -36,8 +36,7 @@ class PreferencesPageModel with ChangeNotifier {
   }
 
   Future<void> enablePerson(BuildContext context) async {
-    final String userDevUUID =
-        (await StorageHelper().get(SQLiteStorageKey.userDevUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String userDevUUID = (await StorageHelper().g(SQLiteStorageKey.userDevUUID.value)) ?? '';
     notifyListeners();
     Share.share(
       FFLocalizations.of(context).getVariableText(
@@ -64,8 +63,7 @@ class PreferencesPageModel with ChangeNotifier {
           .call(notifica: value)
           .then((value) async {
             if (value.jsonBody['error'] == false) {
-              await StorageHelper()
-                  .set(SQLiteStorageKey.notify.value, isNotify ? 'false' : 'true', Storage.SQLiteStorage);
+              await StorageHelper().s(SQLiteStorageKey.notify.value, isNotify ? 'false' : 'true');
               content = FFLocalizations.of(context).getVariableText(
                 enText: 'Notification changed successfully',
                 ptText: 'Notificação alterada com sucesso',
@@ -88,8 +86,7 @@ class PreferencesPageModel with ChangeNotifier {
             );
             SnackBarUtil.showSnackBar(context, content, isError: true);
           })
-          .then((_) async =>
-              isNotify = await StorageHelper().get(SQLiteStorageKey.notify.value, Storage.SQLiteStorage) == 'true')
+          .then((_) async => isNotify = await StorageHelper().g(SQLiteStorageKey.notify.value) == 'true')
           .whenComplete(() => notifyListeners());
       context.pop();
     }
@@ -138,14 +135,13 @@ class PreferencesPageModel with ChangeNotifier {
 
   Future<void> toggleAccess(BuildContext context) async {
     onChange(String key) async {
-      await StorageHelper().set(SecureStorageKey.accessPass.value, key, Storage.SecureStorage);
+      await StorageHelper().s(SecureStorageKey.accessPass.value, key);
       await PhpGroup.changePass
           .call(newSenha: key)
           .then((value) async {
             final String content;
             if (jsonDecode(value.jsonBody['error'].toString()) == false) {
-              await StorageHelper()
-                  .set(SQLiteStorageKey.access.value, isAccess ? 'false' : 'true', Storage.SQLiteStorage);
+              await StorageHelper().s(SQLiteStorageKey.access.value, isAccess ? 'false' : 'true');
               notifyListeners();
               content = FFLocalizations.of(context).getVariableText(
                 enText: 'Access pass changed successfully',
@@ -167,8 +163,7 @@ class PreferencesPageModel with ChangeNotifier {
             );
             SnackBarUtil.showSnackBar(context, content, isError: true);
           })
-          .then((_) async =>
-              isAccess = await StorageHelper().get(SQLiteStorageKey.access.value, Storage.SQLiteStorage) == 'true')
+          .then((_) async => isAccess = await StorageHelper().g(SQLiteStorageKey.access.value) == 'true')
           .whenComplete(() => notifyListeners());
     }
 
@@ -177,14 +172,13 @@ class PreferencesPageModel with ChangeNotifier {
 
   Future<void> togglePanic(BuildContext context) async {
     onChange(String key) async {
-      await StorageHelper().set(SecureStorageKey.panicPass.value, key, Storage.SecureStorage);
+      await StorageHelper().s(SecureStorageKey.panicPass.value, key);
       await PhpGroup.changePanic
           .call(newSenhaPanico: key)
           .then((value) async {
             final String content;
             if (jsonDecode(value.jsonBody['error'].toString()) == false) {
-              await StorageHelper()
-                  .set(SQLiteStorageKey.panic.value, isPanic ? 'false' : 'true', Storage.SQLiteStorage);
+              await StorageHelper().s(SQLiteStorageKey.panic.value, isPanic ? 'false' : 'true');
               notifyListeners();
               content = FFLocalizations.of(context).getVariableText(
                 enText: 'Panic password changed successfully',
@@ -206,8 +200,7 @@ class PreferencesPageModel with ChangeNotifier {
             );
             SnackBarUtil.showSnackBar(context, content, isError: true);
           })
-          .then((_) async =>
-              isPanic = await StorageHelper().get(SQLiteStorageKey.panic.value, Storage.SQLiteStorage) == 'true')
+          .then((_) async => isPanic = await StorageHelper().g(SQLiteStorageKey.panic.value) == 'true')
           .whenComplete(() => notifyListeners());
     }
 
@@ -222,12 +215,11 @@ class PreferencesPageModel with ChangeNotifier {
 
     onChange(String? key) async {
       isFingerprint = !isFingerprint;
-      await StorageHelper().set(SecureStorageKey.fingerprintPass.value, key ?? '', Storage.SecureStorage);
-      await StorageHelper()
-          .set(SQLiteStorageKey.fingerprint.value, isFingerprint ? 'true' : 'false', Storage.SQLiteStorage);
+      await StorageHelper().s(SecureStorageKey.fingerprintPass.value, key ?? '');
+      await StorageHelper().s(SQLiteStorageKey.fingerprint.value, isFingerprint ? 'true' : 'false');
       notifyListeners();
       SnackBarUtil.showSnackBar(context, content);
-      isFingerprint = await StorageHelper().get(SQLiteStorageKey.fingerprint.value, Storage.SQLiteStorage) == 'true';
+      isFingerprint = await StorageHelper().g(SQLiteStorageKey.fingerprint.value) == 'true';
     }
 
     isFingerprint ? onChange(null) : _showPassKey(context, onChange);
diff --git a/lib/pages/qr_code_page/qr_code_page_model.dart b/lib/pages/qr_code_page/qr_code_page_model.dart
index 514f99b2..c2786b7b 100644
--- a/lib/pages/qr_code_page/qr_code_page_model.dart
+++ b/lib/pages/qr_code_page/qr_code_page_model.dart
@@ -29,8 +29,8 @@ class QrCodePageModel extends FlutterFlowModel<QrCodePageWidget> {
   }
 
   Future<void> initVariable() async {
-    isFingerprint = await StorageHelper().get(SQLiteStorageKey.fingerprint.value, Storage.SQLiteStorage) == 'true';
-    userDevUUID = await StorageHelper().get(SQLiteStorageKey.userDevUUID.value, Storage.SQLiteStorage) ?? '';
+    isFingerprint = await StorageHelper().g(SQLiteStorageKey.fingerprint.value) == 'true';
+    userDevUUID = await StorageHelper().g(SQLiteStorageKey.userDevUUID.value) ?? '';
     safeSetState?.call();
   }
 
diff --git a/lib/pages/qr_code_page/qr_code_page_widget.dart b/lib/pages/qr_code_page/qr_code_page_widget.dart
index 43d904df..23c8e894 100644
--- a/lib/pages/qr_code_page/qr_code_page_widget.dart
+++ b/lib/pages/qr_code_page/qr_code_page_widget.dart
@@ -353,7 +353,7 @@ class _QrCodePageWidgetState extends State<QrCodePageWidget> with TickerProvider
     await BiometricHelper.checkBiometrics()
         .then((value) async => await BiometricHelper.authenticateBiometric().then((value) async {
               if (value == false) throw Exception('Biometric authentication failed');
-              final key = await StorageHelper().get(SecureStorageKey.fingerprintPass.value, Storage.SecureStorage);
+              final key = await StorageHelper().g(SecureStorageKey.fingerprintPass.value);
               if (key == null || key.isEmpty) throw Exception('No key found');
               safeSetState(() {
                 if (animationsMap['barcodeOnActionTriggerAnimation'] != null) {
diff --git a/lib/pages/reception_page/reception_page_model.dart b/lib/pages/reception_page/reception_page_model.dart
index ad6c4b2e..e406e8c1 100644
--- a/lib/pages/reception_page/reception_page_model.dart
+++ b/lib/pages/reception_page/reception_page_model.dart
@@ -6,8 +6,7 @@ import 'package:share_plus/share_plus.dart';
 
 class ReceptionPageModel with ChangeNotifier {
   Future<void> getIdenfifier(BuildContext context) async {
-    final String userDevUUID =
-        (await StorageHelper().get(SQLiteStorageKey.userDevUUID.value, Storage.SQLiteStorage)) ?? '';
+    final String userDevUUID = (await StorageHelper().g(SQLiteStorageKey.userDevUUID.value)) ?? '';
 
     notifyListeners();
     Share.share(
diff --git a/lib/pages/reception_page/reception_page_widget.dart b/lib/pages/reception_page/reception_page_widget.dart
index 9cf5a0a8..e6e76e17 100644
--- a/lib/pages/reception_page/reception_page_widget.dart
+++ b/lib/pages/reception_page/reception_page_widget.dart
@@ -163,7 +163,7 @@ class _ReceptionPageWidgetState extends State<ReceptionPageWidget> with WidgetsB
                               onPressed: () async {
                                 PhpGroup.unregisterDevice();
 
-                                StorageHelper().clearAll(Storage.SecureStorage);
+                                StorageHelper().c(Storage.secureStorage);
 
                                 setState(() {});
 
diff --git a/lib/pages/reservation_page/reservation_page_widget.dart b/lib/pages/reservation_page/reservation_page_widget.dart
index c8e210c3..5200e03a 100644
--- a/lib/pages/reservation_page/reservation_page_widget.dart
+++ b/lib/pages/reservation_page/reservation_page_widget.dart
@@ -22,12 +22,11 @@ class _ReservationPageWidgetState extends State<ReservationPageWidget> {
   late WebViewController _controllerAll;
 
   Future<Map<String, String>> initVariables() async {
-    final email = (await StorageHelper().get(hub.SecureStorageKey.email.value, hub.Storage.SecureStorage)) ?? '';
-    final name = (await StorageHelper().get(hub.SQLiteStorageKey.userName.value, hub.Storage.SQLiteStorage)) ?? '';
-    final devUUID = (await StorageHelper().get(hub.SQLiteStorageKey.devUUID.value, hub.Storage.SQLiteStorage)) ?? '';
-    final userUUID = (await StorageHelper().get(hub.SQLiteStorageKey.userUUID.value, hub.Storage.SQLiteStorage)) ?? '';
-    final clientId =
-        (await StorageHelper().get(hub.SQLiteStorageKey.clientUUID.value, hub.Storage.SQLiteStorage)) ?? '';
+    final email = (await StorageHelper().g(hub.SecureStorageKey.email.value)) ?? '';
+    final name = (await StorageHelper().g(hub.SQLiteStorageKey.userName.value)) ?? '';
+    final devUUID = (await StorageHelper().g(hub.SQLiteStorageKey.devUUID.value)) ?? '';
+    final userUUID = (await StorageHelper().g(hub.SQLiteStorageKey.userUUID.value)) ?? '';
+    final clientId = (await StorageHelper().g(hub.SQLiteStorageKey.clientUUID.value)) ?? '';
     const createdAt = '0000-00-00 00:00:00';
 
     final url = 'https://hub.freaccess.com.br/hub/reservation/$clientId';
diff --git a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart
index 2acd9126..05440393 100644
--- a/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart
+++ b/lib/pages/schedule_complete_visit_page/schedule_complete_visit_page_model.dart
@@ -215,9 +215,9 @@ class ScheduleCompleteVisitPageModel extends FlutterFlowModel<ScheduleComplete>
   }
 
   Future<void> _initVariables() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
   }
 
   @override
diff --git a/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart b/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart
index 56022372..b95812ec 100644
--- a/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart
+++ b/lib/pages/schedule_complete_visit_page/visit_history_page_widget.dart
@@ -35,9 +35,9 @@ class _VisitHistoryWidgetState extends State<VisitHistoryWidget> with TickerProv
   List<dynamic> _visitWrap = [];
 
   Future<void> _initVariables() async {
-    devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-    userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-    cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+    userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+    cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
   }
 
   @override
@@ -245,10 +245,10 @@ class _VisitHistoryWidgetState extends State<VisitHistoryWidget> with TickerProv
           },
       ],
       onTapCardItemAction: () async {
-        final devUUID = (await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage)) ?? '';
-        final userUUID = (await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage)) ?? '';
-        final cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
-        final cliName = (await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage)) ?? '';
+        final devUUID = (await StorageHelper().g(SQLiteStorageKey.devUUID.value)) ?? '';
+        final userUUID = (await StorageHelper().g(SQLiteStorageKey.userUUID.value)) ?? '';
+        final cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
+        final cliName = (await StorageHelper().g(SQLiteStorageKey.clientName.value)) ?? '';
 
         await showDialog(
           useSafeArea: true,
diff --git a/lib/pages/welcome_page/welcome_page_widget.dart b/lib/pages/welcome_page/welcome_page_widget.dart
index cb24d5e1..96cc2ec9 100644
--- a/lib/pages/welcome_page/welcome_page_widget.dart
+++ b/lib/pages/welcome_page/welcome_page_widget.dart
@@ -31,13 +31,13 @@ class _WelcomePageWidgetState extends State<WelcomePageWidget> {
     // On page load action.
     SchedulerBinding.instance.addPostFrameCallback((_) async {
       if (isAndroid == true) {
-        await StorageHelper().set(SecureStorageKey.deviceType.value, 'Android', Storage.SecureStorage);
+        await StorageHelper().s(SecureStorageKey.deviceType.value, 'Android');
         setState(() {});
       } else if (isiOS == true) {
-        await StorageHelper().set(SecureStorageKey.deviceType.value, 'iOS', Storage.SecureStorage);
+        await StorageHelper().s(SecureStorageKey.deviceType.value, 'iOS');
         setState(() {});
       } else {
-        await StorageHelper().set(SecureStorageKey.deviceType.value, 'Web', Storage.SecureStorage);
+        await StorageHelper().s(SecureStorageKey.deviceType.value, 'Web');
         setState(() {});
       }
     });
diff --git a/lib/shared/helpers/base_storage.dart b/lib/shared/helpers/base_storage.dart
index 9cc96289..18712f8d 100644
--- a/lib/shared/helpers/base_storage.dart
+++ b/lib/shared/helpers/base_storage.dart
@@ -11,9 +11,11 @@ abstract class BaseStorage {
 }
 
 enum Storage {
-  SecureStorage,
-  SharedPreferences,
-  SQLiteStorage,
+  secureStorage,
+  sharedPreferences,
+  databaseStorage,
+  sqliteStorage,
+  licenseStorage,
 }
 
 enum SharedPreferencesKey {
diff --git a/lib/shared/helpers/database_storage.dart b/lib/shared/helpers/database_storage.dart
new file mode 100644
index 00000000..ce0cec67
--- /dev/null
+++ b/lib/shared/helpers/database_storage.dart
@@ -0,0 +1,44 @@
+import 'package:hub/shared/services/license/license_service.dart';
+import 'package:hub/shared/services/sqlite/sqlite_service.dart';
+import 'package:sqflite/sqflite.dart';
+import 'package:path/path.dart';
+import 'dart:developer';
+
+class DatabaseStorage {
+  static final String _dbName = 'database.db';
+  static final int _dbVersion = 2;
+
+  static final DatabaseStorage instance = DatabaseStorage._internal();
+  factory DatabaseStorage() => instance;
+  DatabaseStorage._internal();
+
+  static late final Database _database;
+  static Database get database => _database;
+
+  Future<void> init() async {
+    _database = await openDatabase(
+      join(await getDatabasesPath(), _dbName),
+      version: _dbVersion,
+      onCreate: _onCreate,
+      onUpgrade: _onUpgrade,
+      onDowngrade: _onDowngrade,
+    );
+  }
+
+  Future<void> _onCreate(Database database, int version) async {
+    log('Creating database...');
+    await database.execute(SQLiteStorage.createTableQuery);
+    await database.execute(LicenseService.createTableQuery);
+    await LicenseService.setupLicense();
+  }
+
+  Future<void> _onUpgrade(Database database, int oldVersion, int newVersion) async {
+    log('Upgrading database from version $oldVersion to $newVersion...');
+    if (oldVersion < 2) {
+      await database.execute(LicenseService.createTableQuery);
+      await LicenseService.setupLicense();
+    }
+  }
+
+  Future<void> _onDowngrade(Database database, int oldVersion, int newVersion) async {}
+}
diff --git a/lib/shared/helpers/sqlite_storage.dart b/lib/shared/helpers/sqlite_storage.dart
deleted file mode 100644
index 7f3261fa..00000000
--- a/lib/shared/helpers/sqlite_storage.dart
+++ /dev/null
@@ -1,180 +0,0 @@
-import 'dart:convert';
-import 'dart:developer';
-
-import 'package:hub/shared/helpers/base_storage.dart';
-import 'package:sqflite/sqflite.dart';
-import 'package:sqflite/sqlite_api.dart';
-import 'package:path/path.dart';
-
-class SQLiteStorage implements BaseStorage {
-  SQLiteStorage._();
-
-  static final String _dbName = 'database.db';
-  static final int _dbVersion = 2;
-
-  static const String tableKeychain = 'keychain';
-  static const String tableLicense = 'license';
-
-  static final SQLiteStorage instance = SQLiteStorage._();
-
-  static late final Database _database;
-  static Database get database => _database;
-
-  @override
-  Future<void> init() async {
-    _database = await openDatabase(
-      join(await getDatabasesPath(), _dbName),
-      version: _dbVersion,
-      onCreate: _onCreate,
-      onUpgrade: _onUpgrade,
-      onDowngrade: _onDowngrade,
-    );
-  }
-
-  _onCreate(Database database, int version) async {
-    log('Creating database...');
-    try {
-      await database.execute(_keychain);
-      await database.execute(_license);
-      await setupLicense();
-    } catch (e) {
-      log('Tables keychain and license already exists');
-    }
-  }
-
-  _onUpgrade(Database database, int oldVersion, int newVersion) async {
-    log('Upgrading database from version $oldVersion to $newVersion...');
-    if (oldVersion < 2) {
-      try {
-        await database.execute(_license);
-        await setupLicense();
-      } catch (e) {
-        log('Table license already exists');
-      }
-    }
-  }
-
-  _onDowngrade(Database database, int oldVersion, int newVersion) async {}
-
-  String get _keychain => '''
-    CREATE TABLE keychain (
-      key TEXT UNIQUE,
-      value TEXT,
-      type TEXT,
-      updateAt TEXT,
-      resolvedAt TEXT,
-      createdAt TEXT
-    );
-  ''';
-
-  String get _license => '''
-  CREATE TABLE license (
-    key TEXT UNIQUE,
-    display TEXT,
-    expirationDate TEXT,
-    startDate TEXT,
-    quantity TEXT
-  );
-  ''';
-
-  static Future<void> setupLicense() async {
-    log('initLicense()');
-    for (var element in LicenseStorageKey.values.map((e) => e.value)) {
-      await database.insert(
-        tableLicense,
-        {
-          'key': element,
-          'display': 'VISIVEL',
-          'expirationDate': '',
-          'startDate': '',
-          'quantity': '',
-        },
-        conflictAlgorithm: ConflictAlgorithm.ignore,
-      );
-    }
-  }
-
-  @override
-  Future<String?> get(String key) async {
-    if (LicenseStorageKey.values.map((e) => e.value).toList().contains(key)) {
-      return await _getLicense(key);
-    } else {
-      return await _getKeychain(key);
-    }
-  }
-
-  Future<String?> _getKeychain(String key) async {
-    var response = await _database.query(tableKeychain, where: 'key = ?', whereArgs: [key]);
-    if (response.isEmpty) {
-      return null;
-    }
-    return response.first['value'].toString();
-  }
-
-  Future<String?> _getLicense(String key) async {
-    var response = await _database.query(tableLicense, where: 'key = ?', whereArgs: [key]);
-    if (response.isEmpty) {
-      return null;
-    }
-    return response.first['value'].toString();
-  }
-
-  Future<String?> getAll(String table) async {
-    var response = await _database.query(table);
-    if (response.isEmpty) {
-      return null;
-    }
-    return jsonEncode(response);
-  }
-
-  @override
-  Future<void> set(String key, String value) async {
-    if (LicenseStorageKey.values.map((e) => e.value).toList().contains(key)) {
-      return await _setLicense(key, value);
-    } else {
-      return await _setKeychain(key, value);
-    }
-  }
-
-  Future<void> _setKeychain(String key, String value) async {
-    var date = DateTime.now().toIso8601String();
-    await _database.insert(
-        tableKeychain,
-        {
-          'key': key,
-          'value': value,
-          'type': 'local',
-          'updateAt': date,
-          'resolvedAt': date,
-          'createdAt': date,
-        },
-        conflictAlgorithm: ConflictAlgorithm.replace);
-  }
-
-  Future<void> _setLicense(String key, String value) async {
-    log('setLicense($key, $value)');
-    Map<String, dynamic> valueMap = jsonDecode(value);
-    log('String to Map<String, dynamic>: $value to $valueMap');
-
-    await _database.insert(
-        tableLicense,
-        {
-          'key': key,
-          'display': valueMap['display'],
-          'expirationDate': valueMap['expirationDate'],
-          'startDate': valueMap['startDate'],
-          'quantity': valueMap['quantity'],
-        },
-        conflictAlgorithm: ConflictAlgorithm.replace);
-  }
-
-  @override
-  Future<void> delete(String key) async {
-    await _database.delete('keychain', where: 'key = ?', whereArgs: [key]);
-  }
-
-  @override
-  Future<void> clearAll() async {
-    await _database.delete('keychain');
-  }
-}
diff --git a/lib/shared/helpers/storage_helper.dart b/lib/shared/helpers/storage_helper.dart
index 582a3b4b..7c233537 100644
--- a/lib/shared/helpers/storage_helper.dart
+++ b/lib/shared/helpers/storage_helper.dart
@@ -1,8 +1,10 @@
 import 'package:flutter/cupertino.dart';
 import 'package:hub/shared/helpers/base_storage.dart';
+import 'package:hub/shared/helpers/database_storage.dart';
 import 'package:hub/shared/helpers/secure_storage.dart';
 import 'package:hub/shared/helpers/shared_preferences_storage.dart';
-import 'package:hub/shared/helpers/sqlite_storage.dart';
+import 'package:hub/shared/services/license/license_service.dart';
+import 'package:hub/shared/services/sqlite/sqlite_service.dart';
 
 class StorageHelper {
   static final StorageHelper _instance = StorageHelper._internal();
@@ -20,7 +22,7 @@ class StorageHelper {
   Future<void> init() async {
     await SecureStorage.instance.init();
     await SharedPreferencesStorage.instance.init();
-    await SQLiteStorage.instance.init();
+    await DatabaseStorage.instance.init();
 
     String? isFirstRun = await SharedPreferencesStorage.instance.get(SharedPreferencesKey.isFirstRun.value);
 
@@ -30,47 +32,110 @@ class StorageHelper {
     }
   }
 
-  Future<String?> get(String key, Storage storage) {
+  static BaseStorage getInstance(Storage storage) {
     switch (storage) {
-      case Storage.SecureStorage:
-        return SecureStorage.instance.get(key);
-      case Storage.SharedPreferences:
-        return SharedPreferencesStorage.instance.get(key);
-      case Storage.SQLiteStorage:
-        return SQLiteStorage.instance.get(key);
+      case Storage.secureStorage:
+        return SecureStorage.instance;
+      case Storage.sharedPreferences:
+        return SharedPreferencesStorage.instance;
+      case Storage.sqliteStorage:
+        return SQLiteStorage.instance;
+      case Storage.licenseStorage:
+        return LicenseService();
+      default:
+        throw Exception('Storage not found');
     }
   }
 
-  Future<void> set(String key, String value, Storage storage) {
-    switch (storage) {
-      case Storage.SecureStorage:
-        return SecureStorage.instance.set(key, value);
-      case Storage.SharedPreferences:
-        return SharedPreferencesStorage.instance.set(key, value);
-      case Storage.SQLiteStorage:
-        return SQLiteStorage.instance.set(key, value);
+  static BaseStorage getInstanceByKey(String key) {
+    if (SecureStorageKey.values.map((e) => e.value).toList().contains(key)) {
+      return SecureStorage.instance;
     }
+    if (SharedPreferencesKey.values.map((e) => e.value).toList().contains(key)) {
+      return SharedPreferencesStorage.instance;
+    }
+    if (SQLiteStorageKey.values.map((e) => e.value).toList().contains(key)) {
+      return SQLiteStorage.instance;
+    }
+    if (LicenseStorageKey.values.map((e) => e.value).toList().contains(key)) {
+      return LicenseService();
+    }
+    throw Exception('Key not found');
   }
 
-  Future<void> delete(String key, Storage storage) {
-    switch (storage) {
-      case Storage.SecureStorage:
-        return SecureStorage.instance.delete(key);
-      case Storage.SharedPreferences:
-        return SharedPreferencesStorage.instance.delete(key);
-      case Storage.SQLiteStorage:
-        return SQLiteStorage.instance.delete(key);
-    }
+  Future<String?> g(String key) {
+    return getInstanceByKey(key).get(key);
   }
 
-  Future<void> clearAll(Storage storage) {
-    switch (storage) {
-      case Storage.SecureStorage:
-        return SecureStorage.instance.clearAll();
-      case Storage.SharedPreferences:
-        return SharedPreferencesStorage.instance.clearAll();
-      case Storage.SQLiteStorage:
-        return SQLiteStorage.instance.clearAll();
-    }
+  Future<void> s(String key, String value) {
+    return getInstanceByKey(key).set(key, value);
   }
+
+  Future<void> d(String key) {
+    return getInstanceByKey(key).delete(key);
+  }
+
+  Future<void> c(Storage storage) {
+    return getInstance(storage).clearAll();
+  }
+
+  // Future<String?> get(String key, Storage storage) {
+  //   switch (storage) {
+  //     case Storage.SecureStorage:
+  //       return SecureStorage.instance.get(key);
+  //     case Storage.SharedPreferences:
+  //       return SharedPreferencesStorage.instance.get(key);
+  //     case Storage.SQLiteStorage:
+  //       return SQLiteStorage.instance.get(key);
+  //     case Storage.LicenseStorage:
+  //       return LicenseStorage.instance.get(key);
+  //     default:
+  //       throw Exception('Storage not found');
+  //   }
+  // }
+
+  // Future<void> set(String key, String value, Storage storage) {
+  //   switch (storage) {
+  //     case Storage.SecureStorage:
+  //       return SecureStorage.instance.set(key, value);
+  //     case Storage.SharedPreferences:
+  //       return SharedPreferencesStorage.instance.set(key, value);
+  //     case Storage.SQLiteStorage:
+  //       return SQLiteStorage.instance.set(key, value);
+  //     case Storage.LicenseStorage:
+  //       return LicenseStorage.instance.set(key, value);
+  //     default:
+  //       throw Exception('Storage not found');
+  //   }
+  // }
+
+  // Future<void> delete(String key, Storage storage) {
+  //   switch (storage) {
+  //     case Storage.SecureStorage:
+  //       return SecureStorage.instance.delete(key);
+  //     case Storage.SharedPreferences:
+  //       return SharedPreferencesStorage.instance.delete(key);
+  //     case Storage.SQLiteStorage:
+  //       return SQLiteStorage.instance.delete(key);
+  //     case Storage.LicenseStorage:
+  //       return LicenseStorage.instance.delete(key);
+  //     default:
+  //       throw Exception('Storage not found');
+  //   }
+  // }
+
+  // Future<void> clearAll(Storage storage) {
+  //   switch (storage) {
+  //     case Storage.SecureStorage:
+  //       return SecureStorage.instance.clearAll();
+  //     case Storage.SharedPreferences:
+  //       return SharedPreferencesStorage.instance.clearAll();
+  //     case Storage.SQLiteStorage:
+  //       return SQLiteStorage.instance.clearAll();
+  //     case Storage.LicenseStorage:
+  //       return LicenseStorage.instance.clearAll();
+  //     default:
+  //       throw Exception('Storage not found');
+  //   }
+  // }
 }
diff --git a/lib/shared/services/authentication/authentication_service.dart b/lib/shared/services/authentication/authentication_service.dart
index 81afd3a1..ebf94824 100644
--- a/lib/shared/services/authentication/authentication_service.dart
+++ b/lib/shared/services/authentication/authentication_service.dart
@@ -24,14 +24,14 @@ class AuthenticationService {
     List<dynamic> locals = response.jsonBody['locais'] ?? [];
 
     if (locals.isEmpty) {
-      await StorageHelper().set(SecureStorageKey.haveLocal.value, 'false', Storage.SecureStorage);
+      await StorageHelper().s(SecureStorageKey.haveLocal.value, 'false');
       context.go('/receptionPage');
     } else {
-      await StorageHelper().set(SecureStorageKey.haveLocal.value, 'true', Storage.SecureStorage);
+      await StorageHelper().s(SecureStorageKey.haveLocal.value, 'true');
       context.go('/homePage');
     }
 
-    await StorageHelper().set(SecureStorageKey.isLogged.value, 'true', Storage.SecureStorage);
+    await StorageHelper().s(SecureStorageKey.isLogged.value, 'true');
   }
 
   static Future signIn(
@@ -44,7 +44,7 @@ class AuthenticationService {
       final ApiCallResponse? response;
       final LoginCall callback = PhpGroup.loginCall;
       String deviceDescription = randomString(10, 10, true, false, false);
-      await StorageHelper().set(SecureStorageKey.deviceDescription.value, deviceDescription, Storage.SecureStorage);
+      await StorageHelper().s(SecureStorageKey.deviceDescription.value, deviceDescription);
 
       final String? devUUID;
       final String userUUID;
@@ -59,9 +59,9 @@ class AuthenticationService {
       devUUID = await DeviceUtil.getDevUUID();
 
       if ((email != '') && (passwd != '')) {
-        await StorageHelper().set(SecureStorageKey.email.value, email, Storage.SecureStorage);
-        await StorageHelper().set(SecureStorageKey.password.value, passwd, Storage.SecureStorage);
-        await StorageHelper().set(SQLiteStorageKey.devUUID.value, devUUID!, Storage.SQLiteStorage);
+        await StorageHelper().s(SecureStorageKey.email.value, email);
+        await StorageHelper().s(SecureStorageKey.password.value, passwd);
+        await StorageHelper().s(SQLiteStorageKey.devUUID.value, devUUID!);
         response = await callback.call();
 
         if (response.jsonBody['error'] == false) {
@@ -70,10 +70,10 @@ class AuthenticationService {
           userDevUUID = response.jsonBody['user']['dev_id'];
           userName = response.jsonBody['user']['name'];
 
-          await StorageHelper().set(SQLiteStorageKey.userUUID.value, userUUID, Storage.SQLiteStorage);
-          await StorageHelper().set(SQLiteStorageKey.userDevUUID.value, userDevUUID, Storage.SQLiteStorage);
-          await StorageHelper().set(SQLiteStorageKey.status.value, status, Storage.SQLiteStorage);
-          await StorageHelper().set(SQLiteStorageKey.userName.value, userName, Storage.SQLiteStorage);
+          await StorageHelper().s(SQLiteStorageKey.userUUID.value, userUUID);
+          await StorageHelper().s(SQLiteStorageKey.userDevUUID.value, userDevUUID);
+          await StorageHelper().s(SQLiteStorageKey.status.value, status);
+          await StorageHelper().s(SQLiteStorageKey.userName.value, userName);
 
           await login(context);
         } else {
@@ -137,8 +137,8 @@ class AuthenticationService {
         alignment: Alignment.bottomCenter,
       ),
     };
-    await StorageHelper().clearAll(Storage.SecureStorage);
-    await StorageHelper().clearAll(Storage.SQLiteStorage);
+    await StorageHelper().c(Storage.secureStorage);
+    await StorageHelper().c(Storage.sqliteStorage);
     context.go('/welcomePage', extra: extra);
   }
 
@@ -199,7 +199,7 @@ class AuthenticationService {
             enText: 'Account deleted successfully',
             ptText: 'Conta deletada com sucesso',
           );
-          await StorageHelper().clearAll(Storage.SecureStorage);
+          await StorageHelper().c(Storage.secureStorage);
           context.pop();
           context.go('/welcomePage', extra: extra);
         }
diff --git a/lib/shared/services/license/license_service.dart b/lib/shared/services/license/license_service.dart
index 01bb6f9f..72bb5356 100644
--- a/lib/shared/services/license/license_service.dart
+++ b/lib/shared/services/license/license_service.dart
@@ -4,17 +4,88 @@ import 'dart:developer';
 
 import 'package:hub/backend/api_requests/api_calls.dart';
 import 'package:hub/shared/helpers/base_storage.dart';
-import 'package:hub/shared/helpers/sqlite_storage.dart';
+import 'package:hub/shared/helpers/database_storage.dart';
 import 'dart:convert';
 
 import 'package:hub/shared/helpers/storage_helper.dart';
+import 'package:sqflite/sqflite.dart';
 
-class LicenseService {
+class LicenseService implements BaseStorage {
   static final LicenseService _instance = LicenseService._internal();
-
   factory LicenseService() => _instance;
   LicenseService._internal();
 
+  static const String tableLicense = 'license';
+
+  static String get createTableQuery => '''
+    CREATE TABLE $tableLicense (
+      key TEXT UNIQUE,
+      display TEXT,
+      expirationDate TEXT,
+      startDate TEXT,
+      quantity TEXT
+    );
+  ''';
+
+  static Future<void> setupLicense() async {
+    log('initLicense()');
+    for (var element in LicenseStorageKey.values.map((e) => e.value)) {
+      await DatabaseStorage.database.insert(
+        tableLicense,
+        {
+          'key': element,
+          'display': 'VISIVEL',
+          'expirationDate': '',
+          'startDate': '',
+          'quantity': '',
+        },
+        conflictAlgorithm: ConflictAlgorithm.ignore,
+      );
+    }
+  }
+
+  @override
+  Future<void> init() async {
+    await DatabaseStorage.instance.init();
+  }
+
+  @override
+  Future<String?> get(String key) async {
+    var response = await DatabaseStorage.database.query(tableLicense, where: 'key = ?', whereArgs: [key]);
+    if (response.isEmpty) {
+      return null;
+    }
+    return response.first['value'].toString();
+  }
+
+  @override
+  Future<void> set(String key, String value) async {
+    log('setLicense($key, $value)');
+    Map<String, dynamic> valueMap = jsonDecode(value);
+    log('String to Map<String, dynamic>: $value to $valueMap');
+
+    await DatabaseStorage.database.insert(
+        tableLicense,
+        {
+          'key': key,
+          'display': valueMap['display'],
+          'expirationDate': valueMap['expirationDate'],
+          'startDate': valueMap['startDate'],
+          'quantity': valueMap['quantity'],
+        },
+        conflictAlgorithm: ConflictAlgorithm.replace);
+  }
+
+  @override
+  Future<void> delete(String key) async {
+    await DatabaseStorage.database.delete(tableLicense, where: 'key = ?', whereArgs: [key]);
+  }
+
+  @override
+  Future<void> clearAll() async {
+    await DatabaseStorage.database.delete(tableLicense);
+  }
+
   static Future<void> initLicenseService() async {
     // for (var element in LicenseStorageKey.values.map((e) => e.value)) {
     //   await SQLiteStorage.database.insert(
@@ -33,10 +104,10 @@ class LicenseService {
 
   static Future<void> processLicense() async {}
 
-  static Future<void> fetchLicenses() async {
+  static Future<bool> fetchLicenses() async {
     try {
       log('Obtendo licenças...');
-      final ApiCallResponse response = await PhpGroup.getLicense();
+      final response = await PhpGroup.getLicense();
       final dynamic responseBody = response.jsonBody;
       log('Licenças obtidas: $responseBody');
 
@@ -51,70 +122,35 @@ class LicenseService {
       }
 
       if (responseBody == []) {
-        await SQLiteStorage.setupLicense();
+        await setupLicense();
+        return true;
       }
 
       for (var element in responseBody) {
-        switch (element['key']) {
-          case 'FRE-HUB-MESSAGES':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-LIBERATIONS':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-RESERVATIONS':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-ACCESS':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-OPENED-VISITS':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-VEHICLES':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-RESIDENTS':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-PETS':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-FASTPASS':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-ORDERS':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-COMPLETE-SCHEDULE':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-AGE-PROV-DELIVERY':
-            _saveModule(element);
-            break;
-          case 'FRE-HUB-AGE-PROV-PRESTADOR':
-            _saveModule(element);
-            break;
-          case 'FRE-WHATSAPP':
-            _saveModule(element);
-            break;
+        if (licenseContainsKey(element['key'])) {
+          _saveModule(element);
         }
       }
+      return true;
     } catch (e, s) {
       log('Erro ao obter licença', error: e, stackTrace: s);
-      await SQLiteStorage.setupLicense();
+      await setupLicense();
+      return true;
     }
   }
 
+  static bool licenseContainsKey(final String key) {
+    return LicenseStorageKey.values.map((e) => e.value).toList().contains(key);
+  }
+
   static Future<void> _saveModule(final dynamic body) async {
     if (body is Map<String, dynamic>) log('Salvando módulo: ${body.toString()}');
-    // if (body is Map<String, dynamic>) await StorageHelper().set(body['key'], '', Storage.SQLiteStorage);
-    if (body is Map<String, dynamic>) await StorageHelper().set(body['key'], jsonEncode(body), Storage.SQLiteStorage);
+    // if (body is Map<String, dynamic>) await StorageHelper().s(body['key'], '');
+    if (body is Map<String, dynamic>) await StorageHelper().s(body['key'], jsonEncode(body));
+    // StorageHelper.getInstance(Storage.SQLiteStorage).set(key, value);
   }
 
   static Future<void> updateLicense(final dynamic body) async {}
 
-  static Future<void> catchLicense() async {
-    await PhpGroup.getLicense();
-  }
+  static Future<dynamic> catchLicense() async {}
 }
diff --git a/lib/shared/services/localization/localization_service.dart b/lib/shared/services/localization/localization_service.dart
index 673c318f..124a460c 100644
--- a/lib/shared/services/localization/localization_service.dart
+++ b/lib/shared/services/localization/localization_service.dart
@@ -45,11 +45,11 @@ class LocalizationService {
       final bool isEnable = !isEmpty && isActive;
 
       if (isEnable) {
-        await StorageHelper().set(SecureStorageKey.haveLocal.value, 'true', Storage.SecureStorage);
-        await StorageHelper().set(SecureStorageKey.isLogged.value, 'true', Storage.SecureStorage);
+        await StorageHelper().s(SecureStorageKey.haveLocal.value, 'true');
+        await StorageHelper().s(SecureStorageKey.isLogged.value, 'true');
         await WidgetsBinding.instance.endOfFrame;
-        await StorageHelper().set(SQLiteStorageKey.clientUUID.value, '', Storage.SQLiteStorage);
-        await StorageHelper().set(SQLiteStorageKey.ownerUUID.value, '', Storage.SQLiteStorage);
+        await StorageHelper().s(SQLiteStorageKey.clientUUID.value, '');
+        await StorageHelper().s(SQLiteStorageKey.ownerUUID.value, '');
         StorageHelper().context?.go('/homePage');
       }
     } catch (e, s) {
@@ -152,7 +152,7 @@ class LocalizationService {
         return false;
       } else {
         await _updateStorageUtil(response.jsonBody);
-        return true;
+        return await LicenseService.fetchLicenses();
       }
     } catch (e, s) {
       log('() => stack processData: $s');
@@ -163,8 +163,6 @@ class LocalizationService {
       );
       await DialogUtil.error(context, errorMsg).whenComplete(() => selectLocal(context, null));
       return false;
-    } finally {
-      await LicenseService.fetchLicenses();
     }
   }
 
@@ -197,8 +195,8 @@ class LocalizationService {
 
       await PhpGroup.resopndeVinculo.call(tarefa: 'I').then((value) async {
         if (value.jsonBody['error'] == false) {
-          await StorageHelper().set(SQLiteStorageKey.clientName.value, '', Storage.SQLiteStorage);
-          await StorageHelper().set(SQLiteStorageKey.clientUUID.value, '', Storage.SQLiteStorage);
+          await StorageHelper().s(SQLiteStorageKey.clientName.value, '');
+          await StorageHelper().s(SQLiteStorageKey.clientUUID.value, '');
           context.pop();
           context.go(
             '/homePage',
@@ -232,8 +230,8 @@ class LocalizationService {
   }
 
   static void _handleError(BuildContext context, String errorMsg) async {
-    final String devUUID = await StorageHelper().get(SQLiteStorageKey.devUUID.value, Storage.SQLiteStorage) ?? '';
-    final String userUUID = await StorageHelper().get(SQLiteStorageKey.userUUID.value, Storage.SQLiteStorage) ?? '';
+    final String devUUID = await StorageHelper().g(SQLiteStorageKey.devUUID.value) ?? '';
+    final String userUUID = await StorageHelper().g(SQLiteStorageKey.userUUID.value) ?? '';
     final bool isAuthenticated = userUUID.isNotEmpty && devUUID.isNotEmpty;
     final bool isDevLinked = !errorMsg.contains('Esse dispositivo nao pertence a esse usuario');
     log('() => isLinked: $errorMsg');
@@ -261,14 +259,14 @@ class LocalizationService {
   static Future<bool> _handleUnavailable(BuildContext context, List<dynamic> locals) async {
     log('() => isUnavailable');
     try {
-      await StorageHelper().set(SQLiteStorageKey.clientUUID.value, locals[0]['CLI_ID'], Storage.SQLiteStorage);
-      await StorageHelper().set(SQLiteStorageKey.ownerUUID.value, locals[0]['CLU_OWNER_ID'], Storage.SQLiteStorage);
-      await StorageHelper().set(SQLiteStorageKey.clientName.value, locals[0]['CLI_NOME'], Storage.SQLiteStorage);
+      await StorageHelper().s(SQLiteStorageKey.clientUUID.value, locals[0]['CLI_ID']);
+      await StorageHelper().s(SQLiteStorageKey.ownerUUID.value, locals[0]['CLU_OWNER_ID']);
+      await StorageHelper().s(SQLiteStorageKey.clientName.value, locals[0]['CLI_NOME']);
       var response = await PhpGroup.resopndeVinculo.call(tarefa: 'A');
       if (response.jsonBody['error'] == true) {
-        await StorageHelper().set(SQLiteStorageKey.clientUUID.value, '', Storage.SQLiteStorage);
-        await StorageHelper().set(SQLiteStorageKey.ownerUUID.value, '', Storage.SQLiteStorage);
-        await StorageHelper().set(SQLiteStorageKey.clientName.value, '', Storage.SQLiteStorage);
+        await StorageHelper().s(SQLiteStorageKey.clientUUID.value, '');
+        await StorageHelper().s(SQLiteStorageKey.ownerUUID.value, '');
+        await StorageHelper().s(SQLiteStorageKey.clientName.value, '');
         return false;
       }
       if (response.jsonBody['error'] == false) return await processData(context).then((value) => value);
@@ -282,10 +280,10 @@ class LocalizationService {
 
   static Future<bool> _handleEnabled(BuildContext context, dynamic local) async {
     log('() => isEnabled');
-    await StorageHelper().set(SQLiteStorageKey.clientUUID.value, local['CLI_ID'], Storage.SQLiteStorage);
-    await StorageHelper().set(SQLiteStorageKey.ownerUUID.value, local['CLU_OWNER_ID'], Storage.SQLiteStorage);
-    await StorageHelper().set(SQLiteStorageKey.clientName.value, local['CLI_NOME'], Storage.SQLiteStorage);
-    await StorageHelper().set(SQLiteStorageKey.userName.value, local['USU_NOME'], Storage.SQLiteStorage);
+    await StorageHelper().s(SQLiteStorageKey.clientUUID.value, local['CLI_ID']);
+    await StorageHelper().s(SQLiteStorageKey.ownerUUID.value, local['CLU_OWNER_ID']);
+    await StorageHelper().s(SQLiteStorageKey.clientName.value, local['CLI_NOME']);
+    await StorageHelper().s(SQLiteStorageKey.userName.value, local['USU_NOME']);
     return await processData(context);
   }
 
@@ -297,19 +295,17 @@ class LocalizationService {
   }
 
   static Future<void> _updateStorageUtil(Map<String, dynamic> jsonBody) async {
-    await StorageHelper().set(SQLiteStorageKey.whatsapp.value,
-        jsonBody['whatsapp'] != null && jsonBody['whatsapp'] ? 'true' : 'false', Storage.SQLiteStorage);
-    await StorageHelper().set(SQLiteStorageKey.provisional.value,
-        jsonBody['provisional'] != null && jsonBody['provisional'] ? 'true' : 'false', Storage.SQLiteStorage);
-    await StorageHelper().set(SQLiteStorageKey.pets.value,
-        jsonBody['pet'] != null && jsonBody['pet'] ? 'true' : 'false', Storage.SQLiteStorage);
-    await StorageHelper().set(
+    await StorageHelper()
+        .s(SQLiteStorageKey.whatsapp.value, jsonBody['whatsapp'] != null && jsonBody['whatsapp'] ? 'true' : 'false');
+    await StorageHelper().s(SQLiteStorageKey.provisional.value,
+        jsonBody['provisional'] != null && jsonBody['provisional'] ? 'true' : 'false');
+    await StorageHelper().s(SQLiteStorageKey.pets.value, jsonBody['pet'] != null && jsonBody['pet'] ? 'true' : 'false');
+    await StorageHelper().s(
         SQLiteStorageKey.petAmount.value,
         jsonBody['petAmountRegister'] != null && jsonBody['petAmountRegister'].toString().isEmpty
             ? '0'
-            : jsonBody['petAmountRegister'].toString(),
-        Storage.SQLiteStorage);
-    await StorageHelper().set(SQLiteStorageKey.userName.value, jsonBody['visitado']['VDO_NOME'], Storage.SQLiteStorage);
+            : jsonBody['petAmountRegister'].toString());
+    await StorageHelper().s(SQLiteStorageKey.userName.value, jsonBody['visitado']['VDO_NOME']);
   }
 
   static bool _isActive(List<dynamic> locals) {
@@ -317,7 +313,7 @@ class LocalizationService {
   }
 
   static Future<bool> _isInactived(List<dynamic> locals) async {
-    String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
+    String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
     return locals.where((local) => local['CLI_ID'] != cliUUID && local['CLU_STATUS'] == 'A').isNotEmpty;
   }
 
@@ -326,21 +322,21 @@ class LocalizationService {
   }
 
   static Future<bool> _isUnselected() async {
-    String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
-    String cliName = (await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage)) ?? '';
-    String ownerUUID = (await StorageHelper().get(SQLiteStorageKey.ownerUUID.value, Storage.SQLiteStorage)) ?? '';
+    String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
+    String cliName = (await StorageHelper().g(SQLiteStorageKey.clientName.value)) ?? '';
+    String ownerUUID = (await StorageHelper().g(SQLiteStorageKey.ownerUUID.value)) ?? '';
     return cliUUID.isEmpty && cliName.isEmpty && ownerUUID.isEmpty;
   }
 
   static Future<bool> _isSelected(bool isInactived) async {
-    String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
-    String cliName = (await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage)) ?? '';
+    String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
+    String cliName = (await StorageHelper().g(SQLiteStorageKey.clientName.value)) ?? '';
     return cliUUID.isNotEmpty && cliName.isNotEmpty && isInactived;
   }
 
   static Future<bool> _isAvailable() async {
-    String cliUUID = (await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage)) ?? '';
-    String cliName = (await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage)) ?? '';
+    String cliUUID = (await StorageHelper().g(SQLiteStorageKey.clientUUID.value)) ?? '';
+    String cliName = (await StorageHelper().g(SQLiteStorageKey.clientName.value)) ?? '';
     return cliUUID.isNotEmpty && cliName.isNotEmpty;
   }
 }
diff --git a/lib/shared/services/sqlite/sqlite_service.dart b/lib/shared/services/sqlite/sqlite_service.dart
new file mode 100644
index 00000000..4f17b4f7
--- /dev/null
+++ b/lib/shared/services/sqlite/sqlite_service.dart
@@ -0,0 +1,64 @@
+import 'dart:convert';
+import 'dart:developer';
+import 'package:hub/shared/helpers/database_storage.dart';
+import 'package:sqflite/sqflite.dart';
+import 'package:hub/shared/helpers/base_storage.dart';
+
+class SQLiteStorage implements BaseStorage {
+  SQLiteStorage._();
+
+  static final SQLiteStorage instance = SQLiteStorage._();
+
+  static const String tableKeychain = 'keychain';
+
+  static String get createTableQuery => '''
+    CREATE TABLE $tableKeychain (
+      key TEXT UNIQUE,
+      value TEXT,
+      type TEXT,
+      updateAt TEXT,
+      resolvedAt TEXT,
+      createdAt TEXT
+    );
+  ''';
+
+  @override
+  Future<void> init() async {
+    await DatabaseStorage.instance.init();
+  }
+
+  @override
+  Future<String?> get(String key) async {
+    var response = await DatabaseStorage.database.query(tableKeychain, where: 'key = ?', whereArgs: [key]);
+    if (response.isEmpty) {
+      return null;
+    }
+    return response.first['value'].toString();
+  }
+
+  @override
+  Future<void> set(String key, String value) async {
+    var date = DateTime.now().toIso8601String();
+    await DatabaseStorage.database.insert(
+        tableKeychain,
+        {
+          'key': key,
+          'value': value,
+          'type': 'local',
+          'updateAt': date,
+          'resolvedAt': date,
+          'createdAt': date,
+        },
+        conflictAlgorithm: ConflictAlgorithm.replace);
+  }
+
+  @override
+  Future<void> delete(String key) async {
+    await DatabaseStorage.database.delete(tableKeychain, where: 'key = ?', whereArgs: [key]);
+  }
+
+  @override
+  Future<void> clearAll() async {
+    await DatabaseStorage.database.delete(tableKeychain);
+  }
+}
diff --git a/lib/shared/utils/share_util.dart b/lib/shared/utils/share_util.dart
index 0922c268..b2313323 100644
--- a/lib/shared/utils/share_util.dart
+++ b/lib/shared/utils/share_util.dart
@@ -4,8 +4,8 @@ import 'package:share_plus/share_plus.dart';
 
 class ShareUtil {
   static Future<void> showShare(payload) async {
-    final cliName = await StorageHelper().get(SQLiteStorageKey.clientName.value, Storage.SQLiteStorage);
-    final cliUUID = await StorageHelper().get(SQLiteStorageKey.clientUUID.value, Storage.SQLiteStorage);
+    final cliName = await StorageHelper().g(SQLiteStorageKey.clientName.value);
+    final cliUUID = await StorageHelper().g(SQLiteStorageKey.clientUUID.value);
 
     for (var i = 0; i < payload['convites'].length; i++) {
       await Share.share('''