Decouple authentication from logins

hzalaz · hzalaz · commit 97e4a98333d9 · 2016-03-15T20:09:47.000-03:00
Now only return token instead of token and profile.
Addded a method to chain get profile after a successful authentication
diff --git a/lib/src/main/java/com/auth0/authentication/AuthenticationAPIClient.java b/lib/src/main/java/com/auth0/authentication/AuthenticationAPIClient.java
@@ -69,6 +69,7 @@ public class AuthenticationAPIClient {
     private static final String OAUTH_PATH = "oauth";
     private static final String RESOURCE_OWNER_PATH = "ro";
     private static final String TOKEN_INFO_PATH = "tokeninfo";
+    private static final String ID_TOKEN = "id_token";
 
     private final Auth0 auth0;
     private final OkHttpClient client;
@@ -142,13 +143,13 @@ public void setDefaultDbConnection(String defaultDbConnection) {
      * @param password        of the user
      * @return a request to configure and start that will yield {@link Token} and {@link UserProfile}
      */
-    public AuthenticationRequest login(String usernameOrEmail, String password) {
+    public ParameterizableRequest<Token> login(String usernameOrEmail, String password) {
         Map<String, Object> requestParameters = ParameterBuilder.newAuthenticationBuilder()
                 .set(USERNAME_KEY, usernameOrEmail)
                 .set(PASSWORD_KEY, password)
                 .setGrantType(GRANT_TYPE_PASSWORD)
                 .asDictionary();
-        return newAuthenticationRequest(requestParameters);
+        return loginWithResourceOwner(requestParameters);
     }
 
     /**
@@ -158,7 +159,7 @@ public AuthenticationRequest login(String usernameOrEmail, String password) {
      * @param connection that will be used to authenticate the user, e.g. 'facebook'
      * @return a request to configure and start that will yield {@link Token} and {@link UserProfile}
      */
-    public AuthenticationRequest loginWithOAuthAccessToken(String token, String connection) {
+    public ParameterizableRequest<Token> loginWithOAuthAccessToken(String token, String connection) {
         HttpUrl url = HttpUrl.parse(auth0.getDomainUrl()).newBuilder()
                 .addPathSegment(OAUTH_PATH)
                 .addPathSegment(ACCESS_TOKEN_PATH)
@@ -170,10 +171,9 @@ public AuthenticationRequest loginWithOAuthAccessToken(String token, String conn
                 .setAccessToken(token)
                 .asDictionary();
 
-        final ParameterizableRequest<UserProfile> profileRequest = profileRequest();
         ParameterizableRequest<Token> credentialsRequest = factory.POST(url, client, mapper, Token.class);
         credentialsRequest.getParameterBuilder().addAll(parameters);
-        return new AuthenticationRequest(credentialsRequest, profileRequest);
+        return credentialsRequest;
     }
 
     /**
@@ -183,15 +183,15 @@ public AuthenticationRequest loginWithOAuthAccessToken(String token, String conn
      * @param verificationCode sent by Auth0 via SMS
      * @return a request to configure and start that will yield {@link Token} and {@link UserProfile}
      */
-    public AuthenticationRequest loginWithPhoneNumber(String phoneNumber, String verificationCode) {
+    public ParameterizableRequest<Token> loginWithPhoneNumber(String phoneNumber, String verificationCode) {
         Map<String, Object> parameters = ParameterBuilder.newAuthenticationBuilder()
                 .set(USERNAME_KEY, phoneNumber)
                 .set(PASSWORD_KEY, verificationCode)
                 .setGrantType(GRANT_TYPE_PASSWORD)
                 .setClientId(getClientId())
                 .setConnection(SMS_CONNECTION)
                 .asDictionary();
-        return newAuthenticationRequest(parameters);
+        return loginWithResourceOwner(parameters);
     }
 
     /**
@@ -201,15 +201,15 @@ public AuthenticationRequest loginWithPhoneNumber(String phoneNumber, String ver
      * @param verificationCode sent by Auth0 via Email
      * @return a request to configure and start that will yield {@link Token} and {@link UserProfile}
      */
-    public AuthenticationRequest loginWithEmail(String email, String verificationCode) {
+    public ParameterizableRequest<Token> loginWithEmail(String email, String verificationCode) {
         Map<String, Object> parameters = ParameterBuilder.newAuthenticationBuilder()
                 .set(USERNAME_KEY, email)
                 .set(PASSWORD_KEY, verificationCode)
                 .setGrantType(GRANT_TYPE_PASSWORD)
                 .setClientId(getClientId())
                 .setConnection(EMAIL_CONNECTION)
                 .asDictionary();
-        return newAuthenticationRequest(parameters);
+        return loginWithResourceOwner(parameters);
     }
 
     /**
@@ -269,8 +269,8 @@ public ParameterizableRequest<DatabaseUser> createUser(String email, String pass
      * @return a request to configure and start that will yield {@link Token} and {@link UserProfile}
      */
     public SignUpRequest signUp(String email, String password, String username) {
-        ParameterizableRequest<DatabaseUser> createUserRequest = createUser(email, password, username);
-        AuthenticationRequest authenticationRequest = login(email, password);
+        final ParameterizableRequest<DatabaseUser> createUserRequest = createUser(email, password, username);
+        final ParameterizableRequest<Token> authenticationRequest = login(email, password);
         return new SignUpRequest(createUserRequest, authenticationRequest);
     }
 
@@ -284,7 +284,7 @@ public SignUpRequest signUp(String email, String password, String username) {
      */
     public SignUpRequest signUp(String email, String password) {
         ParameterizableRequest<DatabaseUser> createUserRequest = createUser(email, password);
-        AuthenticationRequest authenticationRequest = login(email, password);
+        final ParameterizableRequest<Token> authenticationRequest = login(email, password);
         return new SignUpRequest(createUserRequest, authenticationRequest);
     }
 
@@ -466,7 +466,12 @@ public ParameterizableRequest<Void> passwordless() {
         return request;
     }
 
-    protected ParameterizableRequest<Token> loginWithResourceOwner() {
+    public AuthenticationRequest getProfileAfter(ParameterizableRequest<Token> loginRequest) {
+        final ParameterizableRequest<UserProfile> profileRequest = profileRequest();
+        return new AuthenticationRequest(loginRequest, profileRequest);
+    }
+
+    protected ParameterizableRequest<Token> loginWithResourceOwner(Map<String, Object> parameters) {
         HttpUrl url = HttpUrl.parse(auth0.getDomainUrl()).newBuilder()
                 .addPathSegment(OAUTH_PATH)
                 .addPathSegment(RESOURCE_OWNER_PATH)
@@ -475,7 +480,8 @@ protected ParameterizableRequest<Token> loginWithResourceOwner() {
         ParameterizableRequest<Token> request = factory.POST(url, client, mapper, Token.class);
         request.getParameterBuilder()
                 .setClientId(getClientId())
-                .setConnection(defaultDbConnection);
+                .setConnection(defaultDbConnection)
+                .addAll(parameters);
         return request;
     }
 
@@ -486,12 +492,4 @@ private ParameterizableRequest<UserProfile> profileRequest() {
 
         return factory.POST(url, client, mapper, UserProfile.class);
     }
-
-    private AuthenticationRequest newAuthenticationRequest(Map<String, Object> parameters) {
-        final ParameterizableRequest<Token> credentialsRequest = loginWithResourceOwner();
-        final ParameterizableRequest<UserProfile> profileRequest = profileRequest();
-
-        return new AuthenticationRequest(credentialsRequest, profileRequest)
-                .addParameters(parameters);
-    }
 }
diff --git a/lib/src/main/java/com/auth0/authentication/SignUpRequest.java b/lib/src/main/java/com/auth0/authentication/SignUpRequest.java
@@ -25,6 +25,7 @@
 package com.auth0.authentication;
 
 import com.auth0.Auth0Exception;
+import com.auth0.authentication.result.Token;
 import com.auth0.request.ParameterizableRequest;
 import com.auth0.request.Request;
 import com.auth0.callback.BaseCallback;
@@ -34,14 +35,14 @@
 import java.util.Map;
 
 /**
- * Represent a request to create a user + log in + fetch user profile.
+ * Represent a request to create a user + log in
  */
-public class SignUpRequest implements Request<Authentication> {
+public class SignUpRequest implements Request<Token> {
 
     private final ParameterizableRequest<DatabaseUser> signUpRequest;
-    private final AuthenticationRequest authenticationRequest;
+    private final ParameterizableRequest<Token> authenticationRequest;
 
-    SignUpRequest(ParameterizableRequest<DatabaseUser> signUpRequest, AuthenticationRequest authenticationRequest) {
+    SignUpRequest(ParameterizableRequest<DatabaseUser> signUpRequest, ParameterizableRequest<Token> authenticationRequest) {
         this.signUpRequest = signUpRequest;
         this.authenticationRequest = authenticationRequest;
     }
@@ -62,7 +63,9 @@ public SignUpRequest addSignUpParameters(Map<String, Object> parameters) {
      * @return itself
      */
     public SignUpRequest addAuthenticationParameters(Map<String, Object> parameters) {
-        authenticationRequest.addParameters(parameters);
+        authenticationRequest
+                .getParameterBuilder()
+                .addAll(parameters);
         return this;
     }
 
@@ -72,7 +75,9 @@ public SignUpRequest addAuthenticationParameters(Map<String, Object> parameters)
      * @return itself
      */
     public SignUpRequest setScope(String scope) {
-        authenticationRequest.setScope(scope);
+        authenticationRequest
+                .getParameterBuilder()
+                .setScope(scope);
         return this;
     }
 
@@ -82,7 +87,9 @@ public SignUpRequest setScope(String scope) {
      * @return itself
      */
     public SignUpRequest setConnection(String connection) {
-        authenticationRequest.setConnection(connection);
+        authenticationRequest
+                .getParameterBuilder()
+                .setConnection(connection);
         return this;
     }
 
@@ -91,7 +98,7 @@ public SignUpRequest setConnection(String connection) {
      * @param callback called on either success or failure.
      */
     @Override
-    public void start(final BaseCallback<Authentication> callback) {
+    public void start(final BaseCallback<Token> callback) {
         signUpRequest.start(new BaseCallback<DatabaseUser>() {
             @Override
             public void onSuccess(final DatabaseUser user) {
@@ -112,7 +119,7 @@ public void onFailure(Auth0Exception error) {
      * @throws Auth0Exception on failure
      */
     @Override
-    public Authentication execute() throws Auth0Exception {
+    public Token execute() throws Auth0Exception {
         signUpRequest.execute();
         return authenticationRequest.execute();
     }
diff --git a/lib/src/test/java/com/auth0/authentication/AuthenticationAPIClientTest.java b/lib/src/test/java/com/auth0/authentication/AuthenticationAPIClientTest.java
