Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions json-logs/samples/api/oauth.v2.user.access.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"ok": false,
"warning": "",
"error": "",
"needed": "",
"provided": "",
"access_token": "",
"token_type": "",
"id_token": "",
"authed_user": {
"id": "",
"scope": ""
},
"team": {
"id": ""
}
}
1 change: 1 addition & 0 deletions metadata/web-api/rate_limit_tiers.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@
"oauth.token": "Tier4",
"oauth.v2.access": "Tier4",
"oauth.v2.exchange": "Tier3",
"oauth.v2.user.access": "Tier4",
"openid.connect.token": "Tier4",
"openid.connect.userInfo": "Tier3",
"pins.add": "Tier2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
import com.slack.api.methods.request.oauth.OAuthTokenRequest;
import com.slack.api.methods.request.oauth.OAuthV2AccessRequest;
import com.slack.api.methods.request.oauth.OAuthV2ExchangeRequest;
import com.slack.api.methods.request.oauth.OAuthV2UserAccessRequest;
import com.slack.api.methods.request.openid.connect.OpenIDConnectTokenRequest;
import com.slack.api.methods.request.openid.connect.OpenIDConnectUserInfoRequest;
import com.slack.api.methods.request.pins.PinsAddRequest;
Expand Down Expand Up @@ -277,6 +278,7 @@
import com.slack.api.methods.response.oauth.OAuthTokenResponse;
import com.slack.api.methods.response.oauth.OAuthV2AccessResponse;
import com.slack.api.methods.response.oauth.OAuthV2ExchangeResponse;
import com.slack.api.methods.response.oauth.OAuthV2UserAccessResponse;
import com.slack.api.methods.response.openid.connect.OpenIDConnectTokenResponse;
import com.slack.api.methods.response.openid.connect.OpenIDConnectUserInfoResponse;
import com.slack.api.methods.response.pins.PinsAddResponse;
Expand Down Expand Up @@ -1485,6 +1487,10 @@ CompletableFuture<AdminConversationsWhitelistListGroupsLinkedToChannelResponse>

CompletableFuture<OAuthV2ExchangeResponse> oauthV2Exchange(RequestConfigurator<OAuthV2ExchangeRequest.OAuthV2ExchangeRequestBuilder> req);

CompletableFuture<OAuthV2UserAccessResponse> oauthV2UserAccess(OAuthV2UserAccessRequest req);

CompletableFuture<OAuthV2UserAccessResponse> oauthV2UserAccess(RequestConfigurator<OAuthV2UserAccessRequest.OAuthV2UserAccessRequestBuilder> req);

CompletableFuture<OAuthTokenResponse> oauthToken(OAuthTokenRequest req);

CompletableFuture<OAuthTokenResponse> oauthToken(RequestConfigurator<OAuthTokenRequest.OAuthTokenRequestBuilder> req);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,7 @@ private Methods() {
public static final String OAUTH_ACCESS = "oauth.access";
public static final String OAUTH_V2_ACCESS = "oauth.v2.access";
public static final String OAUTH_V2_EXCHANGE = "oauth.v2.exchange";
public static final String OAUTH_V2_USER_ACCESS = "oauth.v2.user.access";
public static final String OAUTH_TOKEN = "oauth.token";

// ------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
import com.slack.api.methods.request.oauth.OAuthTokenRequest;
import com.slack.api.methods.request.oauth.OAuthV2AccessRequest;
import com.slack.api.methods.request.oauth.OAuthV2ExchangeRequest;
import com.slack.api.methods.request.oauth.OAuthV2UserAccessRequest;
import com.slack.api.methods.request.openid.connect.OpenIDConnectTokenRequest;
import com.slack.api.methods.request.openid.connect.OpenIDConnectUserInfoRequest;
import com.slack.api.methods.request.pins.PinsAddRequest;
Expand Down Expand Up @@ -302,6 +303,7 @@
import com.slack.api.methods.response.oauth.OAuthTokenResponse;
import com.slack.api.methods.response.oauth.OAuthV2AccessResponse;
import com.slack.api.methods.response.oauth.OAuthV2ExchangeResponse;
import com.slack.api.methods.response.oauth.OAuthV2UserAccessResponse;
import com.slack.api.methods.response.openid.connect.OpenIDConnectTokenResponse;
import com.slack.api.methods.response.openid.connect.OpenIDConnectUserInfoResponse;
import com.slack.api.methods.response.pins.PinsAddResponse;
Expand Down Expand Up @@ -2599,6 +2601,11 @@ OAuthV2ExchangeResponse oauthV2Exchange(
RequestConfigurator<OAuthV2ExchangeRequest.OAuthV2ExchangeRequestBuilder> req)
throws IOException, SlackApiException;

OAuthV2UserAccessResponse oauthV2UserAccess(OAuthV2UserAccessRequest req) throws IOException, SlackApiException;

OAuthV2UserAccessResponse oauthV2UserAccess(RequestConfigurator<OAuthV2UserAccessRequest.OAuthV2UserAccessRequestBuilder> req)
throws IOException, SlackApiException;

OAuthTokenResponse oauthToken(OAuthTokenRequest req) throws IOException, SlackApiException;

OAuthTokenResponse oauthToken(RequestConfigurator<OAuthTokenRequest.OAuthTokenRequestBuilder> req)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ public static void setRateLimitTier(String methodName, MethodsRateLimitTier tier
setRateLimitTier(OAUTH_TOKEN, Tier4);
setRateLimitTier(OAUTH_V2_ACCESS, Tier4);
setRateLimitTier(OAUTH_V2_EXCHANGE, Tier3);
setRateLimitTier(OAUTH_V2_USER_ACCESS, Tier4);

setRateLimitTier(OPENID_CONNECT_TOKEN, Tier4);
setRateLimitTier(OPENID_CONNECT_USER_INFO, Tier3);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
import com.slack.api.methods.request.oauth.OAuthAccessRequest;
import com.slack.api.methods.request.oauth.OAuthTokenRequest;
import com.slack.api.methods.request.oauth.OAuthV2ExchangeRequest;
import com.slack.api.methods.request.oauth.OAuthV2UserAccessRequest;
import com.slack.api.methods.request.openid.connect.OpenIDConnectUserInfoRequest;
import com.slack.api.methods.request.pins.PinsAddRequest;
import com.slack.api.methods.request.pins.PinsListRequest;
Expand Down Expand Up @@ -2910,6 +2911,17 @@ public static FormBody.Builder toForm(OAuthV2ExchangeRequest req) {
return form;
}

public static FormBody.Builder toForm(OAuthV2UserAccessRequest req) {
FormBody.Builder form = new FormBody.Builder();
setIfNotNull("code", req.getCode(), form);
setIfNotNull("code_verifier", req.getCodeVerifier(), form);
setIfNotNull("redirect_uri", req.getRedirectUri(), form);
setIfNotNull("grant_type", req.getGrantType(), form);
setIfNotNull("refresh_token", req.getRefreshToken(), form);
setIfNotNull("assertion", req.getAssertion(), form);
return form;
}

public static FormBody.Builder toForm(OpenIDConnectUserInfoRequest req) {
FormBody.Builder form = new FormBody.Builder();
return form;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
import com.slack.api.methods.request.oauth.OAuthTokenRequest;
import com.slack.api.methods.request.oauth.OAuthV2AccessRequest;
import com.slack.api.methods.request.oauth.OAuthV2ExchangeRequest;
import com.slack.api.methods.request.oauth.OAuthV2UserAccessRequest;
import com.slack.api.methods.request.openid.connect.OpenIDConnectTokenRequest;
import com.slack.api.methods.request.openid.connect.OpenIDConnectUserInfoRequest;
import com.slack.api.methods.request.pins.PinsAddRequest;
Expand Down Expand Up @@ -281,6 +282,7 @@
import com.slack.api.methods.response.oauth.OAuthTokenResponse;
import com.slack.api.methods.response.oauth.OAuthV2AccessResponse;
import com.slack.api.methods.response.oauth.OAuthV2ExchangeResponse;
import com.slack.api.methods.response.oauth.OAuthV2UserAccessResponse;
import com.slack.api.methods.response.openid.connect.OpenIDConnectTokenResponse;
import com.slack.api.methods.response.openid.connect.OpenIDConnectUserInfoResponse;
import com.slack.api.methods.response.pins.PinsAddResponse;
Expand Down Expand Up @@ -2637,6 +2639,16 @@ public CompletableFuture<OAuthV2ExchangeResponse> oauthV2Exchange(RequestConfigu
return oauthV2Exchange(req.configure(OAuthV2ExchangeRequest.builder()).build());
}

@Override
public CompletableFuture<OAuthV2UserAccessResponse> oauthV2UserAccess(OAuthV2UserAccessRequest req) {
return executor.execute(OAUTH_V2_USER_ACCESS, toMap(req), () -> methods.oauthV2UserAccess(req));
}

@Override
public CompletableFuture<OAuthV2UserAccessResponse> oauthV2UserAccess(RequestConfigurator<OAuthV2UserAccessRequest.OAuthV2UserAccessRequestBuilder> req) {
return oauthV2UserAccess(req.configure(OAuthV2UserAccessRequest.builder()).build());
}

@Override
public CompletableFuture<OAuthTokenResponse> oauthToken(OAuthTokenRequest req) {
return executor.execute(OAUTH_TOKEN, toMap(req), () -> methods.oauthToken(req));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
import com.slack.api.methods.request.oauth.OAuthTokenRequest;
import com.slack.api.methods.request.oauth.OAuthV2AccessRequest;
import com.slack.api.methods.request.oauth.OAuthV2ExchangeRequest;
import com.slack.api.methods.request.oauth.OAuthV2UserAccessRequest;
import com.slack.api.methods.request.openid.connect.OpenIDConnectTokenRequest;
import com.slack.api.methods.request.openid.connect.OpenIDConnectUserInfoRequest;
import com.slack.api.methods.request.pins.PinsAddRequest;
Expand Down Expand Up @@ -304,6 +305,7 @@
import com.slack.api.methods.response.oauth.OAuthTokenResponse;
import com.slack.api.methods.response.oauth.OAuthV2AccessResponse;
import com.slack.api.methods.response.oauth.OAuthV2ExchangeResponse;
import com.slack.api.methods.response.oauth.OAuthV2UserAccessResponse;
import com.slack.api.methods.response.openid.connect.OpenIDConnectTokenResponse;
import com.slack.api.methods.response.openid.connect.OpenIDConnectUserInfoResponse;
import com.slack.api.methods.response.pins.PinsAddResponse;
Expand Down Expand Up @@ -3289,6 +3291,25 @@ public OAuthV2ExchangeResponse oauthV2Exchange(RequestConfigurator<OAuthV2Exchan
return oauthV2Exchange(req.configure(OAuthV2ExchangeRequest.builder()).build());
}

@Override
public OAuthV2UserAccessResponse oauthV2UserAccess(OAuthV2UserAccessRequest req) throws IOException, SlackApiException {
FormBody.Builder form = toForm(req);
if (req.getClientSecret() == null) {
// Without a client secret, such as with PKCE, the client_id is sent as a parameter
if (req.getClientId() != null) {
form.add("client_id", req.getClientId());
}
return postFormAndParseResponse(form, Methods.OAUTH_V2_USER_ACCESS, OAuthV2UserAccessResponse.class);
}
String authorizationHeader = Credentials.basic(req.getClientId(), req.getClientSecret());
return postFormWithAuthorizationHeaderAndParseResponse(form, endpointUrlPrefix + Methods.OAUTH_V2_USER_ACCESS, authorizationHeader, OAuthV2UserAccessResponse.class);
}

@Override
public OAuthV2UserAccessResponse oauthV2UserAccess(RequestConfigurator<OAuthV2UserAccessRequest.OAuthV2UserAccessRequestBuilder> req) throws IOException, SlackApiException {
return oauthV2UserAccess(req.configure(OAuthV2UserAccessRequest.builder()).build());
}

@Override
public OAuthTokenResponse oauthToken(OAuthTokenRequest req) throws IOException, SlackApiException {
return postFormAndParseResponse(toForm(req), Methods.OAUTH_TOKEN, OAuthTokenResponse.class);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package com.slack.api.methods.request.oauth;

import com.slack.api.methods.SlackApiRequest;
import lombok.Builder;
import lombok.Data;

/**
* https://docs.slack.dev/reference/methods/oauth.v2.user.access
*/
@Data
@Builder
public class OAuthV2UserAccessRequest implements SlackApiRequest {

/**
* Issued when you created your application. If possible, avoid sending `client_id` and `client_secret` as parameters in your request and instead supply the Client ID and Client Secret using the HTTP Basic authentication scheme.
*/
private String clientId;

/**
* Issued when you created your application. If possible, avoid sending `client_id` and `client_secret` as parameters in your request and instead supply the Client ID and Client Secret using the HTTP Basic authentication scheme.
*/
private String clientSecret;

/**
* The `code` param returned via the OAuth callback.
*/
private String code;

/**
* The code_verifier param used to generate the code_challenge originally. Used for PKCE.
*/
private String codeVerifier;

/**
* This must match the originally submitted URI (if one was sent).
*/
private String redirectUri;

/**
* The `grant_type` param as described in the OAuth spec.
*/
private String grantType;

/**
* The `refresh_token` param as described in the OAuth spec.
*/
private String refreshToken;

/**
* Identity assertion JWT authorization grant.
*/
private String assertion;

@Override
public String getToken() {
return null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.slack.api.methods.response.oauth;

import com.slack.api.methods.SlackApiTextResponse;
import lombok.Data;

import java.util.List;
import java.util.Map;

/**
* https://docs.slack.dev/reference/methods/oauth.v2.user.access
*/
@Data
public class OAuthV2UserAccessResponse implements SlackApiTextResponse {

private boolean ok;
private String warning;
private String error;
private String needed;
private String provided;
private transient Map<String, List<String>> httpResponseHeaders;

private String accessToken;
private String tokenType; // "user"
private String idToken;
private AuthedUser authedUser;
private Team team;

@Data
public static class AuthedUser {
private String id;
private String scope;
}

@Data
public static class Team {
private String id;
}
}
Loading
Loading