From: user Date: Mon, 11 Jan 2021 13:01:39 +0530 Subject: register --- register --- --- 'a/src/main/java/com/GisSatellite/Server/Controller/LoginController.java' +++ b/src/main/java/com/GisSatellite/Server/Controller/LoginController.java @@ -2,8 +2,7 @@ package com.GisSatellite.Server.Controll import java.util.HashSet; import java.util.Map; - - +import java.util.OptionalDouble; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -29,6 +28,9 @@ public class LoginController { @Autowired private UserRepository userRepository; + private Object Optional; + + @RequestMapping("/") public String Default() { return "login"; @@ -51,7 +53,7 @@ public class LoginController { } @RequestMapping(value = "/register", method = RequestMethod.POST) - public String saveRegisterPage(@Validated @ModelAttribute("user") User user, @RequestParam String role, BindingResult result, Model model, + public String saveRegisterPage(@Validated @ModelAttribute("user") User user, BindingResult result, Model model, Map map) { model.addAttribute("user", user); @@ -61,21 +63,38 @@ public class LoginController { else { + + + long a=userRepository.countByUsername(user.getUsername()); + + + if(a!=0) + { + map.put("message", "User already Exist"); + + return "register"; + } + else + { + + Role r=new Role(); + r.setRole("user"); + user.setRoles(new HashSet() {{ + add(r); + }}); + String pwd = user.getPassword(); + String encryptPwd = passwordEncoder.encode(pwd); + user.setPassword(encryptPwd); + map.put("message", "Successful"); + userRepository.save(user); + return "register"; + + } + + } - Role r=new Role(); - r.setRole(role); - user.setRoles(new HashSet() {{ - add(r); - }}); - String pwd = user.getPassword(); - String encryptPwd = passwordEncoder.encode(pwd); - user.setPassword(encryptPwd); - map.put("message", "Successful"); - userRepository.save(user); - - } - return "register"; + } } \ No newline at end of file --- 'a/src/main/java/com/GisSatellite/Server/Controller/SatelliteController.java' +++ b/src/main/java/com/GisSatellite/Server/Controller/SatelliteController.java @@ -61,6 +61,8 @@ public class SatelliteController { @GetMapping("/admin") public String admin() { return "attributenew"; + + } /* --- /dev/null +++ b/src/main/java/com/GisSatellite/Server/Controller/UserController.java @@ -0,0 +1,16 @@ +package com.GisSatellite.Server.Controller; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +@PreAuthorize("hasRole('ROLE_user')") +public class UserController { + + @GetMapping("/user") + public String userRole() { + return "attributenew"; + } + +} --- 'a/src/main/java/com/GisSatellite/Server/Repository/UserRepository.java' +++ b/src/main/java/com/GisSatellite/Server/Repository/UserRepository.java @@ -1,5 +1,7 @@ package com.GisSatellite.Server.Repository; +import java.util.Optional; + import org.springframework.data.jpa.repository.JpaRepository; import com.GisSatellite.Server.Entities.User; @@ -8,5 +10,7 @@ import com.GisSatellite.Server.Entities. public interface UserRepository extends JpaRepository { User findByUsername(String username); + + long countByUsername(String username); } \ No newline at end of file --- 'a/src/main/webapp/views/attributenew.jsp' +++ b/src/main/webapp/views/attributenew.jsp @@ -309,7 +309,7 @@ -
  • Logout
    • +
  • Logout
    • --- 'a/src/main/webapp/views/login.jsp' +++ b/src/main/webapp/views/login.jsp @@ -1,3 +1,4 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> @@ -79,7 +80,7 @@
    -
    Don't have an account? Sign Up
    +
    Don't have an account? Sign Up
    --- 'a/src/main/webapp/views/register.jsp' +++ b/src/main/webapp/views/register.jsp @@ -1,191 +1,116 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> - - + - - - - - - Material Dashboard PRO by Creative Tim - - - - - - - + + + + + + + + + SDIS + + - - + + + - - - - - - - - -
    -