fixes on bf adapter

axelsrz · axelsrz · commit dcbd64634819 · 2019-11-15T11:08:16.000-08:00
diff --git a/libraries/botbuilder-core/botbuilder/core/__init__.py b/libraries/botbuilder-core/botbuilder/core/__init__.py
@@ -5,6 +5,7 @@
 # license information.
 # --------------------------------------------------------------------------
 from . import conversation_reference_extension
+from .invoke_response import InvokeResponse
 
 from .about import __version__
 from .activity_handler import ActivityHandler
@@ -19,7 +20,6 @@
 from .card_factory import CardFactory
 from .conversation_state import ConversationState
 from .intent_score import IntentScore
-from .invoke_response import InvokeResponse
 from .memory_storage import MemoryStorage
 from .memory_transcript_store import MemoryTranscriptStore
 from .message_factory import MessageFactory
diff --git a/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py b/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py
@@ -108,7 +108,8 @@ def __init__(self, settings: BotFrameworkAdapterSettings):
         )
         self._credential_provider = (
             settings.credential_provider
-            or SimpleCredentialProvider(
+            if settings and settings.credential_provider
+            else SimpleCredentialProvider(
                 self.settings.app_id, self.settings.app_password
             )
         )
@@ -626,7 +627,7 @@ def create_connector_client(self, service_url: str) -> ConnectorClient:
         client.config.add_user_agent(USER_AGENT)
         return client
 
-    def create_connector_client_with_claims(
+    async def create_connector_client_with_claims(
         self, service_url: str, identity: ClaimsIdentity = None
     ) -> ConnectorClient:
         credentials: MicrosoftAppCredentials = None

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ def __init__(self, settings: BotFrameworkAdapterSettings):`
`108`	`108`	`)`
`109`	`109`	`self._credential_provider = (`
`110`	`110`	`settings.credential_provider`
`111`		`- or SimpleCredentialProvider(`
	`111`	`+ if settings and settings.credential_provider`
	`112`	`+ else SimpleCredentialProvider(`
`112`	`113`	`self.settings.app_id, self.settings.app_password`
`113`	`114`	`)`
`114`	`115`	`)`
`@@ -626,7 +627,7 @@ def create_connector_client(self, service_url: str) -> ConnectorClient:`
`626`	`627`	`client.config.add_user_agent(USER_AGENT)`
`627`	`628`	`return client`
`628`	`629`
`629`		`- def create_connector_client_with_claims(`
	`630`	`+ async def create_connector_client_with_claims(`
`630`	`631`	`self, service_url: str, identity: ClaimsIdentity = None`
`631`	`632`	`) -> ConnectorClient:`
`632`	`633`	`credentials: MicrosoftAppCredentials = None`