Merge pull request #436 from DanXi-Dev/fix-426

Fix 426

Author: w568w

lib/feature/bus_feature.dart

@@ -66,7 +66,7 @@ class BusFeature extends Feature {
   _loadBusList(PersonInfo? personInfo) async {
     _status = ConnectionStatus.CONNECTING;
     _busList = await FudanBusRepository.getInstance()
-        .loadBusList(personInfo, holiday: isHoliday);
+        .loadBusList(personInfo, holiday: isHoliday!);
     _status = ConnectionStatus.DONE;
     notifyUpdate();
   }

lib/feature/ecard_balance_feature.dart

@@ -46,9 +46,7 @@ class EcardBalanceFeature extends Feature {
 
   Future<void> _loadCard(PersonInfo? info) async {
     _status = ConnectionStatus.CONNECTING;
-    _cardInfo = await Retrier.tryAsyncWithFix(
-        () => CardRepository.getInstance().loadCardInfo(0),
-        (exception) => CardRepository.getInstance().init(info));
+    _cardInfo = await CardRepository.getInstance().loadCardInfo(info, 0);
     _balance = _cardInfo!.cash;
 
     // If there's any transaction, we'll show it in the subtitle

lib/page/dashboard/card_detail.dart

@@ -17,6 +17,7 @@
 
 import 'package:dan_xi/common/constant.dart';
 import 'package:dan_xi/generated/l10n.dart';
+import 'package:dan_xi/provider/state_provider.dart';
 import 'package:dan_xi/repository/fdu/ecard_repository.dart';
 import 'package:dan_xi/util/platform_universal.dart';
 import 'package:dan_xi/widget/libraries/platform_app_bar_ex.dart';
@@ -102,7 +103,7 @@ class CardDetailPageState extends State<CardDetailPage> {
                   _selectable = false;
                 });
                 _cardInfo!.records = await CardRepository.getInstance()
-                    .loadCardRecord(_tagDays[index]);
+                    .loadCardRecord(StateProvider.personInfo.value, _tagDays[index]);
                 setState(() {
                   tag.checkedIcon = PlatformX.isMaterial(context)
                       ? Icons.check

lib/repository/base_repository.dart

@@ -28,7 +28,10 @@ import 'package:flutter/foundation.dart';
 abstract class BaseRepositoryWithDio {
   /// The host that the implementation works with.
   ///
-  /// Should not contain scheme and/or path. e.g. www.jwc.fudan.edu.cn
+  /// Should not contain scheme and/or path. e.g. fudan.edu.cn
+  ///
+  /// This is used to create a separate [Dio] instance (and [CookieJar]) for each host. That is to say,
+  /// the cookies which can be shared among multiple domains should come with the same [linkHost].
   String get linkHost;
 
   @protected

lib/repository/fdu/aao_repository.dart

@@ -67,7 +67,7 @@ class FudanAAORepository extends BaseRepositoryWithDio {
           .then((value) => true, onError: (e) => false);
 
   @override
-  String get linkHost => "jwc.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 class NotConnectedToLANError implements Exception {}

lib/repository/fdu/bus_repository.dart

@@ -40,12 +40,8 @@ class FudanBusRepository extends BaseRepositoryWithDio {
   factory FudanBusRepository.getInstance() => _instance;
 
   Future<List<BusScheduleItem>?> loadBusList(PersonInfo? info,
-      {bool? holiday = false}) {
-    return Retrier.tryAsyncWithFix(
-        () => _loadBusList(holiday: holiday!),
-        (exception) => UISLoginTool.fixByLoginUIS(
-            dio, _LOGIN_URL, cookieJar!, info, true));
-  }
+      {bool holiday = false}) => UISLoginTool.tryAsyncWithAuth(
+        dio, _LOGIN_URL, cookieJar!, info, () => _loadBusList(holiday: holiday));
 
   Future<List<BusScheduleItem>?> _loadBusList({bool holiday = false}) async {
     List<BusScheduleItem> items = [];
@@ -63,7 +59,7 @@ class FudanBusRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "zlapp.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 class BusScheduleItem implements Comparable<BusScheduleItem> {

lib/repository/fdu/data_center_repository.dart

@@ -84,13 +84,11 @@ class DataCenterRepository extends BaseRepositoryWithDio {
   }
 
   Future<Map<String, TrafficInfo>?> getCrowdednessInfo(
-          PersonInfo? info, int areaCode) async =>
-      Retrier.tryAsyncWithFix(() => _getCrowdednessInfo(areaCode),
-          (exception) async {
-        if (exception is! UnsuitableTimeException) {
-          await UISLoginTool.loginUIS(dio, LOGIN_URL, cookieJar!, info, true);
-        }
-      });
+      PersonInfo? info, int areaCode) async {
+    return UISLoginTool.tryAsyncWithAuth(
+        dio, LOGIN_URL, cookieJar!, info, () => _getCrowdednessInfo(areaCode),
+        isFatalError: (e) => e is UnsuitableTimeException);
+  }
 
   Future<Map<String, TrafficInfo>?> _getCrowdednessInfo(int areaCode) async {
     var result = <String, TrafficInfo>{};
@@ -159,7 +157,7 @@ class DataCenterRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "my.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 class UnsuitableTimeException implements Exception {}

lib/repository/fdu/dorm_repository.dart

@@ -63,7 +63,7 @@ class FudanDormRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "zlapp.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 /// This class represents the electricity info of a dorm. It's an interface for

lib/repository/fdu/ecard_repository.dart

@@ -20,6 +20,7 @@ import 'package:collection/collection.dart' show IterableExtension;
 import 'package:dan_xi/model/person.dart';
 import 'package:dan_xi/repository/base_repository.dart';
 import 'package:dan_xi/repository/fdu/uis_login_tool.dart';
+import 'package:dan_xi/util/io/dio_utils.dart';
 import 'package:dan_xi/util/public_extension_methods.dart';
 import 'package:dan_xi/util/retrier.dart';
 import 'package:dio/dio.dart';
@@ -28,7 +29,6 @@ import 'package:html/dom.dart';
 import 'package:intl/intl.dart';
 
 class CardRepository extends BaseRepositoryWithDio {
-  PersonInfo? _info;
   static const String _LOGIN_URL =
       "https://uis.fudan.edu.cn/authserver/login?service=https%3A%2F%2Fecard.fudan.edu.cn%2Fepay%2Fj_spring_cas_security_check";
   static const String _USER_DETAIL_URL =
@@ -57,15 +57,9 @@ class CardRepository extends BaseRepositoryWithDio {
 
   factory CardRepository.getInstance() => _instance;
 
-  /// Log in before calling any method in this repository.
-  Future<void> init(PersonInfo? info) async {
-    _info = info;
-    await UISLoginTool.loginUIS(dio, _LOGIN_URL, cookieJar!, _info, true);
-  }
-
-  Future<String?> getName() async {
-    return (await loadCardInfo(-1))?.name;
-  }
+  Future<String?> getName(PersonInfo? info) async =>
+      UISLoginTool.tryAsyncWithAuth(dio, _LOGIN_URL, cookieJar!, info,
+          () async => (await _loadCardInfo(-1))?.name);
 
   Future<Iterable<CardRecord>> _loadOnePageCardRecord(
       Map<String, String?> requestData, int pageNum) async {
@@ -94,9 +88,14 @@ class CardRepository extends BaseRepositoryWithDio {
   /// If [logDays] > 0, it will return records of recent [logDays] days;
   /// If [logDays] = 0, it will return the latest records;
   /// If [logDays] < 0, it will return null.
-  Future<List<CardRecord>?> loadCardRecord(int logDays) async {
+  Future<List<CardRecord>?> loadCardRecord(
+          PersonInfo? info, int logDays) async =>
+      UISLoginTool.tryAsyncWithAuth(
+          dio, _LOGIN_URL, cookieJar!, info, () => _loadCardRecord(logDays));
+
+  Future<List<CardRecord>?> _loadCardRecord(int logDays) async {
     if (logDays < 0) return null;
-    //Get csrf id.
+    // Get csrf id.
     Response<String> consumeCsrfPageResponse =
         await dio.get(_CONSUME_DETAIL_CSRF_URL);
     BeautifulSoup consumeCsrfPageSoup =
@@ -141,10 +140,19 @@ class CardRepository extends BaseRepositoryWithDio {
     return list;
   }
 
-  Future<CardInfo?> loadCardInfo(int logDays) async {
+  Future<CardInfo?> loadCardInfo(PersonInfo? info, int logDays) async =>
+      UISLoginTool.tryAsyncWithAuth(
+          dio, _LOGIN_URL, cookieJar!, info, () => _loadCardInfo(logDays));
+
+  Future<CardInfo?> _loadCardInfo(int logDays) async {
     var cardInfo = CardInfo();
 
-    //获取用户页面信息
+    // 2024-11-18 (@w568w): The ECard system is a little bit tricky, we need to
+    // obtain the ticket first. During this process, the correct JSESSIONID will be set.
+    final res = await dio.get(_LOGIN_URL,
+        options: DioUtils.NON_REDIRECT_OPTION_WITH_FORM_TYPE);
+    await DioUtils.processRedirect(dio, res);
+
     var userPageResponse = await dio.get(_USER_DETAIL_URL);
     var soup = BeautifulSoup(userPageResponse.data.toString());
 
@@ -153,13 +161,13 @@ class CardRepository extends BaseRepositoryWithDio {
     cardInfo.cash = cashElement?.text.trim();
     cardInfo.name = nameElement?.text.between("您好，", "！")?.trim();
     List<CardRecord>? records =
-        await Retrier.runAsyncWithRetry(() => loadCardRecord(logDays));
+        await Retrier.runAsyncWithRetry(() => _loadCardRecord(logDays));
     cardInfo.records = records;
     return cardInfo;
   }
 
   @override
-  String get linkHost => "ecard.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 class CardInfo {

lib/repository/fdu/edu_service_repository.dart

@@ -56,7 +56,7 @@ class EduServiceRepository extends BaseRepositoryWithDio {
   };
 
   @override
-  String get linkHost => "jwfw.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 
   EduServiceRepository._();
 

lib/repository/fdu/ehall_repository.dart

@@ -15,7 +15,6 @@
  *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-
 import 'package:dan_xi/model/person.dart';
 import 'package:dan_xi/repository/base_repository.dart';
 import 'package:dan_xi/repository/fdu/uis_login_tool.dart';
@@ -33,10 +32,9 @@ class FudanEhallRepository extends BaseRepositoryWithDio {
 
   factory FudanEhallRepository.getInstance() => _instance;
 
-  Future<StudentInfo> getStudentInfo(PersonInfo info) async {
-    await UISLoginTool.loginUIS(dio, _LOGIN_URL, cookieJar!, info, true);
-    return _getStudentInfo();
-  }
+  Future<StudentInfo> getStudentInfo(PersonInfo info) async =>
+      UISLoginTool.tryAsyncWithAuth(
+          dio, _LOGIN_URL, cookieJar!, info, _getStudentInfo);
 
   Future<StudentInfo> _getStudentInfo() async {
     Response<Map<String, dynamic>> rep = await dio.get(_INFO_URL);
@@ -49,7 +47,7 @@ class FudanEhallRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "ehall.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 class StudentInfo {

lib/repository/fdu/empty_classroom_repository.dart

@@ -148,7 +148,7 @@ class EhallEmptyClassroomRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "zlapp.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 class RoomInfo {

lib/repository/fdu/library_repository.dart

@@ -43,5 +43,5 @@ class FudanLibraryRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "mlibrary.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }

lib/repository/fdu/pe_repository.dart

@@ -40,7 +40,7 @@ class FudanPERepository extends BaseRepositoryWithDio {
   Future<List<ExerciseItem>?> _loadExerciseRecords(PersonInfo? info) async {
     // PE system request a token from UIS to log in.
     String token = "";
-    await UISLoginTool.loginUIS(dio, _LOGIN_URL, cookieJar!, info, true)
+    await UISLoginTool.loginUIS(dio, _LOGIN_URL, cookieJar!, info)
         .catchError((e) {
       if (e is DioException && e.type == DioExceptionType.badResponse) {
         String url = e.response!.requestOptions.path;
@@ -65,7 +65,7 @@ class FudanPERepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "fdtyjw.fudan.edu.cn";
+  String get linkHost => "fdtyjw.fudan.edu.cn"; // uses a separate host here, since we are excepting an error response from server
 }
 
 class ExerciseItem {

lib/repository/fdu/postgraduate_timetable_repository.dart

@@ -136,7 +136,7 @@ class PostgraduateTimetableRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "yjsxk.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 typedef OnCaptchaCallback = Future<String> Function(String imageUrl);

lib/repository/fdu/qr_code_repository.dart

@@ -52,5 +52,5 @@ class QRCodeRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "workflow1.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }

lib/repository/fdu/sports_reserve_repository.dart

@@ -110,7 +110,7 @@ class SportsReserveRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "elife.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 class StadiumData {

lib/repository/fdu/time_table_repository.dart

@@ -59,15 +59,15 @@ class TimeTableRepository extends BaseRepositoryWithDio {
       UISLoginTool.tryAsyncWithAuth(dio, LOGIN_URL, cookieJar!, info,
           () => _loadTimeTableRemotely(startTime: startTime));
 
-  Future<String?> getDefaultSemesterId(PersonInfo? info) =>
-      Retrier.tryAsyncWithFix(() async {
-        await dio.get(ID_URL);
-        return (await cookieJar!.loadForRequest(Uri.parse(HOST)))
-            .firstWhere((element) => element.name == "semester.id")
-            .value;
-      },
-          (exception) => UISLoginTool.fixByLoginUIS(
-              dio, LOGIN_URL, cookieJar!, info, true));
+  Future<String?> getDefaultSemesterId(PersonInfo? info) {
+    return UISLoginTool.tryAsyncWithAuth(dio, LOGIN_URL, cookieJar!, info,
+        () async {
+      await dio.get(ID_URL);
+      return (await cookieJar!.loadForRequest(Uri.parse(HOST)))
+          .firstWhere((element) => element.name == "semester.id")
+          .value;
+    });
+  }
 
   Future<TimeTable?> _loadTimeTableRemotely({DateTime? startTime}) async {
     Future<String?> getAppropriateSemesterId() async {
@@ -100,7 +100,7 @@ class TimeTableRepository extends BaseRepositoryWithDio {
         tablePage.data!);
     for (var course in timetable.courses!) {
       for (var weekday in course.times!) {
-        if (weekday.weekDay == 6)  {
+        if (weekday.weekDay == 6) {
           for (int i = 0; i < course.availableWeeks!.length; i++) {
             course.availableWeeks![i] = course.availableWeeks![i] - 1;
           }
@@ -132,7 +132,7 @@ class TimeTableRepository extends BaseRepositoryWithDio {
   }
 
   @override
-  String get linkHost => "jwfw.fudan.edu.cn";
+  String get linkHost => "fudan.edu.cn";
 }
 
 class Test {