Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

test: allow running composer in hosted mode for tests #1356

Merged
a-b-r-o-w-n merged 3 commits into from
Nov 22, 2019
Merged

test: allow running composer in hosted mode for tests #1356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1198da3
Allow running composer in hosted mode for tests
Oct 30, 2019
8cd29c0
Merge branch 'master' into user/ponagpal/abslocalTest
a-b-r-o-w-n Nov 22, 2019
58ed900
Merge branch 'master' into user/ponagpal/abslocalTest
a-b-r-o-w-n Nov 22, 2019
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
2 changes: 1 addition & 1 deletion Composer/packages/server/src/models/connector/selfHostConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class SelfHostBotConnector implements IBotConnector {
public connect = async (env: BotEnvironments, hostName: string) => {
this.status = BotStatus.Connected;
const prefix = env === 'production' ? '' : 'integration/';
const root = hostName ? `https://${hostName}` : absHostRoot;
const root = hostName && hostName !== `localhost` ? `https://${hostName}` : absHostRoot;

return Promise.resolve(`${root}/api/${prefix}messages`);
};
Expand Down
2 changes: 1 addition & 1 deletion Composer/packages/server/src/settings/env.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

export const absHosted = !!process.env.PUBLIC_URL;
export const absHosted = process.env.COMPOSER_AUTH_PROVIDER === 'abs-h';
export const absHostRoot = process.env.WEBSITE_HOSTNAME
? `https://${process.env.WEBSITE_HOSTNAME}`
: 'http://localhost:3978';