mr.mojtaba/rasadyar_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : login and route

Browse Source
This commit is contained in:
mr.mojtaba
2025-05-18 09:32:43 +03:30
parent 6843973c4f
commit f7ea9f3a19
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/infrastructure/service/auth_service.dart
View File

@@ -1,9 +1,10 @@
import 'package:rasadyar_auth/auth.dart'; import 'package:rasadyar_auth/auth.dart';
import 'package:rasadyar_auth/data/services/token_storage_service.dart'; import 'package:rasadyar_auth/data/services/token_storage_service.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
import 'package:rasadyar_inspection/inspection.dart';
class AuthService extends GetxService { class AuthService extends GetxService {
var tokenService = diAuth.get<TokenStorageService>(); var tokenService = Get.find<TokenStorageService>();
RxBool accessRes = false.obs; RxBool accessRes = false.obs;
RxBool refAccessRes = false.obs; RxBool refAccessRes = false.obs;
@override @override
@@ -15,15 +16,16 @@ class AuthService extends GetxService {
accessRes.value = (callback != null); accessRes.value = (callback != null);
}); });
// رصد تغییرات refreshToken
ever(tokenService.refreshToken, (callback) { ever(tokenService.refreshToken, (callback) {
fLog('Refresh token callback: $callback, value: ${tokenService.refreshToken.value}'); fLog('Refresh token callback: $callback, value: ${tokenService.refreshToken.value}');
refAccessRes.value = (callback != null); refAccessRes.value = (callback != null);
}); });
// بررسی اینکه هر دو مقدار دارند
everAll([accessRes, refAccessRes], (_) { everAll([accessRes, refAccessRes], (_) {
if (accessRes.value && refAccessRes.value) { if (accessRes.value && refAccessRes.value) {
Get.offAndToNamed(InspectionRoutes.inspection);
fLog('Both accessToken and refreshToken are available: accessToken=${tokenService.accessToken.value}, refreshToken=${tokenService.refreshToken.value}'); fLog('Both accessToken and refreshToken are available: accessToken=${tokenService.accessToken.value}, refreshToken=${tokenService.refreshToken.value}');
} else { } else {
fLog('One or both tokens are missing: accessToken=${tokenService.accessToken.value}, refreshToken=${tokenService.refreshToken.value}'); fLog('One or both tokens are missing: accessToken=${tokenService.accessToken.value}, refreshToken=${tokenService.refreshToken.value}');

6
lib/main.dart
View File

@@ -1,5 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:rasadyar_app/presentation/routes/app_pages.dart'; import 'package:rasadyar_app/presentation/routes/app_pages.dart';
import 'package:rasadyar_auth/auth.dart';
import 'package:rasadyar_auth/data/services/token_storage_service.dart';
import 'package:rasadyar_core/core.dart'; import 'package:rasadyar_core/core.dart';
@@ -9,6 +11,10 @@ import 'infrastructure/service/auth_service.dart';
Future<void> main() async { Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await setupInjection(); await setupInjection();
Get.put(TokenStorageService());
var tokenService = Get.find<TokenStorageService>();
await tokenService.init();
Get.put(AuthMiddleware());
Get.put(AuthService()); Get.put(AuthService());
runApp(MyApp()); runApp(MyApp());

1
packages/auth/lib/data/di/auth_di.dart
View File

@@ -16,6 +16,5 @@ Future<void> setupAuthDI() async {
diAuth.registerCachedFactory<AuthRepositoryImpl>( diAuth.registerCachedFactory<AuthRepositoryImpl>(
() => AuthRepositoryImpl(dioRemote), () => AuthRepositoryImpl(dioRemote),
); );
diAuth.registerLazySingleton<TokenStorageService>(() => TokenStorageService());
diAuth.registerLazySingleton<DioErrorHandler>(() => DioErrorHandler()); diAuth.registerLazySingleton<DioErrorHandler>(() => DioErrorHandler());
} }

2
packages/auth/lib/data/services/auth_middelware.dart
View File

@@ -6,7 +6,7 @@ import 'package:rasadyar_core/core.dart';
import '../../presentation/routes/pages.dart'; import '../../presentation/routes/pages.dart';
class AuthMiddleware extends GetMiddleware { class AuthMiddleware extends GetMiddleware {
var tokenService = diAuth.get<TokenStorageService>(); var tokenService = Get.find<TokenStorageService>();
@override @override
RouteSettings? redirect(String? route) { RouteSettings? redirect(String? route) {

2
packages/auth/lib/presentation/pages/auth/logic.dart
View File

@@ -31,7 +31,7 @@ class AuthLogic extends GetxController {
RxnString phoneNumber = RxnString(null); RxnString phoneNumber = RxnString(null);
RxBool isLoading = false.obs; RxBool isLoading = false.obs;
TokenStorageService tokenStorageService = diAuth.get<TokenStorageService>(); TokenStorageService tokenStorageService = Get.find<TokenStorageService>();
Rx<AuthType> authType = AuthType.useAndPass.obs; Rx<AuthType> authType = AuthType.useAndPass.obs;
Rx<AuthStatus> authStatus = AuthStatus.init.obs; Rx<AuthStatus> authStatus = AuthStatus.init.obs;