fixing bug in jwt token extrator (microsoft#475)

Virtual-Josh · axelsrz · commit dfaf3e8df070 · 2019-12-06T15:20:53.000-08:00
* fixing bug in jwt token extrator

* adding fix for credentials
diff --git a/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py b/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py
@@ -653,6 +653,8 @@ async def create_connector_client(
                     credentials.oauth_scope = (
                         GovernmentConstants.TO_CHANNEL_FROM_BOT_OAUTH_SCOPE
                     )
+            else:
+                credentials = self._credentials
         else:
             credentials = self._credentials
 
diff --git a/libraries/botframework-connector/botframework/connector/auth/jwt_token_extractor.py b/libraries/botframework-connector/botframework/connector/auth/jwt_token_extractor.py
@@ -142,7 +142,7 @@ async def _refresh(self):
     def _find(self, key_id: str):
         if not self.keys:
             return None
-        key = next(x for x in self.keys if x["kid"] == key_id)
+        key = [x for x in self.keys if x["kid"] == key_id][0]
         public_key = RSAAlgorithm.from_jwk(json.dumps(key))
         endorsements = key.get("endorsements", [])
         return _OpenIdConfig(public_key, endorsements)

Original file line number	Diff line number	Diff line change
`@@ -653,6 +653,8 @@ async def create_connector_client(`
`653`	`653`	`credentials.oauth_scope = (`
`654`	`654`	`GovernmentConstants.TO_CHANNEL_FROM_BOT_OAUTH_SCOPE`
`655`	`655`	`)`
	`656`	`+ else:`
	`657`	`+ credentials = self._credentials`
`656`	`658`	`else:`
`657`	`659`	`credentials = self._credentials`
`658`	`660`