[hotfix] 누락된 약관 화면 및 잘못된 회원탈퇴 파라미터 수정

YAPP-Github · Aug 29, 2024 · c4d7d7e · c4d7d7e
1 parent b0302df
commit c4d7d7e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/Projects/App/Resources/Pokit-info.plist b/Projects/App/Resources/Pokit-info.plist
@@ -6,8 +6,6 @@
 	<string>$(AppleKeyID)</string>
 	<key>BGTaskSchedulerPermittedIdentifiers</key>
 	<string>com.pokitmons.pokit.taskidentifier</string>
-	<key>FirebaseAppDelegateProxyEnabled</key>
-	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -19,7 +17,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
+	<string>Pokit</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -45,6 +43,8 @@
 	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>FirebaseAppDelegateProxyEnabled</key>
+	<false/>
 	<key>GIDClientID</key>
 	<string>$(GIDClientID)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

diff --git a/Projects/CoreKit/Sources/Data/Network/Auth/AuthEndpoint.swift b/Projects/CoreKit/Sources/Data/Network/Auth/AuthEndpoint.swift
@@ -72,7 +72,8 @@ extension AuthEndpoint: TargetType {
                 parameters: [
                     "client_id": "com.pokitmons.pokit",
                     "client_secret": requestModel.jwt,
-                    "token": refreshToken
+                    "token": refreshToken,
+                    "token_type_hint": "refresh_token"
                 ],
                 encoding: URLEncoding.default
             )

diff --git a/Projects/Feature/FeatureLogin/Sources/AgreeToTerms/AgreeToTermsView.swift b/Projects/Feature/FeatureLogin/Sources/AgreeToTerms/AgreeToTermsView.swift
@@ -54,6 +54,10 @@ public extension AgreeToTermsView {
                     }
                 }
             }
+            .fullScreenCover(isPresented: $store.isWebViewPresented) {
+                PokitWebView(url: $store.webViewURL)
+                    .ignoresSafeArea()
+            }
             .ignoresSafeArea(edges: .bottom)
         }
     }

diff --git a/Projects/Feature/FeatureSetting/Sources/Setting/PokitSettingFeature.swift b/Projects/Feature/FeatureSetting/Sources/Setting/PokitSettingFeature.swift
@@ -204,7 +204,7 @@ private extension PokitSettingFeature {
         switch action {
         case .회원탈퇴_네트워크:
             return .run { send in
-                guard let refreshToken = keychain.read(.refreshToken) else {
+                guard keychain.read(.refreshToken) != nil else {
                     print("refresh가 없어서 벗어남")
                     return
                 }
@@ -228,7 +228,7 @@ private extension PokitSettingFeature {
                 await send(.async(.키_제거))
 
                 try await authClient.appleRevoke(
-                    refreshToken,
+                    serverRefreshToken,
                     AppleTokenRequest(
                         authCode: authCode,
                         jwt: jwt