From 543a2bc1058300f29da887ff0926dfff3436ec1e Mon Sep 17 00:00:00 2001 From: Arnob <68462590+CodeByArnob@users.noreply.github.com> Date: Fri, 6 Nov 2026 23:01:39 +0600 Subject: [PATCH 1/7] Add encrypted secure storage dependency --- pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pubspec.yaml b/pubspec.yaml index 106626a..6c6654c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -19,6 +19,7 @@ dependencies: webview_flutter: ^4.14.1 image_picker: ^1.2.4 shared_preferences: ^2.5.6 + flutter_secure_storage: ^11.2.0 fl_chart: ^1.3.0 uuid: ^4.6.0 intl: ^0.20.2 From 80d0e46d48cf8a7380cdfa78d493e540b73f674e Mon Sep 17 00:00:00 2001 From: Arnob <68462590+CodeByArnob@users.noreply.github.com> Date: Fri, 6 Nov 2026 23:01:43 +0600 Subject: [PATCH 2/7] Store Puter credentials in encrypted secure storage and migrate legacy token --- .../services/local_storage_service.dart | 67 +++++++++++++++++-- 1 file changed, 60 insertions(+), 7 deletions(-) diff --git a/lib/shared/services/local_storage_service.dart b/lib/shared/services/local_storage_service.dart index 7f18a5c..bb20c2e 100644 --- a/lib/shared/services/local_storage_service.dart +++ b/lib/shared/services/local_storage_service.dart @@ -1,29 +1,80 @@ import 'dart:convert'; import 'package:flutter/services.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import '../../core/constants/app_constants.dart'; import '../../features/scanner/models/food_analysis_result.dart'; import '../../features/nutrition_tracking/models/daily_log.dart'; class LocalStorageService { final SharedPreferences _prefs; + final FlutterSecureStorage _secureStorage; + String? _cachedPuterToken; - LocalStorageService(this._prefs); + LocalStorageService(this._prefs, this._secureStorage); SharedPreferences get prefs => _prefs; static Future init() async { final prefs = await SharedPreferences.getInstance(); - return LocalStorageService(prefs); + const secureStorage = FlutterSecureStorage( + aOptions: AndroidOptions(migrateWithBackup: true), + ); + final service = LocalStorageService(prefs, secureStorage); + await service._migrateLegacyPuterToken(); + return service; + } + + // Puter credentials are stored in Android Keystore-backed encrypted storage. + // The in-memory cache preserves the existing synchronous getter API. + String? getPuterToken() => _cachedPuterToken; + + Future _migrateLegacyPuterToken() async { + final secureToken = await _secureStorage.read(key: AppConstants.keyPuterToken); + if (secureToken != null && secureToken.isNotEmpty) { + _cachedPuterToken = secureToken; + await _prefs.remove(AppConstants.keyPuterToken); + return; + } + + final legacyToken = _prefs.getString(AppConstants.keyPuterToken); + if (legacyToken == null || legacyToken.isEmpty) return; + + await _secureStorage.write( + key: AppConstants.keyPuterToken, + value: legacyToken, + ); + final migratedToken = await _secureStorage.read( + key: AppConstants.keyPuterToken, + ); + if (migratedToken != legacyToken) { + throw StateError('Puter credential migration verification failed.'); + } + _cachedPuterToken = migratedToken; + await _prefs.remove(AppConstants.keyPuterToken); } - // Puter Auth - String? getPuterToken() => _prefs.getString(AppConstants.keyPuterToken); Future setPuterToken(String? token) async { - if (token == null) { - return _prefs.remove(AppConstants.keyPuterToken); + if (token == null || token.trim().isEmpty) { + await _secureStorage.delete(key: AppConstants.keyPuterToken); + _cachedPuterToken = null; + await _prefs.remove(AppConstants.keyPuterToken); + return true; } - return _prefs.setString(AppConstants.keyPuterToken, token); + final cleanToken = token.trim(); + await _secureStorage.write( + key: AppConstants.keyPuterToken, + value: cleanToken, + ); + final storedToken = await _secureStorage.read( + key: AppConstants.keyPuterToken, + ); + if (storedToken != cleanToken) { + throw StateError('Puter credential secure-storage verification failed.'); + } + _cachedPuterToken = storedToken; + await _prefs.remove(AppConstants.keyPuterToken); + return true; } String? getPuterUsername() => _prefs.getString(AppConstants.keyPuterUsername); @@ -43,6 +94,8 @@ class LocalStorageService { } Future clearAuth() async { + await _secureStorage.delete(key: AppConstants.keyPuterToken); + _cachedPuterToken = null; await _prefs.remove(AppConstants.keyPuterToken); await _prefs.remove(AppConstants.keyPuterUsername); await _prefs.remove(AppConstants.keyPuterUuid); From b5105469eafde59839049b29cc5902a1efc2c801 Mon Sep 17 00:00:00 2001 From: Arnob <68462590+CodeByArnob@users.noreply.github.com> Date: Fri, 6 Nov 2026 23:01:55 +0600 Subject: [PATCH 3/7] Require authoritative Puter token validation and remove permissive fallback --- .../auth/services/puter_bridge_service.dart | 81 +++++++++++-------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/lib/features/auth/services/puter_bridge_service.dart b/lib/features/auth/services/puter_bridge_service.dart index ab82717..1c35f2a 100644 --- a/lib/features/auth/services/puter_bridge_service.dart +++ b/lib/features/auth/services/puter_bridge_service.dart @@ -457,49 +457,60 @@ class PuterBridgeService { } catch (_) {} } - // Direct REST token validation fallback + // Validate credentials only against Puter's authenticated identity endpoint. + // Network failures are not treated as invalid credentials. Future validatePuterTokenViaRest(String token) async { final cleanToken = token .trim() - .replaceFirst(RegExp(r'^Bearer\s+', caseSensitive: false), '') + .replaceFirst(RegExp(r'^Bearer\\s+', caseSensitive: false), '') .replaceAll('"', '') - .replaceAll("'", ""); - - try { - final response = await http - .get( - Uri.parse('https://api.puter.com/whoami'), - headers: { - 'Authorization': 'Bearer $cleanToken', - 'Content-Type': 'application/json', - }, - ) - .timeout(const Duration(seconds: 8)); - - if (response.statusCode == 200) { - final data = jsonDecode(response.body); - final user = PuterUser.fromJson(data); - await setAuthToken(cleanToken); - return user; - } else if (response.statusCode == 401 || response.statusCode == 403) { - throw PuterAuthException( - 'Invalid Puter authorization token. Please check your credentials.', - ); - } - } catch (e) { - if (e is AppException) rethrow; - debugPrint('[PuterBridge] REST validation error: $e'); + .replaceAll("'", ''); + if (cleanToken.isEmpty) { + throw PuterAuthException('Missing Puter authorization token.'); } - try { - await setAuthToken(cleanToken); - final user = await getUser(); - if (user != null) return user; - } catch (bridgeErr) { - debugPrint('[PuterBridge] Bridge fallback error: $bridgeErr'); + final response = await http + .get( + Uri.parse('https://api.puter.com/whoami'), + headers: { + 'Authorization': 'Bearer $cleanToken', + 'Accept': 'application/json', + }, + ) + .timeout(const Duration(seconds: 12)); + + if (response.statusCode == 401 || response.statusCode == 403) { + throw PuterAuthException( + 'Your Puter session has expired. Please sign in again.', + ); + } + if (response.statusCode != 200) { + throw AppException( + 'Puter could not verify the session (HTTP ${response.statusCode}). Try again.', + code: 'puter_verification_unavailable', + ); } - return null; + final decoded = jsonDecode(response.body); + if (decoded is! Map) { + throw AppException('Puter returned an unexpected identity response.'); + } + final user = PuterUser.fromJson(decoded); + + // Persist only after the server has positively validated the token. + await _storageService.setPuterToken(cleanToken); + await _storageService.setPuterUsername(user.username); + await _storageService.setPuterUuid(user.uuid); + + // Sync the verified credential into the local Puter.js bridge. + final bridgeSynced = await setAuthToken(cleanToken); + if (!bridgeSynced) { + throw AppException( + 'Puter account was verified, but the local AI bridge could not initialize.', + code: 'puter_bridge_sync_failed', + ); + } + return user; } // --- AI Operations --- From a91fdba8053523a4bfaa8548e5a3f80ba15cf795 Mon Sep 17 00:00:00 2001 From: Arnob <68462590+CodeByArnob@users.noreply.github.com> Date: Fri, 6 Nov 2026 23:01:58 +0600 Subject: [PATCH 4/7] Verify cached Puter session before restoring authenticated app state --- .../auth/providers/auth_provider.dart | 98 +++++++++---------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/lib/features/auth/providers/auth_provider.dart b/lib/features/auth/providers/auth_provider.dart index 57fae95..157b0cc 100644 --- a/lib/features/auth/providers/auth_provider.dart +++ b/lib/features/auth/providers/auth_provider.dart @@ -77,31 +77,15 @@ class AuthNotifier extends StateNotifier { } Future _init() async { - // 1. Immediately restore cached session from local storage in 0ms! final cachedToken = _storage.getPuterToken(); - final cachedUsername = _storage.getPuterUsername(); - final cachedUuid = _storage.getPuterUuid(); + state = state.copyWith(isLoading: cachedToken != null && cachedToken.isNotEmpty); - if (cachedToken != null && - cachedToken.isNotEmpty && - cachedUsername != null) { - state = state.copyWith( - user: PuterUser(username: cachedUsername, uuid: cachedUuid), - isLoading: false, - isBridgeReady: false, - ); - } else { - state = state.copyWith(isLoading: false, isBridgeReady: false); - } - - // 2. Wire event streams _bridge.insufficientFundsStream.listen((exc) { state = state.copyWith( hasExhaustedAllowance: true, errorMessage: exc.message, ); }); - _bridge.usageStream.listen((usage) { state = state.copyWith( usage: usage, @@ -109,33 +93,63 @@ class AuthNotifier extends StateNotifier { ); }); - // 3. Initialize Puter Bridge in background without blocking UI try { await _bridge.initializeBridge(); state = state.copyWith(isBridgeReady: true); - // If we have cached token, sync it to WebView if (cachedToken != null && cachedToken.isNotEmpty) { - unawaited(_syncTokenAndFetchUsageAsync(cachedToken)); - } else { - // Quick session check with 3s timeout - final session = await _bridge.checkSession( - timeout: const Duration(seconds: 3), - ); - if (session['isSignedIn'] == true && session['user'] != null) { - final user = PuterUser.fromJson( - session['user'] as Map, - ); - await _storage.setPuterUsername(user.username); - await _storage.setPuterUuid(user.uuid); + try { + final verifiedUser = await _bridge.validatePuterTokenViaRest(cachedToken); + if (verifiedUser != null) { + state = state.copyWith( + user: verifiedUser, + isLoading: false, + isBridgeReady: true, + errorMessage: null, + ); + unawaited(_fetchUsageAsync()); + return; + } + } on PuterAuthException { + await _storage.clearAuth(); state = state.copyWith( - user: user, + clearUser: true, + isLoading: false, isBridgeReady: true, + errorMessage: 'Your Puter session expired. Please sign in again.', + ); + return; + } catch (e) { + // Preserve the encrypted credential on temporary network/server errors, + // but never show a cached username as authenticated before verification. + state = state.copyWith( + clearUser: true, isLoading: false, + isBridgeReady: true, + errorMessage: 'Could not verify your Puter session. Check internet and retry.', ); - unawaited(_fetchUsageAsync()); + return; } } + + final session = await _bridge.checkSession( + timeout: const Duration(seconds: 3), + ); + if (session['isSignedIn'] == true && session['user'] != null) { + final user = PuterUser.fromJson( + session['user'] as Map, + ); + await _storage.setPuterUsername(user.username); + await _storage.setPuterUuid(user.uuid); + state = state.copyWith( + user: user, + isBridgeReady: true, + isLoading: false, + ); + unawaited(_fetchUsageAsync()); + } else { + state = state.copyWith(isLoading: false, clearUser: true); + } } catch (e) { debugPrint('[AuthNotifier] Background init error: $e'); state = state.copyWith(isBridgeReady: true, isLoading: false); @@ -178,23 +192,7 @@ class AuthNotifier extends StateNotifier { throw AppException('Please enter a valid Puter token.'); } - PuterUser? user; - try { - user = await _bridge.validatePuterTokenViaRest(trimmedToken); - } catch (e) { - if (e is PuterAuthException) rethrow; - } - - if (user == null && trimmedToken.length >= 10) { - await _bridge.setAuthToken(trimmedToken); - user = await _bridge.getUser(); - user ??= PuterUser( - username: 'Puter User', - uuid: trimmedToken.length > 8 - ? trimmedToken.substring(0, 8) - : trimmedToken, - ); - } + final user = await _bridge.validatePuterTokenViaRest(trimmedToken); if (user != null) { await _storage.setPuterToken(trimmedToken); From 9a7bac7099173c77990594e94f2314c93d334e52 Mon Sep 17 00:00:00 2001 From: Arnob <68462590+CodeByArnob@users.noreply.github.com> Date: Fri, 6 Nov 2026 23:02:05 +0600 Subject: [PATCH 5/7] Wait for server-side token verification before syncing WebView bridge --- lib/features/auth/services/puter_bridge_service.dart | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/features/auth/services/puter_bridge_service.dart b/lib/features/auth/services/puter_bridge_service.dart index 1c35f2a..0fd73ff 100644 --- a/lib/features/auth/services/puter_bridge_service.dart +++ b/lib/features/auth/services/puter_bridge_service.dart @@ -76,15 +76,8 @@ class PuterBridgeService { NavigationDelegate( onPageFinished: (String url) async { debugPrint('[PuterBridge] Page finished loading: $url'); - final cachedToken = _storageService.getPuterToken(); - if (cachedToken != null && cachedToken.isNotEmpty) { - setAuthToken(cachedToken).catchError((e) { - debugPrint( - '[PuterBridge] Non-blocking initial token set error: $e', - ); - return false; - }); - } + // Do not inject a persisted credential into JavaScript until the + // AuthNotifier has verified it with Puter's identity endpoint. }, onWebResourceError: (WebResourceError error) { debugPrint('[PuterBridge] Resource error: ${error.description}'); From 7d81dad2eb0cc70978ea20b4bd3d5a95a1470083 Mon Sep 17 00:00:00 2001 From: Arnob <68462590+CodeByArnob@users.noreply.github.com> Date: Fri, 6 Nov 2026 23:02:10 +0600 Subject: [PATCH 6/7] Disable Android backup for Keystore-encrypted credential safety --- android/app/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 1a8b835..174e101 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,6 +7,7 @@ Date: Fri, 6 Nov 2026 23:02:31 +0600 Subject: [PATCH 7/7] Correct bearer prefix normalization in token validation --- lib/features/auth/services/puter_bridge_service.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/features/auth/services/puter_bridge_service.dart b/lib/features/auth/services/puter_bridge_service.dart index 0fd73ff..367d95f 100644 --- a/lib/features/auth/services/puter_bridge_service.dart +++ b/lib/features/auth/services/puter_bridge_service.dart @@ -455,7 +455,7 @@ class PuterBridgeService { Future validatePuterTokenViaRest(String token) async { final cleanToken = token .trim() - .replaceFirst(RegExp(r'^Bearer\\s+', caseSensitive: false), '') + .replaceFirst(RegExp(r'^Bearer\s+', caseSensitive: false), '') .replaceAll('"', '') .replaceAll("'", ''); if (cleanToken.isEmpty) {