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
23 changes: 19 additions & 4 deletions crates/wizard-core/src/hub/login.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,12 @@ impl CallbackServer {
pub fn authorization_url(&self) -> Url {
let mut url = Url::parse(&format!("{HUB_ORIGIN}{AUTHORIZATION_PATH}"))
.expect("Hub authorization URL is valid");
url.query_pairs_mut().append_pair(
CALLBACK_PARAMETER,
&format!("http://{}{CALLBACK_PATH}", self.address),
);
url.query_pairs_mut()
.append_pair("source", "wizard")
.append_pair(
CALLBACK_PARAMETER,
&format!("http://{}{CALLBACK_PATH}", self.address),
);
url
}

Expand Down Expand Up @@ -368,4 +370,17 @@ mod tests {
Some("https://hub.coreinfra.ai/hub/api/login?key=test")
);
}

#[tokio::test]
async fn browser_login_identifies_wizard_and_preserves_callback() {
let server = CallbackServer::bind().await.expect("callback listener");
let url = server.authorization_url();
assert_eq!(url.path(), "/app-login");
let params: std::collections::HashMap<_, _> = url.query_pairs().collect();
assert_eq!(params.get("source").map(AsRef::as_ref), Some("wizard"));
assert_eq!(
params.get("callback_url").map(AsRef::as_ref),
Some(format!("http://{}/callback", server.address).as_str())
);
}
}
2 changes: 1 addition & 1 deletion crates/wizard-gui/src/hub_auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ pub(crate) async fn open_hub(app: tauri::AppHandle, theme: String) -> Result<(),
/// Opens the registration page in the system browser, leaving Wizard open.
#[tauri::command]
pub(crate) async fn open_hub_registration() -> Result<(), String> {
let url = Url::parse("https://hub.coreinfra.ai/register")
let url = Url::parse("https://hub.coreinfra.ai/register?source=wizard")
.map_err(|_| "Некорректный адрес регистрации")?;
login::open_browser(&url)
.await
Expand Down
2 changes: 1 addition & 1 deletion crates/wizard-gui/wizard-ui/src/settings/HubSignIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export function HubSignIn({ hub }: { hub: HubAccountControl }) {
{pending
? "После входа вернитесь в Wizard — аккаунт подключится автоматически."
: <>Wizard установлен, теперь войдите в аккаунт хаба, если аккаунта нет – <Link
href="https://hub.coreinfra.ai/register" target="_blank" rel="noreferrer"
href="https://hub.coreinfra.ai/register?source=wizard" target="_blank" rel="noreferrer"
className="text-zinc-800 underline decoration-zinc-400 underline-offset-2 hover:decoration-current focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-blue-500 dark:text-zinc-200 dark:decoration-zinc-500"
aria-disabled={hub.submitting || undefined}
onClick={(event) => { event.preventDefault(); hub.register(); }}
Expand Down
Loading