@wasp.sh/wasp-cli-darwin-arm64-unknown 0.20.2 → 0.21.0-rc.1

package/data/Generator/templates/sdk/wasp/server/auth/user.ts

@@ -52,6 +52,9 @@ export type AuthUserData = Omit<CompleteUserEntityWithAuth, '{= authFieldOnUserE
     {=# enabledProviders.isGitHubAuthEnabled =}
     github: Expand<UserFacingProviderData<'github'>> | null
     {=/ enabledProviders.isGitHubAuthEnabled =}
+    {=# enabledProviders.isMicrosoftAuthEnabled =}
+    microsoft: Expand<UserFacingProviderData<'microsoft'>> | null
+    {=/ enabledProviders.isMicrosoftAuthEnabled =}
   },
 }
 
@@ -117,6 +120,9 @@ This should never happen, but it did which means there is a bug in the code.`)
     {=# enabledProviders.isGitHubAuthEnabled =}
     github: getProviderInfo<'github'>({= authFieldOnUserEntityName =}, 'github'),
     {=/ enabledProviders.isGitHubAuthEnabled =}
+    {=# enabledProviders.isMicrosoftAuthEnabled =}
+    microsoft: getProviderInfo<'microsoft'>({= authFieldOnUserEntityName =}, 'microsoft'),
+    {=/ enabledProviders.isMicrosoftAuthEnabled =}
   }
   return {
     ...rest,

package/data/Generator/templates/sdk/wasp/server/env.ts

@@ -102,6 +102,17 @@ const waspServerCommonSchema = z.object({
       message: 'KEYCLOAK_REALM_URL must be a valid URL',
     }),
   {=/ enabledAuthProviders.isKeycloakAuthEnabled =}
+  {=# enabledAuthProviders.isMicrosoftAuthEnabled =}
+  MICROSOFT_TENANT_ID: z.string({
+    required_error: getRequiredEnvVarErrorMessage('Microsoft auth provider', 'MICROSOFT_TENANT_ID'),
+  }),
+  MICROSOFT_CLIENT_ID: z.string({
+    required_error: getRequiredEnvVarErrorMessage('Microsoft auth provider', 'MICROSOFT_CLIENT_ID'),
+  }),
+  MICROSOFT_CLIENT_SECRET: z.string({
+    required_error: getRequiredEnvVarErrorMessage('Microsoft auth provider', 'MICROSOFT_CLIENT_SECRET'),
+  }),
+  {=/ enabledAuthProviders.isMicrosoftAuthEnabled =}
   {=/ isAuthEnabled =}
 })
 

package/data/Generator/templates/sdk/wasp/tsconfig.json

@@ -89,6 +89,10 @@
   ],
   "exclude": [
     "node_modules",
-    "dist"
+    "dist",
+    // Virtual modules don't belong in the SDK runtime, they are used by the
+    // web-app runtime via Vite virtual modules. That's why we don't want the
+    // SDK to compile them.
+    "client/vite/virtual-files/files",
   ]
 }

package/data/Generator/templates/server/src/auth/providers/config/microsoft.ts

@@ -0,0 +1,65 @@
+{{={= =}=}}
+import type { ProviderConfig } from "wasp/auth/providers/types";
+import { microsoft } from "wasp/server/auth";
+
+import { mergeDefaultAndUserConfig } from "../oauth/config.js";
+import { createOAuthProviderRouter } from "../oauth/handler.js";
+
+{=# userSignupFields.isDefined =}
+{=& userSignupFields.importStatement =}
+const _waspUserSignupFields = {= userSignupFields.importIdentifier =}
+{=/ userSignupFields.isDefined =}
+{=^ userSignupFields.isDefined =}
+const _waspUserSignupFields = undefined
+{=/ userSignupFields.isDefined =}
+{=# configFn.isDefined =}
+{=& configFn.importStatement =}
+const _waspUserDefinedConfigFn = {= configFn.importIdentifier =}
+{=/ configFn.isDefined =}
+{=^ configFn.isDefined =}
+const _waspUserDefinedConfigFn = undefined
+{=/ configFn.isDefined =}
+
+const _waspConfig: ProviderConfig = {
+    id: microsoft.id,
+    displayName: microsoft.displayName,
+    createRouter(provider) {
+        const config = mergeDefaultAndUserConfig({
+            scopes: {=& requiredScopes =},
+        }, _waspUserDefinedConfigFn);
+
+        async function getMicrosoftProfile(accessToken: string): Promise<{
+            providerProfile: unknown;
+            providerUserId: string;
+        }> {
+            const response = await fetch(
+                "https://graph.microsoft.com/oidc/userinfo",
+                {
+                    headers: {
+                        Authorization: `Bearer ${accessToken}`,
+                    },
+                }
+            );
+            const providerProfile = (await response.json()) as {
+                sub?: string;
+            };
+
+            if (!providerProfile.sub) {
+                throw new Error("Invalid profile");
+            }
+
+            return { providerProfile, providerUserId: providerProfile.sub };
+        }
+
+        return createOAuthProviderRouter({
+            provider,
+            oAuthType: 'OAuth2WithPKCE',
+            userSignupFields: _waspUserSignupFields,
+            getAuthorizationUrl: ({ state, codeVerifier }) => microsoft.oAuthClient.createAuthorizationURL(state, codeVerifier, config),
+            getProviderTokens: ({ code, codeVerifier }) => microsoft.oAuthClient.validateAuthorizationCode(code, codeVerifier),
+            getProviderInfo: ({ accessToken }) => getMicrosoftProfile(accessToken),
+        });
+    },
+}
+
+export default _waspConfig;

package/data/Generator/templates/server/src/auth/providers/oauth/cookies.ts

@@ -2,7 +2,7 @@ import {
   Request as ExpressRequest,
   Response as ExpressResponse,
 } from 'express';
-import { parseCookies } from 'oslo/cookie';
+import { parseCookies } from '@wasp.sh/lib-auth/node';
 
 import type { ProviderConfig } from 'wasp/auth/providers/types';
 import { config } from 'wasp/server';

package/data/packages/deploy/dist/common/clientApp.js

@@ -1,15 +1,14 @@
 import { waspSays } from "./terminal.js";
 import { getClientBuildArtefactsDir, getClientBuildDir, } from "./waspProject.js";
 import { createCommandWithCwd } from "./zx.js";
-export const serverUrlEnvVarName = "REACT_APP_API_URL";
-export async function buildClient(defaultServerAppUrl, { waspProjectDir }) {
+const serverUrlEnvVarName = "REACT_APP_API_URL";
+export async function buildClient(serverUrl, { waspProjectDir }) {
     waspSays("Building web client for production...");
-    waspSays(`If you configured a custom domain for the server, you should run the command with an env variable: ${serverUrlEnvVarName}=https://serverUrl.com <command>`);
     const clientBuildDir = getClientBuildDir(waspProjectDir);
     const npmCli = createCommandWithCwd("npm", clientBuildDir);
+    const npxCli = createCommandWithCwd("npx", clientBuildDir);
     await npmCli(["install"]);
-    const serverUrl = getServerAppUrlEnvValue() ?? defaultServerAppUrl;
-    await npmCli(["run", "build"], {
+    await npxCli(["vite", "build"], {
         env: {
             ...process.env,
             [serverUrlEnvVarName]: serverUrl,
@@ -17,10 +16,4 @@ export async function buildClient(defaultServerAppUrl, { waspProjectDir }) {
     });
     return getClientBuildArtefactsDir(waspProjectDir);
 }
-// We allow users to specify the server URL that the client will connect to
-// using an environment variable.
-// TODO: improve this API to allow specifying the server URL via options or a config file.
-function getServerAppUrlEnvValue() {
-    return process.env[serverUrlEnvVarName];
-}
 //# sourceMappingURL=clientApp.js.map

package/data/packages/deploy/dist/common/terminal.js

@@ -6,6 +6,13 @@ export function waspSays(str) {
         .join("\n");
     console.log(chalk.yellow(formattedStr));
 }
+export function waspInfo(str) {
+    const formattedStr = str
+        .split("\n")
+        .map((line) => `👉 ${line}`)
+        .join("\n");
+    console.log(chalk.blue(formattedStr));
+}
 export function displayWaspRocketImage() {
     // Escaping backslashes makes it look weird here, but it works in console.
     const asciiArt = `

package/data/packages/deploy/dist/common/waspProject.js

@@ -24,20 +24,24 @@ export function buildDirExists(waspProjectDir) {
     return fs.existsSync(getWaspBuildDir(waspProjectDir));
 }
 export function getServerBuildArtefactsDir(waspProjectDir) {
-    return getServerBuildDir(waspProjectDir);
+    return getServerDeploymentDir(waspProjectDir);
 }
 export function getClientBuildArtefactsDir(waspProjectDir) {
-    const clientBuildDir = getClientBuildDir(waspProjectDir);
-    return path.join(clientBuildDir, "build");
+    return path.join(getClientDeploymentDir(waspProjectDir), "build");
 }
 function getWaspBuildDir(waspProjectDir) {
-    return path.join(waspProjectDir, ".wasp", "build");
+    return path.join(waspProjectDir, ".wasp", "out");
 }
-export function getServerBuildDir(waspProjectDir) {
-    // The server is built from the Wasp build directory.
+export function getServerDeploymentDir(waspProjectDir) {
+    // The server is built from the Wasp out directory.
     return path.join(getWaspBuildDir(waspProjectDir), ".");
 }
-export function getClientBuildDir(waspProjectDir) {
+export function getClientDeploymentDir(waspProjectDir) {
+    // The client is deployed from the `.out/web-app` dir.
     return path.join(getWaspBuildDir(waspProjectDir), "web-app");
 }
+export function getClientBuildDir(waspProjectDir) {
+    // The client is built from the project root dir.
+    return path.join(waspProjectDir, ".");
+}
 //# sourceMappingURL=waspProject.js.map

package/data/packages/deploy/dist/providers/fly/CommonOps.js

@@ -1,5 +1,5 @@
 import { cd } from "zx";
-import { getClientBuildDir, getServerBuildDir, } from "../../common/waspProject.js";
+import { getClientDeploymentDir, getServerDeploymentDir, } from "../../common/waspProject.js";
 import { clientTomlExistsInProject, copyLocalClientTomlToProject, copyLocalServerTomlToProject, copyProjectClientTomlLocally, copyProjectServerTomlLocally, serverTomlExistsInProject, } from "./tomlFile.js";
 export var ContextOption;
 (function (ContextOption) {
@@ -17,7 +17,7 @@ function createClientCommonOps(waspProjectDir, paths) {
     return {
         waspProjectDir,
         paths,
-        cdToBuildDir: () => cd(getClientBuildDir(waspProjectDir)),
+        cdToDeploymentDir: () => cd(getClientDeploymentDir(waspProjectDir)),
         tomlExistsInProject: () => clientTomlExistsInProject(paths),
         copyLocalTomlToProject: () => copyLocalClientTomlToProject(paths),
         copyProjectTomlLocally: () => copyProjectClientTomlLocally(paths),
@@ -27,7 +27,7 @@ function createServerCommonOps(waspProjectDir, paths) {
     return {
         waspProjectDir,
         paths,
-        cdToBuildDir: () => cd(getServerBuildDir(waspProjectDir)),
+        cdToDeploymentDir: () => cd(getServerDeploymentDir(waspProjectDir)),
         tomlExistsInProject: () => serverTomlExistsInProject(paths),
         copyLocalTomlToProject: () => copyLocalServerTomlToProject(paths),
         copyProjectTomlLocally: () => copyProjectServerTomlLocally(paths),

package/data/packages/deploy/dist/providers/fly/commands/cmd/cmd.js

@@ -16,7 +16,7 @@ export async function cmd(flyctlArgs, cmdOptions) {
     await runFlyctlCommand(commonOps, flyctlArgs);
 }
 async function runFlyctlCommand(commonOps, flyctlArgs) {
-    commonOps.cdToBuildDir();
+    commonOps.cdToDeploymentDir();
     deleteLocalToml();
     if (commonOps.tomlExistsInProject()) {
         commonOps.copyProjectTomlLocally();

package/data/packages/deploy/dist/providers/fly/commands/deploy/deploy.js

@@ -3,7 +3,7 @@ import { buildClient } from "../../../../common/clientApp.js";
 import { getFullCommandName } from "../../../../common/commander.js";
 import { displayWaspRocketImage, waspSays, } from "../../../../common/terminal.js";
 import { ensureWaspProjectIsBuilt } from "../../../../common/waspBuild.js";
-import { getClientBuildDir, getServerBuildDir, } from "../../../../common/waspProject.js";
+import { getClientDeploymentDir, getServerDeploymentDir, } from "../../../../common/waspProject.js";
 import { createDeploymentInstructions, } from "../../DeploymentInstructions.js";
 import { getFlyAppUrl } from "../../flyAppUrl.js";
 import { secretExists } from "../../flyCli.js";
@@ -48,7 +48,7 @@ export async function deploy(cmdOptions) {
 }
 async function deployServer(deploymentInstructions, { buildLocally }) {
     waspSays("Deploying your server now...");
-    cd(getServerBuildDir(deploymentInstructions.cmdOptions.waspProjectDir));
+    cd(getServerDeploymentDir(deploymentInstructions.cmdOptions.waspProjectDir));
     copyProjectServerTomlLocally(deploymentInstructions.tomlFilePaths);
     // Make sure we have a DATABASE_URL present. If not, they need to create/attach their DB first.
     const databaseUrlSet = await secretExists("DATABASE_URL");
@@ -65,10 +65,11 @@ async function deployServer(deploymentInstructions, { buildLocally }) {
 }
 async function deployClient(deploymentInstructions, { buildLocally }) {
     waspSays("Deploying your client now...");
-    cd(getClientBuildDir(deploymentInstructions.cmdOptions.waspProjectDir));
+    cd(getClientDeploymentDir(deploymentInstructions.cmdOptions.waspProjectDir));
     copyProjectClientTomlLocally(deploymentInstructions.tomlFilePaths);
-    const serverFlyAppUrl = getFlyAppUrl(deploymentInstructions.serverFlyAppName);
-    await buildClient(serverFlyAppUrl, deploymentInstructions.cmdOptions);
+    const serverUrl = deploymentInstructions.cmdOptions.customServerUrl ??
+        getFlyAppUrl(deploymentInstructions.serverFlyAppName);
+    await buildClient(serverUrl, deploymentInstructions.cmdOptions);
     // Creates the necessary Dockerfile for deploying static websites to Fly.io.
     // Adds dummy .dockerignore to supress CLI question.
     // Ref: https://fly.io/docs/languages-and-frameworks/static/

package/data/packages/deploy/dist/providers/fly/commands/setup/setup.js

@@ -3,7 +3,7 @@ import { getFullCommandName } from "../../../../common/commander.js";
 import { generateRandomHexString } from "../../../../common/random.js";
 import { waspSays } from "../../../../common/terminal.js";
 import { ensureWaspProjectIsBuilt } from "../../../../common/waspBuild.js";
-import { getClientBuildDir, getServerBuildDir, } from "../../../../common/waspProject.js";
+import { getClientDeploymentDir, getServerDeploymentDir, } from "../../../../common/waspProject.js";
 import { createDeploymentInstructions, } from "../../DeploymentInstructions.js";
 import { getFlyAppUrl } from "../../flyAppUrl.js";
 import { createFlyDbCommand } from "../../index.js";
@@ -37,7 +37,7 @@ export async function setup(baseName, region, cmdOptions) {
 }
 async function setupServer(deploymentInstructions) {
     waspSays(`Setting up server app with name ${deploymentInstructions.serverFlyAppName}`);
-    cd(getServerBuildDir(deploymentInstructions.cmdOptions.waspProjectDir));
+    cd(getServerDeploymentDir(deploymentInstructions.cmdOptions.waspProjectDir));
     deleteLocalToml();
     const launchArgs = [
         "--name",
@@ -104,7 +104,7 @@ Press any key to continue or Ctrl+C to cancel.`);
 }
 async function setupClient(deploymentInstructions) {
     waspSays(`Setting up client app with name ${deploymentInstructions.clientFlyAppName}`);
-    cd(getClientBuildDir(deploymentInstructions.cmdOptions.waspProjectDir));
+    cd(getClientDeploymentDir(deploymentInstructions.cmdOptions.waspProjectDir));
     deleteLocalToml();
     const launchArgs = [
         "--name",

package/data/packages/deploy/dist/providers/fly/index.js

@@ -30,6 +30,9 @@ class FlyCommand extends Command {
         }
         return this.option("--server-secret <serverSecret>", "secret to set on the server app (of form FOO=BAR)", collect, []).option("--client-secret <clientSecret>", "secret to set on the client app (of form FOO=BAR)", collect, []);
     }
+    addCustomServerUrlOption() {
+        return this.option("--custom-server-url <url>", "URL of the server that the client will connect to");
+    }
 }
 const flyLaunchCommand = makeFlyLaunchCommand();
 export const flySetupCommand = makeFlySetupCommand();
@@ -83,6 +86,7 @@ function makeFlyLaunchCommand() {
         .addDbOptions()
         .addLocalBuildOption()
         .addSecretsOptions()
+        .addCustomServerUrlOption()
         .action(launchFn);
 }
 function makeFlySetupCommand() {
@@ -99,6 +103,7 @@ function makeFlyDeployCommand() {
         .option("--skip-client", "do not deploy the web client")
         .option("--skip-server", "do not deploy the server")
         .addLocalBuildOption()
+        .addCustomServerUrlOption()
         .action(deployFn);
 }
 function makeExecuteFlyCommand() {

package/data/packages/deploy/dist/providers/railway/commands/deploy/client.js

@@ -5,7 +5,8 @@ import { generateServiceUrl } from "../../railwayService/url.js";
 import { deployServiceWithStreamingLogs, ServiceDeploymentStatus, } from "./common.js";
 export async function deployClient({ cmdOptions: options, serverServiceName, clientServiceName, }) {
     waspSays("Deploying your client now...");
-    const serverServiceUrl = await generateServiceUrl(serverServiceName, serverAppPort, options);
+    const serverServiceUrl = options.customServerUrl ??
+        (await generateServiceUrl(serverServiceName, serverAppPort, options));
     const clientBuildArtefactsDir = await buildClient(serverServiceUrl, options);
     const deploymentStatus = await deployServiceWithStreamingLogs({
         name: clientServiceName,

package/data/packages/deploy/dist/providers/railway/commands/setup/setup.js

@@ -2,7 +2,7 @@ import { $ } from "zx";
 import { generateRandomHexString } from "../../../../common/random.js";
 import { waspSays } from "../../../../common/terminal.js";
 import { ensureWaspProjectIsBuilt } from "../../../../common/waspBuild.js";
-import { getClientBuildDir, getServerBuildDir, } from "../../../../common/waspProject.js";
+import { getClientDeploymentDir, getServerDeploymentDir, } from "../../../../common/waspProject.js";
 import { createCommandWithCwd } from "../../../../common/zx.js";
 import { createDeploymentInstructions, } from "../../DeploymentInstructions.js";
 import { clientAppPort, serverAppPort } from "../../ports.js";
@@ -104,12 +104,14 @@ async function setupServer({ cmdOptions: options, serverServiceName, clientServi
     // The client service needs a URL so it can be referenced in the
     // server service env variables.
     await generateServiceUrl(clientServiceName, clientAppPort, options);
-    const serverBuildDir = getServerBuildDir(options.waspProjectDir);
-    const railwayCli = createCommandWithCwd(options.railwayExe, serverBuildDir);
-    const clientUrl = `https://${getRailwayEnvVarValueReference(`${clientServiceName}.RAILWAY_PUBLIC_DOMAIN`)}`;
+    const serverDeploymentDir = getServerDeploymentDir(options.waspProjectDir);
+    const railwayCli = createCommandWithCwd(options.railwayExe, serverDeploymentDir);
+    const clientUrl = `https://${getRailwayEnvVarValueReference("RAILWAY_PUBLIC_DOMAIN", { serviceName: clientServiceName })}`;
     // If we reference the service URL in its OWN env variables, we don't prefix it with the service name.
     const serverUrl = `https://${getRailwayEnvVarValueReference("RAILWAY_PUBLIC_DOMAIN")}`;
-    const databaseUrl = getRailwayEnvVarValueReference(`${dbServiceName}.DATABASE_URL`);
+    const databaseUrl = getRailwayEnvVarValueReference("DATABASE_URL", {
+        serviceName: dbServiceName,
+    });
     const jwtSecret = generateRandomHexString();
     await railwayCli([
         "add",
@@ -128,10 +130,10 @@ async function setupServer({ cmdOptions: options, serverServiceName, clientServi
 }
 async function setupClient({ cmdOptions: options, clientServiceName, }) {
     waspSays(`Setting up client app with name ${clientServiceName}`);
-    const clientBuildDir = getClientBuildDir(options.waspProjectDir);
-    const railwayCli = createCommandWithCwd(options.railwayExe, clientBuildDir);
+    const clientDeploymentDir = getClientDeploymentDir(options.waspProjectDir);
+    const railwayCli = createCommandWithCwd(options.railwayExe, clientDeploymentDir);
     // Having a Staticfile tells Railway to use a static file server.
-    await $({ cwd: clientBuildDir }) `touch Staticfile`;
+    await $({ cwd: clientDeploymentDir }) `touch Staticfile`;
     await railwayCli([
         "add",
         ["--service", clientServiceName],
@@ -140,7 +142,16 @@ async function setupClient({ cmdOptions: options, clientServiceName, }) {
     ].flat());
     waspSays("Client setup complete!");
 }
-function getRailwayEnvVarValueReference(name) {
-    return "${{" + name + "}}";
+function getRailwayEnvVarValueReference(name, { serviceName } = {}) {
+    // Railway variable references have the format ${{VARIABLE}} for local variables
+    // or ${{serviceName.VARIABLE}} for cross-service references.
+    // When the service name contains special characters (like hyphens with numbers),
+    // Railway requires it to be quoted: ${{"service-name".VARIABLE}}
+    const parts = [name];
+    if (serviceName) {
+        // JSON.stringify wraps the string in quotes and escapes any special characters.
+        parts.unshift(JSON.stringify(serviceName));
+    }
+    return "${{" + parts.join(".") + "}}";
 }
 //# sourceMappingURL=setup.js.map

package/data/packages/deploy/dist/providers/railway/index.js

@@ -14,6 +14,9 @@ class RailwayCommand extends Command {
         }
         return this.option("--server-secret <serverSecret>", "secret to set on the server app (of form FOO=BAR)", collect, []).option("--client-secret <clientSecret>", "secret to set on the client app (of form FOO=BAR)", collect, []);
     }
+    addCustomServerUrlOption() {
+        return this.option("--custom-server-url <url>", "URL of the server that the client will connect to");
+    }
 }
 export const railwaySetupCommand = makeRailwaySetupCommand();
 export const railwayDeployCommand = makeRailwayDeployCommand();
@@ -68,6 +71,7 @@ function makeRailwayDeployCommand() {
         .option("--skip-client", "do not deploy the web client")
         .option("--skip-server", "do not deploy the server")
         .option("--existing-project-id [projectId]", "use existing project for deployment")
+        .addCustomServerUrlOption()
         .action(deployFn);
 }
 function makeRailwayLaunchCommand() {
@@ -78,6 +82,7 @@ function makeRailwayLaunchCommand() {
         .option("--existing-project-id [projectId]", "use existing project instead of creating a new one")
         .option("--workspace [workspace]", "the Railway workspace to use if a new project needs to be created (if not provided, will ask interactively)")
         .option("--db-image <dbImage>", "custom Docker image for the PostgreSQL database")
+        .addCustomServerUrlOption()
         .action(launchFn);
 }
 //# sourceMappingURL=index.js.map

package/data/packages/deploy/dist/providers/railway/jsonOutputSchemas.js

@@ -13,7 +13,13 @@ export const RailwayCliProjectSchema = z.object({
     }),
 });
 export const RailwayProjectListSchema = z.array(RailwayCliProjectSchema);
-export const RailwayCliDomainSchema = z.object({
-    domain: z.string(),
-});
+export const RailwayCliDomainSchema = z.union([
+    // Railway CLI >=4.18.1
+    z.object({ domains: z.array(z.string()).min(1) }),
+    // Railway CLI <4.18.1
+    z
+        .object({ domain: z.string() })
+        // Convert to the newer format
+        .transform(({ domain }) => ({ domains: [domain] })),
+]);
 //# sourceMappingURL=jsonOutputSchemas.js.map

package/data/packages/deploy/dist/providers/railway/railwayService/url.js

@@ -1,3 +1,4 @@
+import { waspInfo } from "../../../common/terminal.js";
 import { createCommandWithCwd } from "../../../common/zx.js";
 import { RailwayCliDomainSchema } from "../jsonOutputSchemas.js";
 export var ServiceUrlStatus;
@@ -19,7 +20,13 @@ export async function generateServiceUrl(serviceName, port, options) {
         return extractServiceUrlFromString(result.stdout);
     }
     else {
-        return RailwayCliDomainSchema.parse(result.json()).domain;
+        const { domains } = RailwayCliDomainSchema.parse(result.json());
+        const domain = domains[0];
+        if (domains.length > 1) {
+            waspInfo(`Multiple domains detected, using the first one: ${domain}.`);
+            waspInfo('If you want to use a custom domain for the server, you should add the "--custom-server-url <url>" flag.');
+        }
+        return domain;
     }
 }
 function extractServiceUrlFromString(text) {