Setting users private

lucaliechti · Jan 8, 2020 · 2a773d0 · 2a773d0
1 parent fa97b88
commit 2a773d0
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 2 deletions.
diff --git a/src/main/java/radius/config/MultiHttpSecurityConfig.java b/src/main/java/radius/config/MultiHttpSecurityConfig.java
@@ -40,7 +40,7 @@ protected void configure(HttpSecurity http) throws Exception {
 				.authorizeRequests()
 				.antMatchers("/profile", "/answers", "/status", "/toggleStatus").authenticated()
 				.antMatchers("/admin/**", "/updateConfiguration/**", "/contactUsers/**",
-						"/sendNewsletter/**", "/banUser**", "/deleteUser**", "/unsubscribeNewsletter**",
+						"/sendNewsletter/**", "/banUser**", "/deleteUser**", "/setPrivate**", "/unsubscribeNewsletter**",
 						"/actuator/**", "/health/**").hasRole("ADMIN")
 				.anyRequest().permitAll();
 

diff --git a/src/main/java/radius/data/repository/JDBCUserRepository.java b/src/main/java/radius/data/repository/JDBCUserRepository.java
@@ -41,6 +41,7 @@ public class JDBCUserRepository implements UserRepository {
 	private static final String UPDATE_LAST_LOGIN = 	"UPDATE users SET lastlogin = ? WHERE email = ?";
 	private static final String REGION_DENSITY =		"SELECT locations FROM users";
 	private static final String BAN_USER = 				"UPDATE users SET banned = TRUE WHERE email = ?";
+	private static final String SET_PRIVATE =			"UPDATE users SET private = TRUE WHERE email = ?";
 
 	@Autowired
     public void init(DataSource jdbcdatasource, ConfigService configService) {
@@ -189,6 +190,11 @@ public List<String> regionDensity() {
 	public void banUser(String email) {
 		jdbcTemplate.update(BAN_USER, email);
 	}
+
+	@Override
+	public void setPrivate(String email) {
+		jdbcTemplate.update(SET_PRIVATE, email);
+	}
 }
 
 

diff --git a/src/main/java/radius/data/repository/UserRepository.java b/src/main/java/radius/data/repository/UserRepository.java
@@ -36,4 +36,6 @@ public interface UserRepository {
     List<String> regionDensity();
 
     void banUser(String username);
+
+    void setPrivate(String username);
 }
diff --git a/src/main/java/radius/web/controller/AdminController.java b/src/main/java/radius/web/controller/AdminController.java
@@ -71,6 +71,20 @@ public String deleteUser(@RequestParam(value = "uuid") String uuid, Model model)
         return "admin";
     }
 
+    @RequestMapping(path="/setPrivate", method=GET)
+    public String setPrivate(@RequestParam(value = "uuid") String uuid, Model model) {
+        Optional<String> optionalUser = userService.findEmailByUuid(uuid);
+        if(optionalUser.isPresent()) {
+            if(userService.setUserPrivate(optionalUser.get())) {
+                model.addAttribute("success", Boolean.TRUE);
+            } else {
+                model.addAttribute("failure", Boolean.TRUE);
+            }
+        }
+        model.addAttribute("users", userService.allUsers());
+        return "admin";
+    }
+
     @RequestMapping(path="/unsubscribeNewsletter", method=GET)
     public String unsubscribeNewsletter(@RequestParam(value = "uuid") String uuid, Model model) {
         if(newsletterservice.unsubscribe(uuid)){

diff --git a/src/main/java/radius/web/service/UserService.java b/src/main/java/radius/web/service/UserService.java
@@ -198,6 +198,15 @@ public boolean banUser(String username) {
         return true;
     }
 
+    public boolean setUserPrivate(String username) {
+        try {
+            userRepo.setPrivate(username);
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
+
     public List<User> matchableUsers() {
         try {
             return userRepo.matchableUsers();

diff --git a/src/main/webapp/WEB-INF/views/admin.jsp b/src/main/webapp/WEB-INF/views/admin.jsp
@@ -285,6 +285,7 @@
                             <!--<th>Email bestätigt</th>-->
                             <th>Status</th>
                             <th>Letzte Änderung</th>
+                            <th>Privat</th>
                             <th>Sperren</th>
                             <th>Löschen</th>
                         </tr>
@@ -300,7 +301,20 @@
                                 <td><spring:message code="status.${user.status}"/></td>
                                 <td><fmt:formatDate value="${user.dateModified}" pattern = "yyyy-MM-dd"/></td>
                                 <td>
-                                    <a href="<c:url value='/banUser?uuid=${user.uuid}'/>" class="adminbutton ban" onClick="return confirm('Diese Aktion kann nur manuell rückgängig gemacht werden. Sicher?');">sperren</a>
+                                    <c:choose>
+                                        <c:when test="${user.privateUser}">👪👪</c:when>
+                                        <c:otherwise>
+                                            <a href="<c:url value='/setPrivate?uuid=${user.uuid}'/>" class="adminbutton private" onClick="return confirm('Diese Aktion kann nur manuell rückgängig gemacht werden. Sicher?');">privat</a>
+                                        </c:otherwise>
+                                    </c:choose>
+                                </td>
+                                <td>
+                                    <c:choose>
+                                        <c:when test="${user.banned}">🔒🔒</c:when>
+                                        <c:otherwise>
+                                            <a href="<c:url value='/banUser?uuid=${user.uuid}'/>" class="adminbutton ban" onClick="return confirm('Diese Aktion kann nur manuell rückgängig gemacht werden. Sicher?');">sperren</a>
+                                        </c:otherwise>
+                                    </c:choose>
                                 </td>
                                 <td>
                                     <a href="<c:url value='/deleteUser?uuid=${user.uuid}'/>" class="adminbutton delete" onClick="return confirm('Diese Aktion kann nicht rückgängig gemacht werden. Sicher?');">löschen</a>

diff --git a/src/main/webapp/css/admin.css b/src/main/webapp/css/admin.css
@@ -115,3 +115,6 @@ figure {
 .delete {
     background-color: #000;
 }
+.private {
+    background-color: #70ff8b;
+}