Provide user token to the channel group routes

MinChat-official · Nov 2, 2023 · 001f0fa · 001f0fa
1 parent b0a34c9
commit 001f0fa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/minchat-rest/src/main/kotlin/io/minchat/rest/MinchatRestClient.kt b/minchat-rest/src/main/kotlin/io/minchat/rest/MinchatRestClient.kt
@@ -189,7 +189,7 @@ class MinchatRestClient(
 	 * For the caching approach, try `cache.channelgroupCache.values`
 	 */
 	suspend fun getAllChannelGroups() =
-		channelGroupService.getAllGroups()
+		channelGroupService.getAllGroups(account?.token)
 			.onEach(cache::set)
 			.map { it.withClient(this) }
 
@@ -229,7 +229,7 @@ class MinchatRestClient(
 	 * For the caching version of this method, see [cache].
 	 */
 	suspend fun getChannelGroup(id: Long) =
-		channelGroupService.getGroup(id)
+		channelGroupService.getGroup(id, account?.token)
 			.also(cache::set)
 			.withClient(this)
 

diff --git a/minchat-rest/src/main/kotlin/io/minchat/rest/service/ChannelGroupService.kt b/minchat-rest/src/main/kotlin/io/minchat/rest/service/ChannelGroupService.kt
@@ -9,17 +9,19 @@ import io.minchat.common.entity.ChannelGroup
 import io.minchat.common.request.*
 
 class ChannelGroupService(baseUrl: String, client: HttpClient) : AbstractRestService(baseUrl, client) {
-	suspend fun getGroup(id: Long) = run {
-		client.get(makeRouteUrl(Route.ChannelGroup.fetch, id))
-			.body<ChannelGroup>()
+	suspend fun getGroup(id: Long, token: String? = null) = run {
+		client.get(makeRouteUrl(Route.ChannelGroup.fetch, id)) {
+			token?.let { authorizeBearer(it) }
+		}.body<ChannelGroup>()
 	}
 
 	/**
 	 * Fetches all groups registered on the server.
 	 */
-	suspend fun getAllGroups() = run {
-		client.get(makeRouteUrl(Route.ChannelGroup.all))
-			.body<List<ChannelGroup>>()
+	suspend fun getAllGroups(token: String? = null) = run {
+		client.get(makeRouteUrl(Route.ChannelGroup.all)) {
+			token?.let { authorizeBearer(it) }
+		}.body<List<ChannelGroup>>()
 	}
 
 	suspend fun createGroup(