loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Add empty checks using hasAuthMethods (#6983)

Browse Source 
* Add empty checks using hasAuthMethods

* Add regenerated sample for kotlin multiplatform
This commit is contained in:
Andrew Kehrig 2020-07-26 05:10:06 -04:00 committed by GitHub
parent dba14f5ac6
commit 9bfd9545cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/openapi-generator/src/main/resources/kotlin-client/libraries/multiplatform/infrastructure/ApiClient.kt.mustache vendored
View File

@ -46,7 +46,7 @@ import {{packageName}}.auth.*
val clientConfig: (HttpClientConfig<*>) -> Unit = { it.install(JsonFeature, jsonConfig) } val clientConfig: (HttpClientConfig<*>) -> Unit = { it.install(JsonFeature, jsonConfig) }
httpClientEngine?.let { HttpClient(it, clientConfig) } ?: HttpClient(clientConfig) httpClientEngine?.let { HttpClient(it, clientConfig) } ?: HttpClient(clientConfig)
} }
{{#hasAuthMethods}}
private val authentications: kotlin.collections.Map<String, Authentication> by lazy { private val authentications: kotlin.collections.Map<String, Authentication> by lazy {
mapOf({{#authMethods}}{{#isBasic}}{{#isBasicBasic}} mapOf({{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
"{{name}}" to HttpBasicAuth(){{/isBasicBasic}}{{^isBasicBasic}} "{{name}}" to HttpBasicAuth(){{/isBasicBasic}}{{^isBasicBasic}}
@ -54,6 +54,10 @@ import {{packageName}}.auth.*
"{{name}}" to ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"){{/isApiKey}}{{#isOAuth}} "{{name}}" to ApiKeyAuth({{#isKeyInHeader}}"header"{{/isKeyInHeader}}{{^isKeyInHeader}}"query"{{/isKeyInHeader}}, "{{keyParamName}}"){{/isApiKey}}{{#isOAuth}}
"{{name}}" to OAuth(){{/isOAuth}}{{#hasMore}}, {{/hasMore}}{{/authMethods}}) "{{name}}" to OAuth(){{/isOAuth}}{{#hasMore}}, {{/hasMore}}{{/authMethods}})
} }
{{/hasAuthMethods}}
{{^hasAuthMethods}}
private val authentications: kotlin.collections.Map<String, Authentication>? = null
{{/hasAuthMethods}}
{{#nonPublicApi}}internal {{/nonPublicApi}}companion object { {{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
protected val UNSAFE_HEADERS = listOf(HttpHeaders.ContentType) protected val UNSAFE_HEADERS = listOf(HttpHeaders.ContentType)
@ -74,7 +78,7 @@ import {{packageName}}.auth.*
* @param username Username * @param username Username
*/ */
fun setUsername(username: String) { fun setUsername(username: String) {
val auth = authentications.values.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth? val auth = authentications?.values?.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth?
?: throw Exception("No HTTP basic authentication configured") ?: throw Exception("No HTTP basic authentication configured")
auth.username = username auth.username = username
} }
@ -85,7 +89,7 @@ import {{packageName}}.auth.*
* @param password Password * @param password Password
*/ */
fun setPassword(password: String) { fun setPassword(password: String) {
val auth = authentications.values.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth? val auth = authentications?.values?.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth?
?: throw Exception("No HTTP basic authentication configured") ?: throw Exception("No HTTP basic authentication configured")
auth.password = password auth.password = password
} }
@ -97,7 +101,7 @@ import {{packageName}}.auth.*
* @param paramName The name of the API key parameter, or null or set the first key. * @param paramName The name of the API key parameter, or null or set the first key.
*/ */
fun setApiKey(apiKey: String, paramName: String? = null) { fun setApiKey(apiKey: String, paramName: String? = null) {
val auth = authentications.values.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName)} as ApiKeyAuth? val auth = authentications?.values?.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName)} as ApiKeyAuth?
?: throw Exception("No API key authentication configured") ?: throw Exception("No API key authentication configured")
auth.apiKey = apiKey auth.apiKey = apiKey
} }
@ -109,7 +113,7 @@ import {{packageName}}.auth.*
* @param paramName The name of the API key parameter, or null or set the first key. * @param paramName The name of the API key parameter, or null or set the first key.
*/ */
fun setApiKeyPrefix(apiKeyPrefix: String, paramName: String? = null) { fun setApiKeyPrefix(apiKeyPrefix: String, paramName: String? = null) {
val auth = authentications.values.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName) } as ApiKeyAuth? val auth = authentications?.values?.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName) } as ApiKeyAuth?
?: throw Exception("No API key authentication configured") ?: throw Exception("No API key authentication configured")
auth.apiKeyPrefix = apiKeyPrefix auth.apiKeyPrefix = apiKeyPrefix
} }
@ -120,7 +124,7 @@ import {{packageName}}.auth.*
* @param accessToken Access token * @param accessToken Access token
*/ */
fun setAccessToken(accessToken: String) { fun setAccessToken(accessToken: String) {
val auth = authentications.values.firstOrNull { it is OAuth } as OAuth? val auth = authentications?.values?.firstOrNull { it is OAuth } as OAuth?
?: throw Exception("No OAuth2 authentication configured") ?: throw Exception("No OAuth2 authentication configured")
auth.accessToken = accessToken auth.accessToken = accessToken
} }
@ -131,7 +135,7 @@ import {{packageName}}.auth.*
* @param bearerToken The bearer token. * @param bearerToken The bearer token.
*/ */
fun setBearerToken(bearerToken: String) { fun setBearerToken(bearerToken: String) {
val auth = authentications.values.firstOrNull { it is HttpBearerAuth } as HttpBearerAuth? val auth = authentications?.values?.firstOrNull { it is HttpBearerAuth } as HttpBearerAuth?
?: throw Exception("No Bearer authentication configured") ?: throw Exception("No Bearer authentication configured")
auth.bearerToken = bearerToken auth.bearerToken = bearerToken
} }
@ -175,7 +179,7 @@ import {{packageName}}.auth.*
private fun RequestConfig.updateForAuth(authNames: kotlin.collections.List<String>) { private fun RequestConfig.updateForAuth(authNames: kotlin.collections.List<String>) {
for (authName in authNames) { for (authName in authNames) {
val auth = authentications[authName] ?: throw Exception("Authentication undefined: $authName") val auth = authentications?.get(authName) ?: throw Exception("Authentication undefined: $authName")
auth.apply(query, headers) auth.apply(query, headers)
} }
} }

15
samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
View File

@ -46,7 +46,6 @@ open class ApiClient(
val clientConfig: (HttpClientConfig<*>) -> Unit = { it.install(JsonFeature, jsonConfig) } val clientConfig: (HttpClientConfig<*>) -> Unit = { it.install(JsonFeature, jsonConfig) }
httpClientEngine?.let { HttpClient(it, clientConfig) } ?: HttpClient(clientConfig) httpClientEngine?.let { HttpClient(it, clientConfig) } ?: HttpClient(clientConfig)
} }
private val authentications: kotlin.collections.Map<String, Authentication> by lazy { private val authentications: kotlin.collections.Map<String, Authentication> by lazy {
mapOf( mapOf(
"api_key" to ApiKeyAuth("header", "api_key"), "api_key" to ApiKeyAuth("header", "api_key"),
@ -79,7 +78,7 @@ open class ApiClient(
* @param username Username * @param username Username
*/ */
fun setUsername(username: String) { fun setUsername(username: String) {
val auth = authentications.values.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth? val auth = authentications?.values?.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth?
?: throw Exception("No HTTP basic authentication configured") ?: throw Exception("No HTTP basic authentication configured")
auth.username = username auth.username = username
} }
@ -90,7 +89,7 @@ open class ApiClient(
* @param password Password * @param password Password
*/ */
fun setPassword(password: String) { fun setPassword(password: String) {
val auth = authentications.values.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth? val auth = authentications?.values?.firstOrNull { it is HttpBasicAuth } as HttpBasicAuth?
?: throw Exception("No HTTP basic authentication configured") ?: throw Exception("No HTTP basic authentication configured")
auth.password = password auth.password = password
} }
@ -102,7 +101,7 @@ open class ApiClient(
* @param paramName The name of the API key parameter, or null or set the first key. * @param paramName The name of the API key parameter, or null or set the first key.
*/ */
fun setApiKey(apiKey: String, paramName: String? = null) { fun setApiKey(apiKey: String, paramName: String? = null) {
val auth = authentications.values.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName)} as ApiKeyAuth? val auth = authentications?.values?.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName)} as ApiKeyAuth?
?: throw Exception("No API key authentication configured") ?: throw Exception("No API key authentication configured")
auth.apiKey = apiKey auth.apiKey = apiKey
} }
@ -114,7 +113,7 @@ open class ApiClient(
* @param paramName The name of the API key parameter, or null or set the first key. * @param paramName The name of the API key parameter, or null or set the first key.
*/ */
fun setApiKeyPrefix(apiKeyPrefix: String, paramName: String? = null) { fun setApiKeyPrefix(apiKeyPrefix: String, paramName: String? = null) {
val auth = authentications.values.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName) } as ApiKeyAuth? val auth = authentications?.values?.firstOrNull { it is ApiKeyAuth && (paramName == null || paramName == it.paramName) } as ApiKeyAuth?
?: throw Exception("No API key authentication configured") ?: throw Exception("No API key authentication configured")
auth.apiKeyPrefix = apiKeyPrefix auth.apiKeyPrefix = apiKeyPrefix
} }
@ -125,7 +124,7 @@ open class ApiClient(
* @param accessToken Access token * @param accessToken Access token
*/ */
fun setAccessToken(accessToken: String) { fun setAccessToken(accessToken: String) {
val auth = authentications.values.firstOrNull { it is OAuth } as OAuth? val auth = authentications?.values?.firstOrNull { it is OAuth } as OAuth?
?: throw Exception("No OAuth2 authentication configured") ?: throw Exception("No OAuth2 authentication configured")
auth.accessToken = accessToken auth.accessToken = accessToken
} }
@ -136,7 +135,7 @@ open class ApiClient(
* @param bearerToken The bearer token. * @param bearerToken The bearer token.
*/ */
fun setBearerToken(bearerToken: String) { fun setBearerToken(bearerToken: String) {
val auth = authentications.values.firstOrNull { it is HttpBearerAuth } as HttpBearerAuth? val auth = authentications?.values?.firstOrNull { it is HttpBearerAuth } as HttpBearerAuth?
?: throw Exception("No Bearer authentication configured") ?: throw Exception("No Bearer authentication configured")
auth.bearerToken = bearerToken auth.bearerToken = bearerToken
} }
@ -180,7 +179,7 @@ open class ApiClient(
private fun RequestConfig.updateForAuth(authNames: kotlin.collections.List<String>) { private fun RequestConfig.updateForAuth(authNames: kotlin.collections.List<String>) {
for (authName in authNames) { for (authName in authNames) {
val auth = authentications[authName] ?: throw Exception("Authentication undefined: $authName") val auth = authentications?.get(authName) ?: throw Exception("Authentication undefined: $authName")
auth.apply(query, headers) auth.apply(query, headers)
} }
} }