Skip to content
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

Jump to bottom

feat(e2ei): use refresh token for idp authorization (WPB-5880) #2549

Merged
merged 4 commits into from
Dec 21, 2023
Merged

feat(e2ei): use refresh token for idp authorization (WPB-5880) #2549

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb0a6cc
feat(e2ei): use refresh token for idp authorization
mchenani Dec 21, 2023
ce92c53
fix detekt
mchenani Dec 21, 2023
53c7e09
Merge branch 'develop' into feat/oauth/use-oauth-refresh-token
mchenani Dec 21, 2023
3e23a88
update kalium ref
mchenani Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 8 additions & 6 deletions app/src/main/kotlin/com/wire/android/feature/e2ei/GetE2EICertificateUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class GetE2EICertificateUseCase @Inject constructor(
}, {
if (it is E2EIEnrollmentResult.Initialized) {
initialEnrollmentResult = it
OAuthUseCase(context, it.target).launch(
OAuthUseCase(context, it.target, it.oAuthState).launch(
context.getActivity()!!.activityResultRegistry,
::oAuthResultHandler
)
Expand All @@ -61,11 +61,13 @@ class GetE2EICertificateUseCase @Inject constructor(
scope.launch {
when (oAuthResult) {
is OAuthUseCase.OAuthResult.Success -> {
enrollmentResultHandler(enrollE2EI.finalizeEnrollment(
oAuthResult.idToken,
oAuthResult.refreshToken,
initialEnrollmentResult
))
enrollmentResultHandler(
enrollE2EI.finalizeEnrollment(
oAuthResult.idToken,
oAuthResult.authState,
initialEnrollmentResult
)
)
}

is OAuthUseCase.OAuthResult.Failed -> {
Expand Down
29 changes: 24 additions & 5 deletions app/src/main/kotlin/com/wire/android/feature/e2ei/OAuthUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.util.Base64
import android.util.Log
import androidx.activity.result.ActivityResult
import androidx.activity.result.ActivityResultRegistry
import androidx.activity.result.contract.ActivityResultContracts
Expand Down Expand Up @@ -51,8 +52,11 @@ import javax.net.ssl.SSLContext
import javax.net.ssl.TrustManager
import javax.net.ssl.X509TrustManager

class OAuthUseCase(context: Context, private val authUrl: String) {
private var authState: AuthState = AuthState()
class OAuthUseCase(context: Context, private val authUrl: String, oAuthState: String?) {
private var authState: AuthState = oAuthState?.let {
AuthState.jsonDeserialize(it)
} ?: AuthState()

private var authorizationService: AuthorizationService
private lateinit var authServiceConfig: AuthorizationServiceConfiguration

Expand Down Expand Up @@ -96,6 +100,17 @@ class OAuthUseCase(context: Context, private val authUrl: String) {
private fun getAuthorizationRequestIntent(): Intent = authorizationService.getAuthorizationRequestIntent(getAuthorizationRequest())

fun launch(activityResultRegistry: ActivityResultRegistry, resultHandler: (OAuthResult) -> Unit) {
authState.performActionWithFreshTokens(authorizationService) { _, idToken, exception ->
if (exception != null) {
Log.e("OAuthTokenRefreshManager", "Error refreshing tokens, continue with login!", exception)
launchLoginFlow(activityResultRegistry, resultHandler)
} else {
resultHandler(OAuthResult.Success(idToken.toString(), authState.jsonSerializeString()))
}
}
}

private fun launchLoginFlow(activityResultRegistry: ActivityResultRegistry, resultHandler: (OAuthResult) -> Unit) {
val resultLauncher = activityResultRegistry.register(
OAUTH_ACTIVITY_RESULT_KEY, ActivityResultContracts.StartActivityForResult()
) { result ->
Expand Down Expand Up @@ -141,8 +156,12 @@ class OAuthUseCase(context: Context, private val authUrl: String) {
if (response != null) {
authState.update(response, exception)
appLogger.i("OAuth idToken: ${response.idToken}")
appLogger.i("OAuth refreshToken: ${response.refreshToken}")
resultHandler(OAuthResult.Success(response.idToken.toString(), response.refreshToken))
resultHandler(
OAuthResult.Success(
response.idToken.toString(),
authState.jsonSerializeString()
)
)
} else {
resultHandler(OAuthResult.Failed.EmptyResponse)
}
Expand Down Expand Up @@ -182,7 +201,7 @@ class OAuthUseCase(context: Context, private val authUrl: String) {
}

sealed class OAuthResult {
data class Success(val idToken: String, val refreshToken: String?) : OAuthResult()
data class Success(val idToken: String, val authState: String) : OAuthResult()
open class Failed(val reason: String) : OAuthResult() {
object Unknown : Failed("Unknown")
class InvalidActivityResult(reason: String) : Failed(reason)
Expand Down