Merge pull request #218 from sparcs-kaist/217-bug-로그인-무한로딩-문제

Update Version 2.5.2 & Add Reenter Login Page When Error Occurs

Author: happycastle114

lib/pages/login_page.dart

@@ -56,10 +56,18 @@ class _LoginPageState extends State<LoginPage> {
             });
           }
         },
-        onPageFinished: (url) {
+        onPageFinished: (url) async {
           String authority = Uri.parse(url).authority;
           if (authority == AUTHORITY) {
-            context.read<AuthModel>().authenticate('https://$AUTHORITY');
+            try {
+              context.read<AuthModel>().authenticate('https://$AUTHORITY');
+            } catch (e) {
+              setState(() {
+                _isVisible = true;
+              });
+              await controller
+                  .loadRequest(Uri.https(AUTHORITY, '/session/login/', query));
+            }
           } else if (authority == 'sparcssso.kaist.ac.kr') {
             setState(() {
               _isVisible = true;

lib/providers/auth_model.dart

@@ -7,14 +7,16 @@ class AuthModel extends ChangeNotifier {
   bool get isLogined => _isLogined;
 
   Future<void> authenticate(String url) async {
+    final cookieManager = WebviewCookieManager();
     try {
-      final cookieManager = WebviewCookieManager();
       final cookies = await cookieManager.getCookies(url);
       DioProvider().authenticate(cookies);
       _isLogined = true;
       notifyListeners();
     } catch (exception) {
       print(exception);
+      await cookieManager.clearCookies();
+      throw exception;
     }
   }
 

pubspec.yaml

@@ -11,7 +11,7 @@ description: Online Timeplanner with Lectures Plus App @ KAIST
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.5.1+21
+version: 2.5.2+22
 
 environment:
   sdk: ">=3.2.0 <4.0.0"