diff --git a/CHANGELOG.md b/CHANGELOG.md index 95e61ce7..ac7ea92f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,53 +1,3 @@ -## [1.3.5](https://github.com/pragmatismo-io/BotServer/compare/1.3.4...1.3.5) (2019-05-27) - - -### Bug Fixes - -* **core.gbapp:** Self-replication on Azure ([f64cc4c](https://github.com/pragmatismo-io/BotServer/commit/f64cc4c)) - -## [1.3.4](https://github.com/pragmatismo-io/BotServer/compare/1.3.3...1.3.4) (2019-05-27) - - -### Bug Fixes - -* **core.gbapp:** Self-replication on Azure ([e82a813](https://github.com/pragmatismo-io/BotServer/commit/e82a813)) - -## [1.3.3](https://github.com/pragmatismo-io/BotServer/compare/1.3.2...1.3.3) (2019-05-27) - - -### Bug Fixes - -* **core.gbapp:** Self-replication on Azure ([bf602c6](https://github.com/pragmatismo-io/BotServer/commit/bf602c6)) -* **core.gbapp:** Self-replication on Azure ([3cca504](https://github.com/pragmatismo-io/BotServer/commit/3cca504)) -* **core.gbapp:** Self-replication on Azure ([05edafd](https://github.com/pragmatismo-io/BotServer/commit/05edafd)) - -## [1.3.2](https://github.com/pragmatismo-io/BotServer/compare/1.3.1...1.3.2) (2019-05-26) - - -### Bug Fixes - -* **core.gbapp:** Self-replication on Azure. ([2ccae38](https://github.com/pragmatismo-io/BotServer/commit/2ccae38)) -* **core.gbapp:** Self-replication on Azure. ([4b7d29d](https://github.com/pragmatismo-io/BotServer/commit/4b7d29d)) - -## [1.3.1](https://github.com/pragmatismo-io/BotServer/compare/1.3.0...1.3.1) (2019-05-25) - - -### Bug Fixes - -* **core.gbapp:** Azure deployment. ([f1b8eb2](https://github.com/pragmatismo-io/BotServer/commit/f1b8eb2)) -* **core.gbapp:** Azure deployment. ([49e1743](https://github.com/pragmatismo-io/BotServer/commit/49e1743)) -* **core.gbapp:** Azure Deployment. ([f8fab38](https://github.com/pragmatismo-io/BotServer/commit/f8fab38)) -* **core.gbapp:** ESNext in tsconfig.json to match MSFT. ([01b8dd5](https://github.com/pragmatismo-io/BotServer/commit/01b8dd5)) -* **core.gbapp:** Fixing loading of instances. ([bc9c588](https://github.com/pragmatismo-io/BotServer/commit/bc9c588)) -* **core.gbapp:** Investigating BASIC broken. ([f0ec25e](https://github.com/pragmatismo-io/BotServer/commit/f0ec25e)) -* **core.gbapp:** package.json artifacts sync. ([01d34a6](https://github.com/pragmatismo-io/BotServer/commit/01d34a6)) -* **core.gbapp:** Publishing in Azure. ([4d6779e](https://github.com/pragmatismo-io/BotServer/commit/4d6779e)) -* **core.gbapp:** Removing POC code. ([56f46f4](https://github.com/pragmatismo-io/BotServer/commit/56f46f4)) -* **kb.gbapp:** Typo fix. ([ba26578](https://github.com/pragmatismo-io/BotServer/commit/ba26578)) -* **whatsapp.gblib:** Enabling Whatsapp. ([4351b87](https://github.com/pragmatismo-io/BotServer/commit/4351b87)) -* **whatsapp.gblib:** Enabling Whatsapp. ([74f5936](https://github.com/pragmatismo-io/BotServer/commit/74f5936)) -* **whatsapp.lib:** Enabling Whatsapp. ([85249e5](https://github.com/pragmatismo-io/BotServer/commit/85249e5)) - # [1.3.0](https://github.com/pragmatismo-io/BotServer/compare/1.2.2...1.3.0) (2019-05-12) diff --git a/package.json b/package.json index d5d477f3..8fb880a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "botserver", - "version": "1.3.5", + "version": "1.3.0", "description": "General Bot Community Edition open-core server.", "main": "./boot.js", "bugs": "https://github.com/pragmatismo-io/BotServer/issues", @@ -246,4 +246,4 @@ "post-merge": [] } } -} +} \ No newline at end of file diff --git a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts index 2f4cdde3..1d600cbc 100644 --- a/packages/azuredeployer.gbapp/services/AzureDeployerService.ts +++ b/packages/azuredeployer.gbapp/services/AzureDeployerService.ts @@ -404,18 +404,9 @@ export class AzureDeployerService implements IGBInstallationDeployer { instance.botEndpoint = this.defaultEndPoint; instance = await this.internalDeployBot( - instance, - this.accessToken, - name, - name, - name, - 'General BootBot', - `${proxyAddress}/api/messages/${name}`, - 'global', - instance.nlpAppId, - instance.nlpKey, - instance.marketplaceId, - instance.marketplacePassword, + instance, this.accessToken, name, name, name, 'General BootBot', + `${proxyAddress}/api/messages/${name}`, 'global', + instance.nlpAppId, instance.nlpKey, instance.marketplaceId, instance.marketplacePassword, instance.cloudSubscriptionId ); @@ -424,6 +415,10 @@ export class AzureDeployerService implements IGBInstallationDeployer { spinner.stop(); + GBLog.info('Opening your browser with default.gbui...'); + const opn = require('opn'); + opn(`https://${serverName}.azurewebsites.net`); + return instance; } @@ -451,7 +446,7 @@ export class AzureDeployerService implements IGBInstallationDeployer { const credentials = await GBAdminService.getADALCredentialsFromUsername(username, password); // tslint:disable-next-line:no-http-string - const url = `http://${instance.botId}.azurewebsites.net`; + const url = `https://${instance.botId}.azurewebsites.net`; this.deployFarm(url, instance, credentials, subscriptionId); } @@ -713,7 +708,6 @@ export class AzureDeployerService implements IGBInstallationDeployer { }; await this.webSiteClient.webApps.createOrUpdateSourceControl(group, name, souceControlConfig); - // await this.webSiteClient.webApps.syncRepository(name, name); return server; } @@ -725,10 +719,11 @@ export class AzureDeployerService implements IGBInstallationDeployer { serverFarmId: serverFarmId, siteConfig: { appSettings: [ - { name: 'WEBSITES_CONTAINER_START_TIME_LIMIT', value: webSiteResponseTimeout }, + { name: 'WEBSITES_CONTAINER_START_TIME_LIMIT', value: WebSiteResponseTimeout }, { name: 'WEBSITE_NODE_DEFAULT_VERSION', value: GBAdminService.getNodeVersion() }, { name: 'ADDITIONAL_DEPLOY_PATH', value: `` }, { name: 'ADMIN_PASS', value: `${instance.adminPass}` }, + { name: 'BOT_ID', value: `${instance.botId}` }, { name: 'CLOUD_SUBSCRIPTIONID', value: `${instance.cloudSubscriptionId}` }, { name: 'CLOUD_LOCATION', value: `${instance.cloudLocation}` }, { name: 'CLOUD_GROUP', value: `${instance.botId}` }, diff --git a/src/app.ts b/src/app.ts index 2f826991..a661e1b3 100644 --- a/src/app.ts +++ b/src/app.ts @@ -99,7 +99,7 @@ export class GBServer { GBLog.info(`Establishing a development local proxy (ngrok)...`); GBServer.globals.publicAddress = await core.ensureProxy(port); } else { - const serverAddress = `http://${process.env.WEBSITE_SITE_NAME}.azurewebsites.net`; + const serverAddress = `https://${process.env.WEBSITE_SITE_NAME}.azurewebsites.net`; GBLog.info(`Defining server address at ${serverAddress}...`); GBServer.globals.publicAddress = serverAddress; }