Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<uses-feature android:name="android.hardware.camera" android:required="false"/>

<application
android:allowBackup="false"
android:label="FoodLens"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"
Expand Down
98 changes: 48 additions & 50 deletions lib/features/auth/providers/auth_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -77,65 +77,79 @@ class AuthNotifier extends StateNotifier<AuthState> {
}

Future<void> _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,
hasExhaustedAllowance: usage.hasExhaustedAllowance,
);
});

// 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<String, dynamic>,
);
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<String, dynamic>,
);
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);
Expand Down Expand Up @@ -178,23 +192,7 @@ class AuthNotifier extends StateNotifier<AuthState> {
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);
Expand Down
90 changes: 47 additions & 43 deletions lib/features/auth/services/puter_bridge_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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}');
Expand Down Expand Up @@ -457,49 +450,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<PuterUser?> validatePuterTokenViaRest(String token) async {
final cleanToken = token
.trim()
.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<String, dynamic>) {
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 ---
Expand Down
67 changes: 60 additions & 7 deletions lib/shared/services/local_storage_service.dart
Original file line number Diff line number Diff line change
@@ -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<LocalStorageService> 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<void> _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<bool> 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);
Expand All @@ -43,6 +94,8 @@ class LocalStorageService {
}

Future<void> 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);
Expand Down
1 change: 1 addition & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading