-
Notifications
You must be signed in to change notification settings - Fork 554
feat: Implement JWT refresh token for authorization (#2230) #2349
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.
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
Open
aggarwalpulkit596
wants to merge
1
commit into
fossasia:development
Choose a base branch
from
aggarwalpulkit596:2230
base: development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 10 additions & 1 deletion
11
app/src/main/java/org/fossasia/openevent/general/auth/Login.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,12 @@ | ||
package org.fossasia.openevent.general.auth | ||
|
||
data class Login(val email: String, val password: String) | ||
import com.fasterxml.jackson.databind.PropertyNamingStrategy | ||
import com.fasterxml.jackson.databind.annotation.JsonNaming | ||
|
||
@JsonNaming(PropertyNamingStrategy.KebabCaseStrategy::class) | ||
data class Login( | ||
val email: String, | ||
val password: String, | ||
val rememberMe: Boolean = true, | ||
val includeInResponse: Boolean = true | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
app/src/main/java/org/fossasia/openevent/general/auth/RefreshTokenService.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package org.fossasia.openevent.general.auth | ||
|
||
import org.fossasia.openevent.general.BuildConfig | ||
import retrofit2.Response | ||
import retrofit2.Retrofit | ||
import retrofit2.converter.gson.GsonConverterFactory | ||
|
||
class RefreshTokenService { | ||
|
||
private val retrofit = Retrofit.Builder() | ||
.addConverterFactory(GsonConverterFactory.create()) | ||
.baseUrl(BuildConfig.DEFAULT_BASE_URL) | ||
.build() | ||
|
||
private val authApi: AuthApi = retrofit.create(AuthApi::class.java) | ||
|
||
fun refreshToken(): Response<LoginResponse> { | ||
return authApi.refreshToken() | ||
} | ||
} | ||
44 changes: 44 additions & 0 deletions
44
app/src/main/java/org/fossasia/openevent/general/auth/TokenAuthenticator.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
package org.fossasia.openevent.general.auth | ||
|
||
import okhttp3.Authenticator | ||
import okhttp3.Request | ||
import okhttp3.Response | ||
import okhttp3.Route | ||
import org.koin.core.KoinComponent | ||
import org.koin.core.inject | ||
|
||
class TokenAuthenticator : Authenticator, KoinComponent { | ||
|
||
val tokenService: RefreshTokenService by inject() | ||
val authHolder: AuthHolder by inject() | ||
|
||
/** | ||
* Authenticator for when the authToken need to be refresh and updated | ||
* everytime we get a 401 error code | ||
*/ | ||
|
||
override fun authenticate(route: Route?, response: Response): Request? { | ||
|
||
val loginResponse = tokenService.refreshToken() | ||
|
||
return if (loginResponse.isSuccessful) { | ||
/** | ||
* Replace the existing tokens with the new tokens | ||
**/ | ||
loginResponse.body()?.let { | ||
authHolder.accessToken = it.accessToken | ||
authHolder.refreshToken = it.refreshToken | ||
|
||
val newToken = "JWT ${it.accessToken}" | ||
|
||
response.request.newBuilder() | ||
.addHeader("Authorization", newToken) | ||
.build() | ||
} | ||
} else { | ||
authHolder.accessToken = null | ||
authHolder.refreshToken = null | ||
response.request | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make it like other classes with DI, and manually inject
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Manually inject this class into the TokenAutheticator?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@iamareebjamal take a look and i also couldn't figure out a method to logout user in case if the refresh token is expired
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Delete the tokens
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh yes right 😅