minor adjustments

StanfordSpezi · Oct 27, 2024 · 9da53d7 · 9da53d7
1 parent cafe5d4
commit 9da53d7
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 19 deletions.
diff --git a/.../storage/secure/CredentialStorageTests.kt → ...rage/credential/CredentialStorageTests.kt b/.../storage/secure/CredentialStorageTests.kt → ...rage/credential/CredentialStorageTests.kt
@@ -1,4 +1,4 @@
-package edu.stanford.spezi.modules.storage.secure
+package edu.stanford.spezi.modules.storage.credential
 
 import com.google.common.truth.Truth.assertThat
 import dagger.hilt.android.testing.HiltAndroidRule
@@ -45,7 +45,7 @@ class CredentialStorageTests {
         credentialStorage.store(serverCredential)
 
         // when
-        val serverCredentials = credentialStorage.retrieveAll(server = serverCredential.server)
+        val serverCredentials = credentialStorage.retrieveAll(server = serverCredential.server!!)
         val userServerCredential = credentialStorage.retrieve(
             username = serverCredential.username,
             server = serverCredential.server,

diff --git a/...modules/storage/secure/KeyStorageTests.kt → .../modules/storage/local/KeyStorageTests.kt b/...modules/storage/secure/KeyStorageTests.kt → .../modules/storage/local/KeyStorageTests.kt
@@ -1,4 +1,4 @@
-package edu.stanford.spezi.modules.storage.secure
+package edu.stanford.spezi.modules.storage.local
 
 import com.google.common.truth.Truth.assertThat
 import dagger.hilt.android.testing.HiltAndroidRule

diff --git a/...rage/src/androidTest/kotlin/edu/stanford/spezi/modules/storage/local/LocalStorageTests.kt b/...rage/src/androidTest/kotlin/edu/stanford/spezi/modules/storage/local/LocalStorageTests.kt
@@ -5,7 +5,6 @@ import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import edu.stanford.spezi.core.testing.runTestUnconfined
 import edu.stanford.spezi.core.utils.UUID
-import edu.stanford.spezi.modules.storage.secure.KeyStorage
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json

diff --git a/...pezi/modules/storage/secure/Credential.kt → .../modules/storage/credential/Credential.kt b/...pezi/modules/storage/secure/Credential.kt → .../modules/storage/credential/Credential.kt
@@ -1,4 +1,4 @@
-package edu.stanford.spezi.modules.storage.secure
+package edu.stanford.spezi.modules.storage.credential
 
 import kotlinx.serialization.Serializable
 

diff --git a/...dules/storage/secure/CredentialStorage.kt → ...s/storage/credential/CredentialStorage.kt b/...dules/storage/secure/CredentialStorage.kt → ...s/storage/credential/CredentialStorage.kt
@@ -1,4 +1,4 @@
-package edu.stanford.spezi.modules.storage.secure
+package edu.stanford.spezi.modules.storage.credential
 
 import edu.stanford.spezi.modules.storage.di.Storage
 import edu.stanford.spezi.modules.storage.key.KeyValueStorageFactory
@@ -17,7 +17,7 @@ interface CredentialStorage {
     )
 
     fun retrieve(username: String, server: String? = null): Credential?
-    fun retrieveAll(server: String? = null): List<Credential>
+    fun retrieveAll(server: String): List<Credential>
 
     fun delete(username: String, server: String? = null)
     fun deleteAll(types: CredentialTypes)
@@ -46,9 +46,10 @@ internal class CredentialStorageImpl @Inject constructor(
         return storage.getSerializable(storageKey(server, username))
     }
 
-    override fun retrieveAll(server: String?): List<Credential> {
+    override fun retrieveAll(server: String): List<Credential> {
+        val serverKey = storageKey(server, "")
         return storage.allKeys().mapNotNull { key ->
-            if (key.startsWith(storageKey(server, ""))) {
+            if (key.startsWith(serverKey)) {
                 storage.getSerializable(key)
             } else {
                 null
@@ -90,7 +91,7 @@ internal class CredentialStorageImpl @Inject constructor(
         "${server ?: ""}$SERVER_USERNAME_SEPARATOR$username"
 
     private companion object {
-        const val SECURE_STORAGE_FILE_NAME = "${Storage.STORAGE_FILE_PREFIX}SecureStorage"
+        const val SECURE_STORAGE_FILE_NAME = "${Storage.STORAGE_FILE_PREFIX}CredentialStorage"
         const val SERVER_USERNAME_SEPARATOR = "__@__"
     }
 }
diff --git a/...modules/storage/secure/CredentialTypes.kt → ...les/storage/credential/CredentialTypes.kt b/...modules/storage/secure/CredentialTypes.kt → ...les/storage/credential/CredentialTypes.kt
@@ -1,7 +1,7 @@
-package edu.stanford.spezi.modules.storage.secure
+package edu.stanford.spezi.modules.storage.credential
 
-import edu.stanford.spezi.modules.storage.secure.CredentialType.NON_SERVER
-import edu.stanford.spezi.modules.storage.secure.CredentialType.SERVER
+import edu.stanford.spezi.modules.storage.credential.CredentialType.NON_SERVER
+import edu.stanford.spezi.modules.storage.credential.CredentialType.SERVER
 import java.util.EnumSet
 
 data class CredentialTypes(

diff --git a/modules/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/di/StorageModule.kt b/modules/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/di/StorageModule.kt
@@ -5,16 +5,16 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import edu.stanford.spezi.modules.storage.credential.CredentialStorage
+import edu.stanford.spezi.modules.storage.credential.CredentialStorageImpl
 import edu.stanford.spezi.modules.storage.key.KeyValueStorage
 import edu.stanford.spezi.modules.storage.key.KeyValueStorageFactory
 import edu.stanford.spezi.modules.storage.key.KeyValueStorageFactoryImpl
 import edu.stanford.spezi.modules.storage.key.KeyValueStorageType
+import edu.stanford.spezi.modules.storage.local.KeyStorage
+import edu.stanford.spezi.modules.storage.local.KeyStorageImpl
 import edu.stanford.spezi.modules.storage.local.LocalStorage
 import edu.stanford.spezi.modules.storage.local.LocalStorageImpl
-import edu.stanford.spezi.modules.storage.secure.CredentialStorage
-import edu.stanford.spezi.modules.storage.secure.CredentialStorageImpl
-import edu.stanford.spezi.modules.storage.secure.KeyStorage
-import edu.stanford.spezi.modules.storage.secure.KeyStorageImpl
 import javax.inject.Singleton
 
 @Module

diff --git a/...pezi/modules/storage/secure/KeyStorage.kt → ...spezi/modules/storage/local/KeyStorage.kt b/...pezi/modules/storage/secure/KeyStorage.kt → ...spezi/modules/storage/local/KeyStorage.kt
@@ -1,4 +1,4 @@
-package edu.stanford.spezi.modules.storage.secure
+package edu.stanford.spezi.modules.storage.local
 
 import android.security.keystore.KeyGenParameterSpec
 import android.security.keystore.KeyProperties

diff --git a/modules/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/local/LocalStorage.kt b/modules/storage/src/main/kotlin/edu/stanford/spezi/modules/storage/local/LocalStorage.kt
@@ -8,7 +8,6 @@ import edu.stanford.spezi.modules.storage.di.Storage
 import edu.stanford.spezi.modules.storage.local.LocalStorageSetting.Encrypted
 import edu.stanford.spezi.modules.storage.local.LocalStorageSetting.EncryptedUsingKeyStore
 import edu.stanford.spezi.modules.storage.local.LocalStorageSetting.Unencrypted
-import edu.stanford.spezi.modules.storage.secure.KeyStorage
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.DeserializationStrategy