From c4d7d7e36ceeaa3fa90dccccfcddcdc7ec95189a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B9=80=EB=8F=84=ED=98=95?=
<108233361+ShapeKim98@users.noreply.github.com>
Date: Thu, 29 Aug 2024 10:34:49 +0900
Subject: [PATCH] =?UTF-8?q?[hotfix]=20=EB=88=84=EB=9D=BD=EB=90=9C=20?=
=?UTF-8?q?=EC=95=BD=EA=B4=80=20=ED=99=94=EB=A9=B4=20=EB=B0=8F=20=EC=9E=98?=
=?UTF-8?q?=EB=AA=BB=EB=90=9C=20=ED=9A=8C=EC=9B=90=ED=83=88=ED=87=B4=20?=
=?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Projects/App/Resources/Pokit-info.plist | 6 +++---
.../CoreKit/Sources/Data/Network/Auth/AuthEndpoint.swift | 3 ++-
.../Sources/AgreeToTerms/AgreeToTermsView.swift | 4 ++++
.../Sources/Setting/PokitSettingFeature.swift | 4 ++--
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Projects/App/Resources/Pokit-info.plist b/Projects/App/Resources/Pokit-info.plist
index e11650fb..415b2f1c 100644
--- a/Projects/App/Resources/Pokit-info.plist
+++ b/Projects/App/Resources/Pokit-info.plist
@@ -6,8 +6,6 @@
$(AppleKeyID)
BGTaskSchedulerPermittedIdentifiers
com.pokitmons.pokit.taskidentifier
- FirebaseAppDelegateProxyEnabled
-
CFBundleDevelopmentRegion
$(DEVELOPMENT_LANGUAGE)
CFBundleDisplayName
@@ -19,7 +17,7 @@
CFBundleInfoDictionaryVersion
6.0
CFBundleName
- $(PRODUCT_NAME)
+ Pokit
CFBundlePackageType
APPL
CFBundleShortVersionString
@@ -45,6 +43,8 @@
CFBundleVersion
1
+ FirebaseAppDelegateProxyEnabled
+
GIDClientID
$(GIDClientID)
ITSAppUsesNonExemptEncryption
diff --git a/Projects/CoreKit/Sources/Data/Network/Auth/AuthEndpoint.swift b/Projects/CoreKit/Sources/Data/Network/Auth/AuthEndpoint.swift
index 8b00a219..8b5454ae 100644
--- 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
index 2e1a42c6..39e20bbb 100644
--- 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
index d121e771..d2839652 100644
--- 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