X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.mvc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fmvc%2FUsersRolesController.java;h=2ce770c46de5b6dc05e8b9c55ee724cfe7e6ade1;hb=149023e5969377045847bbecf24b0898b18a67a9;hp=7f5334564fe931ed00637a87cc82deadb2faed77;hpb=e241a5585404c07bea8351c4112be64512ad7fb9;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
index 7f5334564..2ce770c46 100644
--- a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
+++ b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
@@ -1,22 +1,135 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.security.mvc;
 
-import org.argeo.security.ArgeoUser;
-import org.argeo.security.core.ArgeoUserDetails;
-import org.springframework.security.Authentication;
-import org.springframework.security.context.SecurityContextHolder;
+import org.argeo.server.mvc.MvcConstants;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
-public class UsersRolesController {
+public class UsersRolesController implements MvcConstants {
+//	private ArgeoSecurityService securityService;
+//	private Deserializer userDeserializer = null;
+
+	/* USER */
+
+//	@RequestMapping("/getCredentials.*")
+//	@ModelAttribute("user")
+//	public ArgeoUser getCredentials() {
+//		ArgeoUser argeoUser = securityService.getCurrentUser();
+//		if (argeoUser == null)
+//			return new SimpleArgeoUser();
+//		else
+//			return argeoUser;
+//	}
+//
+//	@RequestMapping("/getUsersList.*")
+//	@ModelAttribute("users")
+//	public Set<ArgeoUser> getUsersList() {
+//		return securityService.listUsers();
+//	}
+//
+//	@RequestMapping("/userExists.*")
+//	public BooleanAnswer userExists(@RequestParam("username") String username) {
+//		return new BooleanAnswer(securityService.userExists(username));
+//	}
+//
+//	@RequestMapping("/createUser.*")
+//	@ModelAttribute("user")
+//	public ArgeoUser createUser(Reader reader) {
+//		ArgeoUser user = userDeserializer.deserialize(reader,
+//				SimpleArgeoUser.class);
+//		securityService.newUser(user);
+//		return securityService.getUser(user.getUsername());
+//	}
+//
+//	@RequestMapping("/updateUser.*")
+//	@ModelAttribute("user")
+//	public ArgeoUser updateUser(Reader reader) {
+//		ArgeoUser user = userDeserializer.deserialize(reader,
+//				SimpleArgeoUser.class);
+//		securityService.updateUser(user);
+//		return securityService.getUser(user.getUsername());
+//	}
+//
+//	@RequestMapping("/updateUserSelf.*")
+//	@ModelAttribute("user")
+//	/** Will only update the user natures.*/
+//	public ArgeoUser updateUserSelf(Reader reader) {
+//		ArgeoUser user = securityService.getCurrentUser();
+//		ArgeoUser userForNatures = userDeserializer.deserialize(reader,
+//				SimpleArgeoUser.class);
+//		user.updateUserNatures(userForNatures.getUserNatures());
+//		securityService.updateUser(user);
+//		return securityService.getUser(user.getUsername());
+//	}
+//
+//	@RequestMapping("/deleteUser.*")
+//	public ServerAnswer deleteUser(@RequestParam("username") String username) {
+//		securityService.deleteUser(username);
+//		return ServerAnswer.ok("User " + username + " deleted");
+//	}
+//
+//	@RequestMapping("/getUserDetails.*")
+//	@ModelAttribute("user")
+//	public ArgeoUser getUserDetails(@RequestParam("username") String username) {
+//		return securityService.getUser(username);
+//	}
 
-	@RequestMapping("/getCredentials.security")
-	@ModelAttribute("getCredentials")
-	public ArgeoUser getCredentials() {
-		Authentication authentication = SecurityContextHolder.getContext()
-				.getAuthentication();
+	/* ROLE */
+//	@RequestMapping("/getRolesList.*")
+//	@ModelAttribute("roles")
+//	public Set<String> getEditableRolesList() {
+//		return securityService.listEditableRoles();
+//	}
+//
+//	@RequestMapping("/createRole.*")
+//	public ServerAnswer createRole(@RequestParam("role") String role) {
+//		securityService.newRole(role);
+//		return ServerAnswer.ok("Role " + role + " created");
+//	}
+//
+//	@RequestMapping("/deleteRole.*")
+//	public ServerAnswer deleteRole(@RequestParam("role") String role) {
+//		securityService.deleteRole(role);
+//		return ServerAnswer.ok("Role " + role + " deleted");
+//	}
+//
+//	@RequestMapping("/updateUserPassword.*")
+//	public ServerAnswer updateUserPassword(
+//			@RequestParam("username") String username,
+//			@RequestParam("password") String password) {
+//		securityService.updateUserPassword(username, password);
+//		return ServerAnswer.ok("Password updated for user " + username);
+//	}
+//
+//	@RequestMapping("/updatePassword.*")
+//	public ServerAnswer updatePassword(
+//			@RequestParam("oldPassword") String oldPassword,
+//			@RequestParam("password") String password) {
+//		securityService.updateCurrentUserPassword(oldPassword, password);
+//		return ServerAnswer.ok("Password updated");
+//	}
+//
+//	public void setUserDeserializer(Deserializer userDeserializer) {
+//		this.userDeserializer = userDeserializer;
+//	}
+//
+//	public void setSecurityService(ArgeoSecurityService securityService) {
+//		this.securityService = securityService;
+//	}
 
-		return ArgeoUserDetails.createBasicArgeoUser(authentication);
-	}
 }