change OAuthPrompt default to AcceptingInput

microsoft · Jul 10, 2019 · 618f768 · 618f768
1 parent 16944a5
commit 618f768
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 37 deletions.
diff --git a/libraries/botbuilder-azure/package.json.lerna_backup b/libraries/botbuilder-azure/package.json.lerna_backup
diff --git 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<PromptOptions> = {...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<Activity> =
-            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
@@ -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);