Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

collab: Use the right zed.dev URL for the environment (#15566)

Browse source 
This PR updates collab to pick the `zed.dev` URL based on the current
environment rather than always using `https://zed.dev`.

This means that when developing locally we'll use
`http://localhost:3000` to be taken to the locally-running version of
`zed.dev`.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-07-31 17:08:29 -04:00 • committed by GitHub
parent 7b03b7e753
commit 2bc0a58f32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/collab/src/api/billing.rs
View file

@ -153,7 +153,8 @@ async fn create_billing_subscription(
quantity: Some(1),
..Default::default()
}]);
params.success_url = Some("https://zed.dev/billing/success");
let success_url = format!("{}/settings", app.config.zed_dot_dev_url());
params.success_url = Some(&success_url);
CheckoutSession::create(&stripe_client, params).await?
};
@ -260,7 +261,7 @@ async fn manage_billing_subscription(
after_completion: Some(CreateBillingPortalSessionFlowDataAfterCompletion {
type_: stripe::CreateBillingPortalSessionFlowDataAfterCompletionType::Redirect,
redirect: Some(CreateBillingPortalSessionFlowDataAfterCompletionRedirect {
return_url: "https://zed.dev/settings".into(),
return_url: format!("{}/settings", app.config.zed_dot_dev_url()),
}),
..Default::default()
}),
@ -277,7 +278,8 @@ async fn manage_billing_subscription(
let mut params = CreateBillingPortalSession::new(customer_id);
params.flow_data = Some(flow);
params.return_url = Some("https://zed.dev/settings");
let return_url = format!("{}/settings", app.config.zed_dot_dev_url());
params.return_url = Some(&return_url);
let session = BillingPortalSession::create(&stripe_client, params).await?;