Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix pathname (#5558)

Sean Aye84f08a822c8d
diff --git a/services/authentication_service/src/api/login/sso.rs b/services/authentication_service/src/api/login/sso.rs
index cb650cca84..40cc1d401a 100644
--- a/services/authentication_service/src/api/login/sso.rs
+++ b/services/authentication_service/src/api/login/sso.rs
@@ -37,8 +37,8 @@ pub(crate) struct LoginQueryParams {
fn is_allowed_original_url(url: &Url) -> bool {
match url.scheme() {
- // The iOS app uses macro://login as its authentication callback.
- "macro" => matches!(url.host_str(), Some("login" | "welcome")),
+ // The app owns the custom scheme and handles all macro URI routes itself.
+ "macro" => true,
"tauri" => url.host_str() == Some("localhost"),
"http" => matches!(url.host_str(), Some("localhost" | "tauri.localhost")),
"https" => matches!(
diff --git a/services/authentication_service/src/api/login/sso/tests.rs b/services/authentication_service/src/api/login/sso/tests.rs
index e876d05769..123e5eed7f 100644
--- a/services/authentication_service/src/api/login/sso/tests.rs
+++ b/services/authentication_service/src/api/login/sso/tests.rs
@@ -10,6 +10,9 @@ use super::*;
fn allowed_original_urls_are_accepted() {
for original_url in [
"macro://login",
+ "macro:///welcome",
+ "macro:///otherthing",
+ "macro://otherthing/path",
"tauri://localhost/app/login",
"http://tauri.localhost/app/login",
"https://tauri.localhost/app/login",
@@ -34,7 +37,6 @@ fn untrusted_original_urls_are_rejected() {
"https://staging.macro.com/app/login",
"http://macro.com/app/login",
"http://dev.macro.com/app/login",
- "macro://attacker.example",
"tauri://example.com/app/login",
"http://127.0.0.1:3000/app/login",
"javascript:alert('redirected')",