Skip to content

Change order of deletion of identifiers during import. #242

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
nithyaganeshng wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Change order of deletion of identifiers during import. #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
838b020
clear the identifiers only when parsing of export file succeeds.
Nov 15, 2024
f4fb0a5
remove fallback while building the database.
Nov 15, 2024
42816c0
handle migrating from newer versions of database to old.
Nov 16, 2024
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
1 change: 0 additions & 1 deletion sdk/src/main/java/com/microsoft/did/sdk/BackupService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ class BackupService @Inject constructor(
*/
suspend fun importBackup(protectedBackupData: ProtectedBackupData, protectionMethod: ProtectionMethod): Result<UnprotectedBackup> {
return runResultTry {
identityRepository.deleteAll()
val unprotectedBackupData = protectionMethod.unwrap(protectedBackupData, serializer)
val unprotectedBackup = backupProcessorFactory.import(unprotectedBackupData)
Result.Success(unprotectedBackup)
Expand Down
1 change: 1 addition & 0 deletions ...n/java/com/microsoft/did/sdk/backup/content/microsoft2020/Microsoft2020BackupProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class Microsoft2020BackupProcessor @Inject constructor(

override suspend fun import(backupData: UnprotectedBackupData): UnprotectedBackup {
if (backupData !is Microsoft2020UnprotectedBackupData) throw BackupException("BackupData has wrong type ${backupData::class.simpleName}")
identityRepository.deleteAll()
val identifiers = mutableListOf<Identifier>()
var keySet = setOf<JWK>()

Expand Down
13 changes: 13 additions & 0 deletions sdk/src/main/java/com/microsoft/did/sdk/datasource/db/SdkDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ package com.microsoft.did.sdk.datasource.db

import androidx.room.Database
import androidx.room.RoomDatabase
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase
import com.microsoft.did.sdk.datasource.db.dao.IdentifierDao
import com.microsoft.did.sdk.identifier.models.Identifier

Expand All @@ -21,4 +23,15 @@ import com.microsoft.did.sdk.identifier.models.Identifier
abstract class SdkDatabase : RoomDatabase() {

abstract fun identifierDao(): IdentifierDao
}

object SdkDbMigrations {
val MIGRATIONS: Array<Migration> = arrayOf(
object : Migration(3, 2) {
@Suppress("MaxLineLength")
override fun migrate(db: SupportSQLiteDatabase) {
db.execSQL("DROP TABLE IF EXISTS `HolderIdentifierData`")
}
}
)
}
9 changes: 6 additions & 3 deletions sdk/src/main/java/com/microsoft/did/sdk/di/SdkModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import com.microsoft.did.sdk.credential.service.validators.JwtDomainLinkageCrede
import com.microsoft.did.sdk.credential.service.validators.OidcPresentationRequestValidator
import com.microsoft.did.sdk.credential.service.validators.PresentationRequestValidator
import com.microsoft.did.sdk.datasource.db.SdkDatabase
import com.microsoft.did.sdk.datasource.db.SdkDbMigrations
import com.microsoft.did.sdk.datasource.network.interceptors.CorrelationVectorInterceptor
import com.microsoft.did.sdk.datasource.network.interceptors.UserAgentInterceptor
import com.microsoft.did.sdk.identifier.registrars.Registrar
Expand Down Expand Up @@ -90,9 +91,11 @@ class SdkModule {
@Provides
@Singleton
fun sdkDatabase(context: Context): SdkDatabase {
return Room.databaseBuilder(context, SdkDatabase::class.java, "vc-sdk-db")
.fallbackToDestructiveMigration() // TODO: Remove during public preview
.build()
val dbBuilder = Room.databaseBuilder(context, SdkDatabase::class.java, "vc-sdk-db")
SdkDbMigrations.MIGRATIONS.forEach {
dbBuilder.addMigrations(it)
}
return dbBuilder.build()
}

@Provides
Expand Down