[login] fixed no redirect after just logged in

plum-tech · May 5, 2024 · 598e0bf · 598e0bf
1 parent 4f1f74f
commit 598e0bf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/credentials/storage/credential.dart b/lib/credentials/storage/credential.dart
@@ -42,7 +42,7 @@ class CredentialStorage {
 
   late final $oaLastAuthTime = box.provider<DateTime>(_OaK.lastAuthTime);
 
-  LoginStatus? get oaLoginStatus => box.safeGet<LoginStatus>(_OaK.loginStatus);
+  LoginStatus? get oaLoginStatus => box.safeGet<LoginStatus>(_OaK.loginStatus) ?? LoginStatus.never;
 
   set oaLoginStatus(LoginStatus? newV) => box.safePut<LoginStatus>(_OaK.loginStatus, newV);
 

diff --git a/lib/route.dart b/lib/route.dart
@@ -48,7 +48,6 @@ import 'package:sit/timetable/page/edit/editor.dart';
 import 'package:sit/timetable/page/p13n/palette_editor.dart';
 import 'package:sit/timetable/page/patch/patch.dart';
 import 'package:sit/timetable/page/settings.dart';
-import 'package:sit/utils/riverpod.dart';
 import 'package:sit/widgets/not_found.dart';
 import 'package:sit/school/oa_announce/entity/announce.dart';
 import 'package:sit/school/oa_announce/page/details.dart';
@@ -92,7 +91,8 @@ String? _loginRequired(BuildContext ctx, GoRouterState state) {
 }
 
 FutureOr<String?> _redirectRoot(BuildContext ctx, GoRouterState state) {
-  final loginStatus = ctx.riverpod().read(CredentialsInit.storage.$oaLoginStatus);
+  // `ctx.riverpod().read(CredentialsInit.storage.$oaLoginStatus)` would return `LoginStatus.never` after just logged in.
+  final loginStatus = CredentialsInit.storage.oaLoginStatus;
   if (loginStatus == LoginStatus.never) {
 // allow to access settings page.
     if (state.matchedLocation.startsWith("/tools")) return null;

diff --git a/lib/utils/hive.dart b/lib/utils/hive.dart
@@ -180,7 +180,7 @@ extension BoxProviderX on Box {
   }) {
     return StateNotifierProvider<BoxFieldWithDefaultNotifier<T>, T>((ref) {
       return BoxFieldWithDefaultNotifier(
-        get?.call() ?? safeGet<T>(key) ?? getDefault(),
+        (get != null ? get.call() : safeGet<T>(key)) ?? getDefault(),
         listenable(keys: [key]),
         () => get != null ? get.call() : safeGet<T>(key),
         (v) => set != null ? set.call(v) : safePut<T>(key, v),