Skip to content

Commit fecd71a

Browse files
author
Irving Popovetsky
committed
fix to use the right token
1 parent a8a357c commit fecd71a

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

manage.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ async def replay_team_join(
5858

5959
token = slack_configs.get("token")
6060
if not token:
61-
logger.error("No Slack token configured. Set BOT_USER_OAUTH_ACCESS_TOKEN.")
61+
logger.error(
62+
"No Slack token configured. Set one of: "
63+
"BOT_USER_OAUTH_ACCESS_TOKEN, BOT_OAUTH_TOKEN, or SLACK_TOKEN"
64+
)
6265
sys.exit(1)
6366

6467
logger.info(f"Starting team_join replay for user: {user_id}")

pybot/endpoints/slack/utils/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
BOT_USER_OAUTH_ACCESS_TOKEN = os.environ.get("BOT_USER_OAUTH_ACCESS_TOKEN")
44
BOT_OAUTH_TOKEN = os.environ.get("BOT_OAUTH_TOKEN")
55
BOT_OATH_TOKEN = os.environ.get("BOT_OATH_TOKEN")
6+
SLACK_TOKEN = os.environ.get("SLACK_TOKEN")
67
MENTOR_CHANNEL = os.environ.get("MENTOR_CHANNEL", "mentors-internal")
78
COMMUNITY_CHANNEL = os.environ.get("COMMUNITY_CHANNEL", "greetings")
89
MODERATOR_CHANNEL = os.environ.get("MODERATOR_CHANNEL", "moderators")
@@ -22,7 +23,8 @@
2223
slack_configs = {
2324
"token": BOT_USER_OAUTH_ACCESS_TOKEN
2425
or BOT_OAUTH_TOKEN
25-
or BOT_OATH_TOKEN, # fallback for old values
26+
or BOT_OATH_TOKEN
27+
or SLACK_TOKEN, # fallback for various env var names
2628
"signing_secret": os.environ.get("SLACK_BOT_SIGNING_SECRET"),
2729
"verify": os.environ.get("VERIFICATION_TOKEN"),
2830
"bot_id": SLACK_BOT_ID,

0 commit comments

Comments
 (0)