Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,9 @@ private class KeyPairManagerAndroidImpl : KeyPairManager() {
private val keysDir by lazy {
appCtx.filesDir.resolve("passkeys").also { passkeysDir ->
passkeysDir.mkdir()
//TODO[ik-auth]: Remove the code below after the next pre-release.
appCtx.filesDir.listFiles { it.name.endsWith(".key") }!!.forEach { keyFile ->
keyFile.renameTo(passkeysDir.resolve(keyFile.name))
}
}
}

override fun ensureKeyPairsAreMoved() {
val _ = keysDir //TODO[ik-auth]: Remove this code and the super method after the next pre-release.
}
@Throws(Exception::class)
override suspend fun generateNewKey(userId: Long, keyId: String): Failure.KeyManagement.GenerationFailed? {
val keyPair = generateEcKeyPair().getOrElse {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ abstract class AuthenticatorFacade internal constructor() {
val authenticatorManager = AuthenticatorManager(
webAuthnRepository = webAuthnRepository,
accountsRepository = accountsRepository
).also { it.keyPairManager.ensureKeyPairsAreMoved() }
)
val migrationManager = MigrationManager(
accountsDatabase = accountsDatabase,
authenticatorManager = authenticatorManager,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ internal abstract class KeyPairManager protected constructor() {
operator fun invoke(): KeyPairManager = createKeyPairManager()
}

open fun ensureKeyPairsAreMoved() = Unit

/**
* Generates key pair for a new registration
* (migrating from kAuth v1 or a backup, or a fresh new login)
Expand Down
Loading