Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge pull request #1 from practo/slack-fix
Browse files Browse the repository at this point in the history
Slack fix
  • Loading branch information
justjkk authored Feb 20, 2019
2 parents 28d497f + 642e752 commit 2418019
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 9.0.0-practo1
-----------

Fixes broken Slack integration due to the workspace apps preview feature reverted by Slack

Version 9.0
-----------

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
)

# The version of sentry
VERSION = '9.0.0'
VERSION = '9.0.0-practo1'

# Hack to prevent stupid "TypeError: 'NoneType' object is not callable" error
# in multiprocessing/util.py _exit_function when running `python
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/identity/slack/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class SlackIdentityProvider(OAuth2Provider):
# TODO(epurkhiser): This identity provider is actually used for authorizing
# the Slack application through their Workspace Token OAuth flow, not a
# standard user access token flow.
oauth_access_token_url = 'https://slack.com/api/oauth.token'
oauth_access_token_url = 'https://slack.com/api/oauth.access'
oauth_authorize_url = 'https://slack.com/oauth/authorize'

oauth_scopes = (
Expand Down
4 changes: 2 additions & 2 deletions src/sentry/integrations/slack/integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class SlackIntegrationProvider(IntegrationProvider):
'channels:read',
'groups:read',
'users:read',
'chat:write',
'chat:write:bot',
'links:read',
'links:write',
'team:read',
Expand Down Expand Up @@ -100,7 +100,7 @@ def build_integration(self, state):
},
'user_identity': {
'type': 'slack',
'external_id': data['authorizing_user_id'],
'external_id': data['user_id'],
'scopes': [],
'data': {},
},
Expand Down

0 comments on commit 2418019

Please sign in to comment.