From 214bc2b25c7920ea94fc2b479f032d6b30a27ae0 Mon Sep 17 00:00:00 2001
From: Siddharth Vaghasia <siddh.vaghais@gmail.com>
Date: Thu, 3 Jun 2021 23:53:51 +0530
Subject: [PATCH] #2419 Fix to add channel via TeamName

---
 src/m365/teams/commands/channel/channel-add.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/m365/teams/commands/channel/channel-add.ts b/src/m365/teams/commands/channel/channel-add.ts
index 26660ac1241..1a63fee2c1d 100644
--- a/src/m365/teams/commands/channel/channel-add.ts
+++ b/src/m365/teams/commands/channel/channel-add.ts
@@ -52,16 +52,23 @@ class TeamsChannelAddCommand extends GraphCommand {
       .get<{ value: Team[] }>(teamRequestOptions)
       .then(response => {
         const teamItem: Team | undefined = response.value[0];
-
         if (!teamItem) {
           return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
         }
-
+        let teamId = teamItem.id;
         if (response.value.length > 1) {
-          return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
+          let found = 0;
+          response.value.forEach(team => {
+            if(team.displayName === args.options.teamName){
+              found++;
+              teamId = team.id;
+            }
+          });
+          if(found > 1){
+            return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
+          }
         }
-
-        return Promise.resolve(teamItem.id);
+        return Promise.resolve(teamId);
       });
   }