API-SECURITY AUTH_WITH_ADMIN

lib/config/sessionCheckScreen.dart

@@ -4,6 +4,8 @@ import 'package:go_router/go_router.dart';
 import 'package:pocketbase/pocketbase.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uae_stat/config/api_config.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
 import 'package:uae_stat/domain/entities/session_entity.dart';
 import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
@@ -38,11 +40,25 @@ class _SessionCheckScreenState extends ConsumerState<SessionCheckScreen> {
       final userId = prefs.getString('userId');
 
       // Authenticate admin d
-      final adminAuth = await pb.admins.authWithPassword(
+      // final adminAuth = await pb.admins.authWithPassword(
-        'pb@venbainfotech.com',
+      //   'pb@venbainfotech.com',
-        'pb@venbainfotech.com',
+      //   'pb@venbainfotech.com',
+      // );
+
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+
+      // final String adminToken = adminAuth.token;
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
       );
-      final String adminToken = adminAuth.token;
       print('adminToken: $adminToken');
 
       // Fetch user details
@@ -147,7 +163,8 @@ class SplashScreen extends StatelessWidget {
           color: isDark ? null : Colors.white,
           image: isDark
               ? DecorationImage(
-            image: AssetImage('assets/splash_screen/background_splash_dark.png'), // 🔄 Add this background for dark mode
+                  image: AssetImage(
+                      'assets/splash_screen/background_splash_dark.png'), // 🔄 Add this background for dark mode
                   fit: BoxFit.cover,
                 )
               : null,
@@ -191,7 +208,6 @@ class SplashScreen extends StatelessWidget {
   }
 }
 
-
 // import 'dart:math';
 //
 // import 'package:flutter/material.dart';

lib/config/theme/auth_provider.dart

@@ -0,0 +1,62 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+class AuthState {
+  final String email;
+  final String password;
+
+  // AuthState({
+  //   this.email = 'kannan@sightspectrum.com', // default value
+  //   this.password = '1DgZ_we3k5UuCZiF9wziwECQzQo1YNRQ', // default value
+  // });
+
+  AuthState({
+    this.email = "pb@venbainfotech.com", // default value
+    this.password = "pb@venbainfotech.com", // default value
+  });
+
+  // AuthState({
+  //   this.email = 'sangeethae9919@gmail.com', // default value
+  //   this.password = 'Sang@123', // default value
+  // });
+}
+
+final authProvider = StateProvider<AuthState>((ref) => AuthState());
+
+// --------------------- Dynamic USER Email and Password
+
+// final adminAuth = await PocketBaseService.users.authWithPassword(
+//   'user1@gmail.com',
+//   'tes@123',
+// );
+
+//
+// /// Holds login credentials
+// class AuthState {
+//   final String? email;
+//   final String? password;
+//
+//   const AuthState({this.email, this.password});
+//
+//   AuthState copyWith({String? email, String? password}) {
+//     return AuthState(
+//       email: email ?? this.email,
+//       password: password ?? this.password,
+//     );
+//   }
+// }
+//
+// class AuthNotifier extends StateNotifier<AuthState> {
+//   AuthNotifier() : super(const AuthState());
+//
+//   void setCredentials(String email, String password) {
+//     state = AuthState(email: email, password: password);
+//   }
+//
+//   void clearCredentials() {
+//     state = const AuthState();
+//   }
+// }
+//
+// final authProvider = StateNotifierProvider<AuthNotifier, AuthState>((ref) {
+//   return AuthNotifier();
+// });

lib/config/theme/service.dart

@@ -1,8 +1,11 @@
 import 'dart:convert';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:http/http.dart' as http;
 import 'package:pocketbase/pocketbase.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uae_stat/config/api_config.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/infrastructure/services/pocketbase_service.dart';
 
 class ThemeBaseService {
   final pb = PocketBase(apiUrl);
@@ -38,14 +41,40 @@ class ThemeBaseService {
   //   // }
   // }
 
-  Future<dynamic> getUserTheme(String userId) async {
+  Future<dynamic> getAdminToken({
+    required String email,
+    required String password,
+  }) async {
+    print("ADminTOKEN");
+    try {
+      final adminAuth = await pb.admins.authWithPassword(email, password);
+      return adminAuth.token; // return only the token
+    } catch (e) {
+      throw Exception("Admin auth failed: $e");
+    }
+  }
+
+  Future<dynamic> getUserTheme(String userId, WidgetRef ref) async {
     print('getUserTheme');
     final url = "${pb.baseUrl}/api/collections/users/records/$userId";
 
+    // final adminAuth = await pb.admins.authWithPassword(
+    //   'pb@venbainfotech.com',
+    //   'pb@venbainfotech.com',
+    // );
+
+    final auth = ref.watch(authProvider);
+
     final adminAuth = await pb.admins.authWithPassword(
-      'pb@venbainfotech.com',
+      auth.email,
-      'pb@venbainfotech.com',
+      auth.password,
     );
+
+    // final adminAuth = await PocketBaseService.users.authWithPassword(
+    //   'sangeethae9919@gmail.com',
+    //   'Sang@123',
+    // );
+
     final String adminToken = adminAuth.token;
     print('adminToken: $adminToken');
     final response = await http.get(
@@ -71,13 +100,21 @@ class ThemeBaseService {
     }
   }
 
-  Future<void> updateUserTheme(String userId, String theme) async {
+  Future<void> updateUserTheme(
+      String userId, String theme, WidgetRef ref) async {
     print('updateUserTheme');
     // Authenticate admin d
     final url = "${pb.baseUrl}/api/collections/users/records/$userId";
+    // final adminAuth = await pb.admins.authWithPassword(
+    //   'pb@venbainfotech.com',
+    //   'pb@venbainfotech.com',
+    // );
+
+    final auth = ref.watch(authProvider);
+
     final adminAuth = await pb.admins.authWithPassword(
-      'pb@venbainfotech.com',
+      auth.email,
-      'pb@venbainfotech.com',
+      auth.password,
     );
     final String adminToken = adminAuth.token;
     print('adminToken: $adminToken');

lib/config/toggle_lang_service.dart

@@ -1,11 +1,15 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:pocketbase/pocketbase.dart';
 import 'package:uae_stat/config/api_config.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 
 class UserService {
   final _pb = PocketBase(apiUrl);
 
-  Future<void> updateLanguage(String localeCode) async {
+  Future<void> updateLanguage(String localeCode, WidgetRef ref) async {
     try {
       final prefs = await SharedPreferences.getInstance();
       final userId = prefs.getString('userId');
@@ -14,9 +18,22 @@ class UserService {
         throw Exception('User ID not found');
       }
       // Authenticate as admin
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
-      final token = adminAuth.token;
+
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      // final token = adminAuth.token;
+
+      final themeService = ThemeBaseService();
+      final token = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
 
       final headers = {
         'Authorization': 'Bearer $token',

lib/domain/use_cases/auth_use_case.dart

@@ -57,6 +57,7 @@ class AuthUseCase extends _$AuthUseCase {
   }
 
   Future<SessionEntity> login(String email, String pw) async {
+    print("Auth_use_case_1");
     final session = await _repo.login(email, pw);
     final localPrefs = await getIt.call<TLocalPreferencesRepo>().get();
     if (localPrefs != null) {

lib/infrastructure/data/p_auth_repo.dart

@@ -48,6 +48,8 @@ class PAuthRepo implements TAuthRepo {
   @override
   Future<SessionEntity> login(String email, String pw) async {
     late final RecordAuth user;
+    print('P_auth_repo_2');
+
     try {
       user = await PocketBaseService.users.authWithPassword(
         email,
@@ -90,7 +92,6 @@ class PAuthRepo implements TAuthRepo {
     return se;
   }
 
-
   @override
   Future<void> logout() {
     PocketBaseService.authStore.clear();

lib/infrastructure/services/pocketbase_service.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:pocketbase/pocketbase.dart';
 import 'package:uae_stat/config/api_config.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 
 abstract class PocketBaseService {
   static const _host = apiUrl;

lib/presentation/Screens/auth_verification/create_new_pw.dart

@@ -7,6 +7,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uae_stat/config/api_config.dart';
 import 'package:uae_stat/config/connectivity_provider.dart';
 import 'package:uae_stat/config/my_router.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
@@ -18,6 +20,7 @@ import 'package:uae_stat/presentation/components/my_toggle.dart';
 import 'package:uae_stat/presentation/components/space.dart';
 import 'package:uae_stat/l10n/app_localizations.dart';
 import 'package:uae_stat/config/my_theme.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 
 class CreateNewPw extends ConsumerStatefulWidget {
   final String userId;
@@ -146,9 +149,22 @@ class _CreateNewPwState extends ConsumerState<CreateNewPw> {
         isLoading = true;
       });
       // Authenticate as admin
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
-      final token = adminAuth.token;
+
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      // final token = adminAuth.token;
+
+      final themeService = ThemeBaseService();
+      final token = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
 
       final headers = {
         'Authorization': 'Bearer $token',

lib/presentation/Screens/auth_verification/forgot_password.dart

@@ -7,6 +7,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uae_stat/config/api_config.dart';
 import 'package:uae_stat/config/connectivity_provider.dart';
 import 'package:uae_stat/config/my_router.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
@@ -18,6 +20,7 @@ import 'package:uae_stat/presentation/components/indicators/locale_provider.dart
 import 'package:uae_stat/presentation/components/my_toggle.dart';
 import 'package:uae_stat/presentation/components/space.dart';
 import 'package:uae_stat/config/my_theme.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 
 class ForgotPassword extends ConsumerStatefulWidget {
   final String email;
@@ -174,9 +177,23 @@ class _ForgotPasswordState extends ConsumerState<ForgotPassword> {
         isLoading = true;
       });
       // Authenticate as admin
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
-      final token = adminAuth.token;
+
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      //
+      // final token = adminAuth.token;
+
+      final themeService = ThemeBaseService();
+      final token = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
 
       final headers = {
         'Authorization': 'Bearer $token',

lib/presentation/Screens/charts/screens/chart_screen.dart

@@ -13,6 +13,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:tutorial_coach_mark/tutorial_coach_mark.dart';
 import 'package:uae_stat/config/api_config.dart';
 import 'package:uae_stat/config/connectivity_provider.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
 import 'package:uae_stat/config/toast_util.dart';
 import 'package:uae_stat/config/toggle_lang_service.dart';
@@ -23,6 +25,7 @@ import 'package:uae_stat/presentation/Screens/charts/widgets/chart_widget.dart';
 import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
 import 'package:uae_stat/presentation/components/my_toggle.dart';
 import 'package:uae_stat/l10n/app_localizations.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 import 'package:uae_stat/presentation/Screens/app_tour/Target_content.dart';
 import '../filters/search_filter_helper.dart';
@@ -140,12 +143,24 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
     final prefs = await SharedPreferences.getInstance();
     final userID = prefs.getString('userId');
     try {
-      final adminAuth = await _pb.admins.authWithPassword(
+      // final adminAuth = await _pb.admins.authWithPassword(
-        'pb@venbainfotech.com',
+      //   'pb@venbainfotech.com',
-        'pb@venbainfotech.com',
+      //   'pb@venbainfotech.com',
-      );
+      // );
 
-      final adminToken = adminAuth.token;
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      // final adminToken = adminAuth.token;
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
 
       final result = await _pb.collection('bookmark').getList(
         filter: "user_id = '${userID}' && dataset = '${widget.dataSets}'",
@@ -170,8 +185,15 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
     final prefs = await SharedPreferences.getInstance();
     final userID = prefs.getString('userId');
     try {
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+
+      final auth = ref.watch(authProvider);
+
+      final adminAuth = await pb.admins.authWithPassword(
+        auth.email,
+        auth.password,
+      );
       final adminToken = adminAuth.token;
       final response = await _pb.collection('bookmark').create(body: {
         'user_id': userID,
@@ -2398,7 +2420,7 @@ class _ChartScreen1State extends ConsumerState<ChartScreen1> {
         isLoading = true;
         print('isLoadingref $isLoading');
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
 
       // fetchChartData(widget.dataSets, localeCode);
       print('Saving currentTab: $tabWiseKpi before locale change');

lib/presentation/Screens/charts/services/api_service.dart

@@ -46,7 +46,10 @@ class ApiService {
     try {
       final response = await http.post(
         url,
-        headers: {'Content-Type': 'application/json'},
+        headers: {
+          'Content-Type': 'application/json',
+          'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'
+        },
         body: jsonEncode(requestBody),
       );
 

lib/presentation/Screens/profilepage.dart

@@ -16,6 +16,8 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uae_stat/config/api_config.dart';
 import 'package:uae_stat/config/connectivity_provider.dart';
 import 'package:uae_stat/config/my_theme.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
@@ -23,6 +25,7 @@ import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/misc_icon
 import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
 import 'package:uae_stat/presentation/components/my_toggle.dart';
 import 'package:uae_stat/l10n/app_localizations.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 
 class ProfileScreen extends ConsumerStatefulWidget {
   final String userId; // Add this field to hold the user ID
@@ -162,9 +165,23 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
 
   Future<void> _fetchUserData() async {
     try {
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
-      final adminToken = adminAuth.token;
+
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      //
+      // final adminToken = adminAuth.token;
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
       print('adminToken- ${adminToken}');
       final userDetailsResponse = await _pb.collection('users').getOne(
         widget.userId,

lib/presentation/routes/auth_routes/login_route.dart

@@ -17,6 +17,7 @@ import 'package:uae_stat/config/app_links_helper.dart';
 import 'package:uae_stat/config/connectivity_provider.dart';
 import 'package:uae_stat/config/my_theme.dart';
 import 'package:uae_stat/config/theme/app_theme.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
 import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
 import 'package:uae_stat/domain/entities/session_entity.dart';
@@ -25,6 +26,7 @@ import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/infrastructure/data/p_auth_repo.dart';
 import 'package:uae_stat/infrastructure/services/img_asset_paths/banner_asset_path.dart';
 import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/misc_icon_asset_path.dart';
+import 'package:uae_stat/infrastructure/services/pocketbase_service.dart';
 import 'package:uae_stat/l10n/app_localizations.dart';
 import 'package:uae_stat/presentation/components/dialogs.dart';
 import 'package:uae_stat/presentation/components/lang_toggle.dart';
@@ -60,13 +62,22 @@ class LoginRoute extends HookConsumerWidget {
   Future<bool> profileStatus(String userId, WidgetRef ref) async {
     try {
       // Authenticate admin
-      final adminAuth = await pb.admins.authWithPassword(
+      // final adminAuth = await pb.admins.authWithPassword(
-        'pb@venbainfotech.com',
+      //   'pb@venbainfotech.com',
-        'pb@venbainfotech.com',
+      //   'pb@venbainfotech.com',
-      );
+      // );
-      final String adminToken = adminAuth.token;
+      final auth = ref.watch(authProvider);
-      print('adminToken: $adminToken');
 
+      // final adminToken = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
       // Fetch user details
       final userDetailsResponse = await pb.collection('users').getOne(
         userId,
@@ -125,7 +136,8 @@ class LoginRoute extends HookConsumerWidget {
   //   print("FCM Token: $token");
   // }
 
-  Future<void> getDeviceToken(BuildContext context, String userId) async {
+  Future<void> getDeviceToken(
+      BuildContext context, String userId, WidgetRef ref) async {
     try {
       // await _firebaseMessaging.requestPermission();
       print("FCM Token Entry");
@@ -133,7 +145,7 @@ class LoginRoute extends HookConsumerWidget {
       print("FCM Token: $token");
 
       if (token != null) {
-        await updateDeviceToken(userId, token);
+        await updateDeviceToken(userId, token, ref);
 
         // Automatically copy to clipboard
         // Clipboard.setData(ClipboardData(text: token));
@@ -172,14 +184,28 @@ class LoginRoute extends HookConsumerWidget {
     }
   }
 
-  Future<void> updateDeviceToken(String userId, String token) async {
+  Future<void> updateDeviceToken(
+      String userId, String token, WidgetRef ref) async {
     final url = "${pb.baseUrl}/api/collections/users/records/$userId";
 
     try {
       // Authenticate admin (Persist session globally instead)
-      await pb.admins.authWithPassword(
+      // await pb.admins.authWithPassword(
-        'pb@venbainfotech.com',
+      //   'pb@venbainfotech.com',
-        'pb@venbainfotech.com',
+      //   'pb@venbainfotech.com',
+      // );
+
+      final auth = ref.watch(authProvider);
+      //
+      // await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
       );
 
       final response = await http.patch(
@@ -209,7 +235,8 @@ class LoginRoute extends HookConsumerWidget {
         Uri.parse("${pb.baseUrl}api/auth/request-password-reset?email=$email");
 
     try {
-      final response = await http.get(url);
+      final response = await http
+          .get(url, headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       final body = json.decode(response.body);
       if (response.statusCode == 200) {
         return body['status'] ?? 'Reset link sent successfully.';
@@ -322,7 +349,7 @@ class LoginRoute extends HookConsumerWidget {
   Future<void> initializeTheme(
       BuildContext context, WidgetRef ref, String userId) async {
     final themeService = ThemeBaseService();
-    final theme = await themeService.getUserTheme(userId); // e.g., "dark"
+    final theme = await themeService.getUserTheme(userId, ref); // e.g., "dark"
     final platformBrightness = MediaQuery.of(context).platformBrightness;
     ref
         .read(themeProvider.notifier)
@@ -360,7 +387,7 @@ class LoginRoute extends HookConsumerWidget {
         print("Email: ${loginCount}");
 
         await loginCountApi(userId!);
-        await updateOAuthUserDetails(userId!, metaDetails);
+        await updateOAuthUserDetails(userId!, metaDetails, ref);
         // await saveUserId(userId!, loginCount);
         // await getDeviceToken(context, userId);
         await initializeTheme(context, ref, userId);
@@ -429,11 +456,11 @@ class LoginRoute extends HookConsumerWidget {
 
   Future<void> loginCountApi(String userId) async {
     if (userId.isNotEmpty) {
-      final url =
+      final url = Uri.parse('$apiUrl/api/login_success?id=$userId');
-      Uri.parse('$apiUrl/api/login_success?id=$userId');
 
       try {
-        final response = await http.get(url);
+        final response = await http
+            .get(url, headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
 
         if (response.statusCode == 200) {
           print("Login success API call successful: ${response.body}");
@@ -452,7 +479,8 @@ class LoginRoute extends HookConsumerWidget {
     }
   }
 
-  Future<void> updateOAuthUserDetails(String userId, metaDetails) async {
+  Future<void> updateOAuthUserDetails(
+      String userId, metaDetails, WidgetRef ref) async {
     final url = "${pb.baseUrl}/api/collections/users/records/$userId";
 
     try {
@@ -461,7 +489,18 @@ class LoginRoute extends HookConsumerWidget {
       //   'pb@venbainfotech.com',
       //   'pb@venbainfotech.com',
       // );
+      final auth = ref.watch(authProvider);
 
+      // await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
       final userDetails = metaDetails['rawUser'];
       print('oauthDetails $userDetails');
 
@@ -894,14 +933,35 @@ class LoginRoute extends HookConsumerWidget {
           if (!context.mounted || session == null) return;
           final userId = session.id;
           if (userId.isNotEmpty) {
-            final url =
+            print('EMAIL - $email ');
-                Uri.parse('$apiUrl/api/login_success?id=$userId');
+            print('PASSWORD - ${pwCtl.text}');
+
+            // USE Dynamic USER EMail and Password
+
+            // var password = pwCtl.text;
+
+            //  Save to AuthProvider
+            // ref.read(authProvider.notifier).setCredentials(email, password);
+
+            // final session = await context.loaderWithErrorDialog(
+            //   () =>
+            //       ref.read(authUseCaseProvider.notifier).login(email, password),
+            // );
+            //
+            // final auth = ref.watch(authProvider);
+            //
+            // print("EMAIL - ${auth.email}");
+            // print("PASSWORD - ${auth.password}");
+
+            final url = Uri.parse('${apiUrl}api/login_success?id=$userId');
 
             try {
-              final response = await http.get(url);
+              final response = await http.get(url,
+                  headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
 
               if (response.statusCode == 200) {
                 print("Login success API call successful: ${response.body}");
+                print("LOginBtn");
                 final count = jsonDecode(response.body);
                 loginCount =
                     count["login_count"]; // Directly assign it as an int
@@ -915,7 +975,7 @@ class LoginRoute extends HookConsumerWidget {
             }
 
             await saveUserId(userId, loginCount);
-            await getDeviceToken(context, userId);
+            await getDeviceToken(context, userId, ref);
             await initializeTheme(context, ref, userId);
           }
           try {

lib/presentation/routes/bottom_bar_routes/tab_routes/UAE_Numbers/uae_numbers.dart

@@ -116,8 +116,9 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -208,7 +209,7 @@ class _UaenumberWidgetState extends ConsumerState<uaenumberWidget> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/bottom_bar_routes/tab_routes/home/home_route.dart

@@ -1019,8 +1019,9 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getHomePageData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           data = json.decode(response.body);
@@ -1072,7 +1073,7 @@ class EconomyStatsState extends ConsumerState<EconomyStatsWidget> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/bookmark.dart

@@ -6,6 +6,9 @@ import 'package:flutter_svg/svg.dart';
 import 'package:go_router/go_router.dart';
 import 'package:dio/dio.dart';
 import 'package:http/http.dart' as http;
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
+import 'package:uae_stat/infrastructure/services/pocketbase_service.dart';
 import 'package:uae_stat/l10n/app_localizations.dart';
 import 'package:pocketbase/pocketbase.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -18,6 +21,7 @@ import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/bookmark_
 import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/uae_numbers_asset_path.dart';
 // import 'package:uae_stat/l10n/app_localizations.dart';
 import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 
 class BookMark extends ConsumerStatefulWidget {
@@ -69,8 +73,9 @@ class _BookMarkState extends ConsumerState<BookMark> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -129,6 +134,9 @@ class _BookMarkState extends ConsumerState<BookMark> {
           'language': locale,
           'color_mode': themeMode
         },
+        options: Options(
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'},
+        ),
       );
 
       if (response.statusCode == 200 && response.data != null) {
@@ -243,9 +251,28 @@ class _BookMarkState extends ConsumerState<BookMark> {
       setState(() {
         isLoading = true;
       });
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
-      final adminToken = adminAuth.token;
+
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      //
+      //
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
+      print('adminTokenETRE1- ');
+
+      // final adminToken = adminAuth.token;
+
+      print('adminTokenETRE- $adminToken');
 
       await _pb.collection('bookmark').delete(bookmarkId!, headers: {
         'Authorization': adminToken,
@@ -426,7 +453,7 @@ class _BookMarkState extends ConsumerState<BookMark> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
 
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||

lib/presentation/routes/drawer_routes/Drawer Items/contactUs.dart

@@ -53,8 +53,11 @@ class _ContactState extends ConsumerState<Contact> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(
+            baseUrl + '?language=$locale&color_mode=$themeMode',
+          ),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -87,7 +90,7 @@ class _ContactState extends ConsumerState<Contact> {
 
     ref.listen<Locale?>(localeProvider, (previous, next) async {
       final localeCode = next?.languageCode ?? 'en'; // Default to 'en' if null
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
     });
 
     ref.listen<Locale?>(localeProvider, (previous, next) async {
@@ -95,7 +98,7 @@ class _ContactState extends ConsumerState<Contact> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/edit_profile.dart

@@ -17,11 +17,14 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uae_stat/config/api_config.dart';
 import 'package:uae_stat/config/connectivity_provider.dart';
 import 'package:uae_stat/config/my_theme.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
 import 'package:uae_stat/config/toggle_lang_service.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/infrastructure/services/img_asset_paths/icons/misc_icon_asset_path.dart';
 import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 import 'package:uae_stat/l10n/app_localizations.dart';
 
@@ -182,9 +185,22 @@ class _EditProfileState extends ConsumerState<EditProfile> {
   Future<void> _fetchUserData() async {
     try {
       print('EDIT PROFILE isPageLoad');
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
-      final adminToken = adminAuth.token;
+
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      // final adminToken = adminAuth.token;
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
       print('adminToken- $adminToken');
       final userDetailsResponse = await _pb.collection('users').getOne(
         userId,
@@ -556,7 +572,7 @@ class _EditProfileState extends ConsumerState<EditProfile> {
 
     ref.listen<Locale?>(localeProvider, (previous, next) async {
       final localeCode = next?.languageCode ?? 'en'; // Default to 'en' if null
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       setState(() {
         isLoader = true;
       });
@@ -1417,7 +1433,8 @@ class _EditProfileState extends ConsumerState<EditProfile> {
                                         Center(
                                           child: GestureDetector(
                                             onTap: () {
-                                      final email = _emailController.text;
+                                              final email =
+                                                  _emailController.text;
                                               context.push(
                                                   '/createNewPw/$userId/$email?key=editProfile');
                                             },

lib/presentation/routes/drawer_routes/Drawer Items/feedback.dart

@@ -7,6 +7,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import 'package:http/http.dart' as http;
 import 'package:intl/intl.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
 import 'package:pocketbase/pocketbase.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -17,12 +19,14 @@ import 'package:uae_stat/domain/use_cases/language.dart';
 import 'package:uae_stat/infrastructure/services/img_asset_paths/feedback_asset_path.dart';
 
 import 'package:uae_stat/infrastructure/services/packages/go_router.dart';
+import 'package:uae_stat/infrastructure/services/pocketbase_service.dart';
 import 'package:uae_stat/l10n/app_localizations.dart';
 import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
 import 'package:uae_stat/presentation/components/my_drawer.dart';
 import 'package:mailer/mailer.dart';
 import 'package:mailer/smtp_server.dart';
 import 'package:uae_stat/presentation/components/space.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 import '../../../../config/my_theme.dart';
 import '../../../../domain/use_cases/preferences_use_case.dart';
@@ -145,8 +149,9 @@ class _FeedbackFormState extends ConsumerState<FeedbackForm>
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -305,7 +310,7 @@ class _FeedbackFormState extends ConsumerState<FeedbackForm>
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&
@@ -1001,9 +1006,22 @@ class _FeedbackFormState extends ConsumerState<FeedbackForm>
     };
 
     try {
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
-      final adminToken = adminAuth.token;
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      //
+      // final adminToken = adminAuth.token;
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
       final response = await _pb
           .collection('feedback')
           .create(body: feedbackData, headers: {'Authorization': adminToken});

lib/presentation/routes/drawer_routes/Drawer Items/manage_users.dart

@@ -7,6 +7,7 @@ import 'package:pocketbase/pocketbase.dart';
 import 'package:uae_stat/config/api_config.dart';
 import 'package:uae_stat/config/connectivity_provider.dart';
 import 'package:uae_stat/config/theme/app_theme.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
 import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
 import 'package:uae_stat/config/toggle_lang_service.dart';
@@ -16,6 +17,7 @@ import 'package:uae_stat/presentation/components/indicators/locale_provider.dart
 
 import 'package:uae_stat/presentation/components/my_bottom_nav_bar.dart';
 import 'package:uae_stat/presentation/components/my_drawer.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 import 'package:uae_stat/presentation/routes/drawer_routes/custom_drawer_routes.dart';
 import 'package:uae_stat/l10n/app_localizations.dart';
 
@@ -58,8 +60,21 @@ class _ManageUserRouterState extends ConsumerState<ManageUserRouter> {
 
   Future<void> fetchUnverifiedUsers() async {
     try {
-      await _pb.admins
+      // await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+
+      final auth = ref.watch(authProvider);
+
+      // await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
       final result = await _pb.collection('users').getFullList(
             filter: 'role="user"',
           );
@@ -348,7 +363,7 @@ class _ManageUserRouterState extends ConsumerState<ManageUserRouter> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
 
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||

lib/presentation/routes/drawer_routes/Drawer Items/notification/notification.dart

@@ -8,6 +8,8 @@ import 'package:pocketbase/pocketbase.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:uae_stat/config/api_config.dart';
 import 'package:uae_stat/config/connectivity_provider.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
+import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
 import 'package:uae_stat/config/toggle_lang_service.dart';
 import 'package:uae_stat/domain/use_cases/language.dart';
@@ -73,8 +75,9 @@ class _NotificationPageState extends ConsumerState<NotificationPage> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -130,9 +133,22 @@ class _NotificationPageState extends ConsumerState<NotificationPage> {
     try {
       String? fetchedUserId = await getUserId();
       userID = fetchedUserId;
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
-      final adminToken = adminAuth.token;
+
+      final auth = ref.watch(authProvider);
+      //
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      // final adminToken = adminAuth.token;
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
       print('adminToken- ${adminToken}');
       final userDetailsResponse = await _pb.collection('users').getOne(
         fetchedUserId!,
@@ -181,7 +197,8 @@ class _NotificationPageState extends ConsumerState<NotificationPage> {
   Future<void> fetchNotifications(locale) async {
     final baseUrl = apiUrl + '/api/getNotification';
     try {
-      final response = await http.get(Uri.parse('$baseUrl?language=$locale'));
+      final response = await http.get(Uri.parse('$baseUrl?language=$locale'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
 
       if (response.statusCode == 200) {
         final Map<String, dynamic> jsonResponse =
@@ -238,7 +255,7 @@ class _NotificationPageState extends ConsumerState<NotificationPage> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&
@@ -312,7 +329,6 @@ class _NotificationPageState extends ConsumerState<NotificationPage> {
     //   },
     // ];
 
-
     // Filter notifications based on the selected tab
     List<Map<String, dynamic>> filteredNotifications = selectedTabIndex == 0
         ? notifications
@@ -467,8 +483,12 @@ class TabBarHeader extends StatelessWidget {
                     foregroundColor:
                         MaterialStateProperty.resolveWith((states) {
                       return selectedIndex == index
-                          ? isDarkTheme ? Color(0xFFFFFFFF) : Color(0xFFB68A34)
+                          ? isDarkTheme
-                          : isDarkTheme ? Color(0xFFBBBBBB) : Color(0xFF898C81);
+                              ? Color(0xFFFFFFFF)
+                              : Color(0xFFB68A34)
+                          : isDarkTheme
+                              ? Color(0xFFBBBBBB)
+                              : Color(0xFF898C81);
                     }),
                   ),
                   child: Text(
@@ -502,7 +522,7 @@ class TabBarHeader extends StatelessWidget {
   }
 }
 
-class NotificationTile extends StatelessWidget {
+class NotificationTile extends ConsumerWidget {
   final String title;
   final String message;
   final String date;
@@ -524,13 +544,13 @@ class NotificationTile extends StatelessWidget {
   });
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     bool isPushed = userReadedNotiOrNot.contains(id);
     print('isPushed $isPushed , $id');
 
     return GestureDetector(
       onTap: () {
-        readedNotification(userID, id);
+        readedNotification(userID, id, ref);
         final encodedKey = Uri.encodeQueryComponent('notification');
         context.go('/notification_details', extra: {
           'title': title,
@@ -557,7 +577,8 @@ class NotificationTile extends StatelessWidget {
               padding: EdgeInsets.only(top: 4.0, right: 6),
               child: isPushed
                   ? const Icon(Icons.circle, size: 8, color: Color(0xFFFF274E))
-                    : const Icon(Icons.circle, size: 8, color: Colors.transparent),
+                  : const Icon(Icons.circle,
+                      size: 8, color: Colors.transparent),
             ),
             Expanded(
               child: Text(
@@ -567,8 +588,12 @@ class NotificationTile extends StatelessWidget {
                   fontWeight: FontWeight.bold,
                   fontFamily: context.translate('Roboto', 'NotoKufi'),
                   color: isPushed
-                      ? (isDarkTheme ? Colors.white : Color(0xFF414042)) // dark title
+                      ? (isDarkTheme
-                      : (isDarkTheme ? Color(0xFF999999) : Color(0x99414042)), // light grey title
+                          ? Colors.white
+                          : Color(0xFF414042)) // dark title
+                      : (isDarkTheme
+                          ? Color(0xFF999999)
+                          : Color(0x99414042)), // light grey title
                 ),
               ),
             ),
@@ -590,7 +615,8 @@ class NotificationTile extends StatelessWidget {
         //   ),
         // ),
         subtitle: Padding(
-          padding: const EdgeInsets.only(left: 15), // 👈 set your desired left padding here
+          padding: const EdgeInsets.only(
+              left: 15), // 👈 set your desired left padding here
           child: Text(
             date,
             style: TextStyle(
@@ -612,10 +638,24 @@ class NotificationTile extends StatelessWidget {
 }
 
 final pb = PocketBase(apiUrl);
-Future<void> readedNotification(String userId, String notificationId) async {
+Future<void> readedNotification(
-  await pb.admins.authWithPassword(
+    String userId, String notificationId, WidgetRef ref) async {
-    'pb@venbainfotech.com',
+  // await pb.admins.authWithPassword(
-    'pb@venbainfotech.com',
+  //   'pb@venbainfotech.com',
+  //   'pb@venbainfotech.com',
+  // );
+
+  final auth = ref.watch(authProvider);
+
+  // await pb.admins.authWithPassword(
+  //   auth.email,
+  //   auth.password,
+  // );
+
+  final themeService = ThemeBaseService();
+  final adminToken = await themeService.getAdminToken(
+    email: auth.email,
+    password: auth.password,
   );
 
   final url =
@@ -627,6 +667,7 @@ Future<void> readedNotification(String userId, String notificationId) async {
       headers: {
         'Content-Type': 'application/json', // Add this
         'Authorization': pb.authStore.token, // Correct way to send auth token
+        'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'
       },
     );
 

lib/presentation/routes/drawer_routes/Drawer Items/notification/notification_details.dart

@@ -88,8 +88,9 @@ class _NotificationDetailsState extends ConsumerState<NotificationDetails> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -113,8 +114,9 @@ class _NotificationDetailsState extends ConsumerState<NotificationDetails> {
     notificationID = widget.id;
     final baseUrl = apiUrl + '/api/getNotification';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse('$baseUrl?language=$locale&id=$notificationID'));
+          Uri.parse('$baseUrl?language=$locale&id=$notificationID'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
 
       if (response.statusCode == 200) {
         final Map<String, dynamic> jsonResponse =
@@ -167,7 +169,7 @@ class _NotificationDetailsState extends ConsumerState<NotificationDetails> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       fetchNotifications(localeCode);
     });
 
@@ -176,7 +178,7 @@ class _NotificationDetailsState extends ConsumerState<NotificationDetails> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/AboutFCSC.dart

@@ -49,8 +49,9 @@ class _aboutFCSCState extends ConsumerState<aboutFCSC> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -77,7 +78,7 @@ class _aboutFCSCState extends ConsumerState<aboutFCSC> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&
@@ -165,8 +166,7 @@ class _aboutFCSCState extends ConsumerState<aboutFCSC> {
               SizedBox(
                   width: MediaQuery.of(context).size.width,
                   height: MediaQuery.of(context).size.height * 0.36,
-                child:
+                  child: Image.asset(
-                Image.asset(
                     isDarkTheme
                         ? 'assets/user_guide/aboutfcscdark.png'
                         : 'assets/user_guide/aboutfcsclight.png',

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/AboutTheApp/getStarted.dart

@@ -49,8 +49,9 @@ class _GetStartedState extends ConsumerState<GetStarted> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -77,7 +78,7 @@ class _GetStartedState extends ConsumerState<GetStarted> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/AppFeatures.dart

@@ -52,8 +52,9 @@ class _AppFeaturesState extends ConsumerState<AppFeatures> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -80,7 +81,7 @@ class _AppFeaturesState extends ConsumerState<AppFeatures> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/ChangeMyPassword.dart

@@ -50,8 +50,9 @@ class _ChangeMyPasswordState extends ConsumerState<ChangeMyPassword> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -78,7 +79,7 @@ class _ChangeMyPasswordState extends ConsumerState<ChangeMyPassword> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/EditMyProfile.dart

@@ -50,8 +50,9 @@ class _EditMyProfileState extends ConsumerState<EditMyProfile> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -78,7 +79,7 @@ class _EditMyProfileState extends ConsumerState<EditMyProfile> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/howUseTheApp.dart

@@ -51,8 +51,9 @@ class _HowUseTheAppState extends ConsumerState<HowUseTheApp> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -79,7 +80,7 @@ class _HowUseTheAppState extends ConsumerState<HowUseTheApp> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/purpose.dart

@@ -53,8 +53,9 @@ class _PurposeState extends ConsumerState<Purpose> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -81,7 +82,7 @@ class _PurposeState extends ConsumerState<Purpose> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/stayUpdate.dart

@@ -53,8 +53,9 @@ class _StayUpdateState extends ConsumerState<StayUpdate> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -81,7 +82,7 @@ class _StayUpdateState extends ConsumerState<StayUpdate> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/KeyFeatures/useTheApp.dart

@@ -52,8 +52,9 @@ class _WhoUseTheAppState extends ConsumerState<WhoUseTheApp> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -80,7 +81,7 @@ class _WhoUseTheAppState extends ConsumerState<WhoUseTheApp> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/aboutApp.dart

@@ -52,8 +52,9 @@ class _aboutTheAppState extends ConsumerState<aboutTheApp> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -80,7 +81,7 @@ class _aboutTheAppState extends ConsumerState<aboutTheApp> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/faq_page.dart

@@ -50,8 +50,9 @@ class _FAQPageState extends ConsumerState<FAQPage> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -78,7 +79,7 @@ class _FAQPageState extends ConsumerState<FAQPage> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/Drawer Items/user_guide/features.dart

@@ -53,8 +53,9 @@ class _UsingFeaturesState extends ConsumerState<UsingFeatures> {
   Future<void> fetchData(locale, themeMode) async {
     const baseUrl = '$apiUrl/api/getUAENumbersData';
     try {
-      final response = await http
+      final response = await http.get(
-          .get(Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'));
+          Uri.parse(baseUrl + '?language=$locale&color_mode=$themeMode'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
       if (response.statusCode == 200) {
         setState(() {
           homePageData = (json.decode(response.body) as List)
@@ -81,7 +82,7 @@ class _UsingFeaturesState extends ConsumerState<UsingFeatures> {
       setState(() {
         isLoading = true;
       });
-      await _userService.updateLanguage(localeCode);
+      await _userService.updateLanguage(localeCode, ref);
       final currentTheme = ref.read(themeProvider);
       final isDark = currentTheme == ThemeMode.dark ||
           (currentTheme == ThemeMode.system &&

lib/presentation/routes/drawer_routes/custom_drawer_routes.dart

@@ -15,6 +15,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:tutorial_coach_mark/tutorial_coach_mark.dart';
 import 'package:uae_stat/config/injector.dart';
 import 'package:uae_stat/config/theme/app_theme.dart';
+import 'package:uae_stat/config/theme/auth_provider.dart';
 import 'package:uae_stat/config/theme/service.dart';
 import 'package:uae_stat/config/theme/themeDialog.dart';
 import 'package:uae_stat/config/theme/theme_provider.dart';
@@ -31,6 +32,7 @@ import 'package:uae_stat/presentation/Screens/app_tour/Target_content.dart';
 import 'package:uae_stat/presentation/components/indicators/locale_provider.dart';
 import 'package:uae_stat/presentation/components/my_toggle.dart';
 import 'package:uae_stat/config/api_config.dart';
+import 'package:uae_stat/presentation/routes/drawer_routes/Drawer%20Items/notification/notification.dart';
 
 final selectedIndexProvider = StateProvider<int>((ref) => 0);
 
@@ -699,10 +701,23 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
 
   Future<void> _fetchUserData() async {
     try {
-      final adminAuth = await _pb.admins
+      // final adminAuth = await _pb.admins
-          .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
+      //     .authWithPassword('pb@venbainfotech.com', 'pb@venbainfotech.com');
-      final adminToken = adminAuth.token;
+
+      final auth = ref.watch(authProvider);
+
+      // final adminAuth = await pb.admins.authWithPassword(
+      //   auth.email,
+      //   auth.password,
+      // );
+      // final adminToken = adminAuth.token;
       //print('adminToken- ${adminToken}');
+
+      final themeService = ThemeBaseService();
+      final adminToken = await themeService.getAdminToken(
+        email: auth.email,
+        password: auth.password,
+      );
       final userDetailsResponse = await _pb.collection('users').getOne(
         userId!,
         headers: {
@@ -749,7 +764,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
   Future<void> fetchNotifications(locale) async {
     final baseUrl = apiUrl + '/api/getNotification';
     try {
-      final response = await http.get(Uri.parse('$baseUrl?language=$locale'));
+      final response = await http.get(Uri.parse('$baseUrl?language=$locale'),
+          headers: {'APP_SIGNATURE': 'fcsc.gov.ae.X7pL9qZm2A'});
 
       if (response.statusCode == 200) {
         final Map<String, dynamic> jsonResponse =
@@ -942,7 +958,7 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
           ? (platformBrightness == Brightness.dark ? 'dark' : 'light')
           : selectedTheme.name;
 
-      await ThemeBaseService().updateUserTheme(userId, themeToSend);
+      await ThemeBaseService().updateUserTheme(userId, themeToSend, ref);
     }
   }
 
@@ -1395,7 +1411,8 @@ class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
                           ),
                         ),
                       ),
-                      onTap: () => _showLogoutConfirmationDialog(context,isDarkTheme),
+                      onTap: () =>
+                          _showLogoutConfirmationDialog(context, isDarkTheme),
                     ),
                   if (userId == 'guest')
                     ListTile(