Merge pull request #45 from Orange-Co/fix/#44

[Fix] 1차 QA 반영
Orange-Co · Sep 25, 2024 · 2a16f36 · 2a16f36
2 parents b751dcd + 63192b8
commit 2a16f36
Show file tree

Hide file tree

Showing 26 changed files with 588 additions and 352 deletions.
diff --git a/DDANZI_iOS/DDANZI_iOS.xcodeproj/project.pbxproj b/DDANZI_iOS/DDANZI_iOS.xcodeproj/project.pbxproj
@@ -79,6 +79,7 @@
 		363F1A252C9F1BE2007527E2 /* BankList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A242C9F1BE2007527E2 /* BankList.swift */; };
 		363F1A272C9F57D4007527E2 /* CustomAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A262C9F57D4007527E2 /* CustomAlertView.swift */; };
 		363F1A292CA067C7007527E2 /* RefreshTokenRequestDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 363F1A282CA067C7007527E2 /* RefreshTokenRequestDTO.swift */; };
+		363F1A2B2CA09C5E007527E2 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 363F1A2A2CA09C59007527E2 /* PrivacyInfo.xcprivacy */; };
 		3648954E2C6281BB00AAA8E2 /* HomeItemsResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3648954D2C6281BB00AAA8E2 /* HomeItemsResponseDTO.swift */; };
 		364895502C62822200AAA8E2 /* ProductDetailResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3648954F2C62822200AAA8E2 /* ProductDetailResponseDTO.swift */; };
 		364895522C62826200AAA8E2 /* SearchItemsResponseDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 364895512C62826200AAA8E2 /* SearchItemsResponseDTO.swift */; };
@@ -319,6 +320,7 @@
 		363F1A242C9F1BE2007527E2 /* BankList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BankList.swift; sourceTree = "<group>"; };
 		363F1A262C9F57D4007527E2 /* CustomAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomAlertView.swift; sourceTree = "<group>"; };
 		363F1A282CA067C7007527E2 /* RefreshTokenRequestDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshTokenRequestDTO.swift; sourceTree = "<group>"; };
+		363F1A2A2CA09C59007527E2 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		3648954D2C6281BB00AAA8E2 /* HomeItemsResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeItemsResponseDTO.swift; sourceTree = "<group>"; };
 		3648954F2C62822200AAA8E2 /* ProductDetailResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductDetailResponseDTO.swift; sourceTree = "<group>"; };
 		364895512C62826200AAA8E2 /* SearchItemsResponseDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchItemsResponseDTO.swift; sourceTree = "<group>"; };
@@ -1017,6 +1019,7 @@
 				369C63982C1A7A270021E2E0 /* Info.plist */,
 				369C638A2C1A7A240021E2E0 /* AppDelegate.swift */,
 				369C638C2C1A7A240021E2E0 /* SceneDelegate.swift */,
+				363F1A2A2CA09C59007527E2 /* PrivacyInfo.xcprivacy */,
 			);
 			path = Application;
 			sourceTree = "<group>";
@@ -1497,6 +1500,7 @@
 				369C63D92C1A7E320021E2E0 /* Pretendard-ExtraLight.otf in Resources */,
 				369C63942C1A7A270021E2E0 /* Assets.xcassets in Resources */,
 				369C63DB2C1A7E320021E2E0 /* Pretendard-ExtraBold.otf in Resources */,
+				363F1A2B2CA09C5E007527E2 /* PrivacyInfo.xcprivacy in Resources */,
 				369C63D72C1A7E320021E2E0 /* Pretendard-Bold.otf in Resources */,
 				3664CFD72C6E1BC6007FB5DF /* splash.json in Resources */,
 				369C63DA2C1A7E320021E2E0 /* Pretendard-Medium.otf in Resources */,

diff --git a/DDANZI_iOS/DDANZI_iOS/Application/PrivacyInfo.xcprivacy b/DDANZI_iOS/DDANZI_iOS/Application/PrivacyInfo.xcprivacy
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypePhotosorVideos</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeEmailAddress</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypePhoneNumber</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeCreditInfo</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeName</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<true/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyTracking</key>
+	<false/>
+	<key>NSPrivacyTrackingDomains</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C56D.1</string>
+				<string>1C8F.1</string>
+				<string>CA92.1</string>
+			</array>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/DDANZI_iOS/DDANZI_iOS/Common/LocalStorage/Keychainwrapper.swift b/DDANZI_iOS/DDANZI_iOS/Common/LocalStorage/Keychainwrapper.swift
@@ -15,6 +15,8 @@ public final class KeychainWrapper {
   public let userKey = "com.orangeCo.DDANZI-iOS.user"
   public let UUIDKey = "com.orangeCo.DDANZI-iOS.uuid"
 
+  public var isAccessTokenEx = true
+
   // MARK: - deviceUUID
 
   public var deviceUUID: String {
@@ -138,7 +140,13 @@ public final class KeychainWrapper {
     ]
 
     let status = SecItemDelete(query as CFDictionary)
-    assert(status == errSecSuccess, "AccessToken 키체인 삭제 실패")
-    return status == errSecSuccess
+
+    if status == errSecItemNotFound {
+      print("AccessToken이 존재하지 않아 삭제할 수 없습니다.")
+      return true // 이미 없으므로 성공으로 처리
+    } else {
+      assert(status == errSecSuccess, "AccessToken 키체인 삭제 실패")
+      return status == errSecSuccess
+    }
   }
 }
diff --git a/DDANZI_iOS/DDANZI_iOS/Data/Endpoint/MypageEndpoint.swift b/DDANZI_iOS/DDANZI_iOS/Data/Endpoint/MypageEndpoint.swift
@@ -120,7 +120,7 @@ extension MypageEndpoint: BaseTargetType {
       case let .addUserAddress(body):
         return .requestJSONEncodable(body)
       case let .editUserAddress(_, body):
-        return .requestPlain
+        return .requestJSONEncodable(body)
       case .deleteUserAddress:
         return .requestPlain
       case .settingUserNoti:

diff --git a/DDANZI_iOS/DDANZI_iOS/Data/Network/Foundation/Interceptor.swift b/DDANZI_iOS/DDANZI_iOS/Data/Network/Foundation/Interceptor.swift
@@ -30,16 +30,14 @@ final class AuthInterceptor: RequestInterceptor {
     if request.retryCount < retryLimit {
       if statusCode == 401 {
         refreshToken { success in
-          if success {
-            // Retry the request if token refresh was successful
+          switch success {
+          case true:
             completion(.retry)
-          } else {
-            // Token refresh failed; do not retry
+          case false:
             completion(.doNotRetry)
+            self.handleTokenRefreshFailure()
           }
         }
-      } else {
-        completion(.doNotRetryWithError(error))
       }
     } else {
       completion(.doNotRetry)