Hamza/tripz-llc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update codebase

Browse Source
This commit is contained in:
Hamza-Ayed
2026-08-05 00:28:04 +03:00
parent 36833b039d
commit 29f375b122
13 changed files with 133 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/driver_new/ios/Podfile
+4
View File
@@ -54,6 +54,10 @@ post_install do |installer|
if Gem::Version.new($iOSVersion) > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
end
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
'$(inherited)',
'PERMISSION_LOCATION=1',
]
end
end
end
apps/driver_new/lib/core/di.dart
+5 -2
View File
@@ -51,6 +51,7 @@ import 'notifications/push_service.dart';
import 'realtime/realtime_service.dart';
import 'session/session_cubit.dart';
import 'session/session_source.dart';
import 'storage/token_store.dart';
@@ -84,10 +85,12 @@ Future<void> setupInjector() async {
),
);
sl.registerSingleton<AuthRepository>(AuthRepository(sl(), sl()));
final authRepo = AuthRepository(sl(), sl());
sl.registerSingleton<AuthRepository>(authRepo);
sl.registerSingleton<SessionSource>(authRepo);
sl.registerSingleton<ProfileRepository>(ProfileRepository(sl()));
sl.registerSingleton<SessionCubit>(
SessionCubit(sl(), onAuthenticated: () => sl<PushService>().register()),
SessionCubit(authRepo, onAuthenticated: () => sl<PushService>().register()),
);
// تدفّق الدخول قصير العمر: نسخة جديدة لكل دخول، لا نسخة واحدة أبدية.
apps/driver_new/lib/core/storage/token_store.dart
+13 -5
View File
@@ -34,10 +34,10 @@ class TokenStore {
}) async {
_access = accessToken;
_refresh = refreshToken;
await _storage.write(key: _kAccess, value: accessToken);
await _storage.write(key: _kRefresh, value: refreshToken);
await _write(_kAccess, accessToken);
await _write(_kRefresh, refreshToken);
if (signingKey != null) {
await _storage.write(key: _kSigning, value: signingKey);
await _write(_kSigning, signingKey);
}
}
@@ -54,8 +54,16 @@ class TokenStore {
Future<String?> signingKey() => _storage.read(key: _kSigning);
Future<String?> deviceId() => _storage.read(key: _kDeviceId);
Future<void> setDeviceId(String id) =>
_storage.write(key: _kDeviceId, value: id);
Future<void> setDeviceId(String id) => _write(_kDeviceId, id);
Future<void> _write(String key, String value) async {
try {
await _storage.write(key: key, value: value);
} catch (_) {
await _storage.delete(key: key);
await _storage.write(key: key, value: value);
}
}
/// هل انتهت صلاحية التوكن (أو ستنتهي خلال [leeway])؟
///
apps/driver_new/lib/features/auth/cubit/login_cubit.dart
+41 -8
View File
@@ -2,6 +2,7 @@ import 'dart:async';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:geolocator/geolocator.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:shared_preferences/shared_preferences.dart';
@@ -63,24 +64,56 @@ class LoginCubit extends Cubit<LoginState> {
/// تُستدعى أيضاً عند **العودة من إعدادات النظام**: بلا إعادة الفحص تبقى
/// الشاشة عالقة بعد أن يمنح المستخدم الإذن يدوياً (حالة حافة من docs/39 §2).
Future<void> checkLocationPermission() async {
final status = await Permission.locationWhenInUse.status;
if (status.isGranted || status.isLimited) {
emit(state.copyWith(step: LoginStep.phone));
final geoStatus = await Geolocator.checkPermission();
if (geoStatus == LocationPermission.always ||
geoStatus == LocationPermission.whileInUse) {
emit(state.copyWith(
step: LoginStep.phone,
permissionPermanentlyDenied: false,
));
return;
}
final status = await Permission.locationWhenInUse.status;
if (status.isGranted || status.isLimited) {
emit(state.copyWith(
step: LoginStep.phone,
permissionPermanentlyDenied: false,
));
return;
}
emit(state.copyWith(
permissionPermanentlyDenied: status.isPermanentlyDenied,
permissionPermanentlyDenied:
geoStatus == LocationPermission.deniedForever ||
status.isPermanentlyDenied,
));
}
Future<void> requestLocationPermission() async {
final status = await Permission.locationWhenInUse.request();
if (status.isGranted || status.isLimited) {
emit(state.copyWith(step: LoginStep.phone));
final geoStatus = await Geolocator.requestPermission();
if (geoStatus == LocationPermission.always ||
geoStatus == LocationPermission.whileInUse) {
emit(state.copyWith(
step: LoginStep.phone,
permissionPermanentlyDenied: false,
));
return;
}
final status = await Permission.locationWhenInUse.request();
if (status.isGranted || status.isLimited) {
emit(state.copyWith(
step: LoginStep.phone,
permissionPermanentlyDenied: false,
));
return;
}
emit(state.copyWith(
permissionPermanentlyDenied: status.isPermanentlyDenied,
permissionPermanentlyDenied:
geoStatus == LocationPermission.deniedForever ||
status.isPermanentlyDenied,
));
}
apps/driver_new/pubspec.lock
+2 -2
View File
@@ -117,10 +117,10 @@ packages:
dependency: "direct main"
description:
name: device_info_plus
sha256: b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd
sha256: "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c"
url: "https://pub.dev"
source: hosted
version: "12.4.0"
version: "12.3.0"
device_info_plus_platform_interface:
dependency: transitive
description:
apps/driver_new/pubspec.yaml
+1 -1
View File
@@ -45,7 +45,7 @@ dependencies:
# م3: الأذونات وبصمة الجهاز
permission_handler: ^12.0.1
device_info_plus: ^12.3.0
device_info_plus: 12.3.0
cupertino_icons: ^1.0.8
apps/rider_new/ios/Podfile
+4
View File
@@ -50,6 +50,10 @@ post_install do |installer|
if Gem::Version.new($iOSVersion) > Gem::Version.new(config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'])
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSVersion
end
config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
'$(inherited)',
'PERMISSION_LOCATION=1',
]
end
end
end
apps/rider_new/ios/Podfile.lock
+1 -1
View File
@@ -154,6 +154,6 @@ SPEC CHECKSUMS:
PromisesObjC: 752c3227f599e3467650e47ea36f433eeb10c273
shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
PODFILE CHECKSUM: cd8e27edd15d1a27818927147375b1d9d700364a
PODFILE CHECKSUM: 2fb3a1fbcfd139fd6c248e48cbde3560c22a448d
COCOAPODS: 1.16.2
apps/rider_new/lib/core/di.dart
+5 -2
View File
@@ -48,6 +48,7 @@ import 'notifications/push_service.dart';
import 'realtime/realtime_service.dart';
import 'session/session_cubit.dart';
import 'session/session_source.dart';
import 'storage/token_store.dart';
@@ -81,10 +82,12 @@ Future<void> setupInjector() async {
),
);
sl.registerSingleton<AuthRepository>(AuthRepository(sl(), sl()));
final authRepo = AuthRepository(sl(), sl());
sl.registerSingleton<AuthRepository>(authRepo);
sl.registerSingleton<SessionSource>(authRepo);
sl.registerSingleton<ProfileRepository>(ProfileRepository(sl()));
sl.registerSingleton<SessionCubit>(
SessionCubit(sl(), onAuthenticated: () => sl<PushService>().register()),
SessionCubit(authRepo, onAuthenticated: () => sl<PushService>().register()),
);
// تدفّق الدخول قصير العمر: نسخة جديدة لكل دخول، لا نسخة واحدة أبدية.
apps/rider_new/lib/core/storage/token_store.dart
+13 -5
View File
@@ -34,10 +34,10 @@ class TokenStore {
}) async {
_access = accessToken;
_refresh = refreshToken;
await _storage.write(key: _kAccess, value: accessToken);
await _storage.write(key: _kRefresh, value: refreshToken);
await _write(_kAccess, accessToken);
await _write(_kRefresh, refreshToken);
if (signingKey != null) {
await _storage.write(key: _kSigning, value: signingKey);
await _write(_kSigning, signingKey);
}
}
@@ -54,8 +54,16 @@ class TokenStore {
Future<String?> signingKey() => _storage.read(key: _kSigning);
Future<String?> deviceId() => _storage.read(key: _kDeviceId);
Future<void> setDeviceId(String id) =>
_storage.write(key: _kDeviceId, value: id);
Future<void> setDeviceId(String id) => _write(_kDeviceId, id);
Future<void> _write(String key, String value) async {
try {
await _storage.write(key: key, value: value);
} catch (_) {
await _storage.delete(key: key);
await _storage.write(key: key, value: value);
}
}
/// هل انتهت صلاحية التوكن (أو ستنتهي خلال [leeway])؟
///
apps/rider_new/lib/features/auth/cubit/login_cubit.dart
+41 -8
View File
@@ -2,6 +2,7 @@ import 'dart:async';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:geolocator/geolocator.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:shared_preferences/shared_preferences.dart';
@@ -63,24 +64,56 @@ class LoginCubit extends Cubit<LoginState> {
/// تُستدعى أيضاً عند **العودة من إعدادات النظام**: بلا إعادة الفحص تبقى
/// الشاشة عالقة بعد أن يمنح المستخدم الإذن يدوياً (حالة حافة من docs/39 §2).
Future<void> checkLocationPermission() async {
final status = await Permission.locationWhenInUse.status;
if (status.isGranted || status.isLimited) {
emit(state.copyWith(step: LoginStep.phone));
final geoStatus = await Geolocator.checkPermission();
if (geoStatus == LocationPermission.always ||
geoStatus == LocationPermission.whileInUse) {
emit(state.copyWith(
step: LoginStep.phone,
permissionPermanentlyDenied: false,
));
return;
}
final status = await Permission.locationWhenInUse.status;
if (status.isGranted || status.isLimited) {
emit(state.copyWith(
step: LoginStep.phone,
permissionPermanentlyDenied: false,
));
return;
}
emit(state.copyWith(
permissionPermanentlyDenied: status.isPermanentlyDenied,
permissionPermanentlyDenied:
geoStatus == LocationPermission.deniedForever ||
status.isPermanentlyDenied,
));
}
Future<void> requestLocationPermission() async {
final status = await Permission.locationWhenInUse.request();
if (status.isGranted || status.isLimited) {
emit(state.copyWith(step: LoginStep.phone));
final geoStatus = await Geolocator.requestPermission();
if (geoStatus == LocationPermission.always ||
geoStatus == LocationPermission.whileInUse) {
emit(state.copyWith(
step: LoginStep.phone,
permissionPermanentlyDenied: false,
));
return;
}
final status = await Permission.locationWhenInUse.request();
if (status.isGranted || status.isLimited) {
emit(state.copyWith(
step: LoginStep.phone,
permissionPermanentlyDenied: false,
));
return;
}
emit(state.copyWith(
permissionPermanentlyDenied: status.isPermanentlyDenied,
permissionPermanentlyDenied:
geoStatus == LocationPermission.deniedForever ||
status.isPermanentlyDenied,
));
}
apps/rider_new/pubspec.lock
+2 -2
View File
@@ -109,10 +109,10 @@ packages:
dependency: "direct main"
description:
name: device_info_plus
sha256: b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd
sha256: "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c"
url: "https://pub.dev"
source: hosted
version: "12.4.0"
version: "12.3.0"
device_info_plus_platform_interface:
dependency: transitive
description:
apps/rider_new/pubspec.yaml
+1 -1
View File
@@ -42,7 +42,7 @@ dependencies:
# م3: الأذونات وبصمة الجهاز
permission_handler: ^12.0.1
device_info_plus: ^12.3.0
device_info_plus: 12.3.0
cupertino_icons: ^1.0.8