From 1d73faa120b3a0c6bd6de4c70c8426651d39822a Mon Sep 17 00:00:00 2001 From: acrossoffwest <1808737+acrossoffwest@users.noreply.github.com> Date: Sat, 14 Nov 2026 18:26:48 +0100 Subject: [PATCH 1/4] TM-955: phone pairing QR encodes a tmgr://pair link --- src-tauri/src/decisions/phone/pairing.rs | 6 +++++- src-tauri/src/decisions/phone/tests.rs | 10 ++++++++++ src/decisions-phones/App.vue | 1 + src/locales/en/decisions.json | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src-tauri/src/decisions/phone/pairing.rs b/src-tauri/src/decisions/phone/pairing.rs index 1ef9d58b4..9db2e6daa 100644 --- a/src-tauri/src/decisions/phone/pairing.rs +++ b/src-tauri/src/decisions/phone/pairing.rs @@ -93,6 +93,10 @@ fn is_uuid(s: &str) -> bool { }) } +pub(super) fn pair_link(json: &[u8]) -> String { + format!("tmgr://pair#tmgr-pair:v1:{}", URL_SAFE_NO_PAD.encode(json)) +} + fn qr_data_url(text: &str) -> Result { let code = qrcode::QrCode::new(text.as_bytes()).map_err(|_| "could not draw the QR code".to_owned())?; let svg = code.render::().min_dimensions(320, 320).quiet_zone(true).build(); @@ -146,7 +150,7 @@ impl Phones { exp: exp_ms, }; let json = serde_json::to_vec(&payload).map_err(|e| e.to_string())?; - let text = format!("tmgr-pair:v1:{}", URL_SAFE_NO_PAD.encode(json)); + let text = pair_link(&json); let qr = qr_data_url(&text)?; *self.pairing.lock().unwrap_or_else(|p| p.into_inner()) = Some(Pending { api_base: base.clone(), diff --git a/src-tauri/src/decisions/phone/tests.rs b/src-tauri/src/decisions/phone/tests.rs index f26c9d30d..74a37990b 100644 --- a/src-tauri/src/decisions/phone/tests.rs +++ b/src-tauri/src/decisions/phone/tests.rs @@ -1573,3 +1573,13 @@ fn a_listening_card_refreshes_every_minute_and_an_idle_one_every_five() { r.hub.answer(&id, AnswerIn { dismissed: true, ..Default::default() }).unwrap(); waiter.join().unwrap(); } + +#[test] +fn the_pairing_qr_is_a_tmgr_pair_link_around_the_raw_payload() { + let link = super::pairing::pair_link(br#"{"v":1}"#); + let raw = link.strip_prefix("tmgr://pair#").unwrap(); + let body = raw.strip_prefix("tmgr-pair:v1:").unwrap(); + use base64::Engine; + assert_eq!(base64::engine::general_purpose::URL_SAFE_NO_PAD.decode(body).unwrap(), br#"{"v":1}"#); + assert!(!link.contains('?') && link.matches('#').count() == 1); +} diff --git a/src/decisions-phones/App.vue b/src/decisions-phones/App.vue index d8457c481..755de8a8f 100644 --- a/src/decisions-phones/App.vue +++ b/src/decisions-phones/App.vue @@ -14,6 +14,7 @@ :src="s.pairing.qr_svg_data_url" :alt="$t('decisions.phones.qrAlt')" /> +

{{ $t('decisions.phones.qrHint') }}