@bivy/bivy 0.9.1-staging.135 → 0.9.1-staging.136
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/relay-setup.js +7 -1
- package/package.json +1 -1
package/dist/relay-setup.js
CHANGED
|
@@ -164,7 +164,13 @@ async function main() {
|
|
|
164
164
|
const endpoints = hostedEndpoints();
|
|
165
165
|
const controlPlaneUrl = (arg("control-plane", process.env.BIVY_CONTROL_PLANE_URL) ?? endpoints.controlPlane).replace(/\/$/, "");
|
|
166
166
|
const relayUrl = (arg("relay", process.env.BIVY_RELAY_URL) ?? endpoints.relay).replace(/\/$/, "");
|
|
167
|
-
|
|
167
|
+
// The remote web client is served by whichever control plane we just resolved,
|
|
168
|
+
// so default it to `controlPlaneUrl` — NOT `endpoints.clientBaseUrl`, which is
|
|
169
|
+
// derived from env/baked-in defaults and would point at the hosted app even
|
|
170
|
+
// when the user picked self-hosted (the control-plane URL arrives via
|
|
171
|
+
// --control-plane, not the environment). An explicit --client / BIVY_CLIENT_BASE_URL
|
|
172
|
+
// still wins for setups that serve the web app from a separate origin.
|
|
173
|
+
const clientBaseUrl = (arg("client", process.env.BIVY_CLIENT_BASE_URL) ?? controlPlaneUrl).replace(/\/$/, "") || controlPlaneUrl;
|
|
168
174
|
const email = arg("email", process.env.BIVY_EMAIL);
|
|
169
175
|
const sessionToken = arg("session-token", process.env.BIVY_SESSION_TOKEN);
|
|
170
176
|
// GitHub is the primary sign-in: used when --github is passed, or by default
|
package/package.json
CHANGED