check for null or empty description

auth0 · Apr 5, 2017 · bced8e5 · bced8e5
1 parent 4da9670
commit bced8e5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 26 deletions.
diff --git a/auth0/src/main/java/com/auth0/android/authentication/AuthenticationException.java b/auth0/src/main/java/com/auth0/android/authentication/AuthenticationException.java
@@ -24,6 +24,7 @@
 
 package com.auth0.android.authentication;
 
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.auth0.android.Auth0Exception;
@@ -122,7 +123,7 @@ public int getStatusCode() {
  * @return the error description.
  */
  public String getDescription() {
- if (description != null) {
+ if (!TextUtils.isEmpty(description)) {
  return description;
  }
  if (UNKNOWN_ERROR.equals(getCode())) {

diff --git a/auth0/src/test/java/com/auth0/android/provider/WebAuthProviderTest.java b/auth0/src/test/java/com/auth0/android/provider/WebAuthProviderTest.java
@@ -1552,43 +1552,42 @@ private Intent createAuthIntent(String hash) {
  private String createHash(@Nullable String idToken, @Nullable String accessToken, @Nullable String refreshToken, @Nullable String tokenType, @Nullable String state, @Nullable String error, @Nullable String errorDescription) {
  String hash = "#";
  if (accessToken != null) {
- hash = hash.concat("access_token=" + accessToken);
+ hash = hash.concat("access_token=")
+ .concat(accessToken)
+ .concat("&");
  }
  if (idToken != null) {
- if (!hash.endsWith("&")) {
- hash = hash.concat("&");
- }
- hash = hash.concat("id_token=" + idToken);
+ hash = hash.concat("id_token=")
+ .concat(idToken)
+ .concat("&");
  }
  if (refreshToken != null) {
- if (!hash.endsWith("&")) {
- hash = hash.concat("&");
- }
- hash = hash.concat("refresh_token=" + refreshToken);
+ hash = hash.concat("refresh_token=")
+ .concat(refreshToken)
+ .concat("&");
  }
  if (tokenType != null) {
- if (!hash.endsWith("&")) {
- hash = hash.concat("&");
- }
- hash = hash.concat("token_type=" + tokenType);
+ hash = hash.concat("token_type=")
+ .concat(tokenType)
+ .concat("&");
  }
  if (state != null) {
- if (!hash.endsWith("&")) {
- hash = hash.concat("&");
- }
- hash = hash.concat("state=" + state);
+ hash = hash.concat("state=")
+ .concat(state)
+ .concat("&");
  }
  if (error != null) {
- if (!hash.endsWith("&")) {
- hash = hash.concat("&");
- }
- hash = hash.concat("error=" + error);
+ hash = hash.concat("error=")
+ .concat(error)
+ .concat("&");
  }
  if (errorDescription != null) {
- if (!hash.endsWith("&")) {
- hash = hash.concat("&");
- }
- hash = hash.concat("error_description=" + errorDescription);
+ hash = hash.concat("error_description=")
+ .concat(errorDescription)
+ .concat("&");
+ }
+ if (hash.endsWith("&")) {
+ hash = hash.substring(0, hash.length() - 1);
  }
  return hash.length() == 1 ? "" : hash;
  }

diff --git a/auth0/src/test/java/com/auth0/android/request/internal/AuthenticationErrorBuilderTest.java b/auth0/src/test/java/com/auth0/android/request/internal/AuthenticationErrorBuilderTest.java
@@ -6,7 +6,10 @@
 import org.hamcrest.CoreMatchers;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -16,6 +19,8 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
 
+@RunWith(RobolectricTestRunner.class)
+@Config(constants = com.auth0.android.auth0.BuildConfig.class, sdk = 21, manifest = Config.NONE)
 public class AuthenticationErrorBuilderTest {
 
  private AuthenticationErrorBuilder builder;