Merge branch 'main' into dependabot/github_actions/codecov/codecov-action-5.1.2

Author: pmathew92

.github/actions/maven-publish/action.yml

@@ -20,13 +20,11 @@ runs:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Setup Java
-      shell: bash
-      run: |
-        curl -s "https://get.sdkman.io" | bash
-        source "/home/runner/.sdkman/bin/sdkman-init.sh"
-        sdk list java
-        sdk install java ${{ inputs.java-version }} && sdk default java ${{ inputs.java-version }}
+    - name: Set up Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '11'
 
     - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # [email protected]
 

.github/actions/setup/action.yml

@@ -19,11 +19,15 @@ runs:
   using: composite
 
   steps:
+    - name: Set up Java
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: '11'
+
     - run: |
         curl -s "https://get.sdkman.io" | bash
         source "/home/runner/.sdkman/bin/sdkman-init.sh"
-        sdk list java
-        sdk install java ${{ inputs.java }} && sdk default java ${{ inputs.java }}
         sdk install gradle ${{ inputs.gradle }} && sdk default gradle ${{ inputs.gradle }}
         sdk install kotlin ${{ inputs.kotlin }} && sdk default kotlin ${{ inputs.kotlin }}
       shell: bash

.github/workflows/codeql.yml

@@ -35,6 +35,12 @@ jobs:
       - if: github.actor == 'dependabot[bot]' || github.event_name == 'merge_group'
         run: exit 0 # Skip unnecessary test runs for dependabot and merge queues. Artifically flag as successful, as this is a required check for branch protection.
 
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Checkout
         uses: actions/checkout@v4
 

.github/workflows/snyk.yml

@@ -5,16 +5,16 @@ ignore:
   SNYK-JAVA-COMFASTERXMLWOODSTOX-3091135:
     - '*':
         reason: Latest version of dokka has this vulnerability
-        expires: 2024-12-31T12:54:23.000Z
+        expires: 2025-02-21T12:54:23.000Z
         created: 2024-08-01T12:08:37.770Z
   SNYK-JAVA-ORGJETBRAINSKOTLIN-2393744:
     - '*':
         reason: Latest version of dokka has this vulnerability
-        expires: 2024-12-31T12:54:23.000Z
+        expires: 2025-02-21T12:54:23.000Z
         created: 2024-08-01T12:08:55.927Z
   SNYK-JAVA-COMFASTERXMLJACKSONCORE-7569538:
     - '*':
         reason: Latest version of dokka has this vulnerability
-        expires: 2024-12-31T1:54:23.000Z
+        expires: 2025-02-21T1:54:23.000Z
         created: 2024-08-01T12:08:02.973Z
 patch: {}

.snyk

@@ -1 +1 @@
-3.2.1
+3.5.0

.version

@@ -1,5 +1,30 @@
 # Change Log
 
+## [3.5.0](https://github.com/auth0/Auth0.Android/tree/3.5.0) (2025-03-17)
+[Full Changelog](https://github.com/auth0/Auth0.Android/compare/3.4.0...3.5.0)
+
+**Added**
+- Updated documentation to pass an activity context for login and logout [\#808](https://github.com/auth0/Auth0.Android/pull/808) ([pmathew92](https://github.com/pmathew92))
+- Add to CustomTabsOptions ability to disable opening auth in custom tab [\#806](https://github.com/auth0/Auth0.Android/pull/806) ([bennycao](https://github.com/bennycao))
+
+**Changed**
+- Fixed the java samples in the Example.md file [\#807](https://github.com/auth0/Auth0.Android/pull/807) ([pmathew92](https://github.com/pmathew92))
+
+## [3.4.0](https://github.com/auth0/Auth0.Android/tree/3.4.0) (2025-02-13)
+[Full Changelog](https://github.com/auth0/Auth0.Android/compare/3.3.0...3.4.0)
+
+**Added**
+- Support Process Death in WebAuthProvider [\#784](https://github.com/auth0/Auth0.Android/pull/784) ([ahibrahimleague](https://github.com/ahibrahimleague))
+
+**Changed**
+- Updated compile and target sdk version to 35 [\#799](https://github.com/auth0/Auth0.Android/pull/799) ([pmathew92](https://github.com/pmathew92))
+
+## [3.3.0](https://github.com/auth0/Auth0.Android/tree/3.3.0) (2025-02-03)
+[Full Changelog](https://github.com/auth0/Auth0.Android/compare/3.2.1...3.3.0)
+
+**Added**
+- Add support for custom token exchange [\#789](https://github.com/auth0/Auth0.Android/pull/789) ([pmathew92](https://github.com/pmathew92))
+
 ## [3.2.1](https://github.com/auth0/Auth0.Android/tree/3.2.1) (2024-12-06)
 [Full Changelog](https://github.com/auth0/Auth0.Android/compare/3.2.0...3.2.1)
 

CHANGELOG.md

@@ -17,6 +17,7 @@
       - [Step 2: Input the code](#step-2-input-the-code)
     - [Sign Up with a database connection](#sign-up-with-a-database-connection)
     - [Get user information](#get-user-information)
+    - [Custom Token Exchange](#custom-token-exchange)
   - [Credentials Manager](#credentials-manager)
     - [Secure Credentials Manager](#secure-credentials-manager)
       - [Usage](#usage)
@@ -487,6 +488,57 @@ authentication
 ```
 </details>
 
+### Custom Token Exchange
+
+```kotlin
+authentication
+    .customTokenExchange("subject_token_type", "subject_token")
+    .start(object : Callback<Credentials, AuthenticationException> {
+        override fun onSuccess(result: Credentials) {
+            // Handle success
+        }
+
+        override fun onFailure(exception: AuthenticationException) {
+            // Handle error
+        }
+
+    })
+```
+<details> 
+    <summary>Using coroutines</summary> 
+
+``` kotlin 
+try {
+    val credentials = authentication
+        .tokenExchange("subject_token_type", "subject_token")
+        .await()
+} catch (e: AuthenticationException) {
+    e.printStacktrace()
+}
+```
+</details>
+
+<details>
+  <summary>Using Java</summary>
+
+```java
+authentication
+    .customTokenExchange("subject_token_type", "subject_token")
+    .start(new Callback<Credentials, AuthenticationException>() {
+        @Override
+        public void onSuccess(@Nullable Credentials payload) {
+            // Handle success
+        }
+        @Override
+        public void onFailure(@NonNull AuthenticationException error) {
+            // Handle error
+        }
+    });
+```
+
+
+</details>
+
 
 ## Credentials Manager
 
@@ -1236,12 +1288,9 @@ account.networkingClient = netClient
   <summary>Using Java</summary>
 
 ```java
-DefaultClient netClient = new DefaultClient(
-   connectTimeout = 30,
-   readTimeout = 30
-);
+DefaultClient netClient = new DefaultClient(30, 30);
 Auth0 account = Auth0.getInstance("client id", "domain");
-account.networkingClient = netClient;
+account.setNetworkingClient(netClient);
 ```
 </details>
 
@@ -1260,11 +1309,13 @@ account.networkingClient = netClient
   <summary>Using Java</summary>
 
 ```java
+import java.util.HashMap;
+
 DefaultClient netClient = new DefaultClient(
-    enableLogging = true
+        10, 10, new HashMap<>() ,true
 );
 Auth0 account = Auth0.getInstance("client id", "domain");
-account.networkingClient = netClient;
+account.setNetworkingClient(netClient);
 ```
 </details>
 
@@ -1287,10 +1338,10 @@ Map<String, String> defaultHeaders = new HashMap<>();
 defaultHeaders.put("{HEADER-NAME}", "{HEADER-VALUE}");
 
 DefaultClient netClient = new DefaultClient(
-    defaultHeaders = defaultHeaders
+        10,10 , defaultHeaders
 );
 Auth0 account = Auth0.getInstance("client id", "domain");
-account.networkingClient = netClient;
+account.setNetworkingClient(netClient);
 ```
 </details>
 
@@ -1324,7 +1375,7 @@ class CustomNetClient extends NetworkingClient {
       ServerResponse response = // ...
 
       // Return a ServerResponse from the received response data
-      return ServerResponse(responseCode, responseBody, responseHeaders)
+      return new ServerResponse(responseCode, responseBody, responseHeaders);
    }  
 };
 

EXAMPLES.md

@@ -51,7 +51,7 @@ To install Auth0.Android with [Gradle](https://gradle.org/), simply add the foll
 
 ```gradle
 dependencies {
-    implementation 'com.auth0.android:auth0:3.2.1'
+    implementation 'com.auth0.android:auth0:3.5.0'
 }
 ```
 
@@ -197,6 +197,8 @@ The callback will get invoked when the user returns to your application. There a
 
 ##### A note about App Deep Linking:
 
+> Whenever possible, Auth0 recommends using [Android App Links](https://auth0.com/docs/applications/enable-android-app-links) as a secure way to link directly to content within your app. Custom URL schemes can be subject to [client impersonation attacks](https://datatracker.ietf.org/doc/html/rfc8252#section-8.6).
+
 If you followed the configuration steps documented here, you may have noticed the default scheme used for the Callback URI is `https`. This works best for Android API 23 or newer if you're using [Android App Links](https://auth0.com/docs/applications/enable-android-app-links), but in previous Android versions this _may_ show the intent chooser dialog prompting the user to choose either your application or the browser. You can change this behaviour by using a custom unique scheme so that the OS opens directly the link with your app.
 
 1. Update the `auth0Scheme` Manifest Placeholder on the `app/build.gradle` file or update the intent-filter declaration in the `AndroidManifest.xml` to use the new scheme.

README.md

@@ -34,17 +34,19 @@ version = getVersionFromFile()
 logger.lifecycle("Using version ${version} for ${name}")
 
 android {
-    compileSdkVersion 34
+    compileSdk 35
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdk 35
         versionCode 1
         versionName project.version
 
         buildConfigField "String", "LIBRARY_NAME", "\"$project.rootProject.name\""
         buildConfigField "String", "VERSION_NAME", "\"${project.version}\""
 
+        manifestPlaceholders = [auth0Domain: '${auth0Domain}', auth0Scheme: '${auth0Scheme}']
+
         consumerProguardFiles '../proguard/proguard-gson.pro', '../proguard/proguard-okio.pro', '../proguard/proguard-jetpack.pro'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -61,11 +63,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs += [
                 '-Xexplicit-api=strict', // or '-Xexplicit-api=warning'
         ]