Skip to content

fix: Retry restore key creation without cloud backup when E2EE is unavailable #224

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

Open
task4233 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Retry restore key creation without cloud backup when E2EE is unavailable #224

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
22 changes: 17 additions & 5 deletions Shrine/app/src/main/java/com/authentication/shrine/CredentialManagerUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import androidx.credentials.SignalUnknownCredentialRequest
import androidx.credentials.exceptions.CreateCredentialException
import androidx.credentials.exceptions.GetCredentialCancellationException
import androidx.credentials.exceptions.publickeycredential.GetPublicKeyCredentialDomException
import androidx.credentials.exceptions.restorecredential.E2eeUnavailableException
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import com.authentication.shrine.repository.AuthRepository.Companion.RP_ID_KEY
Expand Down Expand Up @@ -227,12 +228,23 @@ class CredentialManagerUtils @Inject constructor(
return GenericCredentialManagerResponse.Error(errorMessage = passkeysEligibility.reason)
}

val restoreCredentialRequest = CreateRestoreCredentialRequest(requestResult.toString())
try {
credentialResponse = credentialManager.createCredential(
context,
restoreCredentialRequest,
) as CreateRestoreCredentialResponse
credentialResponse = try {
credentialManager.createCredential(
context,
CreateRestoreCredentialRequest(requestResult.toString()),
) as CreateRestoreCredentialResponse
} catch (e: E2eeUnavailableException) {
// The device does not meet the cloud backup requirements, so retry locally.
// https://developer.android.com/identity/sign-in/restore-credentials#previous-device
credentialManager.createCredential(
context,
CreateRestoreCredentialRequest(
requestResult.toString(),
isCloudBackupEnabled = false,
),
) as CreateRestoreCredentialResponse
}
} catch (e: Exception) {
return GenericCredentialManagerResponse.Error(errorMessage = e.message ?: "")
}
Expand Down