Skip to content

move guardedRoute ModularRoute->RouteGuard #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 17, 2021
Merged

move guardedRoute ModularRoute->RouteGuard #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flutter_modular/lib/src/core/interfaces/modular_route.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ typedef ModularChild = Widget Function(BuildContext context, ModularArguments ar
abstract class ModularRoute<T> {
Module? get currentModule;

@Deprecated('Use RouteGuard.guardedRoute')
String? guardedRoute;

ModularArguments get args;
Expand Down
6 changes: 5 additions & 1 deletion flutter_modular/lib/src/core/interfaces/route_guard.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@ import 'modular_route.dart';

// ignore: one_member_abstracts
abstract class RouteGuard {
RouteGuard(this.guardedRoute);

final String? guardedRoute;

Future<bool> canActivate(String path, ModularRoute router);
}
}
6 changes: 5 additions & 1 deletion flutter_modular/lib/src/presenters/navigation/modular_route_information_parser.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,11 @@ class ModularRouteInformationParser extends RouteInformationParser<ModularRoute>
for (var guard in router.guards ?? []) {
try {
final result = await guard.canActivate(path, router);
if (!result && router.guardedRoute != null && !isRouterOutlet) {
if(!result && guard.guardedRoute != null && !isRouterOutlet){
print(ModularError('$path is CAN\'T ACTIVATE'));
print('redirect to \'${guard.guardedRoute}\'');
return await selectRoute(guard.guardedRoute!);
} else if (!result && router.guardedRoute != null && !isRouterOutlet) {
print(ModularError('$path is CAN\'T ACTIVATE'));
print('redirect to \'${router.guardedRoute}\'');
return await selectRoute(router.guardedRoute!);
Expand Down
7 changes: 4 additions & 3 deletions flutter_modular/test/src/core/interfaces/route_guard_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ class ModuleMock extends Module {
ChildRoute(
'/guarded',
child: (context, args) => Container(),
guards: [MyGuardedRoute()],
guardedRoute: guardedRoute,
guards: [MyGuardedRoute(guardedRoute: guardedRoute)],
),
ChildRoute(
'/redirected',
Expand All @@ -37,7 +36,9 @@ class ModuleMock extends Module {
];
}

class MyGuardedRoute implements RouteGuard {
class MyGuardedRoute extends RouteGuard {
MyGuardedRoute({String? guardedRoute}) : super(guardedRoute);

@override
Future<bool> canActivate(String path, ModularRoute route) async {
if (path == '/guarded') {
Expand Down
8 changes: 6 additions & 2 deletions flutter_modular/test/src/presenters/navigation/modular_route_information_parse_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,9 @@ class CustomWidget extends StatelessWidget {
}
}

class MyGuard implements RouteGuard {
class MyGuard extends RouteGuard {
MyGuard({String? guardedRoute}) : super(guardedRoute);

@override
Future<bool> canActivate(String path, ModularRoute route) async {
if (path == '/401') {
Expand All @@ -409,7 +411,9 @@ class MyGuard implements RouteGuard {
}
}

class MyGuardModule implements RouteGuard {
class MyGuardModule extends RouteGuard {
MyGuardModule({String? guardedRoute}) : super(guardedRoute);

@override
Future<bool> canActivate(String path, ModularRoute route) async {
if (path == '/guarded/list') {
Expand Down