[WEAV-100] SMS 발송 및 인증 API 연결

Projects/App/Project.swift

@@ -12,7 +12,10 @@ let infoPlist = InfoPlist.extendingDefault(
         "App Enviroment": "$(APP_ENV)",
         "CFBundleDisplayName": "${INFOPLIST_KEY_CFBundleDisplayName}",
         "UIUserInterfaceStyle": "Light",
-        "ITSAppUsesNonExemptEncryption": false
+        "ITSAppUsesNonExemptEncryption": false,
+        "NSAppTransportSecurity": [
+            "NSAllowsArbitraryLoads": true
+        ]
     ]
 )
 

Projects/App/Sources/Navigation/NavigationStack.swift

@@ -23,8 +23,8 @@ extension PathType {
             switch subView {
             case .authPhoneInput:
                 AuthPhoneInputView()
-            case .authPhoneVerify:
-                AuthPhoneVerifyView()
+            case .authPhoneVerify(let smsResponse):
+                AuthPhoneVerifyView(smsResponse)
             case .authAgreement:
                 AuthAgreementView()
 

Projects/Core/CommonKit/Sources/AppCoordinator.swift

@@ -19,10 +19,11 @@ public final class AppCoordinator: ObservableObject {
     //MARK: - Methods
     @MainActor
     public func changeRootView(_ path: PathType) {
-        push(path)
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { // 애니메이션 시간에 맞춰 조정
-            self.navigationStack.removeSubrange(0 ..< self.navigationStack.count - 1)
-        }
+        navigationStack = [path]
+//        push(path)
+//        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+//            self.navigationStack.removeSubrange(0 ..< self.navigationStack.count - 1)
+//        }
     }
 
     @MainActor

Projects/Core/CommonKit/Sources/Path/PathTypes.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import Model
 
 public enum PathType: Hashable {
     case designPreview
@@ -42,11 +43,34 @@ public enum PathType: Hashable {
 
 public enum SignUpSubViewType: Hashable {
     case authPhoneInput
-    case authPhoneVerify
+    case authPhoneVerify(SMSSendResponse)
     case authAgreement
 
     case authGreeting
     case authProfileGender
     case authProfileAge
     case authName
+
+    public static func == (lhs: SignUpSubViewType, rhs: SignUpSubViewType) -> Bool {
+        return lhs.hashValue == rhs.hashValue
+    }
+
+    public func hash(into hasher: inout Hasher) {
+        switch self {
+        case .authPhoneInput:
+            hasher.combine(0)
+        case .authPhoneVerify:
+            hasher.combine(1)
+        case .authAgreement:
+            hasher.combine(2)
+        case .authGreeting:
+            hasher.combine(3)
+        case .authProfileGender:
+            hasher.combine(4)
+        case .authProfileAge:
+            hasher.combine(5)
+        case .authName:
+            hasher.combine(6)
+        }
+    }
 }

Projects/Core/Model/Sources/Network/SMSSendResponse.swift

@@ -0,0 +1,30 @@
+//
+//  SMSSendResponse.swift
+//  CoreKit
+//
+//  Created by 김지수 on 10/9/24.
+//  Copyright © 2024 com.weave. All rights reserved.
+//
+
+import Foundation
+
+public enum UserType: String {
+    case NEW = "NEW"
+    case EXISTING = "EXISTING"
+}
+
+public struct SMSSendResponse {
+    public let userType: UserType
+    public let authCodeId: String
+    public let phoneNumber: String
+
+    public init(
+        userType: UserType,
+        authCodeId: String,
+        phoneNumber: String
+    ) {
+        self.userType = userType
+        self.authCodeId = authCodeId
+        self.phoneNumber = phoneNumber
+    }
+}

Projects/Core/Model/Sources/Network/SMSVerificationResponse.swift

@@ -8,7 +8,12 @@
 
 import Foundation
 
-public struct SMSVerificationResponse {
-    let refreshToken: String
-    let accessToken: String
+public struct ExistingUserVerificationResponse {
+    public let refreshToken: String
+    public let accessToken: String
+
+    public init(refreshToken: String, accessToken: String) {
+        self.refreshToken = refreshToken
+        self.accessToken = accessToken
+    }
 }

Projects/Core/NetworkKit/Sources/AuthService/AuthService.swift

@@ -0,0 +1,80 @@
+//
+//  AuthService.swift
+//  NetworkKit
+//
+//  Created by 김지수 on 8/25/24.
+//  Copyright © 2024 com.studentcenter. All rights reserved.
+//
+
+import Foundation
+import Model
+import CoreKit
+
+enum AuthEndpointError: Error {
+    case emptyToken
+    case tokenResponseNotValid
+}
+
+public enum AuthService: Endpointable {
+    public static func requestSendSMS(phone: String) async throws -> SMSSendResponse {
+        let response = try await client.requestVerification(
+            headers: .init(X_hyphen_OS_hyphen_Type: .IOS),
+            body: .json(.init(phoneNumber: phone))
+        ).created.body.json
+
+        return SMSSendResponse(
+            userType: UserType(
+                rawValue: response.userStatus?.rawValue ?? "NEW"
+            ) ?? .NEW,
+            authCodeId: response.authCodeId,
+            phoneNumber: phone
+        )
+    }
+
+    public static func requestNewUserVerifyCode(
+        _ request: SMSVerificationRequest
+    ) async throws -> String {
+        let response = try await client.newUserVerifyCode(
+            path: .init(authCodeId: request.verificationId),
+            body: .json(.init(verificationCode: request.verificationCode))
+        ).ok.body.json
+        return response.registerToken
+    }
+
+    public static func requestExistingUserVerifyCode(
+        _ request: SMSVerificationRequest
+    ) async throws -> ExistingUserVerificationResponse {
+        let response = try await client.existingUserVerifyCode(
+            path: .init(authCodeId: request.verificationId),
+            body: .json(.init(verificationCode: request.verificationCode))
+        ).ok.body.json
+
+        return ExistingUserVerificationResponse(
+            refreshToken: response.refreshToken,
+            accessToken: response.accessToken
+        )
+    }
+}
+
+//MARK: - AccessToken Refresh
+extension AuthService {
+    static func refreshAccessToken() async throws -> RefreshTokenResponse {
+        guard let refreshToken = TokenManager.refreshToken else {
+            throw AuthEndpointError.emptyToken
+        }
+
+        let response = try await client.refreshToken(
+            body: .json(.init(refreshToken: refreshToken))
+        )
+
+        let result = try response.ok.body.json
+
+        TokenManager.accessToken = result.accessToken
+        TokenManager.refreshToken = result.refreshToken
+
+        return RefreshTokenResponse(
+            refreshToken: result.refreshToken,
+            accessToken: result.accessToken
+        )
+    }
+}

Projects/Core/NetworkKit/Sources/NetworkCore/Middleware/LogMiddleWare.swift

@@ -20,7 +20,7 @@ actor LoggingMiddleware {
     private let logger: Logger
     package let bodyLoggingPolicy: BodyLoggingPolicy
 
-    package init(logger: Logger = defaultLogger, bodyLoggingConfiguration: BodyLoggingPolicy = .never) {
+    package init(logger: Logger = defaultLogger, bodyLoggingConfiguration: BodyLoggingPolicy = .upTo(maxBytes: 2048)) {
         self.logger = logger
         self.bodyLoggingPolicy = bodyLoggingConfiguration
     }

Projects/Core/NetworkKit/Sources/NetworkCore/Middleware/RetryingMiddleware.swift

@@ -129,7 +129,7 @@ extension RetryingMiddleware: ClientMiddleware {
 
                 // 토큰 갱신 시도
                 do {
-                    let tokenResponse = try await AuthEndpoint.refreshAccessToken()
+                    let tokenResponse = try await AuthService.refreshAccessToken()
                     guard let accesstoken = tokenResponse.accessToken,
                           let refreshToken = tokenResponse.refreshToken else {
                         throw AuthEndpointError.tokenResponseNotValid

Projects/DesignSystem/DesignCore/Sources/NavigationBar.swift

@@ -44,4 +44,13 @@ public extension View {
             )
         )
     }
+
+    func setPopNavigation(handler: @escaping () -> Void) -> some View {
+        return modifier(
+            NavigationBarViewModifier(
+                showLeftBackButton: true,
+                handler: handler
+            )
+        )
+    }
 }

Projects/Features/SignUp/Sources/AuthSignUp/AuthAgreement/AuthAgreementView.swift

@@ -57,7 +57,9 @@ public struct AuthAgreementView: View {
         .ignoresSafeArea(.all)
         .padding(.top, 14)
         .textureBackground()
-        .setNavigationWithPop()
+        .setPopNavigation {
+            AppCoordinator.shared.pop()
+        }
         .setLoading(state.isLoading)
     }
 }

Projects/Features/SignUp/Sources/AuthSignUp/AuthPhoneInput/AuthPhoneInputView.swift

@@ -22,7 +22,7 @@ public struct AuthPhoneInputView: View {
         let model = AuthPhoneInputModel()
         let intent = AuthPhoneInputIntent(
             model: model,
-            externalData: .init(input: "temp")
+            externalData: .init()
         )
         let container = MVIContainer(
             intent: intent as AuthPhoneInputIntent.Intentable,
@@ -53,7 +53,7 @@ public struct AuthPhoneInputView: View {
                 title: "다음",
                 isActive: state.isPhoneValidated
             ) {
-                intent.onTapNextButton()
+                intent.onTapNextButton(with: state.phoneInputText)
             }
         }
         .task {
@@ -65,7 +65,9 @@ public struct AuthPhoneInputView: View {
         .ignoresSafeArea(.all)
         .padding(.top, 14)
         .textureBackground()
-        .setNavigationWithPop()
+        .setPopNavigation {
+            AppCoordinator.shared.pop()
+        }
         .setLoading(state.isLoading)
     }
 }