Accounts #33

Merged r-isitani merged 3 commits into nitta-lab-2018:master from nitta-lab-2018:Accounts on 31 May 2018

Patch

Unified Split

Showing 2 changed files

                Ignore Space
               Show notes
              View
            
          
          23 ■■■■■
          src/main/java/cactusServer/models/Accounts.java
 			return null;
		}
	}
 
	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<Account> getAccounts(){
		return accounts;
	}
}
 			return null;
 		}
 	}
+	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<Account> getAccounts(){
+		return accounts;
+	}
 }

                Ignore Space
               Show notes
              View
            
          
          4 ■■■■■
          src/main/java/cactusServer/resources/AccountsRest.java
 	}
 
	@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);
	}
 
	@POST
 	}
 	@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);
 	}
 	@POST