implement authentication error

app/src/main/java/chat/rocket/android/activity/ServerConfigActivity.java

@@ -7,7 +7,7 @@ import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import chat.rocket.android.LaunchUtil;
 import chat.rocket.android.R;
-import chat.rocket.android.fragment.login.GitHubOAuthWebViewFragment;
+import chat.rocket.android.fragment.oauth.GitHubOAuthWebViewFragment;
 import chat.rocket.android.fragment.server_config.AuthenticatingFragment;
 import chat.rocket.android.fragment.server_config.ConnectingToHostFragment;
 import chat.rocket.android.fragment.server_config.InputHostnameFragment;
@@ -60,7 +60,9 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
 
     for (ServerConfig config : configList) {
       ServerConfigCredential credential = config.getCredential();
-      if (credential != null && !TextUtils.isEmpty(credential.getType())) {
+      if (credential != null
+          && !TextUtils.isEmpty(credential.getType())
+          && TextUtils.isEmpty(credential.getErrorMessage())) {
         return launchFor(context, config);
       }
     }
@@ -126,16 +128,20 @@ public class ServerConfigActivity extends AbstractFragmentActivity {
 
     if (config.isTokenVerified()) {
       finish();
+      overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
       return;
     }
 
     final String token = config.getToken();
     if (!TextUtils.isEmpty(token)) {
+      showFragment(new AuthenticatingFragment());
       return;
     }
 
     final ServerConfigCredential credential = config.getCredential();
-    if (credential != null && !TextUtils.isEmpty(credential.getType())) {
+    if (credential != null
+        && !TextUtils.isEmpty(credential.getType())
+        && TextUtils.isEmpty(credential.getErrorMessage())) {
       if (ServerConfigCredential.hasSecret(credential)) {
         showFragment(new AuthenticatingFragment());
       } else {

app/src/main/java/chat/rocket/android/fragment/login/GitHubOAuthWebViewFragment.java → app/src/main/java/chat/rocket/android/fragment/oauth/GitHubOAuthWebViewFragment.java

-package chat.rocket.android.fragment.login;
+package chat.rocket.android.fragment.oauth;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -21,6 +21,7 @@ import timber.log.Timber;
 public class GitHubOAuthWebViewFragment extends AbstractWebViewFragment {
 
   private String serverConfigId;
+  private String credentialId;
   private String hostname;
   private String url;
   private boolean resultOK;
@@ -58,6 +59,7 @@ public class GitHubOAuthWebViewFragment extends AbstractWebViewFragment {
       throw new IllegalArgumentException(
           "Invalid server_config_id given,");
     }
+    credentialId = serverConfig.getCredential().getId();
     hostname = serverConfig.getHostname();
     url = generateURL(oauthConfig.getClientId());
   }
@@ -151,6 +153,7 @@ public class GitHubOAuthWebViewFragment extends AbstractWebViewFragment {
         realm.createOrUpdateObjectFromJson(ServerConfig.class, new JSONObject()
             .put("id", serverConfigId)
             .put("credential", new JSONObject()
+                .put("id", credentialId)
                 .put("type", "github")
                 .put("credentialToken", credentialToken)
                 .put("credentialSecret", credentialSecret))

app/src/main/java/chat/rocket/android/fragment/server_config/LoginFragment.java

 package chat.rocket.android.fragment.server_config;
 
+import android.os.Handler;
+import android.os.Message;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 import chat.rocket.android.R;
 import chat.rocket.android.helper.LogcatIfError;
 import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.model.MeteorLoginServiceConfiguration;
 import chat.rocket.android.model.ServerConfig;
+import chat.rocket.android.model.ServerConfigCredential;
+import chat.rocket.android.renderer.ServerConfigCredentialRenderer;
 import io.realm.Realm;
 import io.realm.RealmResults;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
+import jp.co.crowdworks.realm_java_helpers.RealmHelper;
 import jp.co.crowdworks.realm_java_helpers.RealmListObserver;
 import jp.co.crowdworks.realm_java_helpers_bolts.RealmHelperBolts;
 import org.json.JSONObject;
@@ -24,6 +30,12 @@ public class LoginFragment extends AbstractServerConfigFragment {
     return R.layout.fragment_login;
   }
 
+  private Handler errorShowingHandler = new Handler() {
+    @Override public void handleMessage(Message msg) {
+      Toast.makeText(rootView.getContext(), (String) msg.obj, Toast.LENGTH_SHORT).show();
+    }
+  };
+
   private RealmListObserver<MeteorLoginServiceConfiguration> authProvidersObserver =
       new RealmListObserver<MeteorLoginServiceConfiguration>() {
         @Override protected RealmResults<MeteorLoginServiceConfiguration> queryItems(Realm realm) {
@@ -50,25 +62,55 @@ public class LoginFragment extends AbstractServerConfigFragment {
           realm.createOrUpdateObjectFromJson(ServerConfig.class, new JSONObject()
               .put("id", serverConfigId)
               .put("credential", new JSONObject()
-                  .put("type", "email")
+                  .put("id", serverConfigId)
+                  .put("type", ServerConfigCredential.TYPE_EMAIL)
+                  .put("errorMessage", JSONObject.NULL)
                   .put("username", username.toString())
                   .put("hashedPasswd", sha256sum(passwd.toString())))
           )
       ).continueWith(new LogcatIfError());
     });
+
+    showErrorIfNeeded();
+  }
+
+  private void showErrorIfNeeded() {
+    ServerConfig config = RealmHelper.executeTransactionForRead(realm -> realm.where(ServerConfig.class)
+        .equalTo("id", serverConfigId)
+        .isNotNull("credential.errorMessage")
+        .findFirst());
+
+    if (config != null) {
+      ServerConfigCredential credential = config.getCredential();
+      new ServerConfigCredentialRenderer(getContext(), credential)
+          .usernameInto((TextView) rootView.findViewById(R.id.editor_username));
+
+      String errorMessage = credential.getErrorMessage();
+      if (!TextUtils.isEmpty(errorMessage)) {
+        showError(errorMessage);
+      }
+    }
+  }
+
+  private void showError(String errString) {
+    errorShowingHandler.removeMessages(0);
+    Message msg = Message.obtain(errorShowingHandler, 0, errString);
+    errorShowingHandler.sendMessageDelayed(msg, 160);
   }
 
   private static String sha256sum(String orig) {
-    MessageDigest d = null;
+    MessageDigest messageDigest = null;
     try {
-      d = MessageDigest.getInstance("SHA-256");
-    } catch (NoSuchAlgorithmException e) {
+      messageDigest = MessageDigest.getInstance("SHA-256");
+    } catch (NoSuchAlgorithmException exception) {
       return null;
     }
-    d.update(orig.getBytes());
+    messageDigest.update(orig.getBytes());
 
     StringBuilder sb = new StringBuilder();
-    for(byte b : d.digest()) sb.append(String.format("%02x", b & 0xff));
+    for (byte b : messageDigest.digest()) {
+      sb.append(String.format("%02x", b & 0xff));
+    }
 
     return sb.toString();
   }
@@ -80,16 +122,18 @@ public class LoginFragment extends AbstractServerConfigFragment {
     boolean hasTwitter = false;
     boolean hasGitHub = false;
     for (MeteorLoginServiceConfiguration authProvider : authProviders) {
-      if (!hasTwitter && "twitter".equals(authProvider.getService())) {
+      if (!hasTwitter
+          && ServerConfigCredential.TYPE_TWITTER.equals(authProvider.getService())) {
         hasTwitter = true;
         btnTwitter.setOnClickListener(view -> {
-          setAuthType("twitter");
+          setAuthType(authProvider.getId(), ServerConfigCredential.TYPE_TWITTER);
         });
       }
-      if (!hasGitHub && "github".equals(authProvider.getService())) {
+      if (!hasGitHub
+          && ServerConfigCredential.TYPE_GITHUB.equals(authProvider.getService())) {
         hasGitHub = true;
         btnGitHub.setOnClickListener(view -> {
-          setAuthType("github");
+          setAuthType(authProvider.getId(), ServerConfigCredential.TYPE_GITHUB);
         });
       }
     }
@@ -98,12 +142,14 @@ public class LoginFragment extends AbstractServerConfigFragment {
     btnGitHub.setVisibility(hasGitHub ? View.VISIBLE : View.GONE);
   }
 
-  private void setAuthType(final String authType) {
+  private void setAuthType(final String authProviderId, final String authType) {
     RealmHelperBolts.executeTransaction(realm ->
         realm.createOrUpdateObjectFromJson(ServerConfig.class, new JSONObject()
             .put("id", serverConfigId)
             .put("credential", new JSONObject()
-                .put("type", authType)))
+                .put("id", authProviderId)
+                .put("type", authType))
+                .put("errorMessage", JSONObject.NULL))
     ).continueWith(new LogcatIfError());
   }
 

app/src/main/java/chat/rocket/android/model/ServerConfig.java

@@ -38,7 +38,7 @@ public class ServerConfig extends RealmObject {
     return config != null;
   }
 
-  @DebugLog public static void logError(String id, Exception exception) {
+  @DebugLog public static void logConnectionError(String id, Exception exception) {
     RealmHelperBolts.executeTransaction(
         realm -> realm.createOrUpdateObjectFromJson(ServerConfig.class, new JSONObject()
             .put("id", id)

app/src/main/java/chat/rocket/android/model/ServerConfigCredential.java

 package chat.rocket.android.model;
 
+import chat.rocket.android.helper.LogcatIfError;
 import chat.rocket.android.helper.TextUtils;
+import chat.rocket.android_ddp.DDPClientCallback;
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
 import jp.co.crowdworks.realm_java_helpers_bolts.RealmHelperBolts;
+import org.json.JSONException;
 import org.json.JSONObject;
 
 public class ServerConfigCredential extends RealmObject {
-  @PrimaryKey private String type;
+  public static final String TYPE_EMAIL = "email";
+  public static final String TYPE_TWITTER = "twitter";
+  public static final String TYPE_GITHUB = "github";
+
+  @PrimaryKey private String id;
+  private String type;
   private String credentialToken;
   private String credentialSecret;
   private String username;
   private String hashedPasswd;
+  private String errorMessage;
+
+  public String getId() {
+    return id;
+  }
+
+  public void setId(String id) {
+    this.id = id;
+  }
 
   public String getType() {
     return type;
@@ -53,6 +70,14 @@ public class ServerConfigCredential extends RealmObject {
     this.hashedPasswd = hashedPasswd;
   }
 
+  public String getErrorMessage() {
+    return errorMessage;
+  }
+
+  public void setErrorMessage(String errorMessage) {
+    this.errorMessage = errorMessage;
+  }
+
   public static boolean hasSecret(ServerConfigCredential credential) {
     if (credential == null) {
       return false;
@@ -73,4 +98,25 @@ public class ServerConfigCredential extends RealmObject {
 
     return false;
   }
+
+  public static void logError(final String id, final Exception exception) {
+    RealmHelperBolts.executeTransaction(realm ->
+        realm.createOrUpdateObjectFromJson(ServerConfigCredential.class, new JSONObject()
+            .put("id", id)
+            .put("errorMessage", getErrorMessageFor(exception)))
+    ).continueWith(new LogcatIfError());
+  }
+
+  private static String getErrorMessageFor(Exception exception) throws JSONException {
+    if (exception instanceof DDPClientCallback.RPC.Error) {
+      JSONObject error = ((DDPClientCallback.RPC.Error) exception).error;
+      if (!error.isNull("message")) {
+        return error.getString("message");
+      } else {
+        return error.toString();
+      }
+    } else {
+      return exception.getMessage();
+    }
+  }
 }

app/src/main/java/chat/rocket/android/renderer/AbstractRenderer.java

+package chat.rocket.android.renderer;
+
+import android.content.Context;
+import android.view.View;
+import chat.rocket.android.renderer.optional.Condition;
+import chat.rocket.android.renderer.optional.Optional;
+
+abstract class AbstractRenderer<T> {
+  protected final Context context;
+  protected final T object;
+
+  protected AbstractRenderer(Context context, T object) {
+    this.context = context;
+    this.object = object;
+  }
+
+  protected boolean shouldHandle(View view) {
+    return object != null && view != null;
+  }
+
+  protected boolean shouldHandle(View target, Condition additionalCondition, Optional optional,
+      String key) {
+    if (target == null || object == null) {
+      if (optional != null) optional.onNoData(key);
+      return false;
+    }
+
+    if (optional != null) {
+      if (!additionalCondition.isOK()) {
+        optional.onNoData(key);
+        return false;
+      } else {
+        optional.onDataExists(key);
+      }
+    }
+    return true;
+  }
+}

app/src/main/java/chat/rocket/android/renderer/ServerConfigCredentialRenderer.java

+package chat.rocket.android.renderer;
+
+import android.content.Context;
+import android.widget.TextView;
+import chat.rocket.android.helper.TextUtils;
+import chat.rocket.android.model.ServerConfigCredential;
+
+public class ServerConfigCredentialRenderer extends AbstractRenderer<ServerConfigCredential> {
+  public ServerConfigCredentialRenderer(Context context, ServerConfigCredential credential) {
+    super(context, credential);
+  }
+
+  public ServerConfigCredentialRenderer usernameInto(TextView textView) {
+    if (!shouldHandle(textView)) {
+      return this;
+    }
+
+    if ("email".equals(object.getType())
+        && !TextUtils.isEmpty(object.getUsername())) {
+      textView.setText(object.getUsername());
+    }
+
+    return this;
+  }
+}

app/src/main/java/chat/rocket/android/renderer/optional/Condition.java

+package chat.rocket.android.renderer.optional;
+
+public interface Condition {
+  boolean isOK();
+}

app/src/main/java/chat/rocket/android/renderer/optional/Optional.java

+package chat.rocket.android.renderer.optional;
+
+public interface Optional {
+  void onDataExists(String key);
+
+  void onNoData(String key);
+}

app/src/main/java/chat/rocket/android/renderer/optional/ViewVisibilityOptional.java

+package chat.rocket.android.renderer.optional;
+
+import android.view.View;
+import java.util.HashMap;
+
+public class ViewVisibilityOptional extends HashMap<String, View> implements Optional {
+
+  @Override public void onDataExists(String key) {
+    if (containsKey(key)) {
+      get(key).setVisibility(View.VISIBLE);
+    }
+  }
+
+  @Override public void onNoData(String key) {
+    if (containsKey(key)) {
+      get(key).setVisibility(View.GONE);
+    }
+  }
+}

app/src/main/java/chat/rocket/android/service/RocketChatWebSocketThread.java

@@ -157,7 +157,7 @@ public class RocketChatWebSocketThread extends HandlerThread {
       }
     }).continueWith(task -> {
       if (task.isFaulted()) {
-        ServerConfig.logError(serverConfigId, task.getError());
+        ServerConfig.logConnectionError(serverConfigId, task.getError());
       }
       return null;
     });

app/src/main/java/chat/rocket/android/service/observer/LoginCredentialObserver.java

@@ -2,9 +2,9 @@ package chat.rocket.android.service.observer;
 
 import android.content.Context;
 import bolts.Task;
-import chat.rocket.android.helper.LogcatIfError;
 import chat.rocket.android.helper.TextUtils;
 import chat.rocket.android.model.ServerConfig;
+import chat.rocket.android.model.ServerConfigCredential;
 import chat.rocket.android.ws.RocketChatWebSocketAPI;
 import chat.rocket.android_ddp.DDPClientCallback;
 import io.realm.Realm;
@@ -31,6 +31,7 @@ public class LoginCredentialObserver extends AbstractModelObserver<ServerConfig>
         .isNotNull("credential.credentialToken")
         .isNotNull("credential.credentialSecret")
         .endGroup()
+        .isNull("credential.errorMessage")
         .findAll();
   }
 
@@ -41,6 +42,7 @@ public class LoginCredentialObserver extends AbstractModelObserver<ServerConfig>
 
     ServerConfig config = list.get(0);
     final String serverConfigId = config.getId();
+    final String credentialId = config.getCredential().getId();
 
     login(config).onSuccessTask(task -> {
       final String token = task.getResult().result.getString("token");
@@ -51,17 +53,7 @@ public class LoginCredentialObserver extends AbstractModelObserver<ServerConfig>
               .put("tokenVerified", true)));
     }).continueWith(task -> {
       if (task.isFaulted()) {
-        RealmHelperBolts.executeTransaction(realm -> {
-          ServerConfig _config = realm.where(ServerConfig.class)
-              .equalTo("id", serverConfigId)
-              .findFirst();
-
-          if (_config != null) {
-            _config.getCredential().deleteFromRealm();
-            _config.setToken(null);
-          }
-          return null;
-        }).continueWith(new LogcatIfError());
+        ServerConfigCredential.logError(credentialId, task.getError());
       }
       return null;
     });