Big revamp: Auth/Repository/Router

lib/admin/providers/account_types_list_provider.dart

@@ -3,8 +3,6 @@ import 'package:myecl/admin/class/account_type.dart';
 import 'package:myecl/admin/repositories/account_type_repository.dart';
 import 'package:myecl/tools/providers/list_notifier.dart';
 
-import 'package:myecl/tools/token_expire_wrapper.dart';
-
 class AccountTypesNotifier extends ListNotifier<AccountType> {
   final AccountTypeRepository accountTypeRepository;
   AccountTypesNotifier({required this.accountTypeRepository})
@@ -23,8 +21,6 @@ final allAccountTypesListProvider =
       AccountTypesNotifier provider = AccountTypesNotifier(
         accountTypeRepository: accountTypeRepository,
       );
-      tokenExpireWrapperAuth(ref, () async {
-        await provider.loadAccountTypes();
-      });
+      provider.loadAccountTypes();
       return provider;
     });

lib/admin/providers/association_membership_list_provider.dart

@@ -2,7 +2,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/association_membership_simple.dart';
 import 'package:myecl/admin/repositories/association_membership_repository.dart';
 import 'package:myecl/tools/providers/list_notifier.dart';
-import 'package:myecl/tools/token_expire_wrapper.dart';
 
 class AssociationMembershipListNotifier
     extends ListNotifier<AssociationMembership> {
@@ -67,8 +66,6 @@ final allAssociationMembershipListProvider =
           AssociationMembershipListNotifier(
             associationMembershipRepository: associationMembershipRepository,
           );
-      tokenExpireWrapperAuth(ref, () async {
-        await provider.loadAssociationMemberships();
-      });
+      provider.loadAssociationMemberships();
       return provider;
     });

lib/admin/providers/group_list_provider.dart

@@ -2,7 +2,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/simple_group.dart';
 import 'package:myecl/admin/repositories/group_repository.dart';
 import 'package:myecl/tools/providers/list_notifier.dart';
-import 'package:myecl/tools/token_expire_wrapper.dart';
 import 'package:myecl/user/class/user.dart';
 import 'package:myecl/user/providers/user_provider.dart';
 
@@ -59,9 +58,7 @@ final allGroupListProvider =
       GroupListNotifier provider = GroupListNotifier(
         groupRepository: groupRepository,
       );
-      tokenExpireWrapperAuth(ref, () async {
-        await provider.loadGroups();
-      });
+      provider.loadGroups();
       return provider;
     });
 
@@ -73,8 +70,6 @@ final userGroupListNotifier =
       GroupListNotifier provider = GroupListNotifier(
         groupRepository: groupRepository,
       );
-      tokenExpireWrapperAuth(ref, () async {
-        await provider.loadGroupsFromUser(ref.watch(userProvider));
-      });
+      provider.loadGroupsFromUser(ref.watch(userProvider));
       return provider;
     });

lib/admin/providers/group_logo_provider.dart

@@ -28,6 +28,6 @@ class GroupLogoNotifier extends SingleNotifier<Image> {
 
 final groupLogoProvider =
     StateNotifierProvider<GroupLogoNotifier, AsyncValue<Image>>((ref) {
-      final groupLogoRepository = GroupLogoRepository();
+      final groupLogoRepository = GroupLogoRepository(ref);
       return GroupLogoNotifier(groupLogoRepository: groupLogoRepository);
     });

lib/admin/providers/module_root_list_provider.dart

@@ -1,16 +1,12 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/repositories/module_visibility_repository.dart';
-import 'package:myecl/auth/providers/openid_provider.dart';
 import 'package:myecl/tools/providers/list_notifier.dart';
-import 'package:myecl/tools/token_expire_wrapper.dart';
 import 'package:myecl/user/providers/user_provider.dart';
 
 class ModuleListNotifier extends ListNotifier<String> {
-  ModuleVisibilityRepository repository = ModuleVisibilityRepository();
-  ModuleListNotifier({required String token})
-    : super(const AsyncValue.loading()) {
-    repository.setToken(token);
-  }
+  ModuleVisibilityRepository repository;
+  ModuleListNotifier({required this.repository})
+    : super(const AsyncValue.loading());
 
   Future<AsyncValue<List<String>>> loadMyModuleRoots() async {
     return await loadList(repository.getAccessibleModule);
@@ -19,13 +15,11 @@ class ModuleListNotifier extends ListNotifier<String> {
 
 final moduleRootListProvider =
     StateNotifierProvider<ModuleListNotifier, AsyncValue<List<String>>>((ref) {
-      final token = ref.watch(tokenProvider);
+      final repository = ref.watch(moduleVisibilityRepositoryProvider);
       final userProvider = ref.watch(asyncUserProvider);
-      ModuleListNotifier notifier = ModuleListNotifier(token: token);
+      ModuleListNotifier notifier = ModuleListNotifier(repository: repository);
       userProvider.maybeWhen(
-        data: (data) => tokenExpireWrapperAuth(ref, () async {
-          await notifier.loadMyModuleRoots();
-        }),
+        data: (data) => notifier.loadMyModuleRoots(),
         orElse: () {},
       );
       return notifier;

lib/admin/providers/module_visibility_list_provider.dart

@@ -1,16 +1,12 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/module_visibility.dart';
 import 'package:myecl/admin/repositories/module_visibility_repository.dart';
-import 'package:myecl/auth/providers/openid_provider.dart';
 import 'package:myecl/tools/providers/list_notifier.dart';
-import 'package:myecl/tools/token_expire_wrapper.dart';
 
 class ModuleVisibilityListNotifier extends ListNotifier<ModuleVisibility> {
-  ModuleVisibilityRepository repository = ModuleVisibilityRepository();
-  ModuleVisibilityListNotifier({required String token})
-    : super(const AsyncValue.loading()) {
-    repository.setToken(token);
-  }
+  ModuleVisibilityRepository repository;
+  ModuleVisibilityListNotifier({required this.repository})
+    : super(const AsyncValue.loading());
 
   Future<AsyncValue<List<ModuleVisibility>>> loadModuleVisibility() async {
     return await loadList(repository.getModuleVisibilityList);
@@ -88,12 +84,10 @@ final moduleVisibilityListProvider =
       ModuleVisibilityListNotifier,
       AsyncValue<List<ModuleVisibility>>
     >((ref) {
-      final token = ref.watch(tokenProvider);
+      final repository = ref.watch(moduleVisibilityRepositoryProvider);
       ModuleVisibilityListNotifier notifier = ModuleVisibilityListNotifier(
-        token: token,
+        repository: repository,
       );
-      tokenExpireWrapperAuth(ref, () async {
-        await notifier.loadModuleVisibility();
-      });
+      notifier.loadModuleVisibility();
       return notifier;
     });

lib/admin/providers/school_list_provider.dart

@@ -2,7 +2,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/school.dart';
 import 'package:myecl/admin/repositories/school_repository.dart';
 import 'package:myecl/tools/providers/list_notifier.dart';
-import 'package:myecl/tools/token_expire_wrapper.dart';
 
 class SchoolListNotifier extends ListNotifier<School> {
   final SchoolRepository schoolRepository;
@@ -51,8 +50,6 @@ final allSchoolListProvider =
       SchoolListNotifier provider = SchoolListNotifier(
         schoolRepository: schoolRepository,
       );
-      tokenExpireWrapperAuth(ref, () async {
-        await provider.loadSchools();
-      });
+      provider.loadSchools();
       return provider;
     });

lib/admin/providers/simple_groups_groups_provider.dart

@@ -2,7 +2,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/group.dart';
 import 'package:myecl/admin/providers/group_list_provider.dart';
 import 'package:myecl/tools/providers/map_provider.dart';
-import 'package:myecl/tools/token_expire_wrapper.dart';
 
 class SimpleGroupsGroupsNotifier extends MapNotifier<String, Group> {
   SimpleGroupsGroupsNotifier();
@@ -15,11 +14,9 @@ final simpleGroupsGroupsProvider =
     >((ref) {
       SimpleGroupsGroupsNotifier simpleGroupsGroupsNotifier =
           SimpleGroupsGroupsNotifier();
-      tokenExpireWrapperAuth(ref, () async {
-        final simpleGroups = ref.watch(allGroupListProvider);
-        simpleGroups.whenData((value) {
-          simpleGroupsGroupsNotifier.loadTList(value.map((e) => e.id).toList());
-        });
+      final simpleGroups = ref.watch(allGroupListProvider);
+      simpleGroups.whenData((value) {
+        simpleGroupsGroupsNotifier.loadTList(value.map((e) => e.id).toList());
       });
       return simpleGroupsGroupsNotifier;
     });

lib/admin/providers/user_association_membership_list_provider.dart

@@ -2,7 +2,6 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:myecl/admin/class/user_association_membership.dart';
 import 'package:myecl/admin/repositories/association_membership_user_repository.dart';
 import 'package:myecl/tools/providers/list_notifier.dart';
-import 'package:myecl/tools/token_expire_wrapper.dart';
 
 class UserMembershiplistNotifier
     extends ListNotifier<UserAssociationMembership> {
@@ -54,8 +53,6 @@ final myMembershipListProvider =
         associationMembershipUserRepository:
             associationMembershipUserRepository,
       );
-      tokenExpireWrapperAuth(ref, () async {
-        await provider.loadPersonalAssociationMembershipsList();
-      });
+      provider.loadPersonalAssociationMembershipsList();
       return provider;
     });

lib/admin/repositories/account_type_repository.dart

@@ -1,13 +1,14 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/account_type.dart';
-import 'package:myecl/auth/providers/openid_provider.dart';
 import 'package:myecl/tools/repository/repository.dart';
 
 class AccountTypeRepository extends Repository {
   @override
   // ignore: overridden_fields
   final ext = "users/account-types/";
 
+  AccountTypeRepository(super.ref);
+
   Future<List<AccountType>> getAccountTypeList() async {
     return List<AccountType>.from(
       (await getList()).map((x) => AccountType.fromJson(x)),
@@ -16,6 +17,5 @@ class AccountTypeRepository extends Repository {
 }
 
 final accountTypeRepositoryProvider = Provider((ref) {
-  final token = ref.watch(tokenProvider);
-  return AccountTypeRepository()..setToken(token);
+  return AccountTypeRepository(ref);
 });

lib/admin/repositories/association_membership_repository.dart

@@ -1,7 +1,6 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/association_membership_simple.dart';
 import 'package:myecl/admin/class/user_association_membership.dart';
-import 'package:myecl/auth/providers/openid_provider.dart';
 import 'package:myecl/tools/functions.dart';
 import 'package:myecl/tools/repository/repository.dart';
 
@@ -10,6 +9,8 @@ class AssociationMembershipRepository extends Repository {
   // ignore: overridden_fields
   final ext = "memberships/";
 
+  AssociationMembershipRepository(super.ref);
+
   Future<List<AssociationMembership>> getAssociationMembershipList() async {
     return List<AssociationMembership>.from(
       (await getList()).map((x) => AssociationMembership.fromJson(x)),
@@ -75,6 +76,5 @@ class AssociationMembershipRepository extends Repository {
 }
 
 final associationMembershipRepositoryProvider = Provider((ref) {
-  final token = ref.watch(tokenProvider);
-  return AssociationMembershipRepository()..setToken(token);
+  return AssociationMembershipRepository(ref);
 });

lib/admin/repositories/association_membership_user_repository.dart

@@ -1,14 +1,15 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/user_association_membership.dart';
 import 'package:myecl/admin/class/user_association_membership_base.dart';
-import 'package:myecl/auth/providers/openid_provider.dart';
 import 'package:myecl/tools/repository/repository.dart';
 
 class AssociationMembershipUserRepository extends Repository {
   @override
   // ignore: overridden_fields
   final ext = "memberships/users/";
 
+  AssociationMembershipUserRepository(super.ref);
+
   Future<List<UserAssociationMembership>>
   getPersonalAssociationMembershipList() async {
     return List<UserAssociationMembership>.from(
@@ -54,6 +55,5 @@ class AssociationMembershipUserRepository extends Repository {
 }
 
 final associationMembershipUserRepositoryProvider = Provider((ref) {
-  final token = ref.watch(tokenProvider);
-  return AssociationMembershipUserRepository()..setToken(token);
+  return AssociationMembershipUserRepository(ref);
 });

lib/admin/repositories/group_logo_repository.dart

@@ -1,14 +1,14 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:myecl/auth/providers/openid_provider.dart';
 import 'package:myecl/tools/repository/logo_repository.dart';
 
 class GroupLogoRepository extends LogoRepository {
   @override
   // ignore: overridden_fields
   final ext = 'campaign/';
+
+  GroupLogoRepository(super.ref);
 }
 
 final groupLogoProvider = Provider((ref) {
-  final token = ref.watch(tokenProvider);
-  return GroupLogoRepository()..setToken(token);
+  return GroupLogoRepository(ref);
 });

lib/admin/repositories/group_repository.dart

@@ -1,7 +1,6 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/group.dart';
 import 'package:myecl/admin/class/simple_group.dart';
-import 'package:myecl/auth/providers/openid_provider.dart';
 import 'package:myecl/tools/repository/repository.dart';
 import 'package:myecl/user/class/simple_users.dart';
 import 'dart:convert';
@@ -13,6 +12,8 @@ class GroupRepository extends Repository {
   // ignore: overridden_fields
   final ext = "groups/";
 
+  GroupRepository(super.ref);
+
   Future<List<SimpleGroup>> getGroupList() async {
     return List<SimpleGroup>.from(
       (await getList()).map((x) => SimpleGroup.fromJson(x)),
@@ -60,6 +61,5 @@ class GroupRepository extends Repository {
 }
 
 final groupRepositoryProvider = Provider((ref) {
-  final token = ref.watch(tokenProvider);
-  return GroupRepository()..setToken(token);
+  return GroupRepository(ref);
 });

lib/admin/repositories/module_visibility_repository.dart

@@ -1,3 +1,4 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/module_visibility.dart';
 import 'package:myecl/tools/repository/repository.dart';
 
@@ -6,6 +7,8 @@ class ModuleVisibilityRepository extends Repository {
   // ignore: overridden_fields
   final ext = "module-visibility/";
 
+  ModuleVisibilityRepository(super.ref);
+
   Future<List<ModuleVisibility>> getModuleVisibilityList() async {
     return List<ModuleVisibility>.from(
       (await getList()).map((x) => ModuleVisibility.fromJson(x)),
@@ -43,3 +46,7 @@ class ModuleVisibilityRepository extends Repository {
     return await delete("$root/account-types/$allowedAccounTypes");
   }
 }
+
+final moduleVisibilityRepositoryProvider = Provider((ref) {
+  return ModuleVisibilityRepository(ref);
+});

lib/admin/repositories/school_repository.dart

@@ -1,13 +1,14 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:myecl/admin/class/school.dart';
-import 'package:myecl/auth/providers/openid_provider.dart';
 import 'package:myecl/tools/repository/repository.dart';
 
 class SchoolRepository extends Repository {
   @override
   // ignore: overridden_fields
   final ext = "schools/";
 
+  SchoolRepository(super.ref);
+
   Future<List<School>> getSchoolList() async {
     return List<School>.from((await getList()).map((x) => School.fromJson(x)));
   }
@@ -30,6 +31,5 @@ class SchoolRepository extends Repository {
 }
 
 final schoolRepositoryProvider = Provider((ref) {
-  final token = ref.watch(tokenProvider);
-  return SchoolRepository()..setToken(token);
+  return SchoolRepository(ref);
 });

lib/admin/router.dart

@@ -28,9 +28,9 @@ import 'package:myecl/admin/ui/pages/add_edit_structure_page/add_edit_structure_
     deferred as add_edit_structure_page;
 import 'package:myecl/admin/ui/pages/main_page/main_page.dart'
     deferred as main_page;
-import 'package:myecl/tools/middlewares/admin_middleware.dart';
-import 'package:myecl/tools/middlewares/authenticated_middleware.dart';
-import 'package:myecl/tools/middlewares/deferred_middleware.dart';
+import 'package:myecl/routing/middlewares/admin_middleware.dart';
+import 'package:myecl/routing/middlewares/authenticated_middleware.dart';
+import 'package:myecl/routing/middlewares/deferred_middleware.dart';
 import 'package:qlevar_router/qlevar_router.dart';
 
 class AdminRouter {