这是indexloc提供的服务,不要输入任何密码
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
6 changes: 4 additions & 2 deletions crates/turborepo-auth/src/auth/login.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ pub async fn login<T: Client + TokenClient + CacheClient>(
existing_token,
force,
sso_team: _,
sso_login_callback_port,
} = *options; // Deref or we get double references for each of these

// I created a closure that gives back a closure since the `is_valid` checks do
Expand Down Expand Up @@ -83,7 +84,8 @@ pub async fn login<T: Client + TokenClient + CacheClient>(
}
}

let redirect_url = format!("http://{DEFAULT_HOST_NAME}:{DEFAULT_PORT}");
let port = sso_login_callback_port.unwrap_or(DEFAULT_PORT);
let redirect_url = format!("http://{DEFAULT_HOST_NAME}:{port}");
let mut login_url = Url::parse(login_url_configuration)?;
let mut success_url = login_url.clone();
success_url
Expand Down Expand Up @@ -117,7 +119,7 @@ pub async fn login<T: Client + TokenClient + CacheClient>(
let token_cell = Arc::new(OnceCell::new());
login_server
.run(
DEFAULT_PORT,
port,
crate::LoginType::Basic {
success_redirect: success_url.to_string(),
},
Expand Down
2 changes: 2 additions & 0 deletions crates/turborepo-auth/src/auth/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ pub struct LoginOptions<'a, T: Client + TokenClient + CacheClient> {
pub sso_team: Option<&'a str>,
pub existing_token: Option<&'a str>,
pub force: bool,
pub sso_login_callback_port: Option<u16>,
}
impl<'a, T: Client + TokenClient + CacheClient> LoginOptions<'a, T> {
pub fn new(
Expand All @@ -40,6 +41,7 @@ impl<'a, T: Client + TokenClient + CacheClient> LoginOptions<'a, T> {
sso_team: None,
existing_token: None,
force: false,
sso_login_callback_port: None,
}
}
}
Expand Down
10 changes: 8 additions & 2 deletions crates/turborepo-auth/src/auth/sso.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ pub async fn sso_login<T: Client + TokenClient + CacheClient>(
sso_team,
existing_token,
force,
sso_login_callback_port,
} = *options;

let sso_team = sso_team.ok_or(Error::EmptySSOTeam)?;
Expand Down Expand Up @@ -90,7 +91,8 @@ pub async fn sso_login<T: Client + TokenClient + CacheClient>(
}
}

let redirect_url = format!("http://{DEFAULT_HOST_NAME}:{DEFAULT_PORT}");
let port = sso_login_callback_port.unwrap_or(DEFAULT_PORT);
let redirect_url = format!("http://{DEFAULT_HOST_NAME}:{port}");
let mut login_url = Url::parse(login_url_configuration)?;

login_url
Expand All @@ -117,7 +119,7 @@ pub async fn sso_login<T: Client + TokenClient + CacheClient>(

let token_cell = Arc::new(OnceCell::new());
login_server
.run(DEFAULT_PORT, crate::LoginType::SSO, token_cell.clone())
.run(port, crate::LoginType::SSO, token_cell.clone())
.await?;
spinner.finish_and_clear();

Expand Down Expand Up @@ -384,6 +386,7 @@ mod tests {
};
let mut options = LoginOptions {
sso_team: Some(team),
sso_login_callback_port: None,
..LoginOptions::new(&color_config, &url, &api_client, &login_server)
};

Expand Down Expand Up @@ -426,6 +429,7 @@ mod tests {
existing_token: None,
sso_team: None,
force: false,
sso_login_callback_port: None,
};

let result = sso_login(&options).await;
Expand All @@ -450,6 +454,7 @@ mod tests {
existing_token: Some("existing-token"),
sso_team: Some("my-team"),
force: false,
sso_login_callback_port: None,
};

let result = sso_login(&options).await.unwrap();
Expand All @@ -475,6 +480,7 @@ mod tests {
existing_token: Some("existing-token"),
sso_team: Some("my-team"),
force: true,
sso_login_callback_port: None,
};

let result = sso_login(&options).await.unwrap();
Expand Down
2 changes: 2 additions & 0 deletions crates/turborepo-lib/src/commands/login/manual.rs
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ mod test {
upload_timeout: 0,
login_url: "".into(),
preflight: false,
sso_login_callback_port: None,
};
let login_opts = ManualLoginOptions::from(&api_opts);
assert_eq!(
Expand All @@ -212,6 +213,7 @@ mod test {
upload_timeout: 0,
login_url: "".into(),
preflight: false,
sso_login_callback_port: None,
};
let login_opts = ManualLoginOptions::from(&api_opts);
assert_eq!(
Expand Down
4 changes: 4 additions & 0 deletions crates/turborepo-lib/src/commands/login/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,12 @@ async fn sso_login(base: &mut CommandBase, sso_team: &str, force: bool) -> Resul
let api_client: APIClient = base.api_client()?;
let color_config = base.color_config;
let login_url_config = base.opts.api_client_opts.login_url.to_string();
let sso_login_callback_port = base.opts.api_client_opts.sso_login_callback_port;
let options = LoginOptions {
existing_token: base.opts.api_client_opts.token.as_deref(),
sso_team: Some(sso_team),
force,
sso_login_callback_port,
..LoginOptions::new(
&color_config,
&login_url_config,
Expand All @@ -83,10 +85,12 @@ async fn login_no_sso(base: &mut CommandBase, force: bool) -> Result<(), Error>
let color_config = base.color_config;
let login_url_config = base.opts.api_client_opts.login_url.to_string();
let existing_token = base.opts.api_client_opts.token.as_deref();
let sso_login_callback_port = base.opts.api_client_opts.sso_login_callback_port;

let options = LoginOptions {
existing_token,
force,
sso_login_callback_port,
..LoginOptions::new(
&color_config,
&login_url_config,
Expand Down
14 changes: 14 additions & 0 deletions crates/turborepo-lib/src/config/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ const TURBO_MAPPING: &[(&str, &str)] = [
("turbo_tui_scrollback_length", "tui_scrollback_length"),
("turbo_concurrency", "concurrency"),
("turbo_no_update_notifier", "no_update_notifier"),
("turbo_sso_login_callback_port", "sso_login_callback_port"),
]
.as_slice();

Expand Down Expand Up @@ -212,6 +213,14 @@ impl ResolvedConfigurationOptions for EnvVars {
.filter(|s| !s.is_empty())
.cloned();

let sso_login_callback_port = self
.output_map
.get("sso_login_callback_port")
.filter(|s| !s.is_empty())
.map(|s| s.parse())
.transpose()
.map_err(Error::InvalidSsoLoginCallbackPort)?;

let output = ConfigurationOptions {
api_url: self.output_map.get("api_url").cloned(),
login_url: self.output_map.get("login_url").cloned(),
Expand Down Expand Up @@ -245,6 +254,7 @@ impl ResolvedConfigurationOptions for EnvVars {
cache_dir,
root_turbo_json_path,
log_order,
sso_login_callback_port,
};

Ok(output)
Expand Down Expand Up @@ -339,11 +349,13 @@ mod test {
env.insert("turbo_remote_cache_upload_timeout".into(), "200".into());
env.insert("turbo_tui_scrollback_length".into(), "2048".into());
env.insert("turbo_concurrency".into(), "50%".into());
env.insert("turbo_sso_login_callback_port".into(), "3000".into());

let config = EnvVars::new(&env)
.unwrap()
.get_configuration_options(&ConfigurationOptions::default())
.unwrap();
assert_eq!(config.sso_login_callback_port(), Some(3000));
assert!(config.preflight());
assert!(config.force());
assert_eq!(config.log_order(), LogOrder::Grouped);
Expand Down Expand Up @@ -393,6 +405,7 @@ mod test {
env.insert("turbo_allow_no_turbo_json".into(), "".into());
env.insert("turbo_tui_scrollback_length".into(), "".into());
env.insert("turbo_concurrency".into(), "".into());
env.insert("turbo_sso_login_callback_port".into(), "".into());

let config = EnvVars::new(&env)
.unwrap()
Expand Down Expand Up @@ -421,5 +434,6 @@ mod test {
DEFAULT_TUI_SCROLLBACK_LENGTH
);
assert_eq!(config.concurrency, None);
assert_eq!(config.sso_login_callback_port(), None);
}
}
7 changes: 7 additions & 0 deletions crates/turborepo-lib/src/config/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ pub enum Error {
scrollback."
)]
InvalidTuiScrollbackLength(#[source] std::num::ParseIntError),
#[error("TURBO_SSO_LOGIN_CALLBACK_PORT: Invalid value. Use a number for the callback port.")]
InvalidSsoLoginCallbackPort(#[source] std::num::ParseIntError),
}

const DEFAULT_API_URL: &str = "https://vercel.com/api";
Expand Down Expand Up @@ -309,6 +311,7 @@ pub struct ConfigurationOptions {
pub(crate) tui_scrollback_length: Option<u64>,
pub(crate) concurrency: Option<String>,
pub(crate) no_update_notifier: Option<bool>,
pub(crate) sso_login_callback_port: Option<u16>,
}

#[derive(Default)]
Expand Down Expand Up @@ -464,6 +467,10 @@ impl ConfigurationOptions {
pub fn no_update_notifier(&self) -> bool {
self.no_update_notifier.unwrap_or_default()
}

pub fn sso_login_callback_port(&self) -> Option<u16> {
self.sso_login_callback_port
}
}

// Maps Some("") to None to emulate how Go handles empty strings
Expand Down
4 changes: 4 additions & 0 deletions crates/turborepo-lib/src/opts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ pub struct APIClientOpts {
pub team_slug: Option<String>,
pub login_url: String,
pub preflight: bool,
pub sso_login_callback_port: Option<u16>,
}

#[derive(Debug, Clone, Serialize)]
Expand Down Expand Up @@ -449,6 +450,7 @@ impl<'a> From<OptsInputs<'a>> for APIClientOpts {
let team_id = inputs.config.team_id().map(|s| s.to_string());
let team_slug = inputs.config.team_slug().map(|s| s.to_string());
let login_url = inputs.config.login_url().to_string();
let sso_login_callback_port = inputs.config.sso_login_callback_port();

APIClientOpts {
api_url,
Expand All @@ -459,6 +461,7 @@ impl<'a> From<OptsInputs<'a>> for APIClientOpts {
team_slug,
login_url,
preflight,
sso_login_callback_port,
}
}
}
Expand Down Expand Up @@ -737,6 +740,7 @@ mod test {
team_slug: None,
login_url: "".to_string(),
preflight: false,
sso_login_callback_port: None,
},
scope_opts,
run_opts,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,15 @@ System environment variables are always overridden by flag values provided direc
settings in run or watch mode.
</td>
</tr>
<tr id="turbo_sso_login_callback_port">
<td>
<code>TURBO_SSO_LOGIN_CALLBACK_PORT</code>
</td>
<td>
Override the default port (9789) used for the SSO login callback server
during authentication.
</td>
</tr>
</tbody>
</table>

Expand Down
Loading