mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-05 18:25:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #922 from zed-industries/authenticate-after-showing-window

Browse source 
Attempt to automatically sign in after a window has been shown on startup
This commit is contained in:
Antonio Scandurra 2022-04-27 14:17:44 +02:00 committed by GitHub
commit 27e693d8f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
crates/zed/src/main.rs
View file

@ -130,22 +130,6 @@ fn main() {
diagnostics::init(cx);
search::init(cx);
vim::init(cx);
cx.spawn({
let client = client.clone();
|cx| async move {
if stdout_is_a_pty() {
if client::IMPERSONATE_LOGIN.is_some() {
client.authenticate_and_connect(false, &cx).await?;
}
} else {
if client.has_keychain_credentials(&cx) {
client.authenticate_and_connect(true, &cx).await?;
}
}
Ok::<_, anyhow::Error>(())
}
})
.detach_and_log_err(cx);
let (settings_file, keymap_file) = cx.background().block(config_files).unwrap();
let mut settings_rx = settings_from_files(
@ -184,7 +168,7 @@ fn main() {
languages,
themes,
channel_list,
client,
client: client.clone(),
user_store,
fs,
build_window_options,
@ -218,6 +202,20 @@ fn main() {
})
.detach();
}
cx.spawn(|cx| async move {
if stdout_is_a_pty() {
if client::IMPERSONATE_LOGIN.is_some() {
client.authenticate_and_connect(false, &cx).await?;
}
} else {
if client.has_keychain_credentials(&cx) {
client.authenticate_and_connect(true, &cx).await?;
}
}
Ok::<_, anyhow::Error>(())
})
.detach_and_log_err(cx);
});
}