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 e378b51..4cdd0e1 100644 --- a/src/main/java/com/example/cosmos_serversb/entities/User.java +++ b/src/main/java/com/example/cosmos_serversb/entities/User.java @@ -9,7 +9,7 @@ public boolean login = false; public List token = new ArrayList(); - public User(String name, String uId,String uri,String pw,String token,String iconImage,String iconUri) { + public User(String name, String uId,String uri,String pw,ArrayList token,String iconImage,String iconUri) { this.name = name; this.uId = uId; this.uri=uri; 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 a1323bc..3a06992 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Users.java +++ b/src/main/java/com/example/cosmos_serversb/models/Users.java @@ -6,19 +6,23 @@ //User testUser = new User("test", "123456789", "http://test.com", "testpw", "123456789", "123456789", "http://iconuri/123456789.com"); public User createUser(String name, String pw, String iconImage) { - User testUser = new User("test", "123456789", "http://test.com", "testpw", "123456789", "123456789", "http://iconuri/123456789.com"); - //String uId ="123456789"; - //String token="123456789"; + User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com"); + testUser.token.add("123456789"); + testUser.token.add("987654321"); return testUser; } public final static User getUserById(String uId) { - User testUser = new User("test", "123456789", "http://test.com", "testpw", "123456789", "123456789", "http://iconuri/123456789.com"); + User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com"); + testUser.token.add("123456789"); + testUser.token.add("987654321"); return testUser; } public User getUserByToken(String token) { - User testUser = new User("test", "123456789", "http://test.com", "testpw", "123456789", "123456789", "http://iconuri/123456789.com"); + User testUser = new User("test", "123456789", "http://test.com", "testpw", null, "123456789", "http://iconuri/123456789.com"); + testUser.token.add("123456789"); + testUser.token.add("987654321"); return testUser; } @@ -27,6 +31,7 @@ } public String login(String uId) { + return "123456789";//testToken }