diff --git a/.classpath b/.classpath index 0630208..acfeeee 100644 --- a/.classpath +++ b/.classpath @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java index de5d81c..8431a19 100644 --- a/src/main/java/cactusServer/entities/Account.java +++ b/src/main/java/cactusServer/entities/Account.java @@ -9,7 +9,7 @@ public class Account { private String id, name, token; - @JSONHint(ignore=true) + private String pass; @JSONHint(ignore=true) @@ -41,16 +41,16 @@ public void setName(String name) { this.name = name; } - - public String getpass() { + @JSONHint(ignore=true) + public String getPass() { return pass; } public void setPass(String pass) { this.pass = pass; } - - public boolean islogin() { + @JSONHint(ignore=true) + public boolean isLogin() { return login; } @@ -66,8 +66,8 @@ token = RandomStringGenerator.generateRandomString(64, RandomStringGenerator.ALPHA_NUMERIC); return token; } - - public String getuniqueID() { + @JSONHint(ignore=true) + public String getUniqueID() { return uniqueID; } diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java index 034a015..cf8a9d3 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; @@ -104,7 +104,7 @@ public Account deleteAccount(String token) { Account edit = Accounts.getInstance().getAccountToken(token); userIDSet.remove(edit.getId()); - uniqueIDSet.remove(edit.getuniqueID()); + uniqueIDSet.remove(edit.getUniqueID()); accounts.remove(edit); return edit; }