feat(kotlin-client): support dynamic auth credentials for okhttp client (#23835)

modules/openapi-generator/src/main/resources/kotlin-client/api_doc.mustache

@@ -68,18 +68,42 @@ Configure {{name}}:
 {{/isApiKey}}
 {{#isBasic}}
 {{#isBasicBasic}}
-Configure {{name}}:
-    ApiClient.username = ""
-    ApiClient.password = ""
+Configure {{name}} statically:
+```kotlin
+ApiClient.username = ""
+ApiClient.password = ""
+```
+{{#jvm-okhttp}}
+Configure {{name}} dynamically:
+```kotlin
+apiInstance.userCredentialProvider = { "user" to "pass" }
+```
+{{/jvm-okhttp}}
 {{/isBasicBasic}}
 {{#isBasicBearer}}
-Configure {{name}}:
-    ApiClient.accessToken = ""
+Configure {{name}} statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+{{#jvm-okhttp}}
+Configure {{name}} dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
+{{/jvm-okhttp}}
 {{/isBasicBearer}}
 {{/isBasic}}
 {{#isOAuth}}
-Configure {{name}}:
-    ApiClient.accessToken = ""
+Configure {{name}} statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+{{#jvm-okhttp}}
+Configure {{name}} dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
+{{/jvm-okhttp}}
 {{/isOAuth}}
 {{/authMethods}}
 
@@ -89,4 +113,4 @@ Configure {{name}}:
  - **Accept**: {{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{^produces}}Not defined{{/produces}}
 
 {{/operation}}
-{{/operations}}
+{{/operations}}

modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-okhttp/infrastructure/ApiClient.kt.mustache

@@ -148,6 +148,9 @@ import com.squareup.moshi.adapter
         {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}val builder: OkHttpClient.Builder = OkHttpClient.Builder()
     }
 
+    {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}var userCredentialsProvider: () -> Pair<String?, String?> = { username to password }
+    {{^nonPublicApi}}{{#explicitApi}}public {{/explicitApi}}{{/nonPublicApi}}var accessTokenProvider: () -> String? = { accessToken }
+
     /**
      * Guess Content-Type header from the given byteArray (defaults to "application/octet-stream").
      *
@@ -460,25 +463,26 @@ import com.squareup.moshi.adapter
         {{#isBasic}}
         {{#isBasicBasic}}
         if (requestConfig.headers[AUTHORIZATION].isNullOrEmpty()) {
-            username?.let { username ->
-                password?.let { password ->
-                    requestConfig.headers[AUTHORIZATION] = okhttp3.Credentials.basic(username, password)
+            val (user, passw) = userCredentialsProvider()
+            user?.let { user ->
+                passw?.let { passw ->
+                    requestConfig.headers[AUTHORIZATION] = okhttp3.Credentials.basic(user, passw)
                 }
             }
         }
         {{/isBasicBasic}}
         {{#isBasicBearer}}
         if (requestConfig.headers[AUTHORIZATION].isNullOrEmpty()) {
-            accessToken?.let { accessToken ->
-                requestConfig.headers[AUTHORIZATION] = "Bearer $accessToken"
+            accessTokenProvider()?.let { token ->
+                requestConfig.headers[AUTHORIZATION] = "Bearer $token"
             }
         }
         {{/isBasicBearer}}
         {{/isBasic}}
         {{#isOAuth}}
         if (requestConfig.headers[AUTHORIZATION].isNullOrEmpty()) {
-            accessToken?.let { accessToken ->
-                requestConfig.headers[AUTHORIZATION] = "Bearer $accessToken "
+            accessTokenProvider()?.let { token ->
+                requestConfig.headers[AUTHORIZATION] = "Bearer $token "
             }
         }
         {{/isOAuth}}

samples/client/echo_api/kotlin-jvm-okhttp/docs/AuthApi.md

@@ -45,9 +45,15 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure http_auth:
-    ApiClient.username = ""
-    ApiClient.password = ""
+Configure http_auth statically:
+```kotlin
+ApiClient.username = ""
+ApiClient.password = ""
+```
+Configure http_auth dynamically:
+```kotlin
+apiInstance.userCredentialProvider = { "user" to "pass" }
+```
 
 ### HTTP request headers
 
@@ -91,8 +97,14 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure http_bearer_auth:
-    ApiClient.accessToken = ""
+Configure http_bearer_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+Configure http_bearer_auth dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
 
 ### HTTP request headers
 

samples/client/echo_api/kotlin-jvm-okhttp/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -119,6 +119,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val builder: OkHttpClient.Builder = OkHttpClient.Builder()
     }
 
+    var userCredentialsProvider: () -> Pair<String?, String?> = { username to password }
+    var accessTokenProvider: () -> String? = { accessToken }
+
     /**
      * Guess Content-Type header from the given byteArray (defaults to "application/octet-stream").
      *
@@ -357,15 +360,16 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
 
     protected fun <T> updateAuthParams(requestConfig: RequestConfig<T>) {
         if (requestConfig.headers[AUTHORIZATION].isNullOrEmpty()) {
-            username?.let { username ->
-                password?.let { password ->
-                    requestConfig.headers[AUTHORIZATION] = okhttp3.Credentials.basic(username, password)
+            val (user, passw) = userCredentialsProvider()
+            user?.let { user ->
+                passw?.let { passw ->
+                    requestConfig.headers[AUTHORIZATION] = okhttp3.Credentials.basic(user, passw)
                 }
             }
         }
         if (requestConfig.headers[AUTHORIZATION].isNullOrEmpty()) {
-            accessToken?.let { accessToken ->
-                requestConfig.headers[AUTHORIZATION] = "Bearer $accessToken"
+            accessTokenProvider()?.let { token ->
+                requestConfig.headers[AUTHORIZATION] = "Bearer $token"
             }
         }
     }

samples/client/echo_api/kotlin-jvm-spring-3-restclient/docs/AuthApi.md

@@ -45,9 +45,11 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure http_auth:
-    ApiClient.username = ""
-    ApiClient.password = ""
+Configure http_auth statically:
+```kotlin
+ApiClient.username = ""
+ApiClient.password = ""
+```
 
 ### HTTP request headers
 
@@ -91,8 +93,10 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure http_bearer_auth:
-    ApiClient.accessToken = ""
+Configure http_bearer_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
 
 ### HTTP request headers
 

samples/client/echo_api/kotlin-jvm-spring-3-webclient/docs/AuthApi.md

@@ -45,9 +45,11 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure http_auth:
-    ApiClient.username = ""
-    ApiClient.password = ""
+Configure http_auth statically:
+```kotlin
+ApiClient.username = ""
+ApiClient.password = ""
+```
 
 ### HTTP request headers
 
@@ -91,8 +93,10 @@ This endpoint does not need any parameter.
 ### Authorization
 
 
-Configure http_bearer_auth:
-    ApiClient.accessToken = ""
+Configure http_bearer_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
 
 ### HTTP request headers
 

samples/client/others/kotlin-integer-enum/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -119,6 +119,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val builder: OkHttpClient.Builder = OkHttpClient.Builder()
     }
 
+    var userCredentialsProvider: () -> Pair<String?, String?> = { username to password }
+    var accessTokenProvider: () -> String? = { accessToken }
+
     /**
      * Guess Content-Type header from the given byteArray (defaults to "application/octet-stream").
      *

samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/docs/PetApi.md

@@ -54,8 +54,14 @@ try {
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
+Configure petstore_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+Configure petstore_auth dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
 
 ### HTTP request headers
 
@@ -103,8 +109,14 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
+Configure petstore_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+Configure petstore_auth dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
 
 ### HTTP request headers
 
@@ -151,8 +163,14 @@ try {
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
+Configure petstore_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+Configure petstore_auth dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
 
 ### HTTP request headers
 
@@ -199,8 +217,14 @@ try {
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
+Configure petstore_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+Configure petstore_auth dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
 
 ### HTTP request headers
 
@@ -296,8 +320,14 @@ try {
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
+Configure petstore_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+Configure petstore_auth dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
 
 ### HTTP request headers
 
@@ -347,8 +377,14 @@ null (empty response body)
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
+Configure petstore_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+Configure petstore_auth dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
 
 ### HTTP request headers
 
@@ -399,8 +435,14 @@ try {
 ### Authorization
 
 
-Configure petstore_auth:
-    ApiClient.accessToken = ""
+Configure petstore_auth statically:
+```kotlin
+ApiClient.accessToken = ""
+```
+Configure petstore_auth dynamically:
+```kotlin
+apiInstance.accessTokenProvider = { "" }
+```
 
 ### HTTP request headers
 

samples/client/others/kotlin-jvm-okhttp-non-ascii-headers/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -119,6 +119,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val builder: OkHttpClient.Builder = OkHttpClient.Builder()
     }
 
+    var userCredentialsProvider: () -> Pair<String?, String?> = { username to password }
+    var accessTokenProvider: () -> String? = { accessToken }
+
     /**
      * Guess Content-Type header from the given byteArray (defaults to "application/octet-stream").
      *
@@ -357,8 +360,8 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
 
     protected fun <T> updateAuthParams(requestConfig: RequestConfig<T>) {
         if (requestConfig.headers[AUTHORIZATION].isNullOrEmpty()) {
-            accessToken?.let { accessToken ->
-                requestConfig.headers[AUTHORIZATION] = "Bearer $accessToken "
+            accessTokenProvider()?.let { token ->
+                requestConfig.headers[AUTHORIZATION] = "Bearer $token "
             }
         }
         if (requestConfig.headers["api_key"].isNullOrEmpty()) {

samples/client/others/kotlin-jvm-okhttp-parameter-tests/src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt

@@ -119,6 +119,9 @@ open class ApiClient(val baseUrl: String, val client: Call.Factory = defaultClie
         val builder: OkHttpClient.Builder = OkHttpClient.Builder()
     }
 
+    var userCredentialsProvider: () -> Pair<String?, String?> = { username to password }
+    var accessTokenProvider: () -> String? = { accessToken }
+
     /**
      * Guess Content-Type header from the given byteArray (defaults to "application/octet-stream").
      *