diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java index 7e2240f..034a015 100644 --- a/src/main/java/cactusServer/models/Accounts.java +++ b/src/main/java/cactusServer/models/Accounts.java @@ -96,9 +96,20 @@ } } - public String logoutAccount(String token) { + public Account logoutAccount(String token) { Accounts.getInstance().getAccountToken(token).setLogin(false); - return ""; + return Accounts.getInstance().getAccountToken(token); + } + + public Account deleteAccount(String token) { + Account edit = Accounts.getInstance().getAccountToken(token); + userIDSet.remove(edit.getId()); + uniqueIDSet.remove(edit.getuniqueID()); + accounts.remove(edit); + return edit; } + public ArrayList getAccounts(){ + return accounts; + } } diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java index 0048053..79c0e12 100644 --- a/src/main/java/cactusServer/resources/AccountsRest.java +++ b/src/main/java/cactusServer/resources/AccountsRest.java @@ -19,8 +19,8 @@ @POST @Path("/logout") - @Produces(MediaType.TEXT_PLAIN) - public String logoutAccount(@FormParam("token") String token) { + @Produces(MediaType.APPLICATION_JSON) + public Account logoutAccount(@FormParam("token") String token) { return Accounts.getInstance().logoutAccount(token); }