Fix #208 by updating AsyncOAuthFlow

slackapi · Jan 18, 2021 · 0d242ee · 0d242ee
1 parent a11f6d1
commit 0d242ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/slack_bolt/oauth/async_oauth_flow.py b/slack_bolt/oauth/async_oauth_flow.py
@@ -308,6 +308,9 @@ async def run_installation(self, code: str) -> Optional[Installation]:
             installed_enterprise: Dict[str, str] = (
                 oauth_response.get("enterprise") or {}
             )
+            is_enterprise_install: bool = (
+                oauth_response.get("is_enterprise_install") or False
+            )
             installed_team: Dict[str, str] = oauth_response.get("team") or {}
             installer: Dict[str, str] = oauth_response.get("authed_user") or {}
             incoming_webhook: Dict[str, str] = (
@@ -317,14 +320,20 @@ async def run_installation(self, code: str) -> Optional[Installation]:
             bot_token: Optional[str] = oauth_response.get("access_token")
             # NOTE: oauth.v2.access doesn't include bot_id in response
             bot_id: Optional[str] = None
+            enterprise_url: Optional[str] = None
             if bot_token is not None:
                 auth_test = await self.client.auth_test(token=bot_token)
                 bot_id = auth_test["bot_id"]
+            if is_enterprise_install is True:
+                enterprise_url = auth_test.get("url")
 
             return Installation(
                 app_id=oauth_response.get("app_id"),
                 enterprise_id=installed_enterprise.get("id"),
+                enterprise_name=installed_enterprise.get("name"),
+                enterprise_url=enterprise_url,
                 team_id=installed_team.get("id"),
+                team_name=installed_team.get("name"),
                 bot_token=bot_token,
                 bot_id=bot_id,
                 bot_user_id=oauth_response.get("bot_user_id"),
@@ -333,10 +342,13 @@ async def run_installation(self, code: str) -> Optional[Installation]:
                 user_token=installer.get("access_token"),
                 user_scopes=installer.get("scope"),  # comma-separated string
                 incoming_webhook_url=incoming_webhook.get("url"),
+                incoming_webhook_channel=incoming_webhook.get("channel"),
                 incoming_webhook_channel_id=incoming_webhook.get("channel_id"),
                 incoming_webhook_configuration_url=incoming_webhook.get(
-                    "configuration_url", None
+                    "configuration_url"
                 ),
+                is_enterprise_install=is_enterprise_install,
+                token_type=oauth_response.get("token_type"),
             )
 
         except SlackApiError as e:

diff --git a/slack_bolt/oauth/oauth_flow.py b/slack_bolt/oauth/oauth_flow.py
@@ -340,7 +340,7 @@ def run_installation(self, code: str) -> Optional[Installation]:
                 incoming_webhook_channel=incoming_webhook.get("channel"),
                 incoming_webhook_channel_id=incoming_webhook.get("channel_id"),
                 incoming_webhook_configuration_url=incoming_webhook.get(
-                    "configuration_url", None
+                    "configuration_url"
                 ),
                 is_enterprise_install=is_enterprise_install,
                 token_type=oauth_response.get("token_type"),