WIP: feat: started adding search endpoint

api/api-ktor/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
     commonMainImplementation(libs.rsocketKtorClient)
 
     commonMainApi(projects.api)
+    commonMainImplementation(projects.types.serializable)
 
     jvmTestImplementation(libs.ktorClientCio)
 }

api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/HttpRequestBuilder.kt

@@ -0,0 +1,14 @@
+package app.meetacy.sdk.engine.ktor
+
+import app.meetacy.sdk.types.auth.Token
+import app.meetacy.sdk.version.ApiVersion
+import io.ktor.client.request.*
+import io.ktor.http.*
+
+public fun HttpRequestBuilder.apiVersion(apiVersion: ApiVersion) {
+    header("Api-Version", apiVersion.int)
+}
+
+public fun HttpRequestBuilder.token(token: Token) {
+    header(HttpHeaders.Authorization, token.string)
+}

api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/KtorMeetacyEngine.kt

@@ -8,6 +8,7 @@ import app.meetacy.sdk.engine.ktor.requests.friends.FriendsEngine
 import app.meetacy.sdk.engine.ktor.requests.invitations.InvitationsEngine
 import app.meetacy.sdk.engine.ktor.requests.meetings.MeetingsEngine
 import app.meetacy.sdk.engine.ktor.requests.notifications.NotificationsEngine
+import app.meetacy.sdk.engine.ktor.requests.search.SearchEngine
 import app.meetacy.sdk.engine.ktor.requests.updates.UpdatesEngine
 import app.meetacy.sdk.engine.ktor.requests.users.UsersEngine
 import app.meetacy.sdk.engine.ktor.response.ServerResponse
@@ -51,6 +52,7 @@ public class KtorMeetacyEngine(
     private val files = FilesEngine(baseUrl, this.httpClient)
     private val invitations = InvitationsEngine(baseUrl, this.httpClient, this.json)
     private val notifications = NotificationsEngine(baseUrl, this.httpClient, this.json)
+    private val search = SearchEngine(baseUrl, this.httpClient)
     private val updates = UpdatesEngine(baseUrl, this.httpClient, this.json)
 
     override fun getFileUrl(
@@ -93,12 +95,13 @@ public class KtorMeetacyEngine(
             // notifications
             is ReadNotificationRequest -> notifications.read(request) as T
             is ListNotificationsRequest -> notifications.list(request) as T
+            // search
+            is SearchRequest -> search.search(request) as T
             // updates
             is EmitUpdatesRequest -> updates.stream(request) as T
             // not yet supported
             is LinkEmailRequest -> notSupported()
             is ConfirmEmailRequest -> notSupported()
-            is TokenProviderEmpty -> notSupported()
         }
     }
 

api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/auth/AuthEngine.kt

@@ -2,33 +2,33 @@
 
 package app.meetacy.sdk.engine.ktor.requests.auth
 
-import app.meetacy.sdk.engine.ktor.requests.extencion.postWithoutToken
-import app.meetacy.sdk.engine.ktor.response.models.GenerateIdentityResponse
+import app.meetacy.sdk.engine.ktor.apiVersion
+import app.meetacy.sdk.engine.ktor.response.bodyAsSuccess
 import app.meetacy.sdk.engine.requests.GenerateAuthRequest
 import app.meetacy.sdk.types.annotation.UnsafeConstructor
 import app.meetacy.sdk.types.auth.Token
 import app.meetacy.sdk.types.url.Url
 import io.ktor.client.*
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.put
+import io.ktor.client.request.*
+import kotlinx.serialization.Serializable
 
 internal class AuthEngine(
     private val baseUrl: Url,
-    private val httpClient: HttpClient,
-    private val json: Json
+    private val httpClient: HttpClient
 ) {
+    @Serializable
+    private data class GenerateAuthBody(val nickname: String)
+
     suspend fun generate(request: GenerateAuthRequest): GenerateAuthRequest.Response {
         val url = baseUrl / "auth" / "generate"
-
-        val jsonObject = buildJsonObject {
-            put("nickname", request.nickname)
-        }
-
-        val string = postWithoutToken(url.string, jsonObject, httpClient, request)
-
-        val token = json.decodeFromString<GenerateIdentityResponse>(string).result
-
-        return GenerateAuthRequest.Response(token = Token(token))
+        val body = GenerateAuthBody(request.nickname)
+        val response = httpClient
+            .post(url.string) {
+                apiVersion(request.apiVersion)
+                setBody(body)
+            }
+            .bodyAsSuccess<String>()
+        val result = Token(response)
+        return GenerateAuthRequest.Response(result)
     }
 }

api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/friends/FriendsEngine.kt

@@ -7,10 +7,10 @@ import app.meetacy.sdk.engine.ktor.mapToLocation
 import app.meetacy.sdk.engine.ktor.mapToRegularUser
 import app.meetacy.sdk.engine.ktor.mapToUser
 import app.meetacy.sdk.engine.ktor.requests.extencion.post
-import app.meetacy.sdk.engine.ktor.response.models.ListFriendsResponse
-import app.meetacy.sdk.engine.ktor.response.models.Location as ModelLocation
-import app.meetacy.sdk.engine.ktor.response.models.StatusTrueResponse
-import app.meetacy.sdk.engine.ktor.response.models.User as ModelUser
+import app.meetacy.sdk.engine.ktor.models.ListFriendsResponse
+import app.meetacy.sdk.engine.ktor.models.Location as ModelLocation
+import app.meetacy.sdk.engine.ktor.models.StatusTrueResponse
+import app.meetacy.sdk.engine.ktor.models.User as ModelUser
 import app.meetacy.sdk.engine.requests.AddFriendRequest
 import app.meetacy.sdk.engine.requests.DeleteFriendRequest
 import app.meetacy.sdk.engine.requests.EmitFriendsLocationRequest
@@ -43,7 +43,7 @@ internal class FriendsEngine(
 ) {
     private val baseUrl =  baseUrl / "friends"
 
-    suspend fun add(request: AddFriendRequest): StatusTrueResponse {
+    suspend fun add(request: AddFriendRequest): app.meetacy.sdk.engine.ktor.models.StatusTrueResponse {
         val url =  baseUrl / "add"
 
         val jsonObject = buildJsonObject {
@@ -52,10 +52,10 @@ internal class FriendsEngine(
 
         val string = post(url.string, jsonObject, httpClient, request)
 
-        return json.decodeFromString<StatusTrueResponse>(string)
+        return json.decodeFromString<app.meetacy.sdk.engine.ktor.models.StatusTrueResponse>(string)
     }
 
-    suspend fun delete(request: DeleteFriendRequest): StatusTrueResponse {
+    suspend fun delete(request: DeleteFriendRequest): app.meetacy.sdk.engine.ktor.models.StatusTrueResponse {
         val url =  baseUrl / "delete"
 
         val jsonObject = buildJsonObject {
@@ -64,20 +64,20 @@ internal class FriendsEngine(
 
         val string = post(url.string, jsonObject, httpClient, request)
 
-        return json.decodeFromString<StatusTrueResponse>(string)
+        return json.decodeFromString<app.meetacy.sdk.engine.ktor.models.StatusTrueResponse>(string)
     }
 
     suspend fun list(request: ListFriendsRequest): ListFriendsRequest.Response {
         val url =  baseUrl / "list"
 
         val jsonObject = buildJsonObject {
-            put("amount", request.amount.int.toString())
+            put("amount", request.amount.int)
             put("pagingId", request.pagingId?.string)
         }
 
         val string = post(url.string, jsonObject, httpClient, request)
 
-        val response = Json.decodeFromString<ListFriendsResponse>(string).result
+        val response = Json.decodeFromString<app.meetacy.sdk.engine.ktor.models.ListFriendsResponse>(string).result
 
         val paging = PagingResponse(
             nextPagingId = response.nextPagingId?.let(::PagingId),

api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/invitations/InvitationsEngine.kt

@@ -1,8 +1,8 @@
 package app.meetacy.sdk.engine.ktor.requests.invitations
 
 import app.meetacy.sdk.engine.ktor.requests.extencion.post
-import app.meetacy.sdk.engine.ktor.response.models.CreateInvitationResponse
-import app.meetacy.sdk.engine.ktor.response.models.StatusTrueResponse
+import app.meetacy.sdk.engine.ktor.models.CreateInvitationResponse
+import app.meetacy.sdk.engine.ktor.models.StatusTrueResponse
 import app.meetacy.sdk.engine.ktor.toInvitation
 import app.meetacy.sdk.engine.requests.AcceptInvitationRequest
 import app.meetacy.sdk.engine.requests.CancelInvitationRequest
@@ -32,14 +32,14 @@ internal class InvitationsEngine(
 
         val string = post(url.string, jsonObject, httpClient, request)
 
-        val response = json.decodeFromString<CreateInvitationResponse>(string).result
+        val response = json.decodeFromString<app.meetacy.sdk.engine.ktor.models.CreateInvitationResponse>(string).result
 
         return CreateInvitationRequest.Response(response.toInvitation())
     }
 
     suspend fun accept(
         request: AcceptInvitationRequest
-    ): StatusTrueResponse {
+    ): app.meetacy.sdk.engine.ktor.models.StatusTrueResponse {
         val url = baseUrl / "accept"
 
         val jsonObject = buildJsonObject {
@@ -48,12 +48,12 @@ internal class InvitationsEngine(
 
         val string = post(url.string, jsonObject, httpClient, request)
 
-        return json.decodeFromString<StatusTrueResponse>(string)
+        return json.decodeFromString<app.meetacy.sdk.engine.ktor.models.StatusTrueResponse>(string)
     }
 
     suspend fun deny(
         request: DenyInvitationRequest
-    ): StatusTrueResponse {
+    ): app.meetacy.sdk.engine.ktor.models.StatusTrueResponse {
         val url = baseUrl / "deny"
 
         val jsonObject = buildJsonObject {
@@ -62,12 +62,12 @@ internal class InvitationsEngine(
 
         val string = post(url.string, jsonObject, httpClient, request)
 
-        return json.decodeFromString<StatusTrueResponse>(string)
+        return json.decodeFromString<app.meetacy.sdk.engine.ktor.models.StatusTrueResponse>(string)
     }
 
     suspend fun cancel(
         request: CancelInvitationRequest
-    ): StatusTrueResponse {
+    ): app.meetacy.sdk.engine.ktor.models.StatusTrueResponse {
         val url = baseUrl / "cancel"
 
         val jsonObject = buildJsonObject {
@@ -76,7 +76,7 @@ internal class InvitationsEngine(
 
         val string = post(url.string, jsonObject, httpClient, request)
 
-        return json.decodeFromString<StatusTrueResponse>(string)
+        return json.decodeFromString<app.meetacy.sdk.engine.ktor.models.StatusTrueResponse>(string)
     }
 
 }