Merge remote-tracking branch 'origin/develop'

team-xquare · Aug 23, 2023 · 04eb639 · 04eb639
2 parents a68e506 + a84950b
commit 04eb639
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/Application/Sources/Scene/Home/HomeViewModel.swift b/Application/Sources/Scene/Home/HomeViewModel.swift
@@ -66,8 +66,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 +78,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)

diff --git 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/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:/$()/prod-server.xquare.app
diff --git 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
diff --git 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
 }
diff --git 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) }