Skip to content

Commit

Permalink
Merge pull request #97 from auth0/prepare-release
Browse files Browse the repository at this point in the history
Release 1.5.0
  • Loading branch information
lbalmaceda authored Dec 7, 2017
2 parents 424f99c + 14134eb commit 4e5ac52
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## [1.5.0](https://github.com/auth0/auth0-java/tree/1.5.0) (2017-12-07)
[Full Changelog](https://github.com/auth0/auth0-java/compare/1.4.0...1.5.0)

**Added**
- Resource server [\#77](https://github.com/auth0/auth0-java/pull/77) ([mfarsikov](https://github.com/mfarsikov))

## [1.4.0](https://github.com/auth0/auth0-java/tree/1.4.0) (2017-11-30)
[Full Changelog](https://github.com/auth0/auth0-java/compare/1.3.1...1.4.0)

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ Get Auth0 Java via Maven:
<dependency>
<groupId>com.auth0</groupId>
<artifactId>auth0</artifactId>
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
```

or Gradle:

```gradle
compile 'com.auth0:auth0:1.4.0'
compile 'com.auth0:auth0:1.5.0'
```


Expand Down Expand Up @@ -271,6 +271,7 @@ The Management API is divided into different entities. Each of them have the lis
* **Stats:** See [Docs](https://auth0.com/docs/api/management/v2#!/Stats/get_active_users). Access the methods by calling `mgmt.stats()`.
* **Tenants:** See [Docs](https://auth0.com/docs/api/management/v2#!/Tenants/get_settings). Access the methods by calling `mgmt.tenants()`.
* **Tickets:** See [Docs](https://auth0.com/docs/api/management/v2#!/Tickets/post_email_verification). Access the methods by calling `mgmt.tickets()`.
* **Resource Servers:** See [Docs](https://auth0.com/docs/api/management/v2#!/Resource_Servers/get_resource_servers). Access the methods by calling `mgmt.resourceServers()`.


### Users
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/com/auth0/client/mgmt/ManagementAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public ConnectionsEntity connections() {
public DeviceCredentialsEntity deviceCredentials() {
return new DeviceCredentialsEntity(client, baseUrl, apiToken);
}

/**
* Getter for the Grants entity.
*
Expand Down Expand Up @@ -214,6 +214,11 @@ public TicketsEntity tickets() {
return new TicketsEntity(client, baseUrl, apiToken);
}

/**
* Getter for the Resource Servers entity.
*
* @return the Resource Servers entity.
*/
public ResourceServerEntity resourceServers(){
return new ResourceServerEntity(client, baseUrl, apiToken);
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/auth0/client/mgmt/ResourceServerEntity.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;

/**
* Class that provides an implementation of the Resource Server methods of the Management API as defined in https://auth0.com/docs/api/management/v2#!/Resource_Servers
*/
public class ResourceServerEntity {
private OkHttpClient client;
private HttpUrl baseUrl;
Expand Down

0 comments on commit 4e5ac52

Please sign in to comment.