Merge pull request #81 from sparcs-kaist/#80-bug-fix-change-backend-a…

…ddress-and-error-code Refactor: Change Cookie URL
sparcs-kaist · Sep 18, 2023 · 9fc43ee · 9fc43ee
2 parents 0ebe5ff + cf86d03
commit 9fc43ee
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
@@ -57,6 +57,11 @@
 	<array>
 		<string>itms-beta</string>
 		<string>itms</string>
+		<string>supertoss</string>
+		<string>uber</string>
+		<string>tmoneyonda</string>
+		<string>kakaotalk</string>
+		<string>kakaot</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>

diff --git a/lib/views/taxiView.dart b/lib/views/taxiView.dart
@@ -240,7 +240,9 @@ class TaxiView extends HookWidget {
             if (Token().accessToken != '') {
               await Token().deleteAll();
             }
-            _cookieManager.deleteAllCookies();
+            await _cookieManager.deleteCookie(
+                url: Uri.parse(RemoteConfigController().backUrl),
+                name: "connect.sid");
             isAuthLogin.value = false;
             isLogin.value = false;
             isFirstLogin.value = false;
@@ -300,9 +302,15 @@ class TaxiView extends HookWidget {
                 shouldOverrideUrlLoading: (controller, navigationAction) async {
                   var newHeaders = Map<String, String>.from(
                       navigationAction.request.headers ?? {});
-                  if (!newHeaders.containsKey("Referer") &&
+                  if (Platform.isAndroid &&
+                      !newHeaders.containsKey("Referer") &&
                       navigationAction.request.url.toString() !=
-                          'about:blank') {
+                          'about:blank' &&
+                      (navigationAction.request.url?.origin ==
+                              Uri.parse(address).origin ||
+                          navigationAction.request.url?.origin ==
+                              Uri.parse(RemoteConfigController().backUrl)
+                                  .origin)) {
                     newHeaders['Referer'] =
                         navigationAction.request.url.toString();
                     newHeaders['Origin'] = RemoteConfigController().frontUrl;
@@ -350,11 +358,14 @@ class TaxiView extends HookWidget {
                           await FcmToken()
                               .removeToken(Token().getAccessToken());
                           await Token().deleteAll();
+                          await _cookieManager.deleteAllCookies();
                           isLogin.value = false;
                           isAuthLogin.value = false;
-                          await _cookieManager.deleteAllCookies();
-                          await _controller.value!.loadUrl(
-                              urlRequest: URLRequest(url: Uri.parse(address)));
+                          await _controller.value?.loadUrl(
+                              urlRequest: URLRequest(
+                                  url: Uri.parse(RemoteConfigController()
+                                      .frontUrl
+                                      .toString())));
                         } catch (e) {
                           // TODO
                           Fluttertoast.showToast(
@@ -396,15 +407,18 @@ class TaxiView extends HookWidget {
                       sessionToken.value != '' &&
                       uri?.origin == Uri.parse(address).origin &&
                       (await _cookieManager.getCookie(
-                                  url: Uri.parse(address), name: "connect.sid"))
+                                  url: Uri.parse(
+                                      RemoteConfigController().backUrl),
+                                  name: "connect.sid"))
                               ?.value !=
                           sessionToken.value) {
                     try {
                       await _controller.value?.stopLoading();
                       await _cookieManager.deleteCookie(
-                          url: Uri.parse(address), name: "connect.sid");
+                          url: Uri.parse(RemoteConfigController().backUrl),
+                          name: "connect.sid");
                       await _cookieManager.setCookie(
-                        url: Uri.parse(address),
+                        url: Uri.parse(RemoteConfigController().backUrl),
                         name: "connect.sid",
                         value: sessionToken.value,
                       );
@@ -492,7 +506,9 @@ class TaxiView extends HookWidget {
                   // 될 때까지 리로드
                   if (!isLoaded.value && LoadCount.value < 10) {
                     LoadCount.value++;
-                  } else if (isServerError.value == false && code != 102) {
+                  } else if (isServerError.value == false &&
+                      code != 102 &&
+                      code != -999) {
                     Fluttertoast.showToast(
                         msg: "서버와의 연결에 실패했습니다.",
                         toastLength: Toast.LENGTH_SHORT,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # 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: 1.0.3+26
+version: 1.0.4+29
 
 environment:
   sdk: ">=2.17.5 <3.0.0"