diff --git a/src/main/java/com/example/cosmos_serversb/entities/User.java b/src/main/java/com/example/cosmos_serversb/entities/User.java index 1a93926..c2c2b1c 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/User.java +++ b/src/main/java/com/example/cosmos_serversb/entities/User.java @@ -19,8 +19,8 @@ this.login = true; } - static interface removeuIdAnduri{ - @JsonIgnore String getuId(); + public static interface removeuIdAnduri{ + @JsonIgnore String getUId(); @JsonIgnore String getUri(); } diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java index 0317488..7ff6c9b 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Users.java +++ b/src/main/java/com/example/cosmos_serversb/models/Users.java @@ -75,22 +75,22 @@ } public static User createUser(String name, String pw, String iconImage) { - String uId = getInstance().createUId(); + String uId = "1234"; String uri = baseURI + AppName +"/users/" +uId; Session session = sessionFactory.openSession(); session.beginTransaction(); + createToken(uId); User testUser = new User(name, uId, uri, iconImage);//名前、uId、ユーザーuri、パスワード、アイコンイメージを保存 session.save(testUser); //出力 -// List userResult = session.createQuery( "from User" ).list(); -// for ( User user : (List) userResult ) { -// System.out.println( "UserId (" + user.getuId() + ") : " + user.getUri() + ": " + user.getName()); -// } +/* List userResult = session.createQuery( "from User" ).list(); + for ( User user : (List) userResult ) { + System.out.println( "UserId (" + user.getuId() + ") : " + user.getUri() + ": " + user.getName()); + }*/ session.getTransaction().commit(); session.close(); -//// testUser.token.add(getInstance().createToken(testUser.uId)); -// testUser.token.add(getInstance().createToken(testUser.uId)); + return testUser; } @@ -113,13 +113,11 @@ PutUser putUser = new PutUser(findUser.getUri(),findUser.getuId()); session.getTransaction().commit(); session.close(); -// testUser.token.add(getInstance().createToken(testUser.uId)); -// testUser.token.add(getInstance().createToken(testUser.uId)); //表示するのはUriとuIdのみ return putUser; } - public static User getUserById(String uId) { +/* public static User getUserById(String uId) { //与えられたuIdのUser情報を返す Session session = sessionFactory.openSession(); session.beginTransaction(); @@ -129,25 +127,23 @@ if (user.getuId() == uId) { User findUser = (User) session.load(User.class, uId); ObjectMapper mapper = new ObjectMapper(); - return mapper.addMixIn(findUser, removeuIdAnduri.class); -// System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri());] + User testUser = mapper.addMixIn(findUser,findUser.removeuIdAnduri); + mapper.addMixIn(User.class, User.removeuIdAnduri.class); + return testUser; + System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri());] }else{ break; } } session.getTransaction().commit(); session.close(); -// testUser.token.add(getInstance().createToken(testUser.uId)); -// testUser.token.add(getInstance().createToken(testUser.uId)); //一致しない場合は返す必要がないのでnull return null; - } + }*/ public static User getUserByToken(String token) { //与えられたTokenに紐づくUser情報を返す User testUser = new User("test", getInstance().createUId(), "http://test.com", "http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); -// testUser.token.add(getInstance().createToken(testUser.uId)); -// testUser.token.add(getInstance().createToken(testUser.uId)); return testUser; } @@ -165,19 +161,31 @@ return DeleteResult.SUCCESS; } - public static Token login(String uId) { - Token testtoken = getInstance().createToken(uId); - //tokenを作成後値を返す - return testtoken;//testToken + public static Token login(String uId,String pw) { + if(checkPassword(uId,pw)) { + Token testtoken = getInstance().createToken(uId); + //tokenを作成後値を返す + return testtoken;//testToken + }else{ + return null; + } } - public static DeleteResult logout(String token) { - if(Users.getInstance().getUserByToken(token).uId == null) { - return DeleteResult.FAILURE; - }else{ + public static DeleteResult logout(String uId,String token) { + Session session = sessionFactory.openSession(); + session.beginTransaction(); + List usersList = session.createQuery( "from logout" ).list(); + for ( User user : (List) usersList ) { + if (user.getuId() == uId) { + if (Users.getInstance().getUserByToken(token).uId == null) { + return DeleteResult.FAILURE; + } else { // Users.getInstance().getUserByToken(token).token.remove(Users.getInstance().getUserByToken(token).token.indexOf(token)); - return DeleteResult.SUCCESS; + return DeleteResult.SUCCESS; + } + } } + return null; } public static boolean checkToken(String uId, String token) { diff --git a/src/main/java/com/example/cosmos_serversb/models/UsersMain.java b/src/main/java/com/example/cosmos_serversb/models/UsersMain.java index 375ae66..21acaa2 100644 --- a/src/main/java/com/example/cosmos_serversb/models/UsersMain.java +++ b/src/main/java/com/example/cosmos_serversb/models/UsersMain.java @@ -4,9 +4,9 @@ public class UsersMain { public static void main(String args[]){ Users.setUp(); - Users.createUser("test1","test1","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); - Users.setUser("1234","test3","test3","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); - Users.getUserById("1234"); + //Users.createUser("test1","test1","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); + //Users.setUser("1234","test3","test3","http://localhost:8080/iconImage/b4bb7db0-cc0c-4ee1-816f-8304add12da8.jpg"); + // Users.getUserById("1234"); Users.tearDown(); } } diff --git a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java index 27a3ae6..32a54bb 100644 --- a/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java +++ b/src/main/java/com/example/cosmos_serversb/resources/UsersRest.java @@ -65,7 +65,7 @@ @PathParam("uId") String uId, @FormParam("pw") String pw) throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); - String json = mapper.writeValueAsString(Users.getInstance().login(uId)); + String json = mapper.writeValueAsString(Users.getInstance().login(uId,pw)); return json; } @@ -76,7 +76,7 @@ @PathParam("uId") String uId, @FormParam("token") String token) throws JsonProcessingException { ObjectMapper mapper = new ObjectMapper(); - String json = mapper.writeValueAsString(Users.getInstance().logout(token)); + String json = mapper.writeValueAsString(Users.getInstance().logout(uId,token)); return json; } diff --git a/src/test/java/hibernateTest/models/GroupsMain.java b/src/test/java/hibernateTest/models/GroupsMain.java index 6e3f5b7..55c547f 100644 --- a/src/test/java/hibernateTest/models/GroupsMain.java +++ b/src/test/java/hibernateTest/models/GroupsMain.java @@ -5,9 +5,9 @@ //このメインクラスを実行すると、Hibernateのテストが行えます。 public class GroupsMain { public static void main(String args[]){ - Groups.setUp(); + //Groups.setUp(); Groups.createGroup("test1", "1234567890"); Groups.getGroupByGid("123456789"); - Groups.tearDown(); + //Groups.tearDown(); } }