Skip to content

Fix an issue where different user's token may exist in context #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seratch merged 1 commit into from
Feb 21, 2021
Merged

Fix an issue where different user's token may exist in context #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions slack_bolt/authorization/async_authorize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ async def __call__(
if not self.bot_only and self.find_installation_available:
# since v1.1, this is the default way
try:
# Note that this is the latest information for the org/workspace.
# The installer may not be the user associated with this incoming request.
installation: Optional[
Installation
] = await self.installation_store.async_find_installation(
Expand All @@ -143,6 +145,10 @@ async def __call__(
return None

if installation.user_id != user_id:
# First off, remove the user token as the installer is a different user
installation.user_token = None
installation.user_scopes = []

# try to fetch the request user's installation
# to reflect the user's access token if exists
user_installation = (
Expand All @@ -154,6 +160,7 @@ async def __call__(
)
)
if user_installation is not None:
# Overwrite the installation with the one for this user
installation = user_installation

bot_token, user_token = installation.bot_token, installation.user_token
Expand Down
7 changes: 7 additions & 0 deletions slack_bolt/authorization/authorize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ def __call__(
if not self.bot_only and self.find_installation_available:
# since v1.1, this is the default way
try:
# Note that this is the latest information for the org/workspace.
# The installer may not be the user associated with this incoming request.
installation: Optional[
Installation
] = self.installation_store.find_installation(
Expand All @@ -143,6 +145,10 @@ def __call__(
return None

if installation.user_id != user_id:
# First off, remove the user token as the installer is a different user
installation.user_token = None
installation.user_scopes = []

# try to fetch the request user's installation
# to reflect the user's access token if exists
user_installation = self.installation_store.find_installation(
Expand All @@ -152,6 +158,7 @@ def __call__(
is_enterprise_install=context.is_enterprise_install,
)
if user_installation is not None:
# Overwrite the installation with the one for this user
installation = user_installation

bot_token, user_token = installation.bot_token, installation.user_token
Expand Down