Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 카카오 회원가입시 user id 수정 (#408, #412) #411

Merged
merged 20 commits into from
Apr 14, 2023
Merged

fix: 카카오 회원가입시 user id 수정 (#408, #412) #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
87cf3ef
fix: framework not found 에러 해결 (#397))
hyun99999 Apr 13, 2023
a845b42
chore: pod update (#397)
hyun99999 Apr 13, 2023
ad0095b
fix: url path 변경 (#397)
hyun99999 Apr 13, 2023
ed4402a
fix: UpdateNote DataModel 변경 (#397)
hyun99999 Apr 13, 2023
2517971
feat: HomeViewController 에서 업데이트 API 구현 (#397)
hyun99999 Apr 13, 2023
1684cc8
add: ModuleFactory 에 화면전환 추가 (#397)
hyun99999 Apr 13, 2023
f2be46b
add: UpdateVC 화면전환에 modalTransitionStyle 추가
hyun99999 Apr 14, 2023
e306a6e
feat: 버전 확인 후 업데이트 유무 체크 (#397)
hyun99999 Apr 14, 2023
3979d34
feat: 버전 체크 후에 화면전환 메서드 구현 (#397)
hyun99999 Apr 14, 2023
631c5c0
feat: touchCancelButton 이벤트 구현 (#397)
hyun99999 Apr 14, 2023
9effbf7
feat: touchUpdateButton 이벤트 구현 (#397)
hyun99999 Apr 14, 2023
cf5083c
feat: touchCheckBox 이벤트 주석 제거 (#397)
hyun99999 Apr 14, 2023
0a1aca2
design: 업데이트의 강제 유무에 따른 디자인 수정 (#397)
hyun99999 Apr 14, 2023
52d1c89
add: UpdateViewController 변수 추가 (#397)
hyun99999 Apr 14, 2023
84108bc
feat: 업데이트 내역 텍스트 다루기 (#397)
hyun99999 Apr 14, 2023
ce2cb55
feat: touchCheckBox 이벤트 기능 추가 (#397)
hyun99999 Apr 14, 2023
d7a6ee9
refactor: forceUpdateAgreement 의 접근제어자 수정 (#397)
hyun99999 Apr 14, 2023
3f7933e
Merge branch 'develop' of https://github.com/TeamNADA/NADA-iOS-ForRel…
hyun99999 Apr 14, 2023
6fe01ac
fix: 카카오 회원가입시 user id 수정 (#408)
hyun99999 Apr 14, 2023
b9bd9c4
fix: GenericResponse 데이터 모델 수정 (#412)
hyun99999 Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 25 additions & 28 deletions NADA-iOS-forRelease.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
2566DBA723D1370275ECE593 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D86FBA2B7966CFE6EEF0E7E8 /* Pods_NADA_iOS_forRelease.framework */; };
39007F2C27080D8200E7143E /* UIViewController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39007F2B27080D8200E7143E /* UIViewController+Extension.swift */; };
3903CC202769F4F40094C458 /* EmptyCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3903CC1E2769F4F40094C458 /* EmptyCardCell.swift */; };
3903CC212769F4F40094C458 /* EmptyCardCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3903CC1F2769F4F40094C458 /* EmptyCardCell.xib */; };
Expand Down Expand Up @@ -106,7 +107,6 @@
77F2C0EB27632A91007641E3 /* CardHarmonyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F2C0EA27632A91007641E3 /* CardHarmonyViewController.swift */; };
77F2C0ED27632AA7007641E3 /* CardHarmony.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 77F2C0EC27632AA7007641E3 /* CardHarmony.storyboard */; };
77F47D93276C79B600414659 /* Header.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F47D92276C79B600414659 /* Header.swift */; };
DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */; };
F805588529C993E7002E8EA3 /* UpdateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F805588429C993E7002E8EA3 /* UpdateViewController.swift */; };
F80975E92990A27400075B93 /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F838B66A298E5C5300D84340 /* Widgets.intentdefinition */; };
F80975EA2990A27900075B93 /* Widgets.intentdefinition in Sources */ = {isa = PBXBuildFile; fileRef = F838B66A298E5C5300D84340 /* Widgets.intentdefinition */; };
Expand Down Expand Up @@ -239,7 +239,7 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
1E770167DDA25A2CE063AA5C /* Pods-NADA-iOS-forRelease.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.release.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.release.xcconfig"; sourceTree = "<group>"; };
00BC6C525F13C9651D73976F /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = "<group>"; };
39007F2B27080D8200E7143E /* UIViewController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Extension.swift"; sourceTree = "<group>"; };
3903CC1E2769F4F40094C458 /* EmptyCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyCardCell.swift; sourceTree = "<group>"; };
3903CC1F2769F4F40094C458 /* EmptyCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EmptyCardCell.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -300,8 +300,6 @@
39D88B6A274600B100A72164 /* CommonBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonBottomSheetViewController.swift; sourceTree = "<group>"; };
39F5A3CE271461EA00191F94 /* BackCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackCardCell.swift; sourceTree = "<group>"; };
39F5A3CF271461EA00191F94 /* BackCardCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BackCardCell.xib; sourceTree = "<group>"; };
3C14FF1DC641D872C3FDD637 /* Pods-NADA-iOS-forRelease.beta.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.beta.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.beta.xcconfig"; sourceTree = "<group>"; };
4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7705CF3D2752C7DB005195DF /* CardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardView.swift; sourceTree = "<group>"; };
7705CF3F2752C844005195DF /* CardView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CardView.xib; sourceTree = "<group>"; };
770E58852778A78900498C2E /* Status.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Status.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -345,7 +343,8 @@
77F2C0EA27632A91007641E3 /* CardHarmonyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardHarmonyViewController.swift; sourceTree = "<group>"; };
77F2C0EC27632AA7007641E3 /* CardHarmony.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CardHarmony.storyboard; sourceTree = "<group>"; };
77F47D92276C79B600414659 /* Header.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Header.swift; sourceTree = "<group>"; };
7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.debug.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.debug.xcconfig"; sourceTree = "<group>"; };
78FC1ADEA3CAB995C08D47DB /* Pods-NADA-iOS-forRelease.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NADA-iOS-forRelease.release.xcconfig"; path = "Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease.release.xcconfig"; sourceTree = "<group>"; };
D86FBA2B7966CFE6EEF0E7E8 /* Pods_NADA_iOS_forRelease.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NADA_iOS_forRelease.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F805588429C993E7002E8EA3 /* UpdateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpdateViewController.swift; sourceTree = "<group>"; };
F81171FF27383097002742CF /* ChangeGroupRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChangeGroupRequest.swift; sourceTree = "<group>"; };
F822E7A82709CEB60020452C /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -467,7 +466,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DBBB91E1639641F40C5B4416 /* Pods_NADA_iOS_forRelease.framework in Frameworks */,
2566DBA723D1370275ECE593 /* Pods_NADA_iOS_forRelease.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -477,9 +476,8 @@
186051B2C99DBAECC539DAC9 /* Pods */ = {
isa = PBXGroup;
children = (
7F4EE1D042EC783FA8528743 /* Pods-NADA-iOS-forRelease.debug.xcconfig */,
1E770167DDA25A2CE063AA5C /* Pods-NADA-iOS-forRelease.release.xcconfig */,
3C14FF1DC641D872C3FDD637 /* Pods-NADA-iOS-forRelease.beta.xcconfig */,
00BC6C525F13C9651D73976F /* Pods-NADA-iOS-forRelease.debug.xcconfig */,
78FC1ADEA3CAB995C08D47DB /* Pods-NADA-iOS-forRelease.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
Expand Down Expand Up @@ -700,11 +698,11 @@
4D28D444572353D68574D2B0 /* Frameworks */ = {
isa = PBXGroup;
children = (
4A2183AE0E469153221624A0 /* Pods_NADA_iOS_forRelease.framework */,
F838B65F298E5C5300D84340 /* WidgetKit.framework */,
F838B661298E5C5300D84340 /* SwiftUI.framework */,
F87D2229298ECAFB001A882B /* Intents.framework */,
F87D2234298ECAFB001A882B /* IntentsUI.framework */,
D86FBA2B7966CFE6EEF0E7E8 /* Pods_NADA_iOS_forRelease.framework */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -1430,13 +1428,13 @@
isa = PBXNativeTarget;
buildConfigurationList = F8FC439626C01CDE0033E151 /* Build configuration list for PBXNativeTarget "NADA-iOS-forRelease" */;
buildPhases = (
651C07EF2315142A685BB6AA /* [CP] Check Pods Manifest.lock */,
63B126249E7D65994A592714 /* [CP] Check Pods Manifest.lock */,
F8FC437E26C01CDD0033E151 /* Sources */,
F8FC437F26C01CDD0033E151 /* Frameworks */,
F8FC438026C01CDD0033E151 /* Resources */,
AF97E239CC02D3189BC80412 /* [CP] Embed Pods Frameworks */,
F8FC43BD26C0244D0033E151 /* ShellScript */,
F838B673298E5C5400D84340 /* Embed Foundation Extensions */,
2FD8F2B3BF35A3CA09A8E81C /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -1574,43 +1572,43 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
651C07EF2315142A685BB6AA /* [CP] Check Pods Manifest.lock */ = {
2FD8F2B3BF35A3CA09A8E81C /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-NADA-iOS-forRelease-checkManifestLockResult.txt",
"${PODS_ROOT}/Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
AF97E239CC02D3189BC80412 /* [CP] Embed Pods Frameworks */ = {
63B126249E7D65994A592714 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-NADA-iOS-forRelease-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NADA-iOS-forRelease/Pods-NADA-iOS-forRelease-frameworks.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
F8FC43BD26C0244D0033E151 /* ShellScript */ = {
Expand Down Expand Up @@ -1693,7 +1691,6 @@
F8F00C4129DD48A000A15377 /* UpdateService.swift in Sources */,
F8D92E0A29D5324E002ACC73 /* Taste.swift in Sources */,
F85711A5274A6B2200F59F0B /* CardCreationPreviewViewController.swift in Sources */,
39DC069A2778BEFB00C8ECCC /* CardListLookUp.swift in Sources */,
77A4D60829BD74BC00367B7C /* getClassName.swift in Sources */,
777FF89B27359B7800BF69D3 /* Groups.swift in Sources */,
77F47D93276C79B600414659 /* Header.swift in Sources */,
Expand Down
7 changes: 7 additions & 0 deletions NADA-iOS-forRelease/Sources/Factory/ModuleFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,11 @@ final class ModuleFactory: ModuleFactoryProtocol {
aroundMeVC.modalPresentationStyle = .overFullScreen
return aroundMeVC
}

func makeUpdateVC() -> UpdateViewController {
let updateVC = UpdateViewController()
updateVC.modalPresentationStyle = .overFullScreen
updateVC.modalTransitionStyle = .crossDissolve
return updateVC
}
}
16 changes: 3 additions & 13 deletions NADA-iOS-forRelease/Sources/NetworkModel/GenericResponse.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,13 @@
import Foundation

struct GenericResponse<T: Codable>: Codable {
let error: NetworkError?
let code: String?
let message: String?
let status: Int
let data: T?

enum CodingKeys: String, CodingKey {
case error
case status
case code, message, status
case data = "result"
}
}

struct NetworkError: Codable {
let code: String
let message: String

enum CodingKeys: String, CodingKey {
case code
case message
}
}
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/NetworkModel/Update/UpdateNote.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ import Foundation

struct UpdateNote: Codable {
let text: String
let isForce: String
let isForce: Bool
let latestVersion: String
}
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/NetworkService/Card/CardAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public class CardAPI {
case 200:
return .success(decodedData.data ?? "None-Data")
case 400..<500:
return .requestErr(decodedData.error?.message ?? "error message")
return .requestErr(decodedData.message ?? "error message")
case 500:
return .serverErr
default:
Expand Down
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Sources/NetworkService/Group/GroupAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public class GroupAPI {
case 200:
return .success(decodedData.data ?? "None-Data")
case 400..<500:
return .requestErr(decodedData.error?.message ?? "error message")
return .requestErr(decodedData.message ?? "error message")
case 500:
return .serverErr
default:
Expand All @@ -193,7 +193,7 @@ public class GroupAPI {
case 200:
return .success(decodedData.data ?? "None-Data")
case 400..<500:
return .requestErr(decodedData.error?.message ?? "error message")
return .requestErr(decodedData.message ?? "error message")
case 500:
return .serverErr
default:
Expand All @@ -211,7 +211,7 @@ public class GroupAPI {
case 200:
return .success(decodedData.data ?? "None-Data")
case 400..<500:
return .requestErr(decodedData.error?.message ?? "error message")
return .requestErr(decodedData.message ?? "error message")
case 500:
return .serverErr
default:
Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/NetworkService/Update/UpdateAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public final class UpdateAPI {
case 200:
return .success(decodedData.data ?? "None-Data")
case 400..<500:
return .requestErr(decodedData.error?.message ?? "error message")
return .requestErr(decodedData.message ?? "error message")
case 500:
return .serverErr
default:
Expand Down
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Sources/NetworkService/Update/UpdateService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ extension UpdateService: TargetType {
var path: String {
switch self {
case .updateUserInfoFetch:
return "/app/update/note"
case .updateNoteFetch:
return "/app/update"
case .updateNoteFetch:
return "/app/update/note"
}
}

Expand All @@ -46,7 +46,7 @@ extension UpdateService: TargetType {
}
}

var headers: [String : String]? {
var headers: [String: String]? {
switch self {
case .updateUserInfoFetch, .updateNoteFetch:
return Const.Header.bearerHeader()
Expand Down
6 changes: 3 additions & 3 deletions NADA-iOS-forRelease/Sources/NetworkService/User/UserAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public class UserAPI {
case 200:
return .success(decodedData.data ?? "None-Data")
case 400..<500:
return .requestErr(decodedData.error?.message ?? "error message")
return .requestErr(decodedData.message ?? "error message")
case 500:
return .serverErr
default:
Expand All @@ -111,7 +111,7 @@ public class UserAPI {
case 200:
return .success(decodedData.data ?? "None-Data")
case 400..<500:
return .requestErr(decodedData.error?.message ?? "error message")
return .requestErr(decodedData.message ?? "error message")
case 500:
return .serverErr
default:
Expand Down Expand Up @@ -148,7 +148,7 @@ public class UserAPI {
case 200:
return .success(decodedData.data ?? "None-Data")
case 400..<500:
return .requestErr(decodedData.error?.message ?? "error message")
return .requestErr(decodedData.message ?? "error message")
case 500:
return .serverErr
default:
Expand Down
2 changes: 1 addition & 1 deletion NADA-iOS-forRelease/Sources/NetworkService/Util/UtilAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class UtilAPI {
case 200:
return .success(decodedData.data ?? "None-Data")
case 400..<500:
return .requestErr(decodedData.error?.message ?? "error message")
return .requestErr(decodedData.message ?? "error message")
case 500:
return .serverErr
default:
Expand Down
Loading