| .. | .. |
|---|
| 264 | 264 | em.getTransaction().rollback(); |
|---|
| 265 | 265 | } |
|---|
| 266 | 266 | clearUserCache(username); |
|---|
| 267 | | - |
|---|
| 267 | + String userFullName = String.format("%s %s", user.getFirstName(), user.getLastName() == null ? "" : user.getLastName()).trim(); |
|---|
| 268 | 268 | String tokenAuth = tokenHelper.generateToken(username); |
|---|
| 269 | | - return Response.ok(Utils.createMap("success", true, "token", tokenAuth, "username", username, "full_name", String.format("%s %s", user.getFirstName(), user.getLastName()))) |
|---|
| 270 | | - .build(); |
|---|
| 269 | + return Response.ok(Utils.createMap("success", true, "token", tokenAuth, "username", username, "full_name", userFullName)).build(); |
|---|
| 271 | 270 | } |
|---|
| 272 | 271 | |
|---|
| 273 | 272 | /** |
|---|
