From 833d69515158e5bfd9306e22a8908970f4de115d Mon Sep 17 00:00:00 2001 From: Gabe Levasseur <11285350+GabeL7r@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:30:21 -0500 Subject: [PATCH 1/2] fix: set team id to none on enterprise installs --- slack_sdk/oauth/installation_store/models/installation.py | 7 ++++++- tests/slack_sdk/oauth/installation_store/test_amazon_s3.py | 1 + tests/slack_sdk/oauth/installation_store/test_file.py | 1 + .../slack_sdk/oauth/installation_store/test_sqlalchemy.py | 1 + tests/slack_sdk/oauth/installation_store/test_sqlite3.py | 1 + 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/slack_sdk/oauth/installation_store/models/installation.py b/slack_sdk/oauth/installation_store/models/installation.py index 42d4c90b..7ad551ad 100644 --- a/slack_sdk/oauth/installation_store/models/installation.py +++ b/slack_sdk/oauth/installation_store/models/installation.py @@ -87,7 +87,12 @@ def __init__( self.enterprise_id = enterprise_id self.enterprise_name = enterprise_name self.enterprise_url = enterprise_url - self.team_id = team_id + # Note: when performing an enterprise install a team id + # is still supplied by Python Bolt, but it is not relevant. + if not is_enterprise_install: + self.team_id = team_id + else: + self.team_id = "none" self.team_name = team_name self.bot_token = bot_token self.bot_id = bot_id diff --git a/tests/slack_sdk/oauth/installation_store/test_amazon_s3.py b/tests/slack_sdk/oauth/installation_store/test_amazon_s3.py index a51f37e9..b777f06c 100644 --- a/tests/slack_sdk/oauth/installation_store/test_amazon_s3.py +++ b/tests/slack_sdk/oauth/installation_store/test_amazon_s3.py @@ -99,6 +99,7 @@ def test_org_installation(self): installation = Installation( app_id="AO111", enterprise_id="EO111", + team_id="TO111", user_id="UO111", bot_id="BO111", bot_token="xoxb-O111", diff --git a/tests/slack_sdk/oauth/installation_store/test_file.py b/tests/slack_sdk/oauth/installation_store/test_file.py index 74675452..213dfe65 100644 --- a/tests/slack_sdk/oauth/installation_store/test_file.py +++ b/tests/slack_sdk/oauth/installation_store/test_file.py @@ -83,6 +83,7 @@ def test_org_installation(self): installation = Installation( app_id="AO111", enterprise_id="EO111", + team_id="TO111", user_id="UO111", bot_id="BO111", bot_token="xoxb-O111", diff --git a/tests/slack_sdk/oauth/installation_store/test_sqlalchemy.py b/tests/slack_sdk/oauth/installation_store/test_sqlalchemy.py index 4d827f70..3a7aed5c 100644 --- a/tests/slack_sdk/oauth/installation_store/test_sqlalchemy.py +++ b/tests/slack_sdk/oauth/installation_store/test_sqlalchemy.py @@ -84,6 +84,7 @@ def test_org_installation(self): installation = Installation( app_id="AO111", enterprise_id="EO111", + team_id="TO111", user_id="UO111", bot_id="BO111", bot_token="xoxb-O111", diff --git a/tests/slack_sdk/oauth/installation_store/test_sqlite3.py b/tests/slack_sdk/oauth/installation_store/test_sqlite3.py index e616c20b..ac31f3c8 100644 --- a/tests/slack_sdk/oauth/installation_store/test_sqlite3.py +++ b/tests/slack_sdk/oauth/installation_store/test_sqlite3.py @@ -87,6 +87,7 @@ def test_org_installation(self): installation = Installation( app_id="AO111", enterprise_id="EO111", + team_id="TO111", user_id="UO111", bot_id="BO111", bot_token="xoxb-O111", From 6d8d94e72676c7f8323376c6e9ec44dbec677075 Mon Sep 17 00:00:00 2001 From: Gabe Levasseur <11285350+GabeL7r@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:42:35 -0500 Subject: [PATCH 2/2] fix: use None and the code handles this correctly --- slack_sdk/oauth/installation_store/models/installation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slack_sdk/oauth/installation_store/models/installation.py b/slack_sdk/oauth/installation_store/models/installation.py index 7ad551ad..875b6e9d 100644 --- a/slack_sdk/oauth/installation_store/models/installation.py +++ b/slack_sdk/oauth/installation_store/models/installation.py @@ -92,7 +92,7 @@ def __init__( if not is_enterprise_install: self.team_id = team_id else: - self.team_id = "none" + self.team_id = None self.team_name = team_name self.bot_token = bot_token self.bot_id = bot_id