diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java index 8e5e09d..71833f3 100644 --- a/src/main/java/cactusServer/entities/Account.java +++ b/src/main/java/cactusServer/entities/Account.java @@ -8,11 +8,14 @@ public class Account { private String id, name, token; - @JSONHint(ignore = true) + + @JsonIgnore private String pass; - @JSONHint(ignore = true) + + @JsonIgnore private String uniqueID; - @JSONHint(ignore = true) + + @JsonIgnore private boolean login = false; public Account(String userID, String userName, String userPass, String uniqueID) { @@ -39,7 +42,7 @@ this.name = name; } - public String getPass() { + public String getpass() { return pass; } @@ -64,7 +67,7 @@ return token; } - public String getUniqueID() { + public String getuniqueID() { return uniqueID; } diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java index d3834b4..7e2240f 100644 --- a/src/main/java/cactusServer/models/Accounts.java +++ b/src/main/java/cactusServer/models/Accounts.java @@ -77,7 +77,7 @@ Account editAccount; for (int i = 0; i < accounts.size(); i++) { editAccount = accounts.get(i); - if (editAccount.getUniqueID().equals(uniqueID)) { + if (editAccount.getuniqueID().equals(uniqueID)) { return editAccount; } } @@ -85,11 +85,11 @@ } public Session loginAccount(String userID, String userPass) { - if (getAccountByID(userID).getPass().equals(userPass)) { + if (getAccountByID(userID).getpass().equals(userPass)) { Accounts.getInstance().getAccountByID(userID).setLogin(true); Accounts.getInstance().getAccountByID(userID).formToken(); session = new Session(Accounts.getInstance().getAccountByID(userID), URI.create( - "/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getUniqueID())); + "/CactusServer/rest/accounts/" + Accounts.getInstance().getAccountByID(userID).getuniqueID())); return session; } else { return null;