Skip to content

Form data #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tunetab wants to merge 6 commits into from
Closed

Form data #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3bdf1b9
fix apigenerator to apply submitForBinaryData
tunetab Jul 15, 2022
39bc702
fixed submitFormWithBinaryData request
tunetab Jul 18, 2022
d685278
tests(not working)
tunetab Jul 19, 2022
4872a27
tests(not working)
tunetab Jul 19, 2022
3a1c853
unitTest(not working yet)
tunetab Jul 20, 2022
5bbd605
Merge branch 'develop' into formData
Alex009 Aug 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ robolectricVersion = "4.6.1"
ktorClientVersion = "2.0.1"
kbignumVersion = "2.4.12"
multidexVersion = "2.0.1"
okioVersion = "3.2.0"

[libraries]
# android
Expand Down Expand Up @@ -87,3 +88,7 @@ kotlinSerializationGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-serial
androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.0.4" }
mokoResourcesGradlePlugin = { module = "dev.icerock.moko:resources-generator", version.ref = "mokoResourcesVersion" }
mokoGradlePlugin = { module = "dev.icerock.moko:moko-gradle-plugin", version = "0.1.0" }


# other
okio = { module = "com.squareup.okio:okio", version.ref = "okioVersion" }
84 changes: 80 additions & 4 deletions network-generator/src/main/resources/kotlin-ktor-client/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@ import kotlinx.serialization.builtins.MapSerializer
import kotlinx.serialization.builtins.SetSerializer
import kotlinx.serialization.builtins.serializer
import io.ktor.client.call.ReceivePipelineException
import io.ktor.client.request.forms.MultiPartFormDataContent
import io.ktor.client.request.forms.formData
import io.ktor.client.request.forms.submitFormWithBinaryData
import io.ktor.http.ContentDisposition
import io.ktor.http.HttpHeaders
import io.ktor.http.content.TextContent
import io.ktor.http.Headers
import io.ktor.utils.io.core.Input
import io.ktor.http.encodedPath
import io.ktor.http.path

Expand All @@ -34,7 +41,7 @@ import io.ktor.http.path
{{#allParams}}* @param {{paramName}} {{description}} {{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
{{/allParams}}* @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
*/
{{^nonPublicApi}}public {{/nonPublicApi}}suspend fun {{operationId}}({{#allParams}}{{paramName}}: {{{dataType}}}{{^required}}? = null{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}kotlin.Unit{{/returnType}}
{{^nonPublicApi}}public {{/nonPublicApi}}suspend fun {{operationId}}({{#allParams}}{{paramName}}: {{#isBinary}}Input{{/isBinary}}{{^isBinary}}{{{dataType}}}{{/isBinary}}{{^required}}? = null{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}kotlin.Unit{{/returnType}}

{{/operation}}

Expand All @@ -56,7 +63,8 @@ import io.ktor.http.path
{{/allParams}}* @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
*/{{#returnType}}
@Suppress("UNCHECKED_CAST"){{/returnType}}
override {{^nonPublicApi}}public {{/nonPublicApi}}{{#isOpen}}open {{/isOpen}}suspend fun {{operationId}}({{#allParams}}{{paramName}}: {{{dataType}}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}kotlin.Unit{{/returnType}} {
override {{^nonPublicApi}}public {{/nonPublicApi}}{{#isOpen}}open {{/isOpen}}suspend fun {{operationId}}({{#allParams}}{{paramName}}: {{#isBinary}}Input{{/isBinary}}{{^isBinary}}{{{dataType}}}{{/isBinary}}{{^required}}?{{/required}}{{^-last}}, {{/-last}}{{/allParams}}) : {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}kotlin.Unit{{/returnType}} {
{{^hasFormParams}}
val builder = HttpRequestBuilder()

builder.method = HttpMethod.{{httpMethod}}
Expand Down Expand Up @@ -122,6 +130,7 @@ import io.ktor.http.path
})
builder.setBody(formData)
{{/hasFormParams}}

with(builder.headers) {
append("Accept", "application/json")
{{#headerParams}}
Expand All @@ -145,8 +154,75 @@ import io.ktor.http.path
} catch (pipeline: ReceivePipelineException) {
throw pipeline.cause
}
}
{{/hasFormParams}}

{{#hasFormParams}}
val fileName = "image.jpg"

try {
{{#returnType}}return {{/returnType}}_httpClient.submitFormWithBinaryData{{^returnType}}<String>{{/returnType}} {
url {
takeFrom(_basePath)
encodedPath = encodedPath.let { startingPath ->
path("{{path}}")
return@let startingPath + encodedPath.substring(1)
}
{{#hasQueryParams}}
@Suppress("UNNECESSARY_SAFE_CALL")
with(parameters) {
{{#queryParams}}
{{#isContainer}}
{{paramName}}?.let { appendAll("{{baseName}}", it.map { it.toString() }) }
{{/isContainer}}
{{^isContainer}}
{{paramName}}?.let { append("{{baseName}}", it.toString()) }
{{/isContainer}}
{{/queryParams}}
}
{{/hasQueryParams}}
}
body = MultiPartFormDataContent(
formData {
{{#formParams}}
{{#isBinary}}
{{paramName}}?.let { {{paramName}} ->
appendInput(
key = "{{baseName}}",
block = { {{paramName}} },
headers = Headers.build {
append(
HttpHeaders.ContentType,
ContentType.Application.OctetStream.toString()
)
append(
HttpHeaders.ContentDisposition, ContentDisposition.File
.withParameter(ContentDisposition.Parameters.FileName, fileName)
.toString()
)
}
)
}
{{/isBinary}}
{{^isBinary}}
{{paramName}}?.let { {{paramName}} ->
append(
key = "{{baseName}}",
value = _json.encodeToString(
{{{dataType}}}.serializer(),
{{paramName}}
)
)
}
{{/isBinary}}
{{/formParams}}
}
)
}
} catch (pipeline: ReceivePipelineException) {
throw pipeline.cause
}
{{/hasFormParams}}
}
{{/operation}}
}
{{/operations}}
{{/operations}}
1 change: 1 addition & 0 deletions sample/mpp-library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ dependencies {
commonTestImplementation(libs.kotlinTest)
commonTestImplementation(libs.mokoTest)
commonTestImplementation(libs.kotlinTestAnnotations)
commonTestImplementation(libs.okio)

androidTestImplementation(libs.kotlinTestJUnit)
}
Expand Down
Loading