Skip to content

Commit cbcdc39

Browse files
committed
Auth. Fix binary compatibility.
1 parent 99b41ee commit cbcdc39

File tree

6 files changed

+9
-3
lines changed

6 files changed

+9
-3
lines changed

ktor-client/ktor-client-plugins/ktor-client-auth/api/ktor-client-auth.api

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ public final class io/ktor/client/plugins/auth/providers/BearerAuthConfig {
8888
}
8989

9090
public final class io/ktor/client/plugins/auth/providers/BearerAuthProvider : io/ktor/client/plugins/auth/AuthProvider {
91-
public fun <init> (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/lang/String;)V
91+
public synthetic fun <init> (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/lang/String;)V
92+
public synthetic fun <init> (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
9293
public fun <init> (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/lang/String;ZZ)V
9394
public synthetic fun <init> (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Ljava/lang/String;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
9495
public fun addRequestHeaders (Lio/ktor/client/request/HttpRequestBuilder;Lio/ktor/http/auth/HttpAuthHeader;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;

ktor-client/ktor-client-plugins/ktor-client-auth/api/ktor-client-auth.klib.api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ final class io.ktor.client.plugins.auth.providers/BearerAuthConfig { // io.ktor.
8383
}
8484

8585
final class io.ktor.client.plugins.auth.providers/BearerAuthProvider : io.ktor.client.plugins.auth/AuthProvider { // io.ktor.client.plugins.auth.providers/BearerAuthProvider|null[0]
86+
constructor <init>(kotlin.coroutines/SuspendFunction1<io.ktor.client.plugins.auth.providers/RefreshTokensParams, io.ktor.client.plugins.auth.providers/BearerTokens?>, kotlin.coroutines/SuspendFunction0<io.ktor.client.plugins.auth.providers/BearerTokens?>, kotlin/Function1<io.ktor.client.request/HttpRequestBuilder, kotlin/Boolean> = ..., kotlin/String?) // io.ktor.client.plugins.auth.providers/BearerAuthProvider.<init>|<init>(kotlin.coroutines.SuspendFunction1<io.ktor.client.plugins.auth.providers.RefreshTokensParams,io.ktor.client.plugins.auth.providers.BearerTokens?>;kotlin.coroutines.SuspendFunction0<io.ktor.client.plugins.auth.providers.BearerTokens?>;kotlin.Function1<io.ktor.client.request.HttpRequestBuilder,kotlin.Boolean>;kotlin.String?){}[0]
8687
constructor <init>(kotlin.coroutines/SuspendFunction1<io.ktor.client.plugins.auth.providers/RefreshTokensParams, io.ktor.client.plugins.auth.providers/BearerTokens?>, kotlin.coroutines/SuspendFunction0<io.ktor.client.plugins.auth.providers/BearerTokens?>, kotlin/Function1<io.ktor.client.request/HttpRequestBuilder, kotlin/Boolean> = ..., kotlin/String?, kotlin/Boolean = ..., kotlin/Boolean = ...) // io.ktor.client.plugins.auth.providers/BearerAuthProvider.<init>|<init>(kotlin.coroutines.SuspendFunction1<io.ktor.client.plugins.auth.providers.RefreshTokensParams,io.ktor.client.plugins.auth.providers.BearerTokens?>;kotlin.coroutines.SuspendFunction0<io.ktor.client.plugins.auth.providers.BearerTokens?>;kotlin.Function1<io.ktor.client.request.HttpRequestBuilder,kotlin.Boolean>;kotlin.String?;kotlin.Boolean;kotlin.Boolean){}[0]
87-
constructor <init>(kotlin.coroutines/SuspendFunction1<io.ktor.client.plugins.auth.providers/RefreshTokensParams, io.ktor.client.plugins.auth.providers/BearerTokens?>, kotlin.coroutines/SuspendFunction0<io.ktor.client.plugins.auth.providers/BearerTokens?>, kotlin/Function1<io.ktor.client.request/HttpRequestBuilder, kotlin/Boolean>, kotlin/String?) // io.ktor.client.plugins.auth.providers/BearerAuthProvider.<init>|<init>(kotlin.coroutines.SuspendFunction1<io.ktor.client.plugins.auth.providers.RefreshTokensParams,io.ktor.client.plugins.auth.providers.BearerTokens?>;kotlin.coroutines.SuspendFunction0<io.ktor.client.plugins.auth.providers.BearerTokens?>;kotlin.Function1<io.ktor.client.request.HttpRequestBuilder,kotlin.Boolean>;kotlin.String?){}[0]
8888

8989
final val sendWithoutRequest // io.ktor.client.plugins.auth.providers/BearerAuthProvider.sendWithoutRequest|{}sendWithoutRequest[0]
9090
final fun <get-sendWithoutRequest>(): kotlin/Boolean // io.ktor.client.plugins.auth.providers/BearerAuthProvider.sendWithoutRequest.<get-sendWithoutRequest>|<get-sendWithoutRequest>(){}[0]

ktor-client/ktor-client-plugins/ktor-client-auth/common/src/io/ktor/client/plugins/auth/providers/BearerAuthProvider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,11 @@ public class BearerAuthProvider(
143143
private val nonCancellableRefresh: Boolean = false,
144144
) : AuthProvider {
145145

146+
@Deprecated("Maintained for binary compatibility", level = DeprecationLevel.HIDDEN)
146147
public constructor(
147148
refreshTokens: suspend (RefreshTokensParams) -> BearerTokens?,
148149
loadTokens: suspend () -> BearerTokens?,
149-
sendWithoutRequestCallback: (HttpRequestBuilder) -> Boolean,
150+
sendWithoutRequestCallback: (HttpRequestBuilder) -> Boolean = { true },
150151
realm: String?,
151152
) : this(
152153
refreshTokens,

ktor-server/ktor-server-plugins/ktor-server-auth/api/ktor-server-auth.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public abstract class io/ktor/server/auth/AuthenticationProvider {
107107
}
108108

109109
public class io/ktor/server/auth/AuthenticationProvider$Config {
110+
protected synthetic fun <init> (Ljava/lang/String;)V
110111
protected fun <init> (Ljava/lang/String;Ljava/lang/String;)V
111112
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
112113
public final fun getDescription ()Ljava/lang/String;

ktor-server/ktor-server-plugins/ktor-server-auth/api/ktor-server-auth.klib.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ abstract class io.ktor.server.auth/AuthenticationProvider { // io.ktor.server.au
4646
abstract suspend fun onAuthenticate(io.ktor.server.auth/AuthenticationContext) // io.ktor.server.auth/AuthenticationProvider.onAuthenticate|onAuthenticate(io.ktor.server.auth.AuthenticationContext){}[0]
4747

4848
open class Config { // io.ktor.server.auth/AuthenticationProvider.Config|null[0]
49+
constructor <init>(kotlin/String?) // io.ktor.server.auth/AuthenticationProvider.Config.<init>|<init>(kotlin.String?){}[0]
4950
constructor <init>(kotlin/String?, kotlin/String? = ...) // io.ktor.server.auth/AuthenticationProvider.Config.<init>|<init>(kotlin.String?;kotlin.String?){}[0]
5051

5152
final val description // io.ktor.server.auth/AuthenticationProvider.Config.description|{}description[0]

ktor-server/ktor-server-plugins/ktor-server-auth/common/src/io/ktor/server/auth/AuthenticationProvider.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ public abstract class AuthenticationProvider(config: Config) {
7070
public val name: String?,
7171
public val description: String? = null
7272
) {
73+
@Deprecated("Maintained for binary compatibility", level = DeprecationLevel.HIDDEN)
74+
protected constructor(name: String?) : this(name, description = null)
7375

7476
/**
7577
* Authentication filters specifying if authentication is required for a particular [ApplicationCall].

0 commit comments

Comments
 (0)