From 58f866fef06dcb1637ae54306441da3b4d952e46 Mon Sep 17 00:00:00 2001 From: GME Date: Tue, 16 Apr 2019 18:47:49 +0200 Subject: [PATCH] up --- src/main/java/restService/UserResource.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/restService/UserResource.java b/src/main/java/restService/UserResource.java index f6b2251..e63d6f1 100644 --- a/src/main/java/restService/UserResource.java +++ b/src/main/java/restService/UserResource.java @@ -130,7 +130,8 @@ public class UserResource { try { UserImplementation userImplementation = new UserImplementation(); User r = userImplementation.getUserWithEmail(email); - return ResponseEntity.status(HttpStatus.OK).body(r); + String response = "{\"name\":\""+r.getName()+"\",\"firstname\":\""+r.getFirstname()+"\",\"user_hash\":\""+r.getUser_hash()+"\"}"; + return ResponseEntity.status(HttpStatus.OK).body(response); }catch (Exception e){ String r = "{\"response\":\""+e.getMessage()+"\"}"; return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(r); @@ -143,7 +144,8 @@ public class UserResource { try { UserImplementation userImplementation = new UserImplementation(); User r = userImplementation.getUserWithPhone(phone); - return ResponseEntity.status(HttpStatus.OK).body(r); + String response = "{\"name\":\""+r.getName()+"\",\"firstname\":\""+r.getFirstname()+"\",\"user_hash\":\""+r.getUser_hash()+"\"}"; + return ResponseEntity.status(HttpStatus.OK).body(response); }catch (Exception e){ String r = "{\"response\":\""+e.getMessage()+"\"}"; return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(r); @@ -156,7 +158,8 @@ public class UserResource { try { UserImplementation userImplementation = new UserImplementation(); User r = userImplementation.getUserWithMailAndPhone(email,phone); - return ResponseEntity.status(HttpStatus.OK).body(r); + String response = "{\"name\":\""+r.getName()+"\",\"firstname\":\""+r.getFirstname()+"\",\"user_hash\":\""+r.getUser_hash()+"\"}"; + return ResponseEntity.status(HttpStatus.OK).body(response); }catch (Exception e){ String r = "{\"response\":\""+e.getMessage()+"\"}"; return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(r);