Skip to content

Commit

Permalink
refactor(*): Remove unused redirectProvider
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
realth000 committed Dec 6, 2023
1 parent 628f136 commit 050ca9b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 81 deletions.
51 changes: 0 additions & 51 deletions lib/providers/redirect_provider.dart

This file was deleted.

28 changes: 1 addition & 27 deletions lib/routes/app_routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import 'package:go_router/go_router.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:tsdm_client/constants/url.dart';
import 'package:tsdm_client/providers/auth_provider.dart';
import 'package:tsdm_client/providers/redirect_provider.dart';
import 'package:tsdm_client/routes/screen_paths.dart';
import 'package:tsdm_client/screens/forum/forum_page.dart';
import 'package:tsdm_client/screens/homepage/homepage.dart';
Expand All @@ -24,7 +23,7 @@ part '../generated/routes/app_routes.g.dart';
final _rootRouteKey = GlobalKey<NavigatorState>();
final _shellRouteKey = GlobalKey<NavigatorState>();

@Riverpod(dependencies: [Auth, Redirect])
@Riverpod(dependencies: [Auth])
GoRouter router(RouterRef ref) {
bool isAuthorized() {
return ref.read(authProvider) == AuthState.authorized;
Expand All @@ -48,19 +47,6 @@ GoRouter router(RouterRef ref) {
path: ScreenPaths.homepage,
parentNavigatorKey: _shellRouteKey,
builder: (_) => const HomePage(),
// Do not redirect here because users still can access many pages
// without login.
//
// redirect: (context, state) {
// if (!isAuthorized()) {
// print('homepage: not authoried');
// ref
// .read(redirectProvider.notifier)
// .saveRedirectState(ScreenPaths.homepage, state);
// return ScreenPaths.needLogin;
// }
// return null;
// },
),
AppRoute(
path: ScreenPaths.topic,
Expand All @@ -73,18 +59,6 @@ GoRouter router(RouterRef ref) {
path: ScreenPaths.profile,
parentNavigatorKey: _shellRouteKey,
builder: (_) => const ProfilePage(),
// Do not redirect here because users still can access many pages
// without login.
//
// redirect: (context, state) {
// if (!isAuthorized()) {
// ref
// .read(redirectProvider.notifier)
// .saveRedirectState(ScreenPaths.profile, state);
// return ScreenPaths.needLogin;
// }
// return null;
// },
),
AppRoute(
path: ScreenPaths.settings,
Expand Down
4 changes: 1 addition & 3 deletions lib/screens/need_login/need_login_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:tsdm_client/constants/layout.dart';
import 'package:tsdm_client/generated/i18n/strings.g.dart';
import 'package:tsdm_client/providers/redirect_provider.dart';
import 'package:tsdm_client/routes/screen_paths.dart';

/// A page to show need to login hint.
///
/// This page can be used by:
/// 1. Pushing route to [ScreenPaths.needLogin], with redirect back, route,
/// parameters and extra info saved in [redirectProvider].
/// 1. Pushing route to [ScreenPaths.needLogin] and redirect back.
/// 2. Embedded in another page, pass the redirect back route, parameters and
/// extra info to constructor.
///
Expand Down

0 comments on commit 050ca9b

Please sign in to comment.