Skip to content

Commit

Permalink
feat(basic): General Bots BASIC 2.0 with new keywords and parenthesis…
Browse files Browse the repository at this point in the history
… only when needed.
  • Loading branch information
rodrigorodriguez committed Feb 23, 2019
1 parent d7c0e5c commit 3cc92ec
Show file tree
Hide file tree
Showing 13 changed files with 1,580 additions and 1,659 deletions.
2,636 changes: 1,254 additions & 1,382 deletions package-lock.json

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@microsoft/microsoft-graph-client": "1.4.0",
"@semantic-release/exec": "^3.3.2",
"adal-node": "0.1.28",
"async": "2.6.1",
"async": "2.6.2",
"async-promises": "0.2.1",
"azure-arm-cognitiveservices": "2.4.1",
"azure-arm-resource": "7.3.0",
Expand All @@ -60,53 +60,53 @@
"azure-arm-website": "5.7.0",
"bluebird": "^3.5.3",
"body-parser": "1.18.3",
"botbuilder": "^4.1.7",
"botbuilder-ai": "^4.2.0",
"botbuilder-azure": "^4.2.0",
"botbuilder": "^4.2.1",
"botbuilder-ai": "^4.2.1",
"botbuilder-azure": "^4.2.1",
"botbuilder-choices": "^4.0.0-preview1.2",
"botbuilder-dialogs": "^4.2.0",
"botbuilder-dialogs": "^4.2.1",
"botbuilder-prompts": "^4.0.0-preview1.2",
"botlib": "^0.1.10",
"botlib": "^0.1.12",
"chai": "4.2.0",
"child_process": "^1.0.2",
"chokidar": "2.0.4",
"chokidar": "2.1.2",
"cli-spinner": "^0.2.8",
"csv-parse": "4.3.1",
"csv-parse": "4.3.3",
"dotenv-extended": "2.3.0",
"express": "4.16.4",
"express-promise-router": "3.0.3",
"fs-extra": "7.0.1",
"fs-walk": "0.0.2",
"ip": "^1.1.5",
"js-beautify": "^1.8.9",
"localize": "0.4.7",
"marked": "0.6.0",
"mocha": "5.2.0",
"marked": "0.6.1",
"mocha": "6.0.1",
"mocha-typescript": "1.1.17",
"ms": "2.1.1",
"ms-rest-azure": "2.6.0",
"nexmo": "2.4.1",
"ngrok": "^3.1.0",
"nyc": "^13.1.0",
"ngrok": "^3.1.1",
"nyc": "^13.3.0",
"opn": "^5.4.0",
"pragmatismo-io-framework": "1.0.19",
"process-exists": "^3.1.0",
"public-ip": "^3.0.0",
"reflect-metadata": "0.1.13",
"request-promise-native": "1.0.5",
"request-promise-native": "1.0.7",
"scanf": "^1.0.2",
"sequelize": "4.42.0",
"sequelize-typescript": "0.6.7",
"shx": "^0.3.2",
"simple-git": "^1.107.0",
"sqlite3": "4.0.6",
"strict-password-generator": "^1.1.2",
"swagger-client": "3.8.22",
"tedious": "4.1.3",
"swagger-client": "3.8.24",
"tedious": "5.0.3",
"ts-node": "8.0.2",
"typedoc": "0.14.2",
"typedoc-plugin-external-module-name": "^2.0.0",
"typedoc-plugin-markdown": "^1.1.25",
"typescript": "3.3.1",
"typedoc-plugin-markdown": "^1.1.26",
"typescript": "3.3.3333",
"url-join": "4.0.0",
"vbscript-to-typescript": "^1.0.8",
"wait-until": "0.0.2",
Expand All @@ -121,13 +121,13 @@
"@semantic-release/npm": "^5.1.4",
"@semantic-release/release-notes-generator": "^7.1.4",
"@types/chai": "4.1.7",
"@types/mocha": "5.2.5",
"@types/sequelize": "4.27.34",
"@types/mocha": "5.2.6",
"@types/sequelize": "4.27.37",
"@types/url-join": "4.0.0",
"@types/winston": "2.4.4",
"ban-sensitive-files": "1.9.2",
"commitizen": "^3.0.5",
"coveralls": "^3.0.2",
"commitizen": "^3.0.7",
"coveralls": "^3.0.3",
"cz-conventional-changelog": "^2.1.0",
"dependency-check": "3.3.0",
"deps-ok": "1.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/admin.gbapp/dialogs/AdminDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export class AdminDialog extends IGBDialog {
);
}

private static setupSecurityDialogs(min: any) {
private static setupSecurityDialogs(min: GBMinInstance) {
min.dialogs.add(
new WaterfallDialog('/setupSecurity', [
async step => {
Expand Down
1 change: 0 additions & 1 deletion packages/console.gblib/services/ConsoleDirectLine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const _ = require('lodash');
const Parse = require('csv-parse');
const Async = require('async');
const UrlJoin = require('url-join');
const Walk = require('fs-walk');
const logger = require('../../../src/logger');
const Swagger = require('swagger-client');
const rp = require('request-promise');
Expand Down
7 changes: 6 additions & 1 deletion packages/core.gbapp/services/GBAPIService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import { TurnContext } from 'botbuilder';
import { WaterfallStepContext } from 'botbuilder-dialogs';
import { GBMinInstance } from 'botlib';
import { GBAdminService } from '../../admin.gbapp/services/GBAdminService';
const WaitUntil = require('wait-until');

class SysClass {
Expand All @@ -44,7 +45,11 @@ class SysClass {
this.min = min;
}

public async deployBot(
public generatePassword(){
return GBAdminService.getRndPassword();
}

public async createABotFarmUsing(
botId,
description,
location,
Expand Down
2 changes: 1 addition & 1 deletion packages/core.gbapp/services/GBDeployer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export class GBDeployer {

case '.gbdialog':
const vm = new GBVMService();
return vm.loadJS(localPath, min, this.core, this, localPath);
return vm.loadDialogPackage(localPath, min, this.core, this);

default:
const err = GBError.create(`GuaribasBusinessError: Unknown package type: ${packageType}.`);
Expand Down

0 comments on commit 3cc92ec

Please sign in to comment.