Skip to content

fix: Use okhttp3 Interceptor in place of Authenticator for network module #1041

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

Merged
merged 1 commit into from
Feb 6, 2019
Merged

fix: Use okhttp3 Interceptor in place of Authenticator for network module #1041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions app/src/main/java/org/fossasia/openevent/general/auth/RequestAuthenticator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
package org.fossasia.openevent.general.auth

import okhttp3.Authenticator
import okhttp3.Request
import okhttp3.Interceptor
import okhttp3.Response
import okhttp3.Route

class RequestAuthenticator(private val authHolder: AuthHolder) : Authenticator {
class RequestAuthenticator(private val authHolder: AuthHolder) : Interceptor {

override fun authenticate(route: Route?, response: Response): Request? {
val authorization: String? = authHolder.getAuthorization()
return if (response.request().header("Authorization") == null && authorization != null) {
response.request().newBuilder()
.header("Authorization", authorization)
.build()
} else null // Give up, we already tried authenticating
override fun intercept(chain: Interceptor.Chain): Response? {
val authorization = authHolder.getAuthorization()
val original = chain.request()
return if (authorization != null) {
val request = original.newBuilder()
.header("Authorization", authorization)
.build()
chain.proceed(request)
} else
chain.proceed(original)
}
}
6 changes: 3 additions & 3 deletions app/src/main/java/org/fossasia/openevent/general/di/Modules.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.github.jasminb.jsonapi.retrofit.JSONAPIConverterFactory
import okhttp3.Authenticator
import okhttp3.Interceptor
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import org.fossasia.openevent.general.BuildConfig
Expand Down Expand Up @@ -153,7 +153,7 @@ val networkModule = module {
objectMapper
}

single { RequestAuthenticator(get()) as Authenticator }
single { RequestAuthenticator(get()) as Interceptor }
Copy link
Member

@iamareebjamal iamareebjamal Feb 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to cast IMO

Copy link
Member Author

@liveHarshit liveHarshit Feb 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is giving same definition error if I do not cast.


single {
val connectTimeout = 15 // 15s
Expand All @@ -165,7 +165,7 @@ val networkModule = module {
.addInterceptor(
HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY)
)
.authenticator(get())
.addInterceptor(get())
.build()
Copy link
Member

@iamareebjamal iamareebjamal Feb 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have not added the interceptor here. What's the point then?

Copy link
Member Author

@liveHarshit liveHarshit Feb 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

}

Expand Down