improve auth state ref

Author: amaury901130

app/lib/main/app.dart

@@ -1,10 +1,7 @@
-import 'package:app/presentation/ui/custom/loading_screen.dart';
-import 'package:common/core/resource.dart';
 import 'package:flutter/material.dart';
 import 'package:domain/bloc/app/app_cubit.dart';
 import 'package:domain/bloc/app/app_state.dart';
 import 'package:domain/bloc/auth/auth_cubit.dart';
-import 'package:domain/bloc/auth/auth_state.dart';
 import 'package:app/presentation/navigation/routers.dart';
 import 'package:app/presentation/resources/locale/generated/l10n.dart';
 import 'package:app/presentation/themes/app_themes.dart';

app/lib/presentation/navigation/routers.dart

@@ -1,4 +1,3 @@
-import 'package:app/main/init.dart';
 import 'package:app/presentation/ui/pages/home/home_page.dart';
 import 'package:app/presentation/ui/pages/login/login_page.dart';
 import 'package:app/presentation/ui/pages/sign_up/sign_up_page.dart';
@@ -37,6 +36,7 @@ class Routers {
  path: '/',
  builder: (context, state) {
  return BlocListener<AuthCubit, Resource>(
+ listenWhen: (previous, current) => current is RSuccess,
  listener: (_, state) {
  if (state is RSuccess) {
  switch (state.data) {
@@ -58,11 +58,17 @@ class Routers {
  name: Routes.auth.name,
  path: Routes.auth.path,
  redirect: (context, state) {
- if (getIt<AuthCubit>().isLoggedIn()) {
+ if (context.read<AuthCubit>().isLoggedIn()) {
  return '${Routes.app.path}${Routes.home.path}';
  }
 
- return '${Routes.auth.path}${Routes.login.path}';
+ // Only redirect to /auth/login if currently at /auth
+ if (state.path == Routes.auth.path) {
+ return '${Routes.auth.path}${Routes.login.path}';
+ }
+
+ /// Continue to auth routes
+ return null;
  },
  routes: [
  GoRoute(
@@ -80,13 +86,18 @@ class Routers {
  GoRoute(
  name: Routes.app.name,
  path: Routes.app.path,
- builder: (context, state) => const SplashPage(),
  redirect: (context, state) {
- if (!getIt<AuthCubit>().isLoggedIn()) {
+ if (!context.read<AuthCubit>().isLoggedIn()) {
  return '${Routes.auth.path}${Routes.login.path}';
  }
 
- return '${Routes.app.path}${Routes.home.path}';
+ // Only redirect to /app/home if currently at /app
+ if (state.path == Routes.app.path) {
+ return '${Routes.app.path}${Routes.home.path}';
+ }
+
+ /// Continue to app routes
+ return null;
  },
  routes: [
  GoRoute(