Merge branch 'master' into dependabot/github_actions/actions/setup-java-5.6.0

Author: tanya732

.fern/replay.lock

@@ -5,6 +5,7 @@
 - [Management API usage](#management-api-usage)
 - [Verifying an ID token](#verifying-an-id-token)
 - [Organizations](#organizations)
+- [Token Vault](#token-vault)
 - [Logging](#logging)
 - [Asynchronous operations](#asynchronous-operations)
 
@@ -325,6 +326,57 @@ String url = auth.authorizeUrl("https://me.auth0.com/callback")
     .build();
 ```
 
+## Token Vault
+
+[Token Vault](https://auth0.com/docs/secure/tokens/token-vault) lets you exchange an Auth0 token for a federated identity provider's access token, so your application can call the provider's APIs on the user's behalf. The connection must have Token Vault enabled, and because this exchange requires a private client, the `AuthAPI` instance must be configured with a client secret or client assertion.
+
+### Exchange a refresh token
+
+Use `getTokenForConnectionWithRefreshToken()` to exchange an Auth0 refresh token for the federated provider's access token:
+
+```java
+AuthAPI auth = AuthAPI.newBuilder("{YOUR_DOMAIN}", "{YOUR_CLIENT_ID}", "{YOUR_CLIENT_SECRET}").build();
+TokenHolder result = auth.getTokenForConnectionWithRefreshToken("google-oauth2", "{REFRESH_TOKEN}", null)
+    .execute()
+    .getBody();
+String federatedAccessToken = result.getAccessToken();
+```
+
+### Exchange an access token
+
+Use `getTokenForConnectionWithAccessToken()` to exchange an Auth0 access token instead:
+
+```java
+TokenHolder result = auth.getTokenForConnectionWithAccessToken("google-oauth2", "{ACCESS_TOKEN}", null)
+    .execute()
+    .getBody();
+String federatedAccessToken = result.getAccessToken();
+```
+
+### Specifying a login hint
+
+When a user has multiple accounts on the same connection, pass their ID within the identity provider as the `loginHint` (the final argument). Pass `null` to omit it:
+
+```java
+TokenHolder result = auth.getTokenForConnectionWithRefreshToken("google-oauth2", "{REFRESH_TOKEN}", "{GOOGLE_USER_ID}")
+    .execute()
+    .getBody();
+```
+
+### Exchanging other token types
+
+For full control over the subject token type, use the generic `getTokenForConnection()` and supply the `subject_token_type` URN yourself:
+
+```java
+TokenHolder result = auth.getTokenForConnection(
+        "google-oauth2",
+        "{SUBJECT_TOKEN}",
+        "urn:ietf:params:oauth:token-type:refresh_token",
+        "{GOOGLE_USER_ID}")
+    .execute()
+    .getBody();
+```
+
 ## Logging
 
 The SDK is silent by default. You can enable logging to see HTTP requests and responses, which is useful for debugging.

EXAMPLES.md

@@ -1302,7 +1302,7 @@ client.clients().list(
 <dl>
 <dd>
 
-**externalClientId:** `Optional<String>` — Optional filter by the <a href="https://www.ietf.org/archive/id/draft-ietf-oauth-client-id-metadata-document-04.html">Client ID Metadata Document</a> URI for CIMD-registered clients.
+**externalClientId:** `Optional<String>` — Optional filter by the <a href="https://drafts.oauth.net/draft-ietf-oauth-client-id-metadata-document/draft-ietf-oauth-client-id-metadata-document.html">Client ID Metadata Document</a> URI for CIMD-registered clients.
 
 </dd>
 </dl>
@@ -1786,6 +1786,14 @@ See https://auth0.com/docs/secure/security-guidance/measures-against-app-imperso
 <dl>
 <dd>
 
+**identityAssertionAuthorizationGrant:** `Optional<CreateIdentityAssertionAuthorizationGrant>` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
 **thirdPartySecurityMode:** `Optional<ClientThirdPartySecurityModeEnum>` 
 
 </dd>
@@ -2411,6 +2419,14 @@ client.clients().update(
 <dl>
 <dd>
 
+**identityAssertionAuthorizationGrant:** `Optional<UpdateIdentityAssertionAuthorizationGrant>` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
 **formTemplate:** `Optional<String>` — Form template for WS-Federation protocol
 
 </dd>
@@ -3424,6 +3440,14 @@ client.connections().create(
 
 **crossAppAccessRequestingApp:** `Optional<CrossAppAccessRequestingApp>` 
 
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**crossAppAccessResourceApp:** `Optional<CreateCrossAppAccessResourceApp>` 
+    
 </dd>
 </dl>
 </dd>
@@ -3698,6 +3722,14 @@ client.connections().update(
 
 **crossAppAccessRequestingApp:** `Optional<CrossAppAccessRequestingApp>` 
 
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**crossAppAccessResourceApp:** `Optional<UpdateCrossAppAccessResourceApp>` 
+    
 </dd>
 </dl>
 </dd>
@@ -16871,6 +16903,14 @@ client.branding().themes().create(
 <dl>
 <dd>
 
+**identifiers:** `Optional<BrandingThemeIdentifiers>` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
 **pageBackground:** `BrandingThemePageBackground` 
 
 </dd>
@@ -17228,6 +17268,14 @@ client.branding().themes().update(
 <dl>
 <dd>
 
+**identifiers:** `Optional<BrandingThemeIdentifiers>` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
 **pageBackground:** `BrandingThemePageBackground` 
 
 </dd>
@@ -29546,6 +29594,14 @@ client.selfServiceProfiles().ssoTicket().create(
 <dl>
 <dd>
 
+**thirdPartyClientAccessConfig:** `Optional<ThirdPartyClientAccessConfig>` 
+    
+</dd>
+</dl>
+
+<dl>
+<dd>
+
 **enabledFeatures:** `Optional<SelfServiceProfileSsoTicketEnabledFeatures>` 
 
 </dd>

reference.md

@@ -843,15 +843,20 @@ public TokenRequest exchangeToken(String subjectToken, String subjectTokenType)
     }
 
     /**
-     * Creates a request to exchange an Auth0 refresh token for a federated identity provider's access token
+     * Creates a request to exchange a subject token for a federated identity provider's access token
      * using the Token Vault grant
      * {@code urn:auth0:params:oauth:grant-type:token-exchange:federated-connection-access-token}.
+     * This is the generic entry point: the caller supplies both the {@code subjectToken} and its
+     * {@code subjectTokenType}, so no assumption is made about which kind of token is being exchanged.
+     * For the common cases, prefer {@link #getTokenForConnectionWithRefreshToken(String, String, String)}
+     * or {@link #getTokenForConnectionWithAccessToken(String, String, String)}.
      * The connection must have the token vault enabled, and client authentication
      * (client secret or client assertion) is required as this must be a private client.
      * <pre>
      * {@code
      * try {
-     *      TokenHolder result = authAPI.getTokenForConnection("google-oauth2", refreshToken, "google-user-id")
+     *      TokenHolder result = authAPI.getTokenForConnection(
+     *              "google-oauth2", subjectToken, "urn:ietf:params:oauth:token-type:refresh_token", "google-user-id")
      *          .execute()
      *          .getBody();
      *      String federatedAccessToken = result.getAccessToken();
@@ -864,22 +869,27 @@ public TokenRequest exchangeToken(String subjectToken, String subjectTokenType)
      * @see <a href="https://auth0.com/docs/secure/tokens/token-vault">Token Vault documentation</a>
      * @param connection the name of the federated connection to obtain an access token for
      *                   (for example {@code google-oauth2}). Must not be null.
-     * @param refreshToken a valid Auth0 refresh token to exchange. Must not be null.
+     * @param subjectToken the Auth0 token to exchange. Must not be null.
+     * @param subjectTokenType the identifier for the type of {@code subjectToken}, for example
+     *                         {@code urn:ietf:params:oauth:token-type:refresh_token} or
+     *                         {@code urn:ietf:params:oauth:token-type:access_token}. Must not be null.
      * @param loginHint the user's ID within the identity provider specified by the connection
      *                  (for example, the Google user ID when the connection is {@code google-oauth2}).
      *                  May be null, in which case no {@code login_hint} is sent.
      * @return a Request to configure and execute.
      */
-    public TokenRequest getTokenForConnection(String connection, String refreshToken, String loginHint) {
+    public TokenRequest getTokenForConnection(
+            String connection, String subjectToken, String subjectTokenType, String loginHint) {
         Asserts.assertNotNull(connection, "connection");
-        Asserts.assertNotNull(refreshToken, "refresh token");
+        Asserts.assertNotNull(subjectToken, "subject token");
+        Asserts.assertNotNull(subjectTokenType, "subject token type");
 
         TokenRequest request = new TokenRequest(client, getTokenUrl());
         request.addParameter(KEY_CLIENT_ID, clientId);
         request.addParameter(
                 KEY_GRANT_TYPE, "urn:auth0:params:oauth:grant-type:token-exchange:federated-connection-access-token");
-        request.addParameter(KEY_SUBJECT_TOKEN, refreshToken);
-        request.addParameter(KEY_SUBJECT_TOKEN_TYPE, "urn:ietf:params:oauth:token-type:refresh_token");
+        request.addParameter(KEY_SUBJECT_TOKEN, subjectToken);
+        request.addParameter(KEY_SUBJECT_TOKEN_TYPE, subjectTokenType);
         request.addParameter(
                 KEY_REQUESTED_TOKEN_TYPE, "http://auth0.com/oauth/token-type/federated-connection-access-token");
         request.addParameter(KEY_CONNECTION, connection);
@@ -890,6 +900,97 @@ public TokenRequest getTokenForConnection(String connection, String refreshToken
         return request;
     }
 
+    /**
+     * Convenience method to exchange an Auth0 refresh token for a federated identity provider's access token
+     * using the Token Vault grant. Delegates to
+     * {@link #getTokenForConnection(String, String, String, String)} with the subject token type
+     * {@code urn:ietf:params:oauth:token-type:refresh_token}.
+     * The connection must have the token vault enabled, and client authentication
+     * (client secret or client assertion) is required as this must be a private client.
+     * <pre>
+     * {@code
+     * try {
+     *      TokenHolder result = authAPI.getTokenForConnectionWithRefreshToken("google-oauth2", refreshToken, "google-user-id")
+     *          .execute()
+     *          .getBody();
+     *      String federatedAccessToken = result.getAccessToken();
+     * } catch (Auth0Exception e) {
+     *      //Something happened
+     * }
+     * }
+     * </pre>
+     *
+     * @see <a href="https://auth0.com/docs/secure/tokens/token-vault">Token Vault documentation</a>
+     * @param connection the name of the federated connection to obtain an access token for
+     *                   (for example {@code google-oauth2}). Must not be null.
+     * @param refreshToken a valid Auth0 refresh token to exchange. Must not be null.
+     * @param loginHint the user's ID within the identity provider specified by the connection
+     *                  (for example, the Google user ID when the connection is {@code google-oauth2}).
+     *                  May be null, in which case no {@code login_hint} is sent.
+     * @return a Request to configure and execute.
+     */
+    public TokenRequest getTokenForConnectionWithRefreshToken(
+            String connection, String refreshToken, String loginHint) {
+        Asserts.assertNotNull(refreshToken, "refresh token");
+        return getTokenForConnection(
+                connection, refreshToken, "urn:ietf:params:oauth:token-type:refresh_token", loginHint);
+    }
+
+    /**
+     * Convenience method to exchange an Auth0 access token for a federated identity provider's access token
+     * using the Token Vault grant. Delegates to
+     * {@link #getTokenForConnection(String, String, String, String)} with the subject token type
+     * {@code urn:ietf:params:oauth:token-type:access_token}.
+     * The connection must have the token vault enabled, and client authentication
+     * (client secret or client assertion) is required as this must be a private client.
+     * <pre>
+     * {@code
+     * try {
+     *      TokenHolder result = authAPI.getTokenForConnectionWithAccessToken("google-oauth2", accessToken, "google-user-id")
+     *          .execute()
+     *          .getBody();
+     *      String federatedAccessToken = result.getAccessToken();
+     * } catch (Auth0Exception e) {
+     *      //Something happened
+     * }
+     * }
+     * </pre>
+     *
+     * @see <a href="https://auth0.com/docs/secure/tokens/token-vault">Token Vault documentation</a>
+     * @param connection the name of the federated connection to obtain an access token for
+     *                   (for example {@code google-oauth2}). Must not be null.
+     * @param accessToken a valid Auth0 access token to exchange. Must not be null.
+     * @param loginHint the user's ID within the identity provider specified by the connection
+     *                  (for example, the Google user ID when the connection is {@code google-oauth2}).
+     *                  May be null, in which case no {@code login_hint} is sent.
+     * @return a Request to configure and execute.
+     */
+    public TokenRequest getTokenForConnectionWithAccessToken(String connection, String accessToken, String loginHint) {
+        Asserts.assertNotNull(accessToken, "access token");
+        return getTokenForConnection(
+                connection, accessToken, "urn:ietf:params:oauth:token-type:access_token", loginHint);
+    }
+
+    /**
+     * Creates a request to exchange an Auth0 refresh token for a federated identity provider's access token
+     * using the Token Vault grant.
+     *
+     * @deprecated Use {@link #getTokenForConnectionWithRefreshToken(String, String, String)} to exchange a
+     *             refresh token, or {@link #getTokenForConnectionWithAccessToken(String, String, String)} to
+     *             exchange an access token. For full control over the subject token type, use
+     *             {@link #getTokenForConnection(String, String, String, String)}.
+     * @param connection the name of the federated connection to obtain an access token for
+     *                   (for example {@code google-oauth2}). Must not be null.
+     * @param refreshToken a valid Auth0 refresh token to exchange. Must not be null.
+     * @param loginHint the user's ID within the identity provider specified by the connection.
+     *                  May be null, in which case no {@code login_hint} is sent.
+     * @return a Request to configure and execute.
+     */
+    @Deprecated
+    public TokenRequest getTokenForConnection(String connection, String refreshToken, String loginHint) {
+        return getTokenForConnectionWithRefreshToken(connection, refreshToken, loginHint);
+    }
+
     /**
      * Creates a request to revoke an existing Refresh Token.
      * Confidential clients (Regular Web Apps) <strong>must</strong> have a client secret configured on this {@code AuthAPI} instance.