Fix botEndpoint not correct in docker environment

Composer/packages/client/package.json

@@ -72,7 +72,7 @@
   },
   "scripts": {
     "start": "node scripts/start.js",
-    "build": "node --max-old-space-size=8192 scripts/build.js",
+    "build": "node --max-old-space-size=2048 scripts/build.js",
     "test": "jest",
     "lint": "eslint --quiet --ext .js,.jsx,.ts,.tsx ./src",
     "lint:fix": "yarn lint --fix"

Composer/packages/server/src/models/connector/csharpBotConnector.ts

@@ -11,8 +11,10 @@ import { DialogSetting } from '../bot/interface';
 import { BotConfig, BotEnvironments, BotStatus, IBotConnector, IPublishHistory } from './interface';
 
 export class CSharpBotConnector implements IBotConnector {
+  private adminEndpoint: string;
   private endpoint: string;
-  constructor(endpoint: string) {
+  constructor(adminEndpoint: string, endpoint: string) {
+    this.adminEndpoint = adminEndpoint;
     this.endpoint = endpoint;
   }
 
@@ -21,7 +23,7 @@ export class CSharpBotConnector implements IBotConnector {
   connect = async (_: BotEnvironments, __: string) => {
     // confirm bot runtime is listening here
     try {
-      await axios.get(this.endpoint + '/api/admin');
+      await axios.get(this.adminEndpoint + '/api/admin');
     } catch (err) {
       throw new Error(err);
     }
@@ -65,7 +67,7 @@ export class CSharpBotConnector implements IBotConnector {
       form.append('microsoftAppPassword', config.MicrosoftAppPassword);
     }
     try {
-      await axios.post(this.endpoint + '/api/admin', form, { headers: form.getHeaders() });
+      await axios.post(this.adminEndpoint + '/api/admin', form, { headers: form.getHeaders() });
     } catch (err) {
       throw new Error('Unable to sync content to bot runtime');
     }

Composer/packages/server/src/models/environment/defaultEnvironment.ts

@@ -15,7 +15,7 @@ export class DefaultEnvironment implements IEnvironment {
   public constructor(config: IEnvironmentConfig) {
     this.config = config;
     this.settingManager = new DefaultSettingManager(this.config.basePath);
-    this.botConnector = new CSharpBotConnector(this.config.endpoint);
+    this.botConnector = new CSharpBotConnector(this.config.adminEndpoint, this.config.endpoint);
   }
 
   public getEnvironmentName(_: string): string | undefined {

Composer/packages/server/src/models/environment/interface.ts

@@ -6,6 +6,7 @@ import settings from '../../settings/settings';
 export interface IEnvironmentConfig {
   name: string;
   basePath: string;
+  adminEndpoint: string;
   endpoint: string;
 }
 
@@ -20,19 +21,22 @@ export interface IEnvironment {
 export const absHostedConfig: IEnvironmentConfig = {
   name: 'absh',
   basePath: '',
+  adminEndpoint: '',
   endpoint: '',
 };
 
 export const mockHostedConfig: IEnvironmentConfig = {
   name: 'mockhosted',
   basePath: '',
+  adminEndpoint: '',
   endpoint: '',
 };
 
 export const defaultConfig: IEnvironmentConfig = {
   name: 'default',
   basePath: '',
-  endpoint: settings.botRuntime,
+  adminEndpoint: settings.botAdminEndpoint,
+  endpoint: settings.botEndpoint,
 };
 
 export const currentConfig: IEnvironmentConfig = absHosted

Composer/packages/server/src/settings/settings.json

@@ -1,11 +1,12 @@
 {
   "development": {
-    "botRuntime": "http://localhost:3979",
+    "botAdminEndpoint": "http://localhost:3979",
+    "botEndpoint": "http://localhost:3979",
     "assetsLibray": "./assets",
     "runtimeFolder": "../../../BotProject/Templates",
     "defaultFolder": "../../../SampleBots"
   },
   "container": {
-    "botRuntime": "http://botruntime:80"
+    "botAdminEndpoint": "http://botruntime:80"
   }
-}
+}

Composer/yarn.lock

@@ -2418,22 +2418,14 @@
   dependencies:
     "@types/react" "*"
 
-"@types/react@*", "@types/[email protected]":
+"@types/react@*", "@types/[email protected]", "@types/react@^16.9.2":
   version "16.9.0"
   resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.0.tgz#27434f16d889a335eb4626d1f1e67eda54039e5b"
   integrity sha512-eOct1hyZI9YZf/eqNlYu7jxA9qyTw1EGXruAJhHhBDBpc00W0C1vwlnh+hkOf7UFZkNK+UxnFBpwAZe3d7XJhQ==
   dependencies:
     "@types/prop-types" "*"
     csstype "^2.2.0"
 
-"@types/react@^16.9.2":
-  version "16.9.9"
-  resolved "https://botbuilder.myget.org/F/botbuilder-declarative/npm/@types/react/-/@types/react-16.9.9.tgz#a62c6f40f04bc7681be5e20975503a64fe783c3a"
-  integrity sha1-pixvQPBLx2gb5eIJdVA6ZP54PDo=
-  dependencies:
-    "@types/prop-types" "*"
-    csstype "^2.2.0"
-
 "@types/rimraf@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-2.0.2.tgz#7f0fc3cf0ff0ad2a99bb723ae1764f30acaf8b6e"