From 9b94b081679ea47787c9e8b2998c419caef9642d Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Wed, 28 Jul 2021 13:33:38 -0300 Subject: [PATCH] new(all): Google Translator fix and security fix. --- package-lock.json | 906 ++++++++---------- package.json | 10 +- .../services/GBConversationalService.ts | 2 +- packages/core.gbapp/services/GBMinService.ts | 40 +- packages/security.gbapp/index.ts | 13 +- 5 files changed, 419 insertions(+), 552 deletions(-) diff --git a/package-lock.json b/package-lock.json index ffb3313e..13efed0a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,18 +80,18 @@ } }, "@azure/core-rest-pipeline": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.0.4.tgz", - "integrity": "sha512-RTB2i7/xMRsrCnDMv7a7zjQknRRI8MxBYoAi9uyKoplFAtT7jKfZaKUpMd0uUQBrbdVt61GO6d1ejYcMXTAQSg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.1.1.tgz", + "integrity": "sha512-ObF8iTEDXIG7/NlL28ni9bR3XLJwgm2S3GWO4aNW6CsTCFVoY9HMdbBtN7xOB+pUQwifehifXNnootbzzuwJnw==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", - "@azure/core-tracing": "1.0.0-preview.11", + "@azure/core-tracing": "1.0.0-preview.12", "@azure/logger": "^1.0.0", "form-data": "^3.0.0", "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", - "tslib": "^2.0.0", + "tslib": "^2.2.0", "uuid": "^8.3.0" }, "dependencies": { @@ -118,19 +118,18 @@ } }, "@azure/core-tracing": { - "version": "1.0.0-preview.11", - "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.11.tgz", - "integrity": "sha512-frF0pJc9HTmKncVokhBxCqipjbql02DThQ1ZJ9wLi7SDMLdPAFyDI5xZNzX5guLz+/DtPkY+SGK2li9FIXqshQ==", + "version": "1.0.0-preview.12", + "resolved": "https://registry.npmjs.org/@azure/core-tracing/-/core-tracing-1.0.0-preview.12.tgz", + "integrity": "sha512-nvo2Wc4EKZGN6eFu9n3U7OXmASmL8VxoPIH7xaD6OlQqi44bouF0YIi9ID5rEsKLiAU59IYx6M297nqWVMWPDg==", "requires": { - "@opencensus/web-types": "0.0.7", - "@opentelemetry/api": "1.0.0-rc.0", - "tslib": "^2.0.0" + "@opentelemetry/api": "^1.0.0", + "tslib": "^2.2.0" }, "dependencies": { "@opentelemetry/api": { - "version": "1.0.0-rc.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.0-rc.0.tgz", - "integrity": "sha512-iXKByCMfrlO5S6Oh97BuM56tM2cIBB0XsL/vWF/AtJrJEKx4MC/Xdu0xDsGXMGcNWpqF7ujMsjjnp0+UHBwnDQ==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.0.1.tgz", + "integrity": "sha512-H5Djcc2txGAINgf3TNaq4yFofYSIK3722PM89S/3R8FuI/eqi1UscajlXk7EBkG9s2pxss/q6SHlpturaavXaw==" }, "tslib": { "version": "2.3.0", @@ -140,27 +139,27 @@ } }, "@azure/cosmos": { - "version": "3.11.5", - "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-3.11.5.tgz", - "integrity": "sha512-emKRLrrQLAzwVyOWo67THkPSWD646puwvUfr8oVhCYSs9OgfTCeNh29XB7uU4YZd3ufcumFrTupSCfH6AodZUA==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-3.12.2.tgz", + "integrity": "sha512-57KPx3nXOFxhrlFsjP9+ZE87IJ7TFjy/kFa6FS+fmA3MGFDoKULJkZ9YThKMiUXgT+isUeDlQSiURDq10XbIqA==", "requires": { "@azure/core-auth": "^1.3.0", - "@azure/core-rest-pipeline": "^1.0.3", + "@azure/core-rest-pipeline": "^1.1.0", "debug": "^4.1.1", "fast-json-stable-stringify": "^2.0.0", "jsbi": "^3.1.3", "node-abort-controller": "^1.2.0", "priorityqueuejs": "^1.0.0", "semaphore": "^1.0.5", - "tslib": "^2.0.0", + "tslib": "^2.2.0", "universal-user-agent": "^6.0.0", "uuid": "^8.3.0" }, "dependencies": { "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", "requires": { "ms": "2.1.2" } @@ -1831,9 +1830,9 @@ } }, "@microsoft/recognizers-text-data-types-timex-expression": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-data-types-timex-expression/-/recognizers-text-data-types-timex-expression-1.3.0.tgz", - "integrity": "sha512-REHUXmMUI1jL3b9v+aSdzKxLxRdejsfg9McYRxY3LW0Gu4UbwD7Q+K6mtSo40cwg8uh6fiV9GY8hDuKXHH6dVA==" + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@microsoft/recognizers-text-data-types-timex-expression/-/recognizers-text-data-types-timex-expression-1.1.4.tgz", + "integrity": "sha512-2vICaEJfV9EpaDKs5P1PLAEs+WpNqrtpkl7CLsmc5gKmxgpQtsojG4tk6km5JRKg1mYuLV5ZzJ/65oOEeyTMvQ==" }, "@microsoft/recognizers-text-date-time": { "version": "1.1.4", @@ -2058,11 +2057,6 @@ "@octokit/openapi-types": "^7.3.2" } }, - "@opencensus/web-types": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/@opencensus/web-types/-/web-types-0.0.7.tgz", - "integrity": "sha512-xB+w7ZDAu3YBzqH44rCmG9/RlrOmFuDPt/bpf17eJr8eZSrLt7nc7LnWdxM9Mmoj/YKMHpxRg28txu3TcpiL+g==" - }, "@opentelemetry/api": { "version": "0.18.1", "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-0.18.1.tgz", @@ -2959,11 +2953,6 @@ "resolved": "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.35.tgz", "integrity": "sha512-2WeeXK7BuQo7yPI4WGOBum90SzF/f8rqlvpaXx4rjeTmNssGRDHWf7fgDUH90xMB3sUOu716fUK5d+OVx0+ncQ==" }, - "@types/btoa-lite": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/btoa-lite/-/btoa-lite-1.0.0.tgz", - "integrity": "sha512-wJsiX1tosQ+J5+bY5LrSahHxr2wT+uME5UDwdN1kg4frt40euqA+wzECkmq4t5QbveHiJepfdThgQrPw6KiSlg==" - }, "@types/cacheable-request": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz", @@ -3002,9 +2991,9 @@ "integrity": "sha512-LooLR6XHes9V+kNYRz1Qm8w3atw9QMn7XeZUmIpUelllF9BdryeUKd/u0Wh5ErcjpWfG39NrToU9MF7ngsTFVw==" }, "@types/documentdb": { - "version": "1.10.8", - "resolved": "https://registry.npmjs.org/@types/documentdb/-/documentdb-1.10.8.tgz", - "integrity": "sha512-GkOXovVMlMVTYkPomq9rOI79DmVOMZ0TDziL3H3TSlhUSm1/txi5qA49H/qZRDFsExagjnf5Cd/4xF8mXVxubw==", + "version": "1.10.9", + "resolved": "https://registry.npmjs.org/@types/documentdb/-/documentdb-1.10.9.tgz", + "integrity": "sha512-ypniK3B32olfyShGhW5X814BzopwznNlX5aQSR4LV6ZH2JqRDcwa8mMSJMRuoUWCKzeMu/w9N058YvHgBqFwFw==", "requires": { "@types/node": "*" } @@ -3113,9 +3102,9 @@ "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" }, "@types/lru-cache": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.0.tgz", - "integrity": "sha512-RaE0B+14ToE4l6UqdarKPnXwVDuigfFv+5j9Dze/Nqr23yyuqdNvzcZi3xB+3Agvi5R4EOgAksfv3lXX4vBt9w==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==" }, "@types/minimatch": { "version": "3.0.3", @@ -3129,6 +3118,14 @@ "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==", "dev": true }, + "@types/moment-timezone": { + "version": "0.5.30", + "resolved": "https://registry.npmjs.org/@types/moment-timezone/-/moment-timezone-0.5.30.tgz", + "integrity": "sha512-aDVfCsjYnAQaV/E9Qc24C5Njx1CoDjXsEgkxtp9NyXDpYu4CCbmclb6QhWloS9UTU/8YROUEEdEkWI0D7DxnKg==", + "requires": { + "moment-timezone": "*" + } + }, "@types/node": { "version": "14.0.22", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.22.tgz", @@ -3251,9 +3248,9 @@ } }, "@types/xmldom": { - "version": "0.1.30", - "resolved": "https://registry.npmjs.org/@types/xmldom/-/xmldom-0.1.30.tgz", - "integrity": "sha512-edqgAFXMEtVvaBZ3YnhamvmrHjoYpuxETmnb0lbTZmf/dXpAsO9ZKotUO4K2rn2SIZBDFCMOuA7fOe0H6dRZcA==" + "version": "0.1.31", + "resolved": "https://registry.npmjs.org/@types/xmldom/-/xmldom-0.1.31.tgz", + "integrity": "sha512-bVy7s0nvaR5D1mT1a8ZkByHWNOGb6Vn4yi5TWhEdmyKlAG+08SA7Md6+jH+tYmMLueAwNeWvHHpeKrr6S4c4BA==" }, "@types/yargs": { "version": "15.0.13", @@ -3407,35 +3404,26 @@ } }, "adaptive-expressions": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/adaptive-expressions/-/adaptive-expressions-4.13.5.tgz", - "integrity": "sha512-pmFoZyzFGLSSUAF63O0BT9vZWnW6tZjCJpRq+0j2ytCbPjYiy62doeVEt0dRPEIbpiIdDToUIad/akBK5xdPAQ==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/adaptive-expressions/-/adaptive-expressions-4.11.0.tgz", + "integrity": "sha512-CrSPRrnevGbjA0tSoNQc2q1P4iBmsFvMi1Nx56Qz6pxImMFTCKYhSYR88jvPwGIl5z+UlAWz2zmidMw9lVt9fg==", "requires": { - "@microsoft/recognizers-text-data-types-timex-expression": "1.3.0", + "@microsoft/recognizers-text-data-types-timex-expression": "1.1.4", "@types/atob-lite": "^2.0.0", - "@types/btoa-lite": "^1.0.0", "@types/lru-cache": "^5.1.0", - "@types/xmldom": "^0.1.30", + "@types/moment-timezone": "^0.5.13", + "@types/xmldom": "^0.1.29", "antlr4ts": "0.5.0-alpha.3", "atob-lite": "^2.0.0", "big-integer": "^1.6.48", - "btoa-lite": "^1.0.0", "d3-format": "^1.4.4", - "dayjs": "^1.10.3", "jspath": "^0.4.0", + "lodash": "^4.17.19", "lru-cache": "^5.1.1", - "uuid": "^8.3.2", - "x2js": "^3.4.0", - "xml2js": "^0.4.23", - "xmldom": "^0.5.0", - "xpath": "^0.0.32" + "moment": "^2.25.1", + "moment-timezone": "^0.5.28" }, "dependencies": { - "dayjs": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.5.tgz", - "integrity": "sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g==" - }, "lru-cache": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -3444,21 +3432,6 @@ "yallist": "^3.0.2" } }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - }, - "xmldom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz", - "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==" - }, - "xpath": { - "version": "0.0.32", - "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz", - "integrity": "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==" - }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", @@ -3697,15 +3670,6 @@ "resolved": "https://registry.npmjs.org/any-shell-escape/-/any-shell-escape-0.1.1.tgz", "integrity": "sha1-1Vq5ciRMcaml4asIefML8RCAaVk=" }, - "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, "archiver": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.0.tgz", @@ -4736,11 +4700,6 @@ "chainsaw": "~0.1.0" } }, - "binary-extensions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" - }, "binary-search-bounds": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/binary-search-bounds/-/binary-search-bounds-2.0.3.tgz", @@ -4825,21 +4784,223 @@ } }, "botbuilder": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.13.5.tgz", - "integrity": "sha512-UD3QyUiqWx09yEoRtwFlU/LlS7WkKx95ZznrzeiCcPUvmduAw3uNPAo2j0Y6wjBFEdWWk0Cv70zTr/nrF8QM6Q==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botbuilder/-/botbuilder-4.11.0.tgz", + "integrity": "sha512-amNKc8f9M5lGlWn3e3QTYcNFJhGAC+fWU2wV/PQG6Tn7TRBh4tMcxw3tS6WZbgPDHj1KSSe+/Ih4LOLYfYJHTQ==", "requires": { - "@azure/ms-rest-js": "1.9.1", - "axios": "^0.21.1", - "botbuilder-core": "4.13.5", + "@azure/ms-rest-js": "1.9.0", + "@types/node": "^10.17.27", + "axios": "^0.19.0", + "botbuilder-core": "4.11.0", + "botframework-connector": "4.11.0", + "botframework-streaming": "4.11.0", + "filenamify": "^4.1.0", + "fs-extra": "^7.0.1", + "moment-timezone": "^0.5.28" + }, + "dependencies": { + "@azure/ms-rest-js": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz", + "integrity": "sha512-cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA==", + "requires": { + "@types/tunnel": "0.0.0", + "axios": "^0.19.0", + "form-data": "^2.3.2", + "tough-cookie": "^2.4.3", + "tslib": "^1.9.2", + "tunnel": "0.0.6", + "uuid": "^3.2.1", + "xml2js": "^0.4.19" + } + }, + "@types/node": { + "version": "10.17.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", + "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" + }, + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "requires": { + "follow-redirects": "1.5.10" + } + }, + "botbuilder-core": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.11.0.tgz", + "integrity": "sha512-fKFCNsbNG8ISWUG0r63VDwmjOOjgt6TBqB6nmMb9BVVhMMhhosB0wWZCjvrzFqrUuHwaZkeEEaoJLpCRK0Etww==", + "requires": { + "assert": "^1.4.1", + "botframework-connector": "4.11.0", + "botframework-schema": "4.11.0" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, + "botbuilder-adapter-facebook": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/botbuilder-adapter-facebook/-/botbuilder-adapter-facebook-1.0.11.tgz", + "integrity": "sha512-Pknl3Yr+jHnUcP//y1xjyBWyG0oImdlcLjcAnBSHIX1DIrMtzr22h+uwaB2WRzmHXxFtMYnIbl8qcg1uJweCzg==", + "requires": { + "botbuilder": "^4.10.1", + "botkit": "^4.10.0", + "debug": "^4.1.0" + }, + "dependencies": { + "debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "requires": { + "ms": "2.1.2" + } + } + } + }, + "botbuilder-ai": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.11.0.tgz", + "integrity": "sha512-4cRpgc/jMyklxvY9J4FBT7r/z7LFgKjf+/tlrzUkxLnnwdcOsPgFiuN649qrzMclhjPLtgQNrZhcuYLMuW58/g==", + "requires": { + "@azure/cognitiveservices-luis-runtime": "2.0.0", + "@azure/ms-rest-js": "1.9.0", + "@microsoft/recognizers-text-date-time": "1.1.4", + "adaptive-expressions": "4.11.0", + "botbuilder-core": "4.11.0", + "botbuilder-dialogs": "4.11.0", + "node-fetch": "^2.6.0", + "url-parse": "^1.4.4" + }, + "dependencies": { + "@azure/ms-rest-js": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz", + "integrity": "sha512-cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA==", + "requires": { + "@types/tunnel": "0.0.0", + "axios": "^0.19.0", + "form-data": "^2.3.2", + "tough-cookie": "^2.4.3", + "tslib": "^1.9.2", + "tunnel": "0.0.6", + "uuid": "^3.2.1", + "xml2js": "^0.4.19" + } + }, + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "requires": { + "follow-redirects": "1.5.10" + } + }, + "botbuilder-core": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.11.0.tgz", + "integrity": "sha512-fKFCNsbNG8ISWUG0r63VDwmjOOjgt6TBqB6nmMb9BVVhMMhhosB0wWZCjvrzFqrUuHwaZkeEEaoJLpCRK0Etww==", + "requires": { + "assert": "^1.4.1", + "botframework-connector": "4.11.0", + "botframework-schema": "4.11.0" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "requires": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, + "botbuilder-azure": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.11.0.tgz", + "integrity": "sha512-sp/4L5v4Z0kKK5CZB95l6V+dpP5ej0kfQKpN9RYIT4OgJjMeH+sSmB4/Ko2erSWaf1oX8vcF0KdGPZGlzVSoeg==", + "requires": { + "@azure/cosmos": "^3.3.1", + "@types/documentdb": "^1.10.5", + "@types/node": "^10.17.27", + "azure-storage": "2.10.2", + "botbuilder": "4.11.0", + "documentdb": "1.14.5", + "flat": "^4.0.0", + "semaphore": "^1.1.0" + }, + "dependencies": { + "@types/node": { + "version": "10.17.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", + "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" + } + } + }, + "botbuilder-core": { + "version": "4.13.5", + "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.13.5.tgz", + "integrity": "sha512-br2QNiVtqLqntstUvUEFS02a59hM9uJkIDhqGw2CGUVZbftg7ln3lWb1WOKh/MsxTTSSygYiY0Hxl1r2RyEWAQ==", + "requires": { + "assert": "^1.4.1", "botbuilder-dialogs-adaptive-runtime-core": "4.13.5-preview", "botbuilder-stdlib": "4.13.5-internal", "botframework-connector": "4.13.5", - "botframework-streaming": "4.13.5", - "dayjs": "^1.10.3", - "filenamify": "^4.1.0", - "fs-extra": "^7.0.1", - "htmlparser2": "^6.0.1", + "botframework-schema": "4.13.5", "uuid": "^8.3.2" }, "dependencies": { @@ -4865,17 +5026,25 @@ } } }, - "botbuilder-core": { + "@types/node": { + "version": "10.17.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", + "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" + }, + "botframework-connector": { "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.13.5.tgz", - "integrity": "sha512-br2QNiVtqLqntstUvUEFS02a59hM9uJkIDhqGw2CGUVZbftg7ln3lWb1WOKh/MsxTTSSygYiY0Hxl1r2RyEWAQ==", + "resolved": "https://registry.npmjs.org/botframework-connector/-/botframework-connector-4.13.5.tgz", + "integrity": "sha512-0EiqLYvXv6/IbHi6q2AtDxiSt9RDHWnngSoucEuluy0xveSh/NfDLMjCyxaQ9K5YM3i8xYi75N+TCgy0efEbxA==", "requires": { - "assert": "^1.4.1", - "botbuilder-dialogs-adaptive-runtime-core": "4.13.5-preview", - "botbuilder-stdlib": "4.13.5-internal", - "botframework-connector": "4.13.5", + "@azure/ms-rest-js": "1.9.1", + "@types/jsonwebtoken": "7.2.8", + "@types/node": "^10.17.27", + "adal-node": "0.2.2", + "base64url": "^3.0.0", "botframework-schema": "4.13.5", - "uuid": "^8.3.2" + "cross-fetch": "^3.0.5", + "jsonwebtoken": "8.0.1", + "rsa-pem-from-mod-exp": "^0.8.4" } }, "botframework-schema": { @@ -4886,60 +5055,6 @@ "botbuilder-stdlib": "4.13.5-internal" } }, - "dayjs": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.5.tgz", - "integrity": "sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g==" - }, - "dom-serializer": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", - "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - } - }, - "domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" - }, - "domhandler": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.0.tgz", - "integrity": "sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==", - "requires": { - "domelementtype": "^2.2.0" - } - }, - "domutils": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.7.0.tgz", - "integrity": "sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==", - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - } - }, - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" - }, - "htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", @@ -4956,195 +5071,34 @@ } } }, - "botbuilder-adapter-facebook": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/botbuilder-adapter-facebook/-/botbuilder-adapter-facebook-1.0.11.tgz", - "integrity": "sha512-Pknl3Yr+jHnUcP//y1xjyBWyG0oImdlcLjcAnBSHIX1DIrMtzr22h+uwaB2WRzmHXxFtMYnIbl8qcg1uJweCzg==", - "requires": { - "botbuilder": "^4.10.1", - "botkit": "^4.10.0", - "debug": "^4.1.0" - }, - "dependencies": { - "debug": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", - "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", - "requires": { - "ms": "2.1.2" - } - } - } - }, - "botbuilder-ai": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botbuilder-ai/-/botbuilder-ai-4.13.5.tgz", - "integrity": "sha512-0xk8F0LDpn3s09b1LA8xcyIVILzcHQsWrqGnEbn1Ec5z+VTXbeRtPmnS2824aD7Nw9cAIFRZ7kN0s2l9Wbw3eQ==", - "requires": { - "@azure/cognitiveservices-luis-runtime": "2.0.0", - "@azure/ms-rest-js": "1.9.1", - "@microsoft/recognizers-text-date-time": "1.1.4", - "adaptive-expressions": "4.13.5", - "botbuilder-core": "4.13.5", - "botbuilder-dialogs": "4.13.5", - "botbuilder-dialogs-adaptive-runtime-core": "4.13.5-preview", - "botbuilder-dialogs-declarative": "4.13.5-preview", - "botbuilder-stdlib": "4.13.5-internal", - "lodash": "^4.17.21", - "node-fetch": "^2.6.0", - "url-parse": "^1.5.1" - }, - "dependencies": { - "@azure/ms-rest-js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.1.tgz", - "integrity": "sha512-F1crHKhmsvFLM9fsnDyCGFd2E2KR9GEZm5oBVV5D5k2EBQ7u7idtSJlSF6RDLDIrGWtc4NnFdYwsoiW8NLlBQg==", - "requires": { - "@types/tunnel": "0.0.0", - "axios": "^0.21.1", - "form-data": "^2.3.2", - "tough-cookie": "^2.4.3", - "tslib": "^1.9.2", - "tunnel": "0.0.6", - "uuid": "^3.2.1", - "xml2js": "^0.4.19" - } - }, - "botbuilder-core": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.13.5.tgz", - "integrity": "sha512-br2QNiVtqLqntstUvUEFS02a59hM9uJkIDhqGw2CGUVZbftg7ln3lWb1WOKh/MsxTTSSygYiY0Hxl1r2RyEWAQ==", - "requires": { - "assert": "^1.4.1", - "botbuilder-dialogs-adaptive-runtime-core": "4.13.5-preview", - "botbuilder-stdlib": "4.13.5-internal", - "botframework-connector": "4.13.5", - "botframework-schema": "4.13.5", - "uuid": "^8.3.2" - }, - "dependencies": { - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } - } - }, - "botframework-schema": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.13.5.tgz", - "integrity": "sha512-uqvRj1CukqYX/c4sx4nCbW+2NJJFbji1X116vhwhNGbFNFSy0iXHYRc1uUX88MrKP/HGgERZ2wnJTYZFx0LN/A==", - "requires": { - "botbuilder-stdlib": "4.13.5-internal" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - } - } - }, - "botbuilder-azure": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botbuilder-azure/-/botbuilder-azure-4.13.5.tgz", - "integrity": "sha512-ugBfsWyKRiglQNJW8SX4XGLgDFssaAAeG9jKS22pMcBEypNk0ZTd0shIFybup8NLvx+0OtCqFg4n1+QV6YNkrQ==", - "requires": { - "@azure/cosmos": "^3.3.1", - "@types/documentdb": "^1.10.5", - "azure-storage": "2.10.2", - "botbuilder": "4.13.5", - "documentdb": "1.14.5", - "flat": "^4.0.0", - "semaphore": "^1.1.0" - } - }, - "botbuilder-core": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.13.5.tgz", - "integrity": "sha512-br2QNiVtqLqntstUvUEFS02a59hM9uJkIDhqGw2CGUVZbftg7ln3lWb1WOKh/MsxTTSSygYiY0Hxl1r2RyEWAQ==", - "requires": { - "assert": "^1.4.1", - "botbuilder-dialogs-adaptive-runtime-core": "4.13.5-preview", - "botbuilder-stdlib": "4.13.5-internal", - "botframework-connector": "4.13.5", - "botframework-schema": "4.13.5", - "uuid": "^8.3.2" - }, - "dependencies": { - "botframework-schema": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.13.5.tgz", - "integrity": "sha512-uqvRj1CukqYX/c4sx4nCbW+2NJJFbji1X116vhwhNGbFNFSy0iXHYRc1uUX88MrKP/HGgERZ2wnJTYZFx0LN/A==", - "requires": { - "botbuilder-stdlib": "4.13.5-internal" - } - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } - } - }, "botbuilder-dialogs": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.13.5.tgz", - "integrity": "sha512-345bZGzeEAK2kPe2EqVHdhFNRdyHfb55QnypXyjmcvm0Lzvv/ox0raqL5sgdTZSehpW1Et0j8CfSRH1XcxHIUQ==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botbuilder-dialogs/-/botbuilder-dialogs-4.11.0.tgz", + "integrity": "sha512-KQA5kaV4/Lgk2x8XyH4IwvHRxDSGFtuiLKTSGCL0BMlqMi6lJkuwahdFUiVG0mU8CWPFj0pO88U9ujuZAvoTxQ==", "requires": { "@microsoft/recognizers-text-choice": "1.1.4", "@microsoft/recognizers-text-date-time": "1.1.4", "@microsoft/recognizers-text-number": "1.1.4", "@microsoft/recognizers-text-suite": "1.1.4", - "botbuilder-core": "4.13.5", - "botbuilder-dialogs-adaptive-runtime-core": "4.13.5-preview", - "botbuilder-stdlib": "4.13.5-internal", - "botframework-connector": "4.13.5", - "globalize": "^1.4.2", - "lodash": "^4.17.21", - "runtypes": "~5.1.0", - "uuid": "^8.3.2" + "@types/node": "^10.17.27", + "botbuilder-core": "4.11.0", + "globalize": "^1.4.2" }, "dependencies": { + "@types/node": { + "version": "10.17.60", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", + "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" + }, "botbuilder-core": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.13.5.tgz", - "integrity": "sha512-br2QNiVtqLqntstUvUEFS02a59hM9uJkIDhqGw2CGUVZbftg7ln3lWb1WOKh/MsxTTSSygYiY0Hxl1r2RyEWAQ==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.11.0.tgz", + "integrity": "sha512-fKFCNsbNG8ISWUG0r63VDwmjOOjgt6TBqB6nmMb9BVVhMMhhosB0wWZCjvrzFqrUuHwaZkeEEaoJLpCRK0Etww==", "requires": { "assert": "^1.4.1", - "botbuilder-dialogs-adaptive-runtime-core": "4.13.5-preview", - "botbuilder-stdlib": "4.13.5-internal", - "botframework-connector": "4.13.5", - "botframework-schema": "4.13.5", - "uuid": "^8.3.2" + "botframework-connector": "4.11.0", + "botframework-schema": "4.11.0" } - }, - "botframework-schema": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.13.5.tgz", - "integrity": "sha512-uqvRj1CukqYX/c4sx4nCbW+2NJJFbji1X116vhwhNGbFNFSy0iXHYRc1uUX88MrKP/HGgERZ2wnJTYZFx0LN/A==", - "requires": { - "botbuilder-stdlib": "4.13.5-internal" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" } } }, @@ -5157,73 +5111,33 @@ "runtypes": "~5.1.0" } }, - "botbuilder-dialogs-declarative": { - "version": "4.13.5-preview", - "resolved": "https://registry.npmjs.org/botbuilder-dialogs-declarative/-/botbuilder-dialogs-declarative-4.13.5-preview.tgz", - "integrity": "sha512-muAqwZIRYD7T9cstjYAlnKcDQcc5mvJaiEtYb1T8oBwTC6iMsniRrIavC0a2ZxQaeschNDeDY3rFcVCd/+vdVg==", - "requires": { - "botbuilder-core": "4.13.5", - "botbuilder-dialogs": "4.13.5", - "botbuilder-stdlib": "4.13.5-internal", - "chokidar": "^3.4.0" - }, - "dependencies": { - "botbuilder-core": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botbuilder-core/-/botbuilder-core-4.13.5.tgz", - "integrity": "sha512-br2QNiVtqLqntstUvUEFS02a59hM9uJkIDhqGw2CGUVZbftg7ln3lWb1WOKh/MsxTTSSygYiY0Hxl1r2RyEWAQ==", - "requires": { - "assert": "^1.4.1", - "botbuilder-dialogs-adaptive-runtime-core": "4.13.5-preview", - "botbuilder-stdlib": "4.13.5-internal", - "botframework-connector": "4.13.5", - "botframework-schema": "4.13.5", - "uuid": "^8.3.2" - } - }, - "botframework-schema": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.13.5.tgz", - "integrity": "sha512-uqvRj1CukqYX/c4sx4nCbW+2NJJFbji1X116vhwhNGbFNFSy0iXHYRc1uUX88MrKP/HGgERZ2wnJTYZFx0LN/A==", - "requires": { - "botbuilder-stdlib": "4.13.5-internal" - } - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } - } - }, "botbuilder-stdlib": { "version": "4.13.5-internal", "resolved": "https://registry.npmjs.org/botbuilder-stdlib/-/botbuilder-stdlib-4.13.5-internal.tgz", "integrity": "sha512-ZRnsV0vCDyGQ0iws2lRKEWSlVcxwLQuIbnDOjfXgbVK3qVBhfxtZZrJa2zPOissSHKC2LnJnjdAP44+F6AVedw==" }, "botframework-connector": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botframework-connector/-/botframework-connector-4.13.5.tgz", - "integrity": "sha512-0EiqLYvXv6/IbHi6q2AtDxiSt9RDHWnngSoucEuluy0xveSh/NfDLMjCyxaQ9K5YM3i8xYi75N+TCgy0efEbxA==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botframework-connector/-/botframework-connector-4.11.0.tgz", + "integrity": "sha512-8Hopo/FZwMwmI5vIFwWKzHxO0pKCWN5c/ggMF3pdSqbsl2B3YcaxKBWdmwbDzIksxSGu6dV0Z91JapD/LJdgeQ==", "requires": { - "@azure/ms-rest-js": "1.9.1", + "@azure/ms-rest-js": "1.9.0", "@types/jsonwebtoken": "7.2.8", - "@types/node": "^10.17.27", - "adal-node": "0.2.2", + "adal-node": "0.2.1", "base64url": "^3.0.0", - "botframework-schema": "4.13.5", + "botframework-schema": "4.11.0", "cross-fetch": "^3.0.5", "jsonwebtoken": "8.0.1", "rsa-pem-from-mod-exp": "^0.8.4" }, "dependencies": { "@azure/ms-rest-js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.1.tgz", - "integrity": "sha512-F1crHKhmsvFLM9fsnDyCGFd2E2KR9GEZm5oBVV5D5k2EBQ7u7idtSJlSF6RDLDIrGWtc4NnFdYwsoiW8NLlBQg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@azure/ms-rest-js/-/ms-rest-js-1.9.0.tgz", + "integrity": "sha512-cB4Z2Mg7eBmet1rfbf0QSO1XbhfknRW7B+mX3IHJq0KGHaGJvCPoVTgdsJdCkazEMK1jtANFNEDDzSQacxyzbA==", "requires": { "@types/tunnel": "0.0.0", - "axios": "^0.21.1", + "axios": "^0.19.0", "form-data": "^2.3.2", "tough-cookie": "^2.4.3", "tslib": "^1.9.2", @@ -5233,18 +5147,55 @@ } }, "@types/node": { - "version": "10.17.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" + "version": "8.10.66", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz", + "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==" }, - "botframework-schema": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.13.5.tgz", - "integrity": "sha512-uqvRj1CukqYX/c4sx4nCbW+2NJJFbji1X116vhwhNGbFNFSy0iXHYRc1uUX88MrKP/HGgERZ2wnJTYZFx0LN/A==", + "adal-node": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/adal-node/-/adal-node-0.2.1.tgz", + "integrity": "sha512-C/oasZuTy0NIqh5wPWjG/09XaG+zS7elC8upf1ZVExt9lSRncme4Ejbx8CKYk+wsGgj609y84txtRAXQVvqApg==", "requires": { - "botbuilder-stdlib": "4.13.5-internal" + "@types/node": "^8.0.47", + "async": "^2.6.3", + "date-utils": "*", + "jws": "3.x.x", + "request": "^2.88.0", + "underscore": ">= 1.3.1", + "uuid": "^3.1.0", + "xmldom": ">= 0.1.x", + "xpath.js": "~1.1.0" } }, + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", + "requires": { + "follow-redirects": "1.5.10" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, "tough-cookie": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", @@ -5256,27 +5207,19 @@ } } }, + "botframework-schema": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botframework-schema/-/botframework-schema-4.11.0.tgz", + "integrity": "sha512-K/VQ66jFTws2UmJRP3nlKMi4ZQM1xS8yGhh+lA0MoLrYJBgpzCoi9P2isbAub9QQotzQnTv5bK8NiJTwcdt+hQ==" + }, "botframework-streaming": { - "version": "4.13.5", - "resolved": "https://registry.npmjs.org/botframework-streaming/-/botframework-streaming-4.13.5.tgz", - "integrity": "sha512-MRiW2fIAnFiewngm2F86zzm+b1gvs4GFjduHpfvclJo5+FD9oLJK6iE4ccIaF1q4a52e0zz+rq3ztsBaIHDr4g==", + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/botframework-streaming/-/botframework-streaming-4.11.0.tgz", + "integrity": "sha512-sJjC01TwMbJKx3yUN0J4AAzwggQ3+G096Kb0/oF3TmxwqibPWcNFH0feHmg5FpWVJn7q5tuZ8vnkKtdfsVnh/g==", "requires": { - "@types/node": "^10.17.27", "@types/ws": "^6.0.3", - "uuid": "^8.3.2", + "uuid": "^3.4.0", "ws": "^7.1.2" - }, - "dependencies": { - "@types/node": { - "version": "10.17.60", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz", - "integrity": "sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==" - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - } } }, "botkit": { @@ -5307,15 +5250,15 @@ } }, "botlib": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/botlib/-/botlib-1.9.2.tgz", - "integrity": "sha512-um7oVLrh3xHruQu0N6K4FBYHEidhAdCtgG4U6IadYMIt8j2hjeC5d9mwhElXhu/Darx7TWwoV42TNMVWuTuhxw==", + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/botlib/-/botlib-1.9.3.tgz", + "integrity": "sha512-t5xLXHghHy0694tE+64nvSRlv5SNX5BAUJEOQ2P7tA685UzKbFekrS1Tik8Z+5Rl9MMxfuZFFbMyZQX/2opSxQ==", "requires": { "async": "3.2.0", - "botbuilder": "4.13.5", - "botbuilder-ai": "4.13.5", - "botbuilder-azure": "4.13.5", - "botbuilder-dialogs": "4.13.5", + "botbuilder": "4.11.0", + "botbuilder-ai": "4.11.0", + "botbuilder-azure": "4.11.0", + "botbuilder-dialogs": "4.11.0", "chrono-node": "2.2.7", "dotenv-extended": "2.9.0", "iconv-lite": "0.6.3", @@ -5342,9 +5285,9 @@ } }, "is-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", - "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" }, "ms": { "version": "2.1.3", @@ -5549,11 +5492,6 @@ "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==" }, - "btoa-lite": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz", - "integrity": "sha1-M3dm2hWAEhD92VbCLpxokaudAzc=" - }, "buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", @@ -5860,52 +5798,6 @@ "parse5": "^3.0.1" } }, - "chokidar": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", - "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", - "requires": { - "anymatch": "~3.1.1", - "braces": "~3.0.2", - "fsevents": "~2.3.1", - "glob-parent": "~5.1.0", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.5.0" - }, - "dependencies": { - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "requires": { - "fill-range": "^7.0.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "requires": { - "is-number": "^7.0.0" - } - } - } - }, "chrono-node": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-2.2.7.tgz", @@ -5915,9 +5807,9 @@ }, "dependencies": { "dayjs": { - "version": "1.10.5", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.5.tgz", - "integrity": "sha512-BUFis41ikLz+65iH6LHQCDm4YPMj5r1YFLdupPIyM4SGcXMmtiLQ7U37i+hGS8urIuqe7I/ou3IS1jVc4nbN4g==" + "version": "1.10.6", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.6.tgz", + "integrity": "sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==" } } }, @@ -9400,12 +9292,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "optional": true - }, "fstream": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", @@ -9792,6 +9678,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -10950,14 +10837,6 @@ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==" }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "requires": { - "binary-extensions": "^2.0.0" - } - }, "is-bluebird": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-bluebird/-/is-bluebird-1.0.2.tgz", @@ -11001,7 +10880,8 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true }, "is-finite": { "version": "1.1.0", @@ -11017,6 +10897,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -17674,14 +17555,6 @@ "once": "^1.3.0" } }, - "readdirp": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", - "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", - "requires": { - "picomatch": "^2.2.1" - } - }, "readline": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz", @@ -20945,9 +20818,9 @@ "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==" }, "url-parse": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz", - "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz", + "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==", "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -21407,9 +21280,9 @@ } }, "ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz", + "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==" }, "x256": { "version": "0.0.2", @@ -21417,21 +21290,6 @@ "integrity": "sha1-ya8Yh296F1gB1WT+cK2egxd4STQ=", "dev": true }, - "x2js": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/x2js/-/x2js-3.4.1.tgz", - "integrity": "sha512-RCMEmHNsyeyzF5NyGHbmCCZU9N8uMiz9FluAj3CpfVREHpgm3JB9Wr/dEWdPqGHmK3lRd2fm0ccOWtuJ2YUowQ==", - "requires": { - "xmldom": "^0.5.0" - }, - "dependencies": { - "xmldom": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz", - "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==" - } - } - }, "xdg-basedir": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", diff --git a/package.json b/package.json index 9fba6b75..26e8ef27 100644 --- a/package.json +++ b/package.json @@ -68,12 +68,12 @@ "azure-search-client": "3.1.5", "bluebird": "3.7.2", "body-parser": "1.19.0", - "botbuilder": "4.13.5", + "botbuilder": "4.11.0", "botbuilder-adapter-facebook": "1.0.11", - "botbuilder-ai": "4.13.5", - "botbuilder-dialogs": "4.13.5", - "botframework-connector": "4.13.5", - "botlib": "1.9.2", + "botbuilder-ai": "4.11.0", + "botbuilder-dialogs": "4.11.0", + "botframework-connector": "4.11.0", + "botlib": "1.9.3", "cli-spinner": "0.2.10", "core-js": "3.14.0", "dotenv-extended": "2.9.0", diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index fa6167e2..d73df1c0 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -762,7 +762,7 @@ export class GBConversationalService { const endPoint = min.core.getParam(min.instance, 'translatorEndpoint', null); const key = min.core.getParam(min.instance, 'translatorKey', null); - if (endPoint === null || !translatorEnabled() || process.env.TRANSLATOR_DISABLED === 'true') { + if ((endPoint === null && !min.instance.googleProjectId) || !translatorEnabled() || process.env.TRANSLATOR_DISABLED === 'true') { return text; } diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index 566012dd..0fec2476 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -638,7 +638,7 @@ export class GBMinService { if (GBServer.globals.minBoot === undefined) { GBServer.globals.minBoot = min; } - + if (min.instance.facebookWorkplaceVerifyToken) { min['fbAdapter'] = new FacebookAdapter({ verify_token: min.instance.facebookWorkplaceVerifyToken, @@ -706,15 +706,16 @@ export class GBMinService { min.dialogs = new DialogSet(dialogState); min.dialogs.add(new TextPrompt('textPrompt')); min.dialogs.add(new ConfirmPrompt('confirmPrompt')); - min.dialogs.add( - new OAuthPrompt('oAuthPrompt', { - connectionName: 'OAuth2', - text: 'Please sign in to General Bots.', - title: 'Sign in', - timeout: 300000 - }) - ); - + if (process.env.ENABLE_AUTH) { + min.dialogs.add( + new OAuthPrompt('oAuthPrompt', { + connectionName: 'OAuth2', + text: 'Please sign in to General Bots.', + title: 'Sign in', + timeout: 300000 + }) + ); + } return { min, adapter, conversationState }; } @@ -870,7 +871,7 @@ export class GBMinService { GBLog.info(`Auto start (teams) dialog is now being called: ${startDialog} for ${min.instance.botId}...`); await GBVMService.callVM(startDialog.toLowerCase(), min, step, this.deployer); - + } } } @@ -1227,16 +1228,19 @@ export class GBMinService { if (text !== startDialog) { let nextDialog = null; + let data = { + query: text, + step: step, + notTranslatedQuery: originalText, + message: message ? message['dataValues'] : null, + user: user ? user.dataValues : null + }; await CollectionUtil.asyncForEach(min.appPackages, async (e: IGBPackage) => { - nextDialog = await e.onExchangeData(min, 'handleAnswer', { - query: text, - step: step, - notTranslatedQuery: originalText, - message: message ? message['dataValues'] : null, - user: user ? user.dataValues : null - }); + nextDialog = await e.onExchangeData(min, 'handleAnswer', data); }); + await step.beginDialog(nextDialog ? nextDialog : '/answer', { + data: data, query: text, user: user ? user.dataValues : null, message: message diff --git a/packages/security.gbapp/index.ts b/packages/security.gbapp/index.ts index 930390c2..bc9808c2 100644 --- a/packages/security.gbapp/index.ts +++ b/packages/security.gbapp/index.ts @@ -41,7 +41,7 @@ import urlJoin = require('url-join'); import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService, IGBPackage } from 'botlib'; import { Sequelize } from 'sequelize-typescript'; import { OAuthDialog } from './dialogs/OAuthDialog'; -import {ProfileDialog} from './dialogs/ProfileDialog'; +import { ProfileDialog } from './dialogs/ProfileDialog'; import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from './models'; /** @@ -50,14 +50,19 @@ import { GuaribasGroup, GuaribasUser, GuaribasUserGroup } from './models'; export class GBSecurityPackage implements IGBPackage { public sysPackages: IGBPackage[]; public async getDialogs(min: GBMinInstance) { - return [ + + let out = [ ProfileDialog.getNameDialog(min), ProfileDialog.getEmailDialog(min), ProfileDialog.getMobileDialog(min), - ProfileDialog.getMobileConfirmDialog(min), - OAuthDialog.getOAuthDialog(min) + ProfileDialog.getMobileConfirmDialog(min) ]; + if (process.env.ENABLE_AUTH) { + out.push(OAuthDialog.getOAuthDialog(min)); + } + return out; + } public async unloadPackage(core: IGBCoreService): Promise { GBLog.verbose(`unloadPackage called.`);