diff --git a/libraries/botbuilder-azure/package.json.lerna_backup b/libraries/botbuilder-azure/package.json.lerna_backup deleted file mode 100644 index 3273bd42d9..0000000000 --- a/libraries/botbuilder-azure/package.json.lerna_backup +++ /dev/null @@ -1,33 +0,0 @@ -{ - "name": "botbuilder-azure", - "author": "Microsoft Corp.", - "description": "Azure extensions for Microsoft BotBuilder.", - "version": "4.1.6", - "license": "MIT", - "keywords": [ - "botbuilder", - "botframework", - "bots", - "chatbots", - "azure" - ], - "bugs": { - "url": "https://github.com/Microsoft/botbuilder-js/issues" - }, - "repository": { - "type": "git", - "url": "https://github.com/Microsoft/botbuilder-js.git" - }, - "main": "./lib/index.js", - "typings": "./lib/index.d.ts", - "dependencies": { - "botbuilder": "~4.1.6" - }, - "devDependencies": { - "nock": "^10.0.1" - }, - "files": [ - "/lib", - "/src" - ] -} diff --git a/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts b/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts index 8ce7aec035..1eae30cb03 100644 --- a/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts +++ b/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts @@ -120,10 +120,10 @@ export class OAuthPrompt extends Dialog { // Ensure prompts have input hint set const o: Partial = {...options}; if (o.prompt && typeof o.prompt === 'object' && typeof o.prompt.inputHint !== 'string') { - o.prompt.inputHint = InputHints.ExpectingInput; + o.prompt.inputHint = InputHints.AcceptingInput; } if (o.retryPrompt && typeof o.retryPrompt === 'object' && typeof o.retryPrompt.inputHint !== 'string') { - o.retryPrompt.inputHint = InputHints.ExpectingInput; + o.retryPrompt.inputHint = InputHints.AcceptingInput; } // Initialize prompt state @@ -242,7 +242,7 @@ export class OAuthPrompt extends Dialog { // Initialize outgoing message const msg: Partial = - typeof prompt === 'object' ? {...prompt} : MessageFactory.text(prompt, undefined, InputHints.ExpectingInput); + typeof prompt === 'object' ? {...prompt} : MessageFactory.text(prompt, undefined, InputHints.AcceptingInput); if (!Array.isArray(msg.attachments)) { msg.attachments = []; } // Add login card as needed diff --git a/libraries/botbuilder-dialogs/tests/oauthPrompt.test.js b/libraries/botbuilder-dialogs/tests/oauthPrompt.test.js index 55dee67603..292d2546e9 100644 --- a/libraries/botbuilder-dialogs/tests/oauthPrompt.test.js +++ b/libraries/botbuilder-dialogs/tests/oauthPrompt.test.js @@ -1,4 +1,4 @@ -const { ActivityTypes, ConversationState, MemoryStorage, TestAdapter, CardFactory } = require('botbuilder-core'); +const { ActivityTypes, CardFactory, ConversationState, InputHints, MemoryStorage, TestAdapter } = require('botbuilder-core'); const { OAuthPrompt, OAuthPromptSettings, DialogSet, DialogTurnStatus, ListStyle } = require('../'); const assert = require('assert'); @@ -47,6 +47,7 @@ describe('OAuthPrompt', function () { .assertReply(activity => { assert(activity.attachments.length === 1); assert(activity.attachments[0].contentType === CardFactory.contentTypes.oauthCard); + assert(activity.inputHint === InputHints.AcceptingInput); // send a mock EventActivity back to the bot with the token adapter.addUserToken(connectionName, activity.channelId, activity.recipient.id, token);