mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 18:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Authenticate on startup if ZED_IMPERSONATE is assigned

Browse source 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
This commit is contained in:
Nathan Sobo 2022-03-23 12:25:06 -06:00
parent 657b92b020
commit 4a42025c28
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/client/src/client.rs
View file

@ -45,7 +45,7 @@ pub use user::*;
lazy_static! { lazy_static! {
static ref ZED_SERVER_URL: String = static ref ZED_SERVER_URL: String =
std::env::var("ZED_SERVER_URL").unwrap_or("https://zed.dev".to_string()); std::env::var("ZED_SERVER_URL").unwrap_or("https://zed.dev".to_string());
static ref IMPERSONATE_LOGIN: Option<String> = std::env::var("ZED_IMPERSONATE") pub static ref IMPERSONATE_LOGIN: Option<String> = std::env::var("ZED_IMPERSONATE")
.ok() .ok()
.and_then(|s| if s.is_empty() { None } else { Some(s) }); .and_then(|s| if s.is_empty() { None } else { Some(s) });
} }

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

@ -81,8 +81,14 @@ fn main() {
cx.spawn({ cx.spawn({
let client = client.clone(); let client = client.clone();
|cx| async move { |cx| async move {
if !stdout_is_a_pty() && client.has_keychain_credentials(&cx) { if stdout_is_a_pty() {
client.authenticate_and_connect(true, &cx).await?; 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>(()) Ok::<_, anyhow::Error>(())
} }