Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 11, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/org/mifos/mobilebanking/models/User.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
)
2 changes: 1 addition & 1 deletion app/src/main/java/org/mifos/mobilebanking/presenters/LoginPresenter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion app/src/test/java/org/mifos/mobilebanking/LoginPresenterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down