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 numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.2.1",
"version": "0.3.0",
"description": "",
"type": "module",
"scripts": {
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
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]asyncfnget_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 IDifletOk(device_id) = fs::read_to_string(&device_id_path){returnOk(device_id.trim().to_string());}// Generate and persist new device IDlet 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 numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
"active": true,
"targets": "all",
"android": {
"versionCode": 2
"versionCode": 6

Copy link
Copy Markdown
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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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 numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.2.1",
"version": "0.3.0",
"description": "",
"type": "module",
"scripts": {
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
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]asyncfnget_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 IDifletOk(device_id) = fs::read_to_string(&device_id_path){returnOk(device_id.trim().to_string());}// Generate and persist new device IDlet 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 numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
"active": true,
"targets": "all",
"android": {
"versionCode": 2
"versionCode": 6

Copy link
Copy Markdown
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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.2.1",
"version": "0.3.0",
"description": "",
"type": "module",
"scripts": {
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
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]asyncfnget_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 IDifletOk(device_id) = fs::read_to_string(&device_id_path){returnOk(device_id.trim().to_string());}// Generate and persist new device IDlet 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 numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
"active": true,
"targets": "all",
"android": {
"versionCode": 2
"versionCode": 6

Copy link
Copy Markdown
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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.2.1",
"version": "0.3.0",
"description": "",
"type": "module",
"scripts": {
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
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]asyncfnget_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 IDifletOk(device_id) = fs::read_to_string(&device_id_path){returnOk(device_id.trim().to_string());}// Generate and persist new device IDlet 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 numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
"active": true,
"targets": "all",
"android": {
"versionCode": 2
"versionCode": 6

Copy link
Copy Markdown
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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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 numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.2.1",
"version": "0.3.0",
"description": "",
"type": "module",
"scripts": {
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
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]asyncfnget_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 IDifletOk(device_id) = fs::read_to_string(&device_id_path){returnOk(device_id.trim().to_string());}// Generate and persist new device IDlet 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 numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
"active": true,
"targets": "all",
"android": {
"versionCode": 2
"versionCode": 6

Copy link
Copy Markdown
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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.2.1",
"version": "0.3.0",
"description": "",
"type": "module",
"scripts": {
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
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]asyncfnget_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 IDifletOk(device_id) = fs::read_to_string(&device_id_path){returnOk(device_id.trim().to_string());}// Generate and persist new device IDlet 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 numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
"active": true,
"targets": "all",
"android": {
"versionCode": 2
"versionCode": 6

Copy link
Copy Markdown
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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.2.1",
"version": "0.3.0",
"description": "",
"type": "module",
"scripts": {
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
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]asyncfnget_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 IDifletOk(device_id) = fs::read_to_string(&device_id_path){returnOk(device_id.trim().to_string());}// Generate and persist new device IDlet 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 numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
"active": true,
"targets": "all",
"android": {
"versionCode": 2
"versionCode": 6

Copy link
Copy Markdown
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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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 numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "eid-wallet",
"version": "0.2.1",
"version": "0.3.0",
"description": "",
"type": "module",
"scripts": {
Expand DownExpand 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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 DownExpand 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
Copy Markdown
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]asyncfnget_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 IDifletOk(device_id) = fs::read_to_string(&device_id_path){returnOk(device_id.trim().to_string());}// Generate and persist new device IDlet 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 numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@
"active": true,
"targets": "all",
"android": {
"versionCode": 2
"versionCode": 6

Copy link
Copy Markdown
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