Skip to content

Commit d4d8156

Browse files
authored
Fix #960 The bot refresh token is overriden with the user refresh token in OAuthV2DefaultSuccessHandler.java (#961)
1 parent 8c03217 commit d4d8156

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

bolt/src/main/java/com/slack/api/bolt/service/builtin/oauth/default_impl/OAuthV2DefaultSuccessHandler.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,13 @@ public Response handle(OAuthCallbackRequest request, Response response, OAuthV2A
7575
if (o.getAuthedUser() != null) {
7676
// we can assume authed_user should exist but just in case
7777
i = i.installerUserId(o.getAuthedUser().getId())
78+
// These properties can exist only when a user token is requested
7879
.installerUserAccessToken(o.getAuthedUser().getAccessToken())
79-
.botRefreshToken(o.getAuthedUser().getRefreshToken())
80-
.botTokenExpiresAt(o.getAuthedUser().getExpiresIn() == null ?
81-
null : System.currentTimeMillis() + (o.getAuthedUser().getExpiresIn() * 1000))
82-
.installerUserScope(o.getAuthedUser().getScope());
80+
.installerUserScope(o.getAuthedUser().getScope())
81+
// These token-rotation-related properties can be absent
82+
.installerUserRefreshToken(o.getAuthedUser().getRefreshToken())
83+
.installerUserTokenExpiresAt(o.getAuthedUser().getExpiresIn() == null ?
84+
null : System.currentTimeMillis() + (o.getAuthedUser().getExpiresIn() * 1000));
8385
}
8486

8587
if (o.getBotUserId() != null) {

0 commit comments

Comments
 (0)