Skip to content
Merged
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
3 changes: 2 additions & 1 deletion infrastructure/eid-wallet/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.2.1",
"version": "0.3.0",
"description": "",
"type": "module",
"scripts": {
Expand Down Expand Up @@ -29,6 +29,7 @@
"@tauri-apps/plugin-barcode-scanner": "^2.2.0",
"@tauri-apps/plugin-biometric": "^2.2.0",
"@tauri-apps/plugin-deep-link": "^2.4.1",
"@tauri-apps/plugin-notification": "^2.3.1",
"@tauri-apps/plugin-opener": "^2",
"@tauri-apps/plugin-store": "^2.2.0",
"@veriff/incontext-sdk": "^2.4.0",
Expand Down
70 changes: 69 additions & 1 deletion infrastructure/eid-wallet/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions infrastructure/eid-wallet/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ tauri-build = { version = "2", features = [] }
tauri = { version = "2", features = [] }
tauri-plugin-opener = "2"
tauri-plugin-deep-link = "2"
tauri-plugin-notification = "2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tauri-plugin-store = "2.2.0"
uuid = { version = "1.0", features = ["v4"] }


argon2 = { version = "0.5.3" }
Expand Down
36 changes: 21 additions & 15 deletions infrastructure/eid-wallet/src-tauri/capabilities/mobile.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
{
"$schema": "../gen/schemas/mobile-schema.json",
"identifier": "mobile-capability",
"description": "Capability for the main window on mobile",
"windows": ["main"],
"permissions": [
"core:default",
"opener:default",
"store:default",
"biometric:default",
"barcode-scanner:default",
"deep-link:default",
"crypto-hw:default"
],
"platforms": ["iOS", "android"]
}
"$schema": "../gen/schemas/mobile-schema.json",
"identifier": "mobile-capability",
"description": "Capability for the main window on mobile",
"windows": [
"main"
],
"permissions": [
"core:default",
"opener:default",
"store:default",
"biometric:default",
"barcode-scanner:default",
"deep-link:default",
"crypto-hw:default",
"notification:default"
],
"platforms": [
"iOS",
"android"
]
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ val tauriProperties = Properties().apply {
}

android {
compileSdk = 34
compileSdk = 35
namespace = "foundation.metastate.eid_wallet"
defaultConfig {
manifestPlaceholders["usesCleartextTraffic"] = "false"
applicationId = "foundation.metastate.eid_wallet"
minSdk = 24
targetSdk = 34
targetSdk = 35
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.VIBRATE" />

<!-- AndroidTV support -->
<uses-feature android:name="android.software.leanback" android:required="false" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellPath = /bin/zsh;
shellScript = "[ -s \"$NVM_DIR/nvm.sh\" ] && \\. \"$NVM_DIR/nvm.sh\"\npnpm tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}\n";
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -388,7 +388,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 0.2.1.2;
CURRENT_PROJECT_VERSION = 0.3.0.0;
DEVELOPMENT_TEAM = M49C8XS835;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
Expand All @@ -415,8 +415,8 @@
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
);
MARKETING_VERSION = 0.2.1;
PRODUCT_BUNDLE_IDENTIFIER = foundation.metastate.eid-wallet;
MARKETING_VERSION = 0.3.0;
PRODUCT_BUNDLE_IDENTIFIER = "foundation.metastate.eid-wallet";
PRODUCT_NAME = "eID for W3DS";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -436,7 +436,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 0.2.1.2;
CURRENT_PROJECT_VERSION = 0.3.0.0;
DEVELOPMENT_TEAM = M49C8XS835;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
Expand All @@ -463,8 +463,8 @@
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
);
MARKETING_VERSION = 0.2.1;
PRODUCT_BUNDLE_IDENTIFIER = foundation.metastate.eid-wallet;
MARKETING_VERSION = 0.3.0;
PRODUCT_BUNDLE_IDENTIFIER = "foundation.metastate.eid-wallet";
PRODUCT_NAME = "eID for W3DS";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.2.1</string>
<string>0.3.0</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
Expand All @@ -28,7 +28,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>0.2.1.2</string>
<string>0.3.0.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down Expand Up @@ -61,4 +61,4 @@
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
</dict>
</plist>
</plist>
40 changes: 39 additions & 1 deletion infrastructure/eid-wallet/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
mod errors;
mod funcs;

use uuid::Uuid;
use std::env;

// Learn more about Tauri commands at https://tauri.app/develop/calling-rust/
// #[tauri::command]
// fn greet(name: &str) -> String {
Expand Down Expand Up @@ -32,12 +35,47 @@ async fn verify(pin: String, hash: String) -> Result<bool, String> {
funcs::verify(pin, hash).map_err(|err| format!("Failed to verify PIN: {}", err))
}

/// Gets a unique device identifier
#[tauri::command]
async fn get_device_id() -> Result<String, String> {
// Try to get device ID from environment or generate one
if let Ok(device_id) = env::var("DEVICE_ID") {
Ok(device_id)
} else {
// Generate a UUID as device ID
Ok(Uuid::new_v4().to_string())
}
}
Comment on lines +38 to +48
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Device ID lacks persistence mechanism.

The function generates a new UUID every time DEVICE_ID is not set in the environment. This means each app restart will produce a different device ID, which could break device registration and notification delivery.

Consider persisting the generated device ID to storage (e.g., using Tauri's store plugin) or ensure DEVICE_ID is consistently set in the environment across restarts.

use tauri::Manager;
use std::fs;

#[tauri::command]
async fn get_device_id(app: tauri::AppHandle) -> Result<String, String> {
    let device_id_path = app.path_resolver()
        .app_data_dir()
        .ok_or("Failed to get app data dir")?
        .join("device_id");
    
    // Try to read existing device ID
    if let Ok(device_id) = fs::read_to_string(&device_id_path) {
        return Ok(device_id.trim().to_string());
    }
    
    // Generate and persist new device ID
    let device_id = Uuid::new_v4().to_string();
    fs::create_dir_all(device_id_path.parent().ok_or("Invalid path")?).map_err(|e| e.to_string())?;
    fs::write(&device_id_path, &device_id).map_err(|e| e.to_string())?;
    
    Ok(device_id)
}
🤖 Prompt for AI Agents
in infrastructure/eid-wallet/src-tauri/src/lib.rs around lines 38 to 48, the
current get_device_id generates a new UUID on every run when DEVICE_ID isn't in
the environment; change it to accept a tauri::AppHandle, resolve the app data
dir via app.path_resolver().app_data_dir(), attempt to read a "device_id" file
and return its trimmed contents if present, otherwise generate
Uuid::new_v4().to_string(), ensure the parent directory exists (create_dir_all),
write the new ID to the file, and propagate filesystem errors as String for the
Result so the device ID is persisted across restarts.


/// Gets the current platform
#[tauri::command]
async fn get_platform() -> Result<String, String> {
#[cfg(target_os = "android")]
return Ok("android".to_string());

#[cfg(target_os = "ios")]
return Ok("ios".to_string());

#[cfg(target_os = "windows")]
return Ok("windows".to_string());

#[cfg(target_os = "macos")]
return Ok("macos".to_string());

#[cfg(target_os = "linux")]
return Ok("linux".to_string());

#[cfg(not(any(target_os = "android", target_os = "ios", target_os = "windows", target_os = "macos", target_os = "linux")))]
return Ok("unknown".to_string());
}

#[cfg_attr(mobile, tauri::mobile_entry_point)]
pub fn run() {
tauri::Builder::default()
.plugin(tauri_plugin_opener::init())
.plugin(tauri_plugin_store::Builder::new().build())
.plugin(tauri_plugin_deep_link::init())
.plugin(tauri_plugin_notification::init())
.setup(move |_app| {
#[cfg(mobile)]
{
Expand All @@ -48,7 +86,7 @@ pub fn run() {
Ok(())
})
// Register the commands with Tauri.
.invoke_handler(tauri::generate_handler![hash, verify])
.invoke_handler(tauri::generate_handler![hash, verify, get_device_id, get_platform])
.run(tauri::generate_context!())
.expect("error while running tauri application");
}
2 changes: 1 addition & 1 deletion infrastructure/eid-wallet/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"active": true,
"targets": "all",
"android": {
"versionCode": 2
"versionCode": 6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Keep Tauri app version in sync with the release.

versionCode is bumped, but the same file still reports "version": "0.1.8", while package.json is now 0.3.0. This mismatch will surface in the built app (and any distribution metadata). Please update the Tauri version field to 0.3.0 so the Android bundle and desktop binaries advertise the intended release number.

🤖 Prompt for AI Agents
in infrastructure/eid-wallet/src-tauri/tauri.conf.json around line 29, the Tauri
config's "version" field is out of sync with package.json (file shows "version":
"0.1.8" while package.json is 0.3.0); update the "version" value to "0.3.0" so
it matches package.json/versionCode and ensure any other version fields in this
file match the new release number before committing.

},
"icon": [
"icons/32x32.png",
Expand Down
Loading
Loading