Merge branch 'main' into #75-deeplink-add

sparcs-kaist · Sep 11, 2023 · 8ec6481 · 8ec6481
2 parents 05a9750 + 569399b
commit 8ec6481
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 28 deletions.
diff --git a/android/app/src/main/kotlin/com/example/taxi_app/MainActivity.kt b/android/app/src/main/kotlin/com/example/taxi_app/MainActivity.kt
@@ -22,6 +22,7 @@ class MainActivity: FlutterActivity() {
                     val intent = Intent.parseUri(call.arguments as String, Intent.URI_INTENT_SCHEME)
 
                     if (intent.resolveActivity(packageManager) != null) {
+                        packageManager.getLaunchIntentForPackage(""+intent.getPackage())
                         startActivity(intent)
                         result.success(null)
                     } else {

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -160,7 +160,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/lib/utils/fcmToken.dart b/lib/utils/fcmToken.dart
@@ -21,6 +21,15 @@ class FcmToken {
 
   Future<void> init() async {
     final token = await FirebaseMessaging.instance.getToken();
+    _dio.interceptors
+        .add(InterceptorsWrapper(onRequest: (options, handler) async {
+      options.headers["Origin"] = options.uri.origin;
+      return handler.next(options);
+    }, onResponse: (response, handler) async {
+      return handler.next(response);
+    }, onError: (error, handler) async {
+      return handler.next(error);
+    }));
 
     if (token == null) {
       this.token = '';

diff --git a/lib/utils/remoteConfigController.dart b/lib/utils/remoteConfigController.dart
@@ -4,8 +4,8 @@ import 'package:package_info/package_info.dart';
 class RemoteConfigController {
   String backUrl;
   String frontUrl;
-  String ios_version;
-  String android_version;
+  String iosVersion;
+  String androidVersion;
 
   static RemoteConfigController? _instance;
 
@@ -14,28 +14,28 @@ class RemoteConfigController {
   RemoteConfigController._internal(
       {required this.backUrl,
       required this.frontUrl,
-      required this.ios_version,
-      required this.android_version});
+      required this.iosVersion,
+      required this.androidVersion});
 
   factory RemoteConfigController(
       {String? backUrl,
       String? frontUrl,
-      String? ios_version,
-      String? android_version}) {
+      String? iosVersion,
+      String? androidVersion}) {
     if (frontUrl == null ||
         backUrl == null ||
-        ios_version == null ||
-        android_version == null) {
+        iosVersion == null ||
+        androidVersion == null) {
       return _instance ??= RemoteConfigController._internal(
-          backUrl: '', frontUrl: '', ios_version: '', android_version: '');
+          backUrl: '', frontUrl: '', iosVersion: '', androidVersion: '');
     }
     _instance = RemoteConfigController._internal(
         backUrl: backUrl,
         frontUrl: frontUrl,
-        ios_version: ios_version,
-        android_version: android_version);
+        iosVersion: iosVersion,
+        androidVersion: androidVersion);
     return _instance ??= RemoteConfigController._internal(
-        backUrl: '', frontUrl: '', ios_version: '', android_version: '');
+        backUrl: '', frontUrl: '', iosVersion: '', androidVersion: '');
   }
 
   Future<void> init() async {
@@ -47,7 +47,7 @@ class RemoteConfigController {
     ));
     await remoteConfig.setDefaults({
       "back_url": "https://taxi.sparcs.org/api/",
-      "front_url": "https://taxi.sparcs.org",
+      "front_url": "https://taxi.sparcs.org/",
       "version": value.version,
       "ios_version": value.version,
     });
@@ -56,8 +56,8 @@ class RemoteConfigController {
 
     this.backUrl = remoteConfig.getString("back_url");
     this.frontUrl = remoteConfig.getString("front_url");
-    this.android_version = remoteConfig.getString("version");
-    this.ios_version = remoteConfig.getString("ios_version");
+    this.androidVersion = remoteConfig.getString("version");
+    this.iosVersion = remoteConfig.getString("ios_version");
 
     return;
   }

diff --git a/lib/utils/token.dart b/lib/utils/token.dart
@@ -30,6 +30,16 @@ class Token {
   Future<void> init() async {
     accessToken = (await getAccessTokenFromStorage()) ?? '';
     refreshToken = (await getRefreshTokenFromStorage()) ?? '';
+    _dio.interceptors.add(CookieManager(_cookieJar));
+    _dio.interceptors
+        .add(InterceptorsWrapper(onRequest: (options, handler) async {
+      options.headers["Origin"] = options.uri.origin;
+      return handler.next(options);
+    }, onResponse: (response, handler) async {
+      return handler.next(response);
+    }, onError: (error, handler) async {
+      return handler.next(error);
+    }));
   }
 
   Future<void> setAccessToken({required String accessToken}) async {

diff --git a/lib/views/taxiView.dart b/lib/views/taxiView.dart
@@ -209,13 +209,13 @@ class TaxiView extends HookWidget {
         try {
           if (Platform.isIOS) {
             if (int.parse(
-                    RemoteConfigController().ios_version.replaceAll(".", "")) >
+                    RemoteConfigController().iosVersion.replaceAll(".", "")) >
                 int.parse(value.version.replaceAll(".", ""))) {
               isMustUpdate.value = true;
             }
           } else {
             if (int.parse(RemoteConfigController()
-                    .android_version
+                    .androidVersion
                     .replaceAll(".", "")) >
                 int.parse(value.version.replaceAll(".", ""))) {
               isMustUpdate.value = true;
@@ -240,8 +240,9 @@ class TaxiView extends HookWidget {
             if (Token().accessToken != '') {
               await Token().deleteAll();
             }
-            isLogin.value = false;
+            _cookieManager.deleteAllCookies();
             isAuthLogin.value = false;
+            isLogin.value = false;
             isFirstLogin.value = false;
             LoadCount.value += 1;
           } else {
@@ -296,6 +297,24 @@ class TaxiView extends HookWidget {
                             AndroidOverScrollMode.OVER_SCROLL_NEVER),
                     ios: IOSInAppWebViewOptions(disallowOverScroll: true)),
                 // initialUrlRequest: URLRequest(url: Uri.parse(address)),
+                shouldOverrideUrlLoading: (controller, navigationAction) async {
+                  var newHeaders = Map<String, String>.from(
+                      navigationAction.request.headers ?? {});
+                  if (!newHeaders.containsKey("Referer") &&
+                      navigationAction.request.url.toString() !=
+                          'about:blank') {
+                    newHeaders['Referer'] =
+                        navigationAction.request.url.toString();
+                    newHeaders['Origin'] = RemoteConfigController().frontUrl;
+                    var newRequest = navigationAction.request;
+                    newRequest.headers = newHeaders;
+                    await controller.loadUrl(urlRequest: newRequest);
+
+                    return NavigationActionPolicy.CANCEL;
+                  }
+
+                  return NavigationActionPolicy.ALLOW;
+                },
                 onWebViewCreated: (InAppWebViewController webcontroller) async {
                   _controller.value = webcontroller;
                   _controller.value?.addJavaScriptHandler(
@@ -308,13 +327,17 @@ class TaxiView extends HookWidget {
                       }
                       // 로그인 성공 시 / 기존 토큰 삭제 후 새로운 토큰 저장
                       if (!isAuthLogin.value) {
-                        await Token().setAccessToken(
-                            accessToken: arguments[0]['accessToken']);
-                        await Token().setRefreshToken(
-                            refreshToken: arguments[0]['refreshToken']);
-                        await FcmToken()
-                            .registerToken(arguments[0]['accessToken']);
-                        isAuthLogin.value = true;
+                        if (arguments[0]['accessToken'] != null &&
+                            arguments[0]['refreshToken'] != null) {
+                          await Token().deleteAll();
+                          await Token().setAccessToken(
+                              accessToken: arguments[0]['accessToken']);
+                          await Token().setRefreshToken(
+                              refreshToken: arguments[0]['refreshToken']);
+                          await FcmToken()
+                              .registerToken(arguments[0]['accessToken']);
+                          isAuthLogin.value = true;
+                        }
                       }
                       return;
                     },
@@ -469,7 +492,7 @@ class TaxiView extends HookWidget {
                   // 될 때까지 리로드
                   if (!isLoaded.value && LoadCount.value < 10) {
                     LoadCount.value++;
-                  } else if (isServerError.value == false) {
+                  } else if (isServerError.value == false && code != 102) {
                     Fluttertoast.showToast(
                         msg: "서버와의 연결에 실패했습니다.",
                         toastLength: Toast.LENGTH_SHORT,