Rename default db name setter.

First draft of README and LICENSE.

Author: hzalaz

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Auth0
+Copyright (c) 2016 Auth0, Inc. <support@auth0.com> (http://auth0.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1 +1,101 @@
-# auth0-api-java
+# Auth0 Java
+
+Java client library for the [Auth0](https://auth0.com) platform.
+
+## Download
+
+Get Auth0 Java via Maven:
+
+```xml
+<dependency>
+  <groupId>com.auth0</groupId>
+  <artifactId>auth0-java</artifactId>
+  <version>0.0.1</version>
+</dependency>
+```
+
+or Gradle:
+
+```gradle
+compile 'com.auth0:auth0-java:0.0.1'
+```
+
+## Usage
+
+First with your Auth0 account information
+
+```java
+Auth0 auth0 = new Auth0("{YOUR_CLIENT_ID}", "{YOUR_DOMAIN}");
+```
+
+and then ask `Auth0` object for the Authentication API Client
+
+```java
+AuthenticationAPIClient client = auth0.newAuthenticationAPIClient();
+```
+
+> Currently we only have a Authentication API Client, in future version we'll start adding Management API Client and methods.
+
+### Authentication API
+
+#### Making a request
+
+Asynchronously
+
+```java
+Auth0 auth0 = new Auth0("{YOUR_CLIENT_ID}", "{YOUR_DOMAIN}");
+AuthenticationAPIClient client = auth0.newAuthenticationAPIClient();
+
+client.login("{username or email}", "{password}")
+        .setConnection("{database connection name}")
+        .start(new BaseCallback<Credentials>() {
+            Override
+            public void onSuccess(Credentials payload) { }
+        
+            Override
+            public void onFailure(Auth0Exception error) { }
+        });
+```
+
+Synchronously
+
+```java
+Auth0 auth0 = new Auth0("{YOUR_CLIENT_ID}", "{YOUR_DOMAIN}");
+AuthenticationAPIClient client = auth0.newAuthenticationAPIClient();
+
+Credentials credentials = client.login("{username or email}", "{password}")
+                                    .setConnection("{database connection name}")
+                                    .execute();
+```
+
+## Documentation
+
+For more information about [auth0](http://auth0.com) check our [documentation page](http://docs.auth0.com/).
+
+## What is Auth0?
+
+Auth0 helps you to:
+
+* Add authentication with [multiple authentication sources](https://docs.auth0.com/identityproviders), either social like **Google, Facebook, Microsoft Account, LinkedIn, GitHub, Twitter, Box, Salesforce, amont others**, or enterprise identity systems like **Windows Azure AD, Google Apps, Active Directory, ADFS or any SAML Identity Provider**.
+* Add authentication through more traditional **[username/password databases](https://docs.auth0.com/mysql-connection-tutorial)**.
+* Add support for **[linking different user accounts](https://docs.auth0.com/link-accounts)** with the same user.
+* Support for generating signed [Json Web Tokens](https://docs.auth0.com/jwt) to call your APIs and **flow the user identity** securely.
+* Analytics of how, when and where users are logging in.
+* Pull data from other sources and add it to the user profile, through [JavaScript rules](https://docs.auth0.com/rules).
+
+## Create a free Auth0 Account
+
+1. Go to [Auth0](https://auth0.com) and click Sign Up.
+2. Use Google, GitHub or Microsoft Account to login.
+
+## Issue Reporting
+
+If you have found a bug or if you have a feature request, please report them at this repository issues section. Please do not report security vulnerabilities on the public GitHub issue tracker. The [Responsible Disclosure Program](https://auth0.com/whitehat) details the procedure for disclosing security issues.
+
+## Author
+
+[Auth0](auth0.com)
+
+## License
+
+This project is licensed under the MIT license. See the [LICENSE](LICENSE) file for more info.

lib/src/main/java/com/auth0/Auth0.java

@@ -51,6 +51,7 @@ public class Auth0 {
     private static final String DOT_AUTH0_DOT_COM = ".auth0.com";
 
     private final String clientId;
+    private final String clientSecret;
     private final String domainUrl;
     private final String configurationUrl;
     private Telemetry telemetry;
@@ -61,19 +62,30 @@ public class Auth0 {
      * @param domain of your Auth0 account
      */
     public Auth0(String clientId, String domain) {
-        this(clientId, domain, null);
+        this(clientId, null, domain, null);
+    }
+
+    /**
+     * Creates a new object using clientId & domain
+     * @param clientId of your Auth0 application
+     * @param domain of your Auth0 account
+     */
+    public Auth0(String clientId, String clientSecret, String domain) {
+        this(clientId, clientSecret, domain, null);
     }
 
     /**
      * Creates a new object using clientId, domain and configuration domain.
      * Useful when using a on-premise auth0 server that is not in the public cloud,
      * otherwise we recommend using the constructor {@link #Auth0(String, String)}
      * @param clientId of your Auth0 application
+     * @param clientSecret of your Auth0 application. It can be null, specially if used for an Android application
      * @param domain of your Auth0 account
      * @param configurationDomain where Auth0's configuration will be fetched. By default is Auth0 public cloud
      */
-    public Auth0(String clientId, String domain, String configurationDomain) {
+    public Auth0(String clientId, String clientSecret, String domain, String configurationDomain) {
         this.clientId = clientId;
+        this.clientSecret = clientSecret;
         this.domainUrl = ensureUrlString(domain);
         this.configurationUrl = resolveConfiguration(configurationDomain, this.domainUrl);
         this.telemetry = new BaseTelemetry();
@@ -94,6 +106,13 @@ public String getDomainUrl() {
         return domainUrl;
     }
 
+    /**
+     * @return your Auth0 account client secret or null
+     */
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
     /**
      * @return your account configuration url
      */

lib/src/main/java/com/auth0/authentication/AuthenticationAPIClient.java

@@ -75,7 +75,7 @@ public class AuthenticationAPIClient {
     private final ObjectMapper mapper;
     private final RequestFactory factory;
 
-    private String defaultDbConnection = DEFAULT_DB_CONNECTION;
+    private String defaultDatabaseConnection = DEFAULT_DB_CONNECTION;
 
     /**
      * Creates a new API client instance providing Auth0 account info.
@@ -86,18 +86,6 @@ public AuthenticationAPIClient(Auth0 auth0) {
         this(auth0, new OkHttpClient(), new ObjectMapper());
     }
 
-    /**
-     * Creates a new API client instance providing Auth API and Configuration Urls different than the default. (Useful for on premise deploys).
-     *
-     * @param clientID         Your application clientID.
-     * @param baseURL          Auth0's auth API endpoint
-     * @param configurationURL Auth0's endpoint where App info can be retrieved.
-     */
-    @SuppressWarnings("unused")
-    public AuthenticationAPIClient(String clientID, String baseURL, String configurationURL) {
-        this(new Auth0(clientID, baseURL, configurationURL));
-    }
-
     private AuthenticationAPIClient(Auth0 auth0, OkHttpClient client, ObjectMapper mapper) {
         this.auth0 = auth0;
         this.client = client;
@@ -127,20 +115,20 @@ public void setUserAgent(String userAgent) {
     }
 
     /**
-     * Set the default DB connection name used. By default is 'Username-Password-Authentication'
+     * Set the default Auth0 database connection name used. By default is 'Username-Password-Authentication'
      *
-     * @param defaultDbConnection name to use on every login with DB connection
+     * @param defaultDatabaseConnection name to use on every login with DB connection
      */
-    public void setDefaultDbConnection(String defaultDbConnection) {
-        this.defaultDbConnection = defaultDbConnection;
+    public void setDefaultDatabaseConnection(String defaultDatabaseConnection) {
+        this.defaultDatabaseConnection = defaultDatabaseConnection;
     }
 
     /**
      * Log in a user with email/username and password using a DB connection.
      * Example usage:
      * <pre><code>
      * client.login("{username or email}", "{password}")
-     *      .setConnection("second-database")
+     *      .setConnection("{database connection name}")
      *      .start(new BaseCallback<Credentials>() {
      *          {@literal@}Override
      *          public void onSuccess(Credentials payload) { }
@@ -308,7 +296,7 @@ public DatabaseConnectionRequest<DatabaseUser> createUser(String email, String p
                 .set(USERNAME_KEY, username)
                 .set(EMAIL_KEY, email)
                 .set(PASSWORD_KEY, password)
-                .setConnection(defaultDbConnection)
+                .setConnection(defaultDatabaseConnection)
                 .setClientId(getClientId())
                 .asDictionary();
         final ParameterizableRequest<DatabaseUser> request = factory.POST(url, client, mapper, DatabaseUser.class)
@@ -418,7 +406,7 @@ public DatabaseConnectionRequest<Void> requestChangePassword(String email) {
         final Map<String, Object> parameters = ParameterBuilder.newBuilder()
                 .set(EMAIL_KEY, email)
                 .setClientId(getClientId())
-                .setConnection(defaultDbConnection)
+                .setConnection(defaultDatabaseConnection)
                 .asDictionary();
         final ParameterizableRequest<Void> request = factory.POST(url, client, mapper)
                 .addParameters(parameters);
@@ -675,7 +663,7 @@ private AuthenticationRequest loginWithResourceOwner(Map<String, Object> paramet
 
         final Map<String, Object> requestParameters = ParameterBuilder.newBuilder()
                 .setClientId(getClientId())
-                .setConnection(defaultDbConnection)
+                .setConnection(defaultDatabaseConnection)
                 .addAll(parameters)
                 .asDictionary();
         return factory.authenticationPOST(url, client, mapper)

lib/src/test/java/com/auth0/Auth0Test.java

@@ -53,7 +53,7 @@ public void shouldBuildWithClientIdAndDomain() throws Exception {
 
     @Test
     public void shouldBuildWithConfigurationDomainToo() throws Exception {
-        Auth0 auth0 = new Auth0(CLIENT_ID, DOMAIN, CONFIG_DOMAIN_CUSTOM);
+        Auth0 auth0 = new Auth0(CLIENT_ID, null, DOMAIN, CONFIG_DOMAIN_CUSTOM);
         assertThat(auth0.getClientId(), equalTo(CLIENT_ID));
         assertThat(auth0.getDomainUrl(), equalTo("https://samples.auth0.com"));
         assertThat(auth0.getConfigurationUrl(), equalTo("https://config.mydomain.com"));