From 0eec7945502cb6f6bdbd401ab1dc1cc30670fc31 Mon Sep 17 00:00:00 2001 From: Byung jin Date: Thu, 17 Aug 2023 18:11:22 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20response=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Remote/Response/SigninAndRefreshTokenResponse.swift | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Services/AuthService/Sources/Data/Remote/Response/SigninAndRefreshTokenResponse.swift b/Services/AuthService/Sources/Data/Remote/Response/SigninAndRefreshTokenResponse.swift index 0f36059f..a2cf2690 100644 --- a/Services/AuthService/Sources/Data/Remote/Response/SigninAndRefreshTokenResponse.swift +++ b/Services/AuthService/Sources/Data/Remote/Response/SigninAndRefreshTokenResponse.swift @@ -4,12 +4,13 @@ struct SigninAndRefreshTokenResponse: Decodable { private enum CodingKeys: String, CodingKey { case accessToken = "access_token" + case accessTokenExpireAt = "access_token_expire_at" case refreshToken = "refresh_token" - case expirationAt = "expire_at" + case refreshTokenExpireAt = "refresh_token_expire_at" } let accessToken: String + let accessTokenExpireAt: String let refreshToken: String - let expirationAt: String - + let refreshTokenExpireAt: String } From 7b074f40a99b0ef9a8a5a8272de5dd63d445d81c Mon Sep 17 00:00:00 2001 From: Byung jin Date: Thu, 17 Aug 2023 18:11:57 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20response=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=97=90=20=EB=94=B0=EB=A5=B8=20repo=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Data/Repository/AuthRepositoryImpl.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Services/AuthService/Sources/Data/Repository/AuthRepositoryImpl.swift b/Services/AuthService/Sources/Data/Repository/AuthRepositoryImpl.swift index 4c05732e..cc8bf603 100644 --- a/Services/AuthService/Sources/Data/Repository/AuthRepositoryImpl.swift +++ b/Services/AuthService/Sources/Data/Repository/AuthRepositoryImpl.swift @@ -22,7 +22,7 @@ class AuthRepositoryImpl: AuthRepository { .do(onSuccess: { [weak self] tokenResponse in self?.localTokenDataSource.registerAccessToken(tokenResponse.accessToken) self?.localTokenDataSource.registerRefreshToken(tokenResponse.refreshToken) - self?.localTokenDataSource.registerExpiredAt(tokenResponse.expirationAt) + self?.localTokenDataSource.registerExpiredAt(tokenResponse.accessTokenExpireAt) self?.localAuthDataSource.registerIdAndPassword(id: signinEntity.id, password: signinEntity.password) }).catch { error in let moyaError = error as? MoyaError @@ -55,7 +55,7 @@ class AuthRepositoryImpl: AuthRepository { .do(onSuccess: { [weak self] tokenResponse in self?.localTokenDataSource.registerAccessToken(tokenResponse.accessToken) self?.localTokenDataSource.registerRefreshToken(tokenResponse.refreshToken) - self?.localTokenDataSource.registerExpiredAt(tokenResponse.expirationAt) + self?.localTokenDataSource.registerExpiredAt(tokenResponse.accessTokenExpireAt) }).catch { [weak self] error in let moyaError = error as? MoyaError guard moyaError?.response?.statusCode != nil else { return .error(AuthServiceError.networkNotWorking) } From 96b1a1e25d06653888fa5da51a3a26f4f17179e9 Mon Sep 17 00:00:00 2001 From: Byung jin Date: Thu, 17 Aug 2023 18:12:29 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20stage=20API?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=97=90=20=EB=94=B0=EB=A5=B8=20xcconfig=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configurations/develop.xcconfig | 2 +- Configurations/stage.xcconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Configurations/develop.xcconfig b/Configurations/develop.xcconfig index 4e66d53d..00a2f142 100644 --- a/Configurations/develop.xcconfig +++ b/Configurations/develop.xcconfig @@ -1,4 +1,4 @@ BUNDLE_DISPLAY_NAME = XQUARE (dev) APP_BUNDLE_ID = com.xquare.XQUARE-iOS.dev -API_BASE_URL = https:/$()/stag-api.xquare.app +API_BASE_URL = https:/$()/stag-server.xquare.app diff --git a/Configurations/stage.xcconfig b/Configurations/stage.xcconfig index ae914060..4f0b8c22 100644 --- a/Configurations/stage.xcconfig +++ b/Configurations/stage.xcconfig @@ -1,4 +1,4 @@ BUNDLE_DISPLAY_NAME = XQUARE (stage) APP_BUNDLE_ID = com.xquare.XQUARE-iOS.stage -API_BASE_URL = https:/$()/stag-api.xquare.app +API_BASE_URL = https:/$()/stag-server.xquare.app From 48b7201344b00b28f45495aa009e17210bec0e27 Mon Sep 17 00:00:00 2001 From: Byung jin Date: Thu, 17 Aug 2023 18:12:45 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20=ED=95=84?= =?UTF-8?q?=EC=9A=94=EC=97=86=EB=8A=94=20print=EA=B5=AC=EB=AC=B8=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sources/Scene/Home/HomeViewModel.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Sources/Scene/Home/HomeViewModel.swift b/Application/Sources/Scene/Home/HomeViewModel.swift index cdf88fcd..c7a816b6 100644 --- a/Application/Sources/Scene/Home/HomeViewModel.swift +++ b/Application/Sources/Scene/Home/HomeViewModel.swift @@ -57,6 +57,8 @@ class HomeViewModel: ObservableObject { self.imageUrl = $0.profileFileName self.merit = $0.goodPoint self.demerit = $0.badPoint + }, onError: { + print("pointErr: \($0)") }).disposed(by: disposeBag) } @@ -66,8 +68,7 @@ class HomeViewModel: ObservableObject { self.name = $0.name self.endTime = $0.endTime self.isShowOutingView = true - }, onError: { - print($0) + }, onError: { _ in self.isShowOutingView = false }) .disposed(by: disposeBag) @@ -79,8 +80,7 @@ class HomeViewModel: ObservableObject { self.name = $0.name self.locationClassroom = $0.locationClassroom self.isShowMovedClass = true - }, onError: { - print($0) + }, onError: { _ in self.isShowMovedClass = false }) .disposed(by: disposeBag) From ce00a9c1b436082a778d2ead74e9d006a9300c27 Mon Sep 17 00:00:00 2001 From: Byung jin Date: Thu, 17 Aug 2023 18:29:56 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20=EB=B6=88?= =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=9C=20print=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sources/Scene/Home/HomeViewModel.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/Application/Sources/Scene/Home/HomeViewModel.swift b/Application/Sources/Scene/Home/HomeViewModel.swift index c7a816b6..46680ea7 100644 --- a/Application/Sources/Scene/Home/HomeViewModel.swift +++ b/Application/Sources/Scene/Home/HomeViewModel.swift @@ -57,8 +57,6 @@ class HomeViewModel: ObservableObject { self.imageUrl = $0.profileFileName self.merit = $0.goodPoint self.demerit = $0.badPoint - }, onError: { - print("pointErr: \($0)") }).disposed(by: disposeBag) } From 034ea636048fd4f33dc278981fc1339ac42925d9 Mon Sep 17 00:00:00 2001 From: Byung jin Date: Mon, 21 Aug 2023 11:55:36 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20stage=20url=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configurations/product.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configurations/product.xcconfig b/Configurations/product.xcconfig index 235e73f7..65426ed1 100644 --- a/Configurations/product.xcconfig +++ b/Configurations/product.xcconfig @@ -1,4 +1,4 @@ BUNDLE_DISPLAY_NAME = XQUARE APP_BUNDLE_ID = com.xquare.XQUARE-iOS -API_BASE_URL = https:/$()/api.xquare.app +API_BASE_URL = https:/$()/stag-server.xquare.app From 630a581297bab327ef32a223e9a7557f26ae9983 Mon Sep 17 00:00:00 2001 From: Byung jin Date: Mon, 21 Aug 2023 11:56:56 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=20::=20prod=20url=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configurations/product.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configurations/product.xcconfig b/Configurations/product.xcconfig index 65426ed1..55a172e6 100644 --- a/Configurations/product.xcconfig +++ b/Configurations/product.xcconfig @@ -1,4 +1,4 @@ BUNDLE_DISPLAY_NAME = XQUARE APP_BUNDLE_ID = com.xquare.XQUARE-iOS -API_BASE_URL = https:/$()/stag-server.xquare.app +API_BASE_URL = https:/$()/prod-server.xquare.app