Teams + SSO: Update OAuthcard channel support and return 412 instead…

… of 409 on sso fail (#2407) * Teams + SSO: Update OAuthcard channel support and return 412 instead of 409 on sso fail * SSO: Update OAuthPrompt test to match new status code
microsoft · Jun 24, 2020 · 72e436b · 72e436b
1 parent f3e7e02
commit 72e436b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts b/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts
@@ -399,7 +399,7 @@ export class OAuthPrompt extends Dialog {
 
                 if(!tokenExchangeResponse || !tokenExchangeResponse.token) {
                     await context.sendActivity(this.getTokenExchangeInvokeResponse(
-                        StatusCodes.CONFLICT, 
+                        StatusCodes.PRECONDITION_FAILED, 
                         'The bot is unable to exchange token. Proceed with regular login.'));
                 } else {
                     await context.sendActivity(this.getTokenExchangeInvokeResponse(StatusCodes.OK, null, context.activity.value.id));
@@ -492,7 +492,6 @@ export class OAuthPrompt extends Dialog {
 
     private channelSupportsOAuthCard(channelId: string): boolean {
         switch (channelId) {
-            case Channels.Msteams:
             case Channels.Cortana:
             case Channels.Skype:
             case Channels.Skypeforbusiness:

diff --git a/libraries/botbuilder-dialogs/tests/oauthPrompt.test.js b/libraries/botbuilder-dialogs/tests/oauthPrompt.test.js
@@ -655,7 +655,7 @@ describe('OAuthPrompt', function() {
                 .assertReply(a => {
                     assert.strictEqual('invokeResponse', a.type);
                     assert(a.value);
-                    assert.strictEqual(a.value.status, 409);
+                    assert.strictEqual(a.value.status, 412);
                     assert(a.value.body.failureDetail);
                 });
         });

diff --git a/libraries/botframework-schema/src/index.ts b/libraries/botframework-schema/src/index.ts
@@ -1928,6 +1928,7 @@ export enum StatusCodes {
   NOT_FOUND = 404,
   METHOD_NOT_ALLOWED = 405,
   CONFLICT = 409,
+  PRECONDITION_FAILED = 412,
   UPGRADE_REQUIRED = 426,
   INTERNAL_SERVER_ERROR = 500,
   NOT_IMPLEMENTED = 501,