diff --git a/package-lock.json b/package-lock.json index 19bd155d..3a3dbe40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8439,14 +8439,12 @@ "es6-promise": { "version": "4.2.8", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==", - "dev": true + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" }, "es6-promisify": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", - "dev": true, "requires": { "es6-promise": "^4.0.3" } @@ -9923,9 +9921,9 @@ } }, "googleapis": { - "version": "76.0.0", - "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-76.0.0.tgz", - "integrity": "sha512-l/TFSW7IRFcb7wF641BlmuP8Ox1ncuzJk5Fcs2947otlGBm5ktDxFhPkmrcNDaG+LWPQsuDwP1ojL0xV39cpmw==", + "version": "75.0.0", + "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-75.0.0.tgz", + "integrity": "sha512-ZAZbWiBMw+ke5rzKRjNBSIJ+ab6wX/4HyHucIV1UHuLScNc8/rFCQsQg2VXEWBkdWUvsRxpB2AtTGtzcviJfwg==", "requires": { "google-auth-library": "^7.0.2", "googleapis-common": "^5.0.2" @@ -12860,19 +12858,18 @@ } }, "microsoft-cognitiveservices-speech-sdk": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/microsoft-cognitiveservices-speech-sdk/-/microsoft-cognitiveservices-speech-sdk-1.17.0.tgz", - "integrity": "sha512-RVUCpTeu1g+R4HB/PaLQmEfsdHzwEa6+2phgCiPA4lGIiR7ILEL7qZHHUWAG6W4zcjnWeiLnL7tVgMbyd5XGgA==", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/microsoft-cognitiveservices-speech-sdk/-/microsoft-cognitiveservices-speech-sdk-1.14.1.tgz", + "integrity": "sha512-+bltlfn5sc0WBhWPiC2Iq503LadmDmCSfF7OH+gTBe5xFeeHuaIMPF1y+Q5B9c/kjZUhLWgxRYahTCMfcyLJZg==", "requires": { - "agent-base": "^6.0.1", - "asn1.js-rfc2560": "^5.0.1", + "agent-base": "^6.0.0", + "asn1.js-rfc2560": "^5.0.0", "asn1.js-rfc5280": "^3.0.0", "async-disk-cache": "^2.1.0", - "https-proxy-agent": "^4.0.0", + "https-proxy-agent": "^3.0.1", "simple-lru-cache": "0.0.2", - "url-parse": "^1.4.7", - "uuid": "^3.3.3", - "ws": "^7.3.1", + "uuid": "^8.3.1", + "ws": "^7.2.0", "xmlhttprequest-ts": "^1.0.1" }, "dependencies": { @@ -12893,20 +12890,36 @@ } }, "https-proxy-agent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", - "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz", + "integrity": "sha512-+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==", "requires": { - "agent-base": "5", - "debug": "4" + "agent-base": "^4.3.0", + "debug": "^3.1.0" }, "dependencies": { "agent-base": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", - "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", + "requires": { + "es6-promisify": "^5.0.0" + } + }, + "debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "requires": { + "ms": "^2.1.1" + } } } + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" } } }, diff --git a/package.json b/package.json index 5b597472..2803ed27 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "express-remove-route": "1.0.0", "ffmpeg-static": "4.3.0", "google-libphonenumber": "3.2.21", - "googleapis": "^76.0.0", + "googleapis": "75.0.0", "ibm-watson": "6.1.1", "js-beautify": "1.13.13", "marked": "2.0.7", diff --git a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts index 18e09026..8e7eec48 100644 --- a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts +++ b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts @@ -131,7 +131,7 @@ export class FeedbackDialog extends IGBDialog { await min.whatsAppDirectLine.sendToDeviceEx(manualUser.userSystemId, Messages[locale].notify_end_transfer(min.instance.botId), locale); - if (userSystemId.charAt(2) === ":") { // Agent is from Teams. + if (userSystemId.charAt(2) === ":" || userSystemId.indexOf('@') > -1) { // Agent is from Teams or Google Chat. await min.conversationalService.sendText(min, step, Messages[locale].notify_end_transfer(min.instance.botId)); } else { @@ -154,7 +154,7 @@ export class FeedbackDialog extends IGBDialog { Messages[locale].notify_end_transfer(min.instance.botId), locale); - if (user.systemUser.agentSystemId.charAt(2) === ":") { // Agent is from Teams. + if (user.systemUser.agentSystemId.charAt(2) === ":" || userSystemId.indexOf('@') > -1) { // Agent is from Teams or Google Chat. await min.conversationalService.sendText(min, step, Messages[locale].notify_end_transfer(min.instance.botId)); } else { @@ -171,7 +171,7 @@ export class FeedbackDialog extends IGBDialog { } else { - if (user.systemUser.userSystemId.charAt(2) === ":") { // Agent is from Teams. + if (user.systemUser.userSystemId.charAt(2) === ":" || userSystemId.indexOf('@') > -1) { // Agent is from Teams or Google Chat. await min.conversationalService.sendText(min, step, 'Nenhum atendimento em andamento.'); } else {