Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Add min server supported native vault method, add user authenticate method with custom prompt (#1347)

Leendert de Borst1097218ee16f
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
index 95e092df5..18c396a4a 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
@@ -1163,6 +1163,24 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
}
}
+ // MARK: - Server Version Management
+
+ /**
+ * Check if the stored server version is greater than or equal to the specified version.
+ * @param targetVersion The version to compare against (e.g., "0.25.0")
+ * @param promise The promise to resolve.
+ */
+ @ReactMethod
+ override fun isServerVersionGreaterThanOrEqualTo(targetVersion: String, promise: Promise) {
+ try {
+ val isGreaterOrEqual = vaultStore.metadata.isServerVersionGreaterThanOrEqualTo(targetVersion)
+ promise.resolve(isGreaterOrEqual)
+ } catch (e: Exception) {
+ Log.e(TAG, "Error comparing server version", e)
+ promise.reject("ERR_COMPARE_SERVER_VERSION", "Failed to compare server version: ${e.message}", e)
+ }
+ }
+
// MARK: - Offline Mode Management
/**
@@ -1388,4 +1406,63 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
val intent = Intent(activity, net.aliasvault.app.pinunlock.PinUnlockActivity::class.java)
activity.startActivityForResult(intent, PIN_UNLOCK_REQUEST_CODE)
}
+
+ /**
+ * Authenticate the user using biometric or PIN unlock.
+ * This method automatically detects which authentication method is enabled and uses it.
+ * Returns true if authentication succeeded, false otherwise.
+ *
+ * @param title The title for authentication. If null or empty, uses default.
+ * @param subtitle The subtitle for authentication. If null or empty, uses default.
+ * @param promise The promise to resolve with authentication result.
+ */
+ @ReactMethod
+ override fun authenticateUser(title: String?, subtitle: String?, promise: Promise) {
+ CoroutineScope(Dispatchers.Main).launch {
+ try {
+ // Check if PIN is enabled first
+ val pinEnabled = vaultStore.isPinEnabled()
+
+ if (pinEnabled) {
+ // PIN is enabled, show PIN unlock UI
+ try {
+ // Store promise for later resolution by MainActivity
+ pendingActivityResultPromise = promise
+
+ // Launch PIN unlock activity
+ val activity = currentActivity
+ if (activity == null) {
+ promise.reject("NO_ACTIVITY", "No activity available", null)
+ return@launch
+ }
+
+ val intent = Intent(activity, net.aliasvault.app.pinunlock.PinUnlockActivity::class.java)
+ // Add custom title/subtitle if provided
+ if (!title.isNullOrEmpty()) {
+ intent.putExtra(net.aliasvault.app.pinunlock.PinUnlockActivity.EXTRA_CUSTOM_TITLE, title)
+ }
+ if (!subtitle.isNullOrEmpty()) {
+ intent.putExtra(net.aliasvault.app.pinunlock.PinUnlockActivity.EXTRA_CUSTOM_SUBTITLE, subtitle)
+ }
+ activity.startActivityForResult(intent, PIN_UNLOCK_REQUEST_CODE)
+ } catch (e: Exception) {
+ Log.e(TAG, "PIN authentication failed", e)
+ promise.reject("AUTH_ERROR", "PIN authentication failed: ${e.message}", e)
+ }
+ } else {
+ // Use biometric authentication
+ try {
+ val authenticated = vaultStore.authenticateUser(title, subtitle)
+ promise.resolve(authenticated)
+ } catch (e: Exception) {
+ Log.e(TAG, "Biometric authentication failed", e)
+ promise.resolve(false)
+ }
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "Authentication failed", e)
+ promise.reject("AUTH_ERROR", "Authentication failed: ${e.message}", e)
+ }
+ }
+ }
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinUnlockActivity.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinUnlockActivity.kt
index c73f4864a..d1255ef2f 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinUnlockActivity.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinUnlockActivity.kt
@@ -64,6 +64,12 @@ class PinUnlockActivity : AppCompatActivity() {
/** Intent extra key for the encryption key to use during setup. */
const val EXTRA_SETUP_ENCRYPTION_KEY = "setup_encryption_key"
+ /** Intent extra key for custom title (optional). */
+ const val EXTRA_CUSTOM_TITLE = "custom_title"
+
+ /** Intent extra key for custom subtitle (optional). */
+ const val EXTRA_CUSTOM_SUBTITLE = "custom_subtitle"
+
/** Mode: Unlock vault with existing PIN. */
const val MODE_UNLOCK = "unlock"
@@ -113,9 +119,11 @@ class PinUnlockActivity : AppCompatActivity() {
else -> PinMode.UNLOCK
}
setupEncryptionKey = intent.getStringExtra(EXTRA_SETUP_ENCRYPTION_KEY)
+ val customTitle = intent.getStringExtra(EXTRA_CUSTOM_TITLE)
+ val customSubtitle = intent.getStringExtra(EXTRA_CUSTOM_SUBTITLE)
// Initialize configuration
- configuration = viewModel.initializeConfiguration(mode)
+ configuration = viewModel.initializeConfiguration(mode, customTitle, customSubtitle)
// Initialize views
initializeViews()
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt
index fcb88ead9..f35b8a535 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt
@@ -17,23 +17,30 @@ class PinViewModel(
) {
/**
* Initialize PIN configuration based on mode.
+ * @param mode The PIN mode (unlock or setup)
+ * @param customTitle Optional custom title to override default
+ * @param customSubtitle Optional custom subtitle to override default
*/
- fun initializeConfiguration(mode: PinMode): PinConfiguration {
+ fun initializeConfiguration(
+ mode: PinMode,
+ customTitle: String? = null,
+ customSubtitle: String? = null,
+ ): PinConfiguration {
return when (mode) {
PinMode.UNLOCK -> {
val pinLength = vaultStore.getPinLength()
PinConfiguration(
mode = PinMode.UNLOCK,
- title = context.getString(R.string.pin_unlock_vault),
- subtitle = context.getString(R.string.pin_enter_to_unlock),
+ title = customTitle ?: context.getString(R.string.pin_unlock_vault),
+ subtitle = customSubtitle ?: context.getString(R.string.pin_enter_to_unlock),
pinLength = pinLength,
)
}
PinMode.SETUP -> {
PinConfiguration(
mode = PinMode.SETUP,
- title = context.getString(R.string.pin_setup_title),
- subtitle = context.getString(R.string.pin_setup_description),
+ title = customTitle ?: context.getString(R.string.pin_setup_title),
+ subtitle = customSubtitle ?: context.getString(R.string.pin_setup_description),
pinLength = null, // Allow any length from 4-8
setupStep = PinSetupStep.ENTER_NEW,
)
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultMetadataManager.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultMetadataManager.kt
index 971c888ea..caa1986ba 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultMetadataManager.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultMetadataManager.kt
@@ -103,6 +103,41 @@ class VaultMetadataManager(
// endregion
+ // region Server Version Management
+
+ /**
+ * Set the server API version.
+ */
+ fun setServerVersion(version: String) {
+ storageProvider.setServerVersion(version)
+ }
+
+ /**
+ * Get the server API version.
+ */
+ fun getServerVersion(): String? {
+ return storageProvider.getServerVersion()
+ }
+
+ /**
+ * Clear the server version.
+ */
+ fun clearServerVersion() {
+ storageProvider.clearServerVersion()
+ }
+
+ /**
+ * Check if the stored server version is greater than or equal to the specified version.
+ * @param targetVersion The version to compare against (e.g., "0.25.0")
+ * @return true if stored server version >= targetVersion, false if server version not available or less than target
+ */
+ fun isServerVersionGreaterThanOrEqualTo(targetVersion: String): Boolean {
+ val serverVersion = getServerVersion() ?: return false // No server version stored yet
+ return VersionComparison.isGreaterThanOrEqualTo(serverVersion, targetVersion)
+ }
+
+ // endregion
+
// region Internal Helpers
/**
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt
index 552c80fe1..2f2791750 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt
@@ -619,4 +619,51 @@ class VaultStore(
}
// endregion
+
+ // region Re-authentication
+
+ /**
+ * Authenticate the user using biometric authentication only.
+ * Note: This method only handles biometric authentication. If PIN is enabled,
+ * this will return false and the caller should use showPinUnlock instead.
+ * Returns true if authentication succeeded, false otherwise.
+ *
+ * @param title The title for authentication. Optional, defaults to "Unlock Vault".
+ * @param subtitle The subtitle for authentication. Optional, defaults to title or "Unlock Vault".
+ * @return True if biometric authentication succeeded, false if PIN is enabled or authentication failed.
+ */
+ suspend fun authenticateUser(title: String?, subtitle: String?): Boolean {
+ // Use title if provided, otherwise default
+ val authReason = title?.takeIf { it.isNotEmpty() } ?: "Unlock Vault"
+
+ // Check if PIN is enabled - if so, return false (caller should use PIN UI)
+ if (isPinEnabled()) {
+ Log.d("VaultStore", "PIN authentication is enabled, returning false")
+ return false
+ }
+
+ // Check if biometric authentication is enabled
+ val authMethods = auth.getAuthMethods()
+ val isBiometricEnabled = authMethods.contains("faceid")
+
+ if (!isBiometricEnabled) {
+ Log.e("VaultStore", "No authentication method enabled")
+ return false
+ }
+
+ // Check if biometric is available
+ if (!keystoreProvider.isBiometricAvailable()) {
+ Log.e("VaultStore", "Biometric authentication not available")
+ return false
+ }
+
+ return try {
+ keystoreProvider.authenticateWithBiometric(authReason)
+ } catch (e: Exception) {
+ Log.e("VaultStore", "Biometric authentication failed", e)
+ false
+ }
+ }
+
+ // endregion
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
index 6049b2f48..584d536fe 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultSync.kt
@@ -121,6 +121,9 @@ class VaultSync(
throw VaultSyncError.ServerVersionNotSupported()
}
+ // Store server version in metadata
+ vaultStore.metadata.setServerVersion(status.serverVersion)
+
validateSrpSalt(status.srpSalt)
return status
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/AndroidStorageProvider.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/AndroidStorageProvider.kt
index 9bcda970c..92a9dff99 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/AndroidStorageProvider.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/AndroidStorageProvider.kt
@@ -131,4 +131,23 @@ class AndroidStorageProvider(private val context: Context) : StorageProvider {
val sharedPreferences = context.getSharedPreferences("aliasvault", Context.MODE_PRIVATE)
return sharedPreferences.getBoolean("offline_mode", false)
}
+
+ override fun setServerVersion(version: String) {
+ val sharedPreferences = context.getSharedPreferences("aliasvault", Context.MODE_PRIVATE)
+ sharedPreferences.edit {
+ putString("server_version", version)
+ }
+ }
+
+ override fun getServerVersion(): String? {
+ val sharedPreferences = context.getSharedPreferences("aliasvault", Context.MODE_PRIVATE)
+ return sharedPreferences.getString("server_version", null)
+ }
+
+ override fun clearServerVersion() {
+ val sharedPreferences = context.getSharedPreferences("aliasvault", Context.MODE_PRIVATE)
+ sharedPreferences.edit {
+ remove("server_version")
+ }
+ }
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/StorageProvider.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/StorageProvider.kt
index b32eef88f..8bf1dc7fd 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/StorageProvider.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/storageprovider/StorageProvider.kt
@@ -106,4 +106,21 @@ interface StorageProvider {
* @return True if app is in offline mode, false otherwise
*/
fun getOfflineMode(): Boolean
+
+ /**
+ * Set the server API version.
+ * @param version The server version to store
+ */
+ fun setServerVersion(version: String)
+
+ /**
+ * Get the server API version.
+ * @return The server version or null if not set
+ */
+ fun getServerVersion(): String?
+
+ /**
+ * Clear the server version.
+ */
+ fun clearServerVersion()
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/utils/VersionComparison.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/utils/VersionComparison.kt
index 8b4604297..1929196f3 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/utils/VersionComparison.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/utils/VersionComparison.kt
@@ -13,9 +13,10 @@ import net.aliasvault.app.utils.AppInfo
*/
object VersionComparison {
/**
- * Checks if version1 is greater than or equal to version2, following SemVer rules.
+ * Checks if version1 is greater than or equal to version2, ignoring pre-release suffixes.
*
- * Pre-release versions (e.g., -alpha, -beta, -dev) are considered lower than release versions.
+ * Pre-release suffixes (e.g., -alpha, -beta, -dev) are stripped from version1 before comparison.
+ * This allows server versions like "0.25.0-alpha-dev" to be treated as "0.25.0".
*
* @param version1 First version string (e.g., "1.2.3" or "1.2.3-beta")
* @param version2 Second version string (e.g., "1.2.0" or "1.2.0-alpha")
@@ -24,26 +25,23 @@ object VersionComparison {
* Example:
* ```kotlin
* VersionComparison.isGreaterThanOrEqualTo("1.2.3", "1.2.0") // true
- * VersionComparison.isGreaterThanOrEqualTo("1.2.0-alpha", "1.2.0") // false
- * VersionComparison.isGreaterThanOrEqualTo("1.2.0", "1.2.0-alpha") // true
+ * VersionComparison.isGreaterThanOrEqualTo("1.2.0-alpha", "1.2.0") // true (ignores -alpha)
+ * VersionComparison.isGreaterThanOrEqualTo("1.2.0-dev", "1.2.1") // false (0.25.0 < 0.25.1)
* ```
*/
fun isGreaterThanOrEqualTo(version1: String, version2: String): Boolean {
- // Split versions into core and pre-release parts
+ // Strip pre-release suffix from version1 (server version)
val components1 = version1.split("-", limit = 2)
val components2 = version2.split("-", limit = 2)
val core1 = components1[0]
val core2 = components2[0]
- val preRelease1 = components1.getOrNull(1)
- val preRelease2 = components2.getOrNull(1)
-
// Parse core version numbers
val parts1 = core1.split(".").mapNotNull { it.toIntOrNull() }
val parts2 = core2.split(".").mapNotNull { it.toIntOrNull() }
- // Compare core versions first
+ // Compare core versions only
val maxLength = maxOf(parts1.size, parts2.size)
for (i in 0 until maxLength) {
val part1 = parts1.getOrElse(i) { 0 }
@@ -55,14 +53,8 @@ object VersionComparison {
}
}
- // If core versions are equal, check pre-release versions
- // No pre-release (release version) is greater than pre-release version
- return when {
- preRelease1 == null && preRelease2 != null -> true
- preRelease1 != null && preRelease2 == null -> false
- preRelease1 == null && preRelease2 == null -> true
- else -> preRelease1!! >= preRelease2!!
- }
+ // Core versions are equal
+ return true
}
/**
diff --git a/apps/mobile-app/app/(tabs)/settings/qr-confirm.tsx b/apps/mobile-app/app/(tabs)/settings/qr-confirm.tsx
index b6ebb109b..31b4de6d3 100644
--- a/apps/mobile-app/app/(tabs)/settings/qr-confirm.tsx
+++ b/apps/mobile-app/app/(tabs)/settings/qr-confirm.tsx
@@ -73,14 +73,6 @@ export default function QRConfirmScreen() : React.ReactNode {
console.error('Mobile unlock error:', error);
let errorMsg = t('common.errors.unknownErrorTryAgain');
- if (error instanceof Error) {
- if (error.message.includes('404')) {
- errorMsg = t('settings.qrScanner.mobileUnlock.requestExpired');
- } else {
- errorMsg = t('common.errors.unknownErrorTryAgain');
- }
- }
-
// Error! Navigate to result page
router.replace({
pathname: '/(tabs)/settings/qr-result',
@@ -103,6 +95,29 @@ export default function QRConfirmScreen() : React.ReactNode {
setIsProcessing(true);
try {
+ // Check server version compatibility
+ const isVersionSupported = await NativeVaultManager.isServerVersionGreaterThanOrEqualTo('0.25.0');
+
+ if (!isVersionSupported) {
+ Alert.alert(
+ t('common.error'),
+ t('common.errors.serverVersionTooOld'),
+ [
+ {
+ text: t('common.ok'),
+ /**
+ * Go back to the settings tab.
+ */
+ onPress: (): void => {
+ router.back();
+ },
+ },
+ ]
+ );
+ setIsProcessing(false);
+ return;
+ }
+
// Check if biometric or PIN is enabled
const authMethods = await NativeVaultManager.getAuthMethods();
const isPinEnabled = await NativeVaultManager.isPinEnabled();
diff --git a/apps/mobile-app/i18n/locales/en.json b/apps/mobile-app/i18n/locales/en.json
index c6fb9b634..6d3cda288 100644
--- a/apps/mobile-app/i18n/locales/en.json
+++ b/apps/mobile-app/i18n/locales/en.json
@@ -22,7 +22,8 @@
"disabled": "Disabled",
"errors": {
"unknownError": "An unknown error occurred. Please try again.",
- "unknownErrorTryAgain": "An unknown error occurred. Please try again."
+ "unknownErrorTryAgain": "An unknown error occurred. Please try again.",
+ "serverVersionTooOld": "The AliasVault server needs to be updated to a newer version in order to use this feature. Please contact the server admin if you need help."
}
},
"auth": {
diff --git a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
index 47f2978ef..160c18413 100644
--- a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
+++ b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
@@ -231,6 +231,12 @@
[vaultManager clearUsername:resolve rejecter:reject];
}
+// MARK: - Server Version Management
+
+- (void)isServerVersionGreaterThanOrEqualTo:(NSString *)targetVersion resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
+ [vaultManager isServerVersionGreaterThanOrEqualTo:targetVersion resolver:resolve rejecter:reject];
+}
+
// MARK: - Offline Mode Management
- (void)setOfflineMode:(BOOL)isOffline resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
diff --git a/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift b/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
index 5a4062db2..4d0bc3191 100644
--- a/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
+++ b/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
@@ -649,6 +649,16 @@ public class VaultManager: NSObject {
resolve(nil)
}
+ // MARK: - Server Version Management
+
+ @objc
+ func isServerVersionGreaterThanOrEqualTo(_ targetVersion: String,
+ resolver resolve: @escaping RCTPromiseResolveBlock,
+ rejecter reject: @escaping RCTPromiseRejectBlock) {
+ let isGreaterOrEqual = vaultStore.isServerVersionGreaterThanOrEqualTo(targetVersion)
+ resolve(isGreaterOrEqual)
+ }
+
// MARK: - Offline Mode Management
@objc
diff --git a/apps/mobile-app/ios/VaultModels/VaultMetadata.swift b/apps/mobile-app/ios/VaultModels/VaultMetadata.swift
index 270b73224..51b8930f4 100644
--- a/apps/mobile-app/ios/VaultModels/VaultMetadata.swift
+++ b/apps/mobile-app/ios/VaultModels/VaultMetadata.swift
@@ -4,7 +4,7 @@ public struct VaultMetadata: Codable {
public var publicEmailDomains: [String]?
public var privateEmailDomains: [String]?
public var vaultRevisionNumber: Int
-
+
public init(publicEmailDomains: [String]? = nil, privateEmailDomains: [String]? = nil, vaultRevisionNumber: Int) {
self.publicEmailDomains = publicEmailDomains
self.privateEmailDomains = privateEmailDomains
diff --git a/apps/mobile-app/ios/VaultStoreKit/Constants/VaultConstants.swift b/apps/mobile-app/ios/VaultStoreKit/Constants/VaultConstants.swift
index 1f8f1ff9f..febfc9082 100644
--- a/apps/mobile-app/ios/VaultStoreKit/Constants/VaultConstants.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/Constants/VaultConstants.swift
@@ -16,6 +16,7 @@ public struct VaultConstants {
static let usernameKey = "aliasvault_username"
static let offlineModeKey = "aliasvault_offline_mode"
static let pinEnabledKey = "aliasvault_pin_enabled"
+ static let serverVersionKey = "aliasvault_server_version"
static let defaultAutoLockTimeout: Int = 3600 // 1 hour in seconds
}
diff --git a/apps/mobile-app/ios/VaultStoreKit/Utils/VersionComparison.swift b/apps/mobile-app/ios/VaultStoreKit/Utils/VersionComparison.swift
index cba7df6b4..51df422e0 100644
--- a/apps/mobile-app/ios/VaultStoreKit/Utils/VersionComparison.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/Utils/VersionComparison.swift
@@ -2,9 +2,10 @@ import Foundation
/// Utility for comparing semantic version strings
public enum VersionComparison {
- /// Checks if version1 is greater than or equal to version2, following SemVer rules.
+ /// Checks if version1 is greater than or equal to version2, ignoring pre-release suffixes.
///
- /// Pre-release versions (e.g., -alpha, -beta, -dev) are considered lower than release versions.
+ /// Pre-release suffixes (e.g., -alpha, -beta, -dev) are stripped from version1 before comparison.
+ /// This allows server versions like "0.25.0-alpha-dev" to be treated as "0.25.0".
///
/// - Parameters:
/// - version1: First version string (e.g., "1.2.3" or "1.2.3-beta")
@@ -14,25 +15,22 @@ public enum VersionComparison {
/// - Example:
/// ```swift
/// VersionComparison.isGreaterThanOrEqualTo("1.2.3", "1.2.0") // true
- /// VersionComparison.isGreaterThanOrEqualTo("1.2.0-alpha", "1.2.0") // false
- /// VersionComparison.isGreaterThanOrEqualTo("1.2.0", "1.2.0-alpha") // true
+ /// VersionComparison.isGreaterThanOrEqualTo("1.2.0-alpha", "1.2.0") // true (ignores -alpha)
+ /// VersionComparison.isGreaterThanOrEqualTo("1.2.0-dev", "1.2.1") // false (0.25.0 < 0.25.1)
/// ```
public static func isGreaterThanOrEqualTo(_ version1: String, _ version2: String) -> Bool {
- // Split versions into core and pre-release parts
+ // Strip pre-release suffix from version1 (server version)
let components1 = version1.split(separator: "-", maxSplits: 1)
let components2 = version2.split(separator: "-", maxSplits: 1)
let core1 = String(components1[0])
let core2 = String(components2[0])
- let preRelease1 = components1.count > 1 ? String(components1[1]) : nil
- let preRelease2 = components2.count > 1 ? String(components2[1]) : nil
-
// Parse core version numbers
let parts1 = core1.split(separator: ".").compactMap { Int($0) }
let parts2 = core2.split(separator: ".").compactMap { Int($0) }
- // Compare core versions first
+ // Compare core versions only
let maxLength = max(parts1.count, parts2.count)
for iVal in 0..<maxLength {
let part1 = iVal < parts1.count ? parts1[iVal] : 0
@@ -46,20 +44,8 @@ public enum VersionComparison {
}
}
- // If core versions are equal, check pre-release versions
- // No pre-release (release version) is greater than pre-release version
- if preRelease1 == nil && preRelease2 != nil {
- return true
- }
- if preRelease1 != nil && preRelease2 == nil {
- return false
- }
- if preRelease1 == nil && preRelease2 == nil {
- return true
- }
-
- // Both have pre-release versions, compare them lexically
- return preRelease1! >= preRelease2!
+ // Core versions are equal
+ return true
}
/// Checks if a given server version meets the minimum requirement
diff --git a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Metadata.swift b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Metadata.swift
index 42fcb05dd..552555158 100644
--- a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Metadata.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Metadata.swift
@@ -85,4 +85,33 @@ extension VaultStore {
public func getOfflineMode() -> Bool {
return userDefaults.bool(forKey: VaultConstants.offlineModeKey)
}
+
+ // MARK: - Server Version Storage
+
+ /// Set the server API version
+ public func setServerVersion(_ version: String) {
+ userDefaults.set(version, forKey: VaultConstants.serverVersionKey)
+ userDefaults.synchronize()
+ }
+
+ /// Get the server API version
+ public func getServerVersion() -> String? {
+ return userDefaults.string(forKey: VaultConstants.serverVersionKey)
+ }
+
+ /// Clear the server version
+ public func clearServerVersion() {
+ userDefaults.removeObject(forKey: VaultConstants.serverVersionKey)
+ userDefaults.synchronize()
+ }
+
+ /// Check if the stored server version is greater than or equal to the specified version
+ /// - Parameter targetVersion: The version to compare against (e.g., "0.25.0")
+ /// - Returns: true if stored server version >= targetVersion, false if server version not available or less than target
+ public func isServerVersionGreaterThanOrEqualTo(_ targetVersion: String) -> Bool {
+ guard let serverVersion = getServerVersion() else {
+ return false // No server version stored yet
+ }
+ return VersionComparison.isGreaterThanOrEqualTo(serverVersion, targetVersion)
+ }
}
diff --git a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Sync.swift b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Sync.swift
index 31c0b3492..aefac0ab0 100644
--- a/apps/mobile-app/ios/VaultStoreKit/VaultStore+Sync.swift
+++ b/apps/mobile-app/ios/VaultStoreKit/VaultStore+Sync.swift
@@ -130,6 +130,9 @@ extension VaultStore {
throw VaultSyncError.serverVersionNotSupported
}
+ // Store server version in metadata
+ setServerVersion(status.serverVersion)
+
try validateSrpSalt(status.srpSalt)
return status
}
diff --git a/apps/mobile-app/specs/NativeVaultManager.ts b/apps/mobile-app/specs/NativeVaultManager.ts
index 88dfc0929..3212f0379 100644
--- a/apps/mobile-app/specs/NativeVaultManager.ts
+++ b/apps/mobile-app/specs/NativeVaultManager.ts
@@ -85,6 +85,9 @@ export interface Spec extends TurboModule {
setOfflineMode(isOffline: boolean): Promise<void>;
getOfflineMode(): Promise<boolean>;
+ // Server version management
+ isServerVersionGreaterThanOrEqualTo(targetVersion: string): Promise<boolean>;
+
// Vault sync and mutate
isNewVaultVersionAvailable(): Promise<{ isNewVersionAvailable: boolean; newRevision: number | null }>;
downloadVault(newRevision: number): Promise<boolean>;