[API] home api 통신

composeApp/src/androidMain/AndroidManifest.xml

@@ -10,7 +10,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@android:style/Theme.Material.Light.NoActionBar">
+        android:theme="@android:style/Theme.Material.Light.NoActionBar"
+        android:usesCleartextTraffic="true">
         <activity
             android:exported="true"
             android:name=".MainActivity">

composeApp/src/androidMain/kotlin/org/whosin/client/presentation/component/BackHandler.kt

@@ -0,0 +1,9 @@
+package org.whosin.client.presentation.component
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun CommonBackHandler(enabled: Boolean, onBack: () -> Unit) {
+    BackHandler(enabled = enabled, onBack = onBack)
+}

composeApp/src/commonMain/kotlin/org/whosin/client/core/navigation/WhosInNavGraph.kt

@@ -127,7 +127,6 @@ fun WhosInNavGraph(
         composable<Route.Home> {
             HomeScreen(
                 modifier = modifier,
-                onNavigateBack = { navController.navigateUp() },
                 onNavigateToMyPage = {
                     navController.navigate(Route.MyPage)
                 }

composeApp/src/commonMain/kotlin/org/whosin/client/core/network/HttpClientFactory.kt

@@ -15,6 +15,7 @@ import io.ktor.client.plugins.logging.Logging
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.http.ContentType
+import io.ktor.http.Url
 import io.ktor.http.contentType
 import io.ktor.http.encodedPath
 import io.ktor.serialization.kotlinx.json.json
@@ -47,31 +48,42 @@ object HttpClientFactory {
             install(Auth){
                 bearer {
                     loadTokens {
-                        val accessToken = tokenManager.getAccessToken() ?: "no_token"
+                        val accessToken = tokenManager.getAccessToken() ?: "eyJhbGciOiJIUzI1NiJ9.eyJ0b2tlblR5cGUiOiJhY2Nlc3MiLCJ1c2VySWQiOjUsInByb3ZpZGVySWQiOiJsb2NhbGhvc3QiLCJuYW1lIjoi7Iug7KKF7JykIiwicm9sZSI6IlJPTEVfTUVNQkVSIiwiaWF0IjoxNzU5MzgyMzg3LCJleHAiOjE3NTk5ODcxODd9.kT9IH60aCA-6ByEITb-_qPAJY0Oik1bbPKqcBWXzHIk"
                         val refreshToken = tokenManager.getRefreshToken() ?: "no_token"
                         BearerTokens(accessToken = accessToken, refreshToken = refreshToken)
                     }
                     sendWithoutRequest { request ->
-                        val host = "https://"+request.url.host+"/"
-                        val path = request.url.encodedPath
-                        val pathWithNoAuth = listOf(
-                            "jokes",
-                            "users/signup",
-                            "users/find-password",
-                            "auth/login",
-                            "auth/email",
-                            "auth/email/validation"
-                        )
-                        // 결과가 true면 Authorization 헤더 추가, false면 제거
-                        if(host != BASE_URL){
+                        val requestHost = request.url.host
+                        val baseHost = try {
+                            Url(BASE_URL).host
+                        } catch (e: Exception) {
+                            // BASE_URL 형식이 잘못되었을 경우를 대비한 예외 처리
+                            null
+                        }
+
+                        // 요청하는 API의 host가 우리 서버의 host와 다르면 외부 API로 간주하여 토큰을 보내지 않음
+                        if (requestHost != baseHost) {
                             println("External API - No Auth")
                             false
-                        }else{
-                            // pathWithNoAuth에 있는 경로에는 Authorization 헤더 제외
+                        } else {
+                            // 우리 서버로 요청하는 경우, 인증이 필요 없는 경로인지 확인
+                            val path = request.url.encodedPath
+                            val pathWithNoAuth = listOf(
+                                "jokes",
+                                "users/signup",
+                                "users/find-password",
+                                "auth/login",
+                                "auth/email",
+                                "auth/email/validation",
+                                "member/reissue" // 토큰 재발급 요청 자체에는 만료된 액세스 토큰을 보내면 안 됨
+                            )
+
                             val isNoAuthPath = pathWithNoAuth.any { noAuthPath ->
-                                path.startsWith(noAuthPath) || path.contains(noAuthPath)
+                                path.contains(noAuthPath)
                             }
-                            println("isNoAuthPath: $isNoAuthPath")
+
+                            // isNoAuthPath가 true이면 인증이 필요 없는 경로 -> 헤더를 보내지 않음 (false 반환)
+                            // isNoAuthPath가 false이면 인증이 필요한 경로 -> 헤더를 보냄 (true 반환)
                             !isNoAuthPath
                         }
                     }

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/response/ClubPresencesResponseDto.kt

@@ -0,0 +1,32 @@
+package org.whosin.client.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ClubPresencesResponseDto(
+    @SerialName("success")
+    val success: Boolean,
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: ClubPresencesData
+)
+
+@Serializable
+data class ClubPresencesData(
+    @SerialName("clubName")
+    val clubName: String,
+    @SerialName("presentMembers")
+    val presentMembers: List<PresentMembers>
+)
+
+@Serializable
+data class PresentMembers(
+    @SerialName("userName")
+    val userName: String,
+    @SerialName("isMe")
+    val isMe: Boolean
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/remote/RemoteClubDataSource.kt

@@ -1,9 +1,96 @@
 package org.whosin.client.data.remote
 
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.request.delete
+import io.ktor.client.request.get
+import io.ktor.client.request.post
+import io.ktor.client.statement.HttpResponse
+import io.ktor.http.isSuccess
+import org.whosin.client.core.network.ApiResult
+import org.whosin.client.data.dto.response.ClubPresencesResponseDto
+import org.whosin.client.data.dto.response.MyClubResponseDto
 
 class RemoteClubDataSource(
-    private val client : HttpClient
+    private val client: HttpClient
 ) {
+    suspend fun getMyClubs(): ApiResult<MyClubResponseDto> {
+        return try {
+            val response: HttpResponse = client.get(urlString = "clubs/my")
 
+            if (response.status.isSuccess()) {
+                ApiResult.Success(
+                    data = response.body(),
+                    statusCode = response.status.value
+                )
+            } else {
+                ApiResult.Error(
+                    code = response.status.value,
+                    message = "HTTP Error: ${response.status.value}"
+                )
+            }
+        } catch (t: Throwable) {
+            ApiResult.Error(message = t.message, cause = t)
+        }
+    }
+
+    suspend fun getPresentMembers(clubId: Int): ApiResult<ClubPresencesResponseDto> {
+        return try {
+            val response: HttpResponse = client.get(urlString = "clubs/$clubId/presences")
+
+            if (response.status.isSuccess()) {
+                ApiResult.Success(
+                    data = response.body(),
+                    statusCode = response.status.value
+                )
+            } else {
+                ApiResult.Error(
+                    code = response.status.value,
+                    message = "HTTP Error: ${response.status.value}"
+                )
+            }
+        } catch (t: Throwable) {
+            ApiResult.Error(message = t.message, cause = t)
+        }
+    }
+
+    suspend fun checkIn(clubId: Int): ApiResult<Unit> {
+        return try {
+            val response: HttpResponse = client.post(urlString = "clubs/$clubId/check-in")
+
+            if (response.status.isSuccess()) {
+                ApiResult.Success(
+                    data = response.body(),
+                    statusCode = response.status.value
+                )
+            } else {
+                ApiResult.Error(
+                    code = response.status.value,
+                    message = "HTTP Error: ${response.status.value}"
+                )
+            }
+        } catch (t: Throwable) {
+            ApiResult.Error(message = t.message, cause = t)
+        }
+    }
+
+    suspend fun checkOut(clubId: Int): ApiResult<Unit> {
+        return try {
+            val response: HttpResponse = client.delete(urlString = "clubs/$clubId/check-out")
+
+            if (response.status.isSuccess()) {
+                ApiResult.Success(
+                    data = response.body(),
+                    statusCode = response.status.value
+                )
+            } else {
+                ApiResult.Error(
+                    code = response.status.value,
+                    message = "HTTP Error: ${response.status.value}"
+                )
+            }
+        } catch (t: Throwable) {
+            ApiResult.Error(message = t.message, cause = t)
+        }
+    }
 }

composeApp/src/commonMain/kotlin/org/whosin/client/data/repository/ClubRepository.kt

@@ -1,9 +1,22 @@
 package org.whosin.client.data.repository
 
+import org.whosin.client.core.network.ApiResult
+import org.whosin.client.data.dto.response.ClubPresencesResponseDto
+import org.whosin.client.data.dto.response.MyClubResponseDto
 import org.whosin.client.data.remote.RemoteClubDataSource
 
 class ClubRepository(
     private val dataSource: RemoteClubDataSource
 ) {
+    suspend fun getMyClubs(): ApiResult<MyClubResponseDto> =
+        dataSource.getMyClubs()
 
+    suspend fun getPresentMembers(clubId: Int): ApiResult<ClubPresencesResponseDto> =
+        dataSource.getPresentMembers(clubId)
+
+    suspend fun checkIn(clubId: Int): ApiResult<Unit> =
+        dataSource.checkIn(clubId)
+
+    suspend fun checkOut(clubId: Int): ApiResult<Unit> =
+        dataSource.checkOut(clubId)
 }

composeApp/src/commonMain/kotlin/org/whosin/client/presentation/component/BackHandler.kt

@@ -0,0 +1,6 @@
+package org.whosin.client.presentation.component
+
+import androidx.compose.runtime.Composable
+
+@Composable
+expect fun CommonBackHandler(enabled: Boolean = true, onBack: () -> Unit)