bug fix in permissions
This commit is contained in:
parent
2e0c68967b
commit
e372cac9ae
|
|
@ -70,6 +70,8 @@ class _MyAppState extends State<MyApp> {
|
||||||
final themeController = ThemeController();
|
final themeController = ThemeController();
|
||||||
await themeController.load();
|
await themeController.load();
|
||||||
final authStore = AuthStore();
|
final authStore = AuthStore();
|
||||||
|
// بایند کردن AuthStore قبل از load برای ارسال هدر Authorization در درخواستهای اولیه
|
||||||
|
ApiClient.bindAuthStore(authStore);
|
||||||
await authStore.load();
|
await authStore.load();
|
||||||
|
|
||||||
// تنظیم کنترلرها
|
// تنظیم کنترلرها
|
||||||
|
|
@ -251,8 +253,17 @@ class _MyAppState extends State<MyApp> {
|
||||||
final themeController = _themeController!;
|
final themeController = _themeController!;
|
||||||
|
|
||||||
print('🔍 BUILD DEBUG: All controllers loaded, creating main router');
|
print('🔍 BUILD DEBUG: All controllers loaded, creating main router');
|
||||||
|
// حفظ URL فعلی مرورگر هنگام سوئیچ از لودینگ به روتر اصلی
|
||||||
|
final currentInitialLocation = () {
|
||||||
|
final base = Uri.base;
|
||||||
|
final path = base.path.isNotEmpty ? base.path : '/';
|
||||||
|
final query = base.hasQuery ? '?${base.query}' : '';
|
||||||
|
final fragment = base.fragment.isNotEmpty ? '#${base.fragment}' : '';
|
||||||
|
return '$path$query$fragment';
|
||||||
|
}();
|
||||||
|
|
||||||
final router = GoRouter(
|
final router = GoRouter(
|
||||||
initialLocation: '/',
|
initialLocation: currentInitialLocation,
|
||||||
redirect: (context, state) async {
|
redirect: (context, state) async {
|
||||||
final currentPath = state.uri.path;
|
final currentPath = state.uri.path;
|
||||||
final fullUri = state.uri.toString();
|
final fullUri = state.uri.toString();
|
||||||
|
|
|
||||||
|
|
@ -988,6 +988,7 @@ class _BusinessShellState extends State<BusinessShell> {
|
||||||
context.pop();
|
context.pop();
|
||||||
onSelectChild(i, item.children!.indexOf(child));
|
onSelectChild(i, item.children!.indexOf(child));
|
||||||
},
|
},
|
||||||
|
);
|
||||||
}).toList(),
|
}).toList(),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue