From 620aa4fd5ec6ade63fc2355a2ad768a816d82a49 Mon Sep 17 00:00:00 2001 From: Bruno Coelho <4brunu@users.noreply.github.com> Date: Wed, 23 Oct 2019 17:46:46 +0100 Subject: [PATCH] [kotlin][client] only use authentication tokens when they are not null (#4238) * [kotlin-client] only use authentication tokens when they are not null * [kotlin-client] only use authentication tokens when they are not null --- .../jvm/infrastructure/ApiClient.kt.mustache | 14 +++++++++++--- .../kotlin/org/openapitools/client/apis/PetApi.kt | 10 ++++++++-- .../kotlin/org/openapitools/client/apis/UserApi.kt | 6 +++++- .../client/infrastructure/ApiClient.kt | 4 +++- .../kotlin/org/openapitools/client/apis/PetApi.kt | 10 ++++++++-- .../kotlin/org/openapitools/client/apis/UserApi.kt | 6 +++++- .../client/infrastructure/ApiClient.kt | 4 +++- .../client/infrastructure/ApiClient.kt | 4 +++- .../client/infrastructure/ApiClient.kt | 4 +++- .../client/infrastructure/ApiClient.kt | 4 +++- 10 files changed, 52 insertions(+), 14 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/ApiClient.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/ApiClient.kt.mustache index 1cd9edcf4b2..e7fcabf7ddf 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/ApiClient.kt.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm/infrastructure/ApiClient.kt.mustache @@ -130,18 +130,26 @@ import java.io.File {{#isBasic}} {{^isBasicBearer}} if (requestConfig.headers[Authorization].isNullOrEmpty()) { - requestConfig.headers[Authorization] = Credentials.basic(username, password) + username?.let { username -> + password?.let { password -> + requestConfig.headers[Authorization] = Credentials.basic(username, password) + } + } } {{/isBasicBearer}} {{#isBasicBearer}} if (requestConfig.headers[Authorization].isNullOrEmpty()) { - requestConfig.headers[Authorization] = "Bearer " + accessToken + accessToken?.let { accessToken -> + requestConfig.headers[Authorization] = "Bearer " + accessToken + } } {{/isBasicBearer}} {{/isBasic}} {{#isOAuth}} if (requestConfig.headers[Authorization].isNullOrEmpty()) { - requestConfig.headers[Authorization] = "Bearer " + accessToken + accessToken?.let { accessToken -> + requestConfig.headers[Authorization] = "Bearer " + accessToken + } } {{/isOAuth}} {{/authMethods}} diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index ea0bccdd44e..1bd48689c1e 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -98,7 +98,10 @@ internal class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") @Suppress("UNCHECKED_CAST") fun findPetsByStatus(status: kotlin.Array) : kotlin.Array { val localVariableBody: kotlin.Any? = null - val localVariableQuery: MultiValueMap = mapOf("status" to toMultiValue(status.toList(), "csv")) + val localVariableQuery: MultiValueMap = mutableMapOf>() + .apply { + put("status", toMultiValue(status.toList(), "csv")) + } val localVariableHeaders: MutableMap = mutableMapOf() val localVariableConfig = RequestConfig( RequestMethod.GET, @@ -129,7 +132,10 @@ internal class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") @Suppress("UNCHECKED_CAST") fun findPetsByTags(tags: kotlin.Array) : kotlin.Array { val localVariableBody: kotlin.Any? = null - val localVariableQuery: MultiValueMap = mapOf("tags" to toMultiValue(tags.toList(), "csv")) + val localVariableQuery: MultiValueMap = mutableMapOf>() + .apply { + put("tags", toMultiValue(tags.toList(), "csv")) + } val localVariableHeaders: MutableMap = mutableMapOf() val localVariableConfig = RequestConfig( RequestMethod.GET, diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index 18506d2a276..6a0c0b46346 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -188,7 +188,11 @@ internal class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2" @Suppress("UNCHECKED_CAST") fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String { val localVariableBody: kotlin.Any? = null - val localVariableQuery: MultiValueMap = mapOf("username" to listOf("$username"), "password" to listOf("$password")) + val localVariableQuery: MultiValueMap = mutableMapOf>() + .apply { + put("username", listOf(username.toString())) + put("password", listOf(password.toString())) + } val localVariableHeaders: MutableMap = mutableMapOf() val localVariableConfig = RequestConfig( RequestMethod.GET, diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 7a82f3eef2d..3b6246b9ee4 100644 --- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -83,7 +83,9 @@ internal open class ApiClient(val baseUrl: String) { } } if (requestConfig.headers[Authorization].isNullOrEmpty()) { - requestConfig.headers[Authorization] = "Bearer " + accessToken + accessToken?.let { accessToken -> + requestConfig.headers[Authorization] = "Bearer " + accessToken + } } } diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt index 15f63f2a1b5..9501ccfdfc5 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt @@ -98,7 +98,10 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli @Suppress("UNCHECKED_CAST") fun findPetsByStatus(status: kotlin.Array) : kotlin.Array { val localVariableBody: kotlin.Any? = null - val localVariableQuery: MultiValueMap = mapOf("status" to toMultiValue(status.toList(), "csv")) + val localVariableQuery: MultiValueMap = mutableMapOf>() + .apply { + put("status", toMultiValue(status.toList(), "csv")) + } val localVariableHeaders: MutableMap = mutableMapOf() val localVariableConfig = RequestConfig( RequestMethod.GET, @@ -129,7 +132,10 @@ class PetApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCli @Suppress("UNCHECKED_CAST") fun findPetsByTags(tags: kotlin.Array) : kotlin.Array { val localVariableBody: kotlin.Any? = null - val localVariableQuery: MultiValueMap = mapOf("tags" to toMultiValue(tags.toList(), "csv")) + val localVariableQuery: MultiValueMap = mutableMapOf>() + .apply { + put("tags", toMultiValue(tags.toList(), "csv")) + } val localVariableHeaders: MutableMap = mutableMapOf() val localVariableConfig = RequestConfig( RequestMethod.GET, diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt index daaaeae3150..6028664673b 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt @@ -188,7 +188,11 @@ class UserApi(basePath: kotlin.String = "http://petstore.swagger.io/v2") : ApiCl @Suppress("UNCHECKED_CAST") fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String { val localVariableBody: kotlin.Any? = null - val localVariableQuery: MultiValueMap = mapOf("username" to listOf("$username"), "password" to listOf("$password")) + val localVariableQuery: MultiValueMap = mutableMapOf>() + .apply { + put("username", listOf(username.toString())) + put("password", listOf(password.toString())) + } val localVariableHeaders: MutableMap = mutableMapOf() val localVariableConfig = RequestConfig( RequestMethod.GET, diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3c5a60ccd30..3eb74d9ddfc 100644 --- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -81,7 +81,9 @@ open class ApiClient(val baseUrl: String) { } } if (requestConfig.headers[Authorization].isNullOrEmpty()) { - requestConfig.headers[Authorization] = "Bearer " + accessToken + accessToken?.let { accessToken -> + requestConfig.headers[Authorization] = "Bearer " + accessToken + } } } diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3df0d806a91..443c18a8353 100644 --- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -83,7 +83,9 @@ open class ApiClient(val baseUrl: String) { } } if (requestConfig.headers[Authorization].isNullOrEmpty()) { - requestConfig.headers[Authorization] = "Bearer " + accessToken + accessToken?.let { accessToken -> + requestConfig.headers[Authorization] = "Bearer " + accessToken + } } } diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3df0d806a91..443c18a8353 100644 --- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -83,7 +83,9 @@ open class ApiClient(val baseUrl: String) { } } if (requestConfig.headers[Authorization].isNullOrEmpty()) { - requestConfig.headers[Authorization] = "Bearer " + accessToken + accessToken?.let { accessToken -> + requestConfig.headers[Authorization] = "Bearer " + accessToken + } } } diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt index 3df0d806a91..443c18a8353 100644 --- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt +++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt @@ -83,7 +83,9 @@ open class ApiClient(val baseUrl: String) { } } if (requestConfig.headers[Authorization].isNullOrEmpty()) { - requestConfig.headers[Authorization] = "Bearer " + accessToken + accessToken?.let { accessToken -> + requestConfig.headers[Authorization] = "Bearer " + accessToken + } } }