Fix #897: Username is shown as null on login (#915)

openMF · Nov 11, 2018 · e203fd6 · e203fd6
1 parent aa20e9f
commit e203fd6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/java/org/mifos/mobilebanking/models/User.kt b/app/src/main/java/org/mifos/mobilebanking/models/User.kt
@@ -11,7 +11,7 @@ data class User (
 
     var userId: Long = 0,
     var isAuthenticated: Boolean = false,
-    var userName: String? = null,
+    var username: String? = null,
     var base64EncodedAuthenticationKey: String? = null,
     var permissions: List<String> = ArrayList()
     )
diff --git a/app/src/main/java/org/mifos/mobilebanking/presenters/LoginPresenter.java b/app/src/main/java/org/mifos/mobilebanking/presenters/LoginPresenter.java
@@ -112,7 +112,7 @@ public void onError(Throwable e) {
                         @Override
                         public void onNext(User user) {
                             if (user != null) {
-                                final String userName = user.getUserName();
+                                final String userName = user.getUsername();
                                 final long userID = user.getUserId();
                                 final String authToken = Constants.BASIC +
                                         user.getBase64EncodedAuthenticationKey();

diff --git a/app/src/test/java/org/mifos/mobilebanking/LoginPresenterTest.java b/app/src/test/java/org/mifos/mobilebanking/LoginPresenterTest.java
@@ -72,7 +72,7 @@ public void testLogin() throws Exception {
         presenter.login("selfservice", "password");
 
         verify(view).showProgress();
-        verify(view).onLoginSuccess(user.getUserName());
+        verify(view).onLoginSuccess(user.getUsername());
     }
 
     @Test