Skip to content

Commit 0b3eeb6

Browse files
authored
Merge branch 'master' into sdk-6065-tenant-acl-autho-java-support-ga
2 parents 8788c10 + d19d186 commit 0b3eeb6

File tree

16 files changed

+96
-74
lines changed

16 files changed

+96
-74
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ runs:
3636

3737
- name: Publish Android/Java Packages to Maven
3838
shell: bash
39-
run: ./gradlew publish -PisSnapshot=false --stacktrace
39+
run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository --stacktrace
4040
env:
4141
JAVA_HOME: ${{ env.JAVA_HOME }}
4242
MAVEN_USERNAME: ${{ inputs.ossr-username }}

.github/workflows/build-and-test.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ jobs:
1515
with:
1616
distribution: temurin
1717
java-version: 8
18-
- uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff
19-
with:
20-
arguments: assemble apiDiff check jacocoTestReport --continue --console=plain
21-
- uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c
18+
19+
- name: Set up Gradle
20+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
21+
22+
- name: Test and Assemble and ApiDiff with Gradle
23+
run: ./gradlew assemble apiDiff check jacocoTestReport --continue --console=plain
24+
25+
- uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
2226
with:
2327
flags: unittests
2428
- uses: actions/upload-artifact@v4

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v4
10-
- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # pin@3.3.2
10+
- uses: gradle/actions/wrapper-validation@v4

.github/workflows/rl-scanner.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ jobs:
3939
distribution: temurin
4040
java-version: ${{ inputs.java-version }}
4141

42-
- name: Build with Gradle
43-
uses: gradle/gradle-build-action@4c39dd82cd5e1ec7c6fa0173bb41b4b6bb3b86ff
44-
with:
45-
arguments: assemble apiDiff check jacocoTestReport --continue --console=plain
42+
- name: Set up Gradle
43+
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
44+
45+
- name: Test and Assemble and ApiDiff with Gradle
46+
run: ./gradlew assemble apiDiff check jacocoTestReport --continue --console=plain
4647

4748
- id: get_version
4849
uses: ./.github/actions/get-version

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.22.0
1+
2.23.0

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Change Log
22

3+
## [2.23.0](https://github.com/auth0/auth0-java/tree/2.23.0) (2025-07-21)
4+
[Full Changelog](https://github.com/auth0/auth0-java/compare/2.22.0...2.23.0)
5+
6+
**Added**
7+
- Added organization support for Change Password [\#726](https://github.com/auth0/auth0-java/pull/726) ([tanya732](https://github.com/tanya732))
8+
9+
**Fixed**
10+
- Fix: Resource Server Scopes [\#725](https://github.com/auth0/auth0-java/pull/725) ([tanya732](https://github.com/tanya732))
11+
312
## [2.22.0](https://github.com/auth0/auth0-java/tree/2.22.0) (2025-06-20)
413
[Full Changelog](https://github.com/auth0/auth0-java/compare/2.21.0...2.22.0)
514

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ Add the dependency via Maven:
3434
<dependency>
3535
<groupId>com.auth0</groupId>
3636
<artifactId>auth0</artifactId>
37-
<version>2.22.0</version>
37+
<version>2.23.0</version>
3838
</dependency>
3939
```
4040

4141
or Gradle:
4242

4343
```gradle
44-
implementation 'com.auth0:auth0:2.22.0'
44+
implementation 'com.auth0:auth0:2.23.0'
4545
```
4646

4747
### Configure the SDK

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ plugins {
1515
id 'java'
1616
id 'jacoco'
1717
id 'me.champeau.gradle.japicmp' version '0.2.9'
18+
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
1819
}
1920

2021
repositories {

gradle/maven-publish.gradle

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ artifacts {
2525
archives sourcesJar, javadocJar
2626
}
2727

28-
29-
final releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
30-
final snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
31-
3228
publishing {
3329
publications {
3430
mavenJava(MavenPublication) {
@@ -68,28 +64,18 @@ publishing {
6864
connection = POM_SCM_CONNECTION
6965
developerConnection = POM_SCM_DEV_CONNECTION
7066
}
71-
72-
pom.withXml {
73-
def dependenciesNode = asNode().appendNode('dependencies')
74-
75-
project.configurations.implementation.allDependencies.each {
76-
def dependencyNode = dependenciesNode.appendNode('dependency')
77-
dependencyNode.appendNode('groupId', it.group)
78-
dependencyNode.appendNode('artifactId', it.name)
79-
dependencyNode.appendNode('version', it.version)
80-
}
81-
}
8267
}
8368
}
8469
}
70+
}
71+
72+
nexusPublishing {
8573
repositories {
86-
maven {
87-
name = "sonatype"
88-
url = version.endsWith('SNAPSHOT') ? snapshotRepositoryUrl : releaseRepositoryUrl
89-
credentials {
90-
username = System.getenv("MAVEN_USERNAME")
91-
password = System.getenv("MAVEN_PASSWORD")
92-
}
74+
sonatype {
75+
nexusUrl.set(uri('https://ossrh-staging-api.central.sonatype.com/service/local/'))
76+
snapshotRepositoryUrl.set(uri('https://central.sonatype.com/repository/maven-snapshots/'))
77+
username.set(System.getenv("MAVEN_USERNAME"))
78+
password.set(System.getenv("MAVEN_PASSWORD"))
9379
}
9480
}
9581
}

src/main/java/com/auth0/client/auth/AuthAPI.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,31 @@ public Request<Void> resetPassword(String email, String connection) {
525525
* @return a Request to execute.
526526
*/
527527
public Request<Void> resetPassword(String clientId, String email, String connection) {
528+
return resetPassword(clientId, email, connection, null);
529+
}
530+
531+
/**
532+
* Request a password reset for the given client ID, email, database connection and organization ID. The response will always be successful even if
533+
* there's no user associated to the given email for that database connection.
534+
* i.e.:
535+
* <pre>
536+
* {@code
537+
* try {
538+
* authAPI.resetPassword("CLIENT-ID", "me@auth0.com", "db-connection", "ORGANIZATION-ID").execute().getBody();
539+
* } catch (Auth0Exception e) {
540+
* //Something happened
541+
* }
542+
* }
543+
* </pre>
544+
*
545+
* @see <a href="https://auth0.com/docs/api/authentication#change-password">Change Password API docs</a>
546+
* @param clientId the client ID of your client.
547+
* @param email the email associated to the database user.
548+
* @param connection the database connection where the user was created.
549+
* @param organization the organization ID where the user was created.
550+
* @return a Request to execute.
551+
*/
552+
public Request<Void> resetPassword(String clientId, String email, String connection, String organization) {
528553
Asserts.assertNotNull(email, "email");
529554
Asserts.assertNotNull(connection, "connection");
530555

@@ -538,6 +563,7 @@ public Request<Void> resetPassword(String clientId, String email, String connect
538563
request.addParameter(KEY_CLIENT_ID, clientId);
539564
request.addParameter(KEY_EMAIL, email);
540565
request.addParameter(KEY_CONNECTION, connection);
566+
request.addParameter(KEY_ORGANIZATION, organization);
541567
return request;
542568
}
543569

0 commit comments

Comments
 (0)