Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow users to permanently delete their account

Browse Source
This commit is contained in:
Athou
2013-05-08 11:15:50 +02:00
parent e68b38139e
commit ef618c1e13
6 changed files with 68 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/commafeed/backend/services/UserService.java
View File

@@ -6,10 +6,16 @@ import java.util.Collection;
import javax.ejb.Stateless;
import javax.inject.Inject;
import com.commafeed.backend.dao.FeedCategoryDAO;
import com.commafeed.backend.dao.FeedEntryStatusDAO;
import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.dao.UserRoleDAO;
import com.commafeed.backend.dao.UserSettingsDAO;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.model.UserSettings.ReadingOrder;
import com.google.common.base.Preconditions;
@Stateless
@@ -18,6 +24,21 @@ public class UserService {
@Inject
UserDAO userDAO;
@Inject
FeedEntryStatusDAO feedEntryStatusDAO;
@Inject
FeedSubscriptionDAO feedSubscriptionDAO;
@Inject
FeedCategoryDAO feedCategoryDAO;
@Inject
UserSettingsDAO userSettingsDAO;
@Inject
UserRoleDAO userRoleDAO;
@Inject
PasswordEncryptionService encryptionService;
@@ -63,4 +84,14 @@ public class UserService {
userDAO.save(user);
return user;
}
public void unregister(User user) {
feedEntryStatusDAO.delete(feedEntryStatusDAO.findAll(user, false,
ReadingOrder.desc, false));
feedSubscriptionDAO.delete(feedSubscriptionDAO.findAll(user));
feedCategoryDAO.delete(feedCategoryDAO.findAll(user));
userSettingsDAO.delete(userSettingsDAO.findByUser(user));
userRoleDAO.delete(userRoleDAO.findAll(user));
userDAO.delete(user);
}
}

10
src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
View File

@@ -18,7 +18,6 @@ import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.backend.model.User;
import com.commafeed.backend.model.UserRole;
import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.model.UserSettings.ReadingOrder;
import com.commafeed.frontend.SecurityCheck;
import com.commafeed.frontend.model.UserModel;
import com.commafeed.frontend.model.request.IDRequest;
@@ -150,14 +149,7 @@ public class AdminREST extends AbstractResourceREST {
return Response.status(Status.FORBIDDEN)
.entity("You cannot delete the admin user.").build();
}
feedEntryStatusDAO.delete(feedEntryStatusDAO.findAll(user, false,
ReadingOrder.desc, false));
feedSubscriptionDAO.delete(feedSubscriptionDAO.findAll(user));
feedCategoryDAO.delete(feedCategoryDAO.findAll(user));
userSettingsDAO.delete(userSettingsDAO.findByUser(user));
userRoleDAO.delete(userRoleDAO.findAll(user));
userDAO.delete(user);
userService.unregister(user);
return Response.ok().build();
}

12
src/main/java/com/commafeed/frontend/rest/resources/UserREST.java
View File

@@ -122,6 +122,18 @@ public class UserREST extends AbstractResourceREST {
return Response.ok().build();
}
@Path("/profile/deleteAccount")
@POST
@ApiOperation(value = "Delete the user account")
public Response delete() {
if (StartupBean.USERNAME_ADMIN.equals(getUser().getName())
|| StartupBean.USERNAME_DEMO.equals(getUser().getName())) {
return Response.status(Status.UNAUTHORIZED).build();
}
userService.unregister(getUser());
return Response.ok().build();
}
private String generateKey(User user) {
byte[] key = encryptionService.getEncryptedPassword(UUID.randomUUID()
.toString(), user.getSalt());