Changeset 6eba109 for springapp/src/main/java

Timestamp:

08/17/22 16:21:10 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

702ca77

Parents:

800779d

Message:

implemented authentication in react

Location:

springapp/src/main/java/mk/profesori/springapp

Files:

• Controller/PublicController.java (modified) (3 diffs)
• Controller/SecureController.java (modified) (5 diffs)
• Model/CustomUserDetails.java (modified) (2 diffs)
• Security/CustomAuthenticationSuccessHandler.java (added)
• Security/SecurityConfiguration.java (modified) (3 diffs)
• Service/RegistrationService.java (modified) (2 diffs)

springapp/src/main/java/mk/profesori/springapp/Controller/PublicController.java

@@ -1 +1 @@
 package mk.profesori.springapp.Controller;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
@@ -21 +23 @@
 @RestController
 @RequestMapping("/public")
-@CrossOrigin(origins = { "http://192.168.0.17:3000", "http://192.168.0.24:3000" })
+@CrossOrigin(origins = { "http://192.168.0.18:3000", "http://192.168.0.24:3000" })
 public class PublicController {
 
@@ -95 +97 @@
         return mainService.getCityById(cityId); // vrakja grad spored id
     }
+
+    @RequestMapping(value = "/loginSuccessRegular", method = RequestMethod.GET)
+    public Map<String, String> loginSuccessRegular(@RequestParam String sessionId) {
+        return Collections.singletonMap("sessionId", sessionId);
+    }
+
+    @RequestMapping(value = "/loginSuccessModerator", method = RequestMethod.GET)
+    public Map<String, String> loginSuccessModerator(@RequestParam String sessionId) {
+        return Collections.singletonMap("sessionId", sessionId);
+    }
 }

springapp/src/main/java/mk/profesori/springapp/Controller/SecureController.java

@@ -1 +1 @@
 package mk.profesori.springapp.Controller;
+
+import java.util.Collections;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -5 +8 @@
 import org.springframework.security.core.annotation.CurrentSecurityContext;
 import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -10 +14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15 +20 @@
 
 import mk.profesori.springapp.Model.CustomUserDetails;
+import mk.profesori.springapp.Service.CustomUserDetailsService;
 import mk.profesori.springapp.Service.MainService;
 
 @RestController
 @RequestMapping("/secure")
-@CrossOrigin(origins = { "http://192.168.0.17:3000", "http://192.168.0.24:3000" })
+@CrossOrigin(origins = { "http://192.168.0.18:3000", "http://192.168.0.24:3000" })
 public class SecureController {
 
     @Autowired
     private MainService mainService;
+    @Autowired
+    CustomUserDetailsService customUserDetailsService;
 
     @RequestMapping(value = "/professor/{professorId}/addOpinion", method = RequestMethod.POST)
@@ -52 +60 @@
     }
 
+    @RequestMapping(value = "/user", method = RequestMethod.GET)
+    public UserDetails getUserDetails(@CurrentSecurityContext SecurityContext context) {
+
+        Authentication authentication = context.getAuthentication();
+        if (authentication != null && authentication.getPrincipal() instanceof CustomUserDetails) {
+            CustomUserDetails currentUser = (CustomUserDetails) authentication.getPrincipal();
+            return customUserDetailsService.loadUserByUsername(currentUser.getEmail());
+        }
+
+        return null;
+    }
+
 }

springapp/src/main/java/mk/profesori/springapp/Model/CustomUserDetails.java

@@ -53 +53 @@
     private Set<ConfirmationToken> confirmationTokens = new HashSet<>();
     @OneToMany(mappedBy = "author", cascade = CascadeType.ALL)
-    private List<Post> authoredPosts = new ArrayList<>();
+    private Set<Post> authoredPosts = new HashSet<>();
 
     public CustomUserDetails(String fullName, String username, String email, String password, UserRole userRole) {
@@ -99 +99 @@
     }
 
-    List<Post> getAuthoredPosts() {
+    public Set<Post> getAuthoredPosts() {
         return this.authoredPosts;
     }

springapp/src/main/java/mk/profesori/springapp/Security/SecurityConfiguration.java

@@ -10 +10 @@
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -36 +37 @@
             @Override
             public void addCorsMappings(CorsRegistry registry) {
-                registry.addMapping("/**").allowedOrigins("http://192.168.0.17:3000", "http://192.168.0.24:3000");
+                registry.addMapping("/**").allowedOrigins("http://192.168.0.18:3000", "http://192.168.0.24:3000")
+                        .allowCredentials(true);
             }
         };
+    }
+
+    @Bean
+    public AuthenticationSuccessHandler customAuthenticationSuccessHandler() {
+        return new CustomAuthenticationSuccessHandler();
     }
 
@@ -54 +61 @@
                 .antMatchers("/registration/**").permitAll()
                 .and()
-                .formLogin();
+                .formLogin().successHandler(customAuthenticationSuccessHandler());
 
         return http.build();

springapp/src/main/java/mk/profesori/springapp/Service/RegistrationService.java

@@ -25 +25 @@
     private final EmailSender emailSender;
     private final UserRepository userRepository;
-    
+
     public String register(RegistrationRequest request) {
 
         boolean isValidEmail = emailValidator.test(request.getEmail());
-        if(!isValidEmail) throw new IllegalStateException("Invalid email");
+        if (!isValidEmail)
+            throw new IllegalStateException("Invalid email");
 
         boolean isValidPassword = passwordValidator.test(request.getPassword());
-        if(!isValidPassword) throw new IllegalStateException("Invalid password");
+        if (!isValidPassword)
+            throw new IllegalStateException("Invalid password");
 
         boolean isValidUsername = usernameValidator.test(request.getUsername());
-        if(!isValidUsername) throw new IllegalStateException("Invalid username");
+        if (!isValidUsername)
+            throw new IllegalStateException("Invalid username");
 
         boolean emailExists = userRepository.findByEmail(request.getEmail()).isPresent();
-        if(emailExists) {
-            if(!userRepository.findByEmail(request.getEmail()).get().isEnabled()) {
-                String tokenToResend = customUserDetailsService.createToken(userRepository.findByEmail(request.getEmail()).get());
-                String link = "http://192.168.0.17:8080/registration/confirm?token=" + tokenToResend;
+        if (emailExists) {
+            if (!userRepository.findByEmail(request.getEmail()).get().isEnabled()) {
+                String tokenToResend = customUserDetailsService
+                        .createToken(userRepository.findByEmail(request.getEmail()).get());
+                String link = "http://192.168.0.18:8080/registration/confirm?token=" + tokenToResend;
                 emailSender.send(request.getEmail(), emailSender.buildEmail(request.getUsername(), link));
-                return tokenToResend; 
+                return tokenToResend;
             } else {
-            throw new IllegalStateException("Email is taken");
+                throw new IllegalStateException("Email is taken");
             }
         }
 
         boolean usernameExists = userRepository.findByUsername(request.getUsername()).isPresent();
-        if(usernameExists) {
+        if (usernameExists) {
             throw new IllegalStateException("Username is taken");
         }
 
         String token = customUserDetailsService.signUp(
-            new CustomUserDetails(
-                request.getFullName(),
-                request.getUsername(),
-                request.getEmail(),
-                request.getPassword(),
-                UserRole.REGULAR
-            )
-            );
-        
-        String link = "http://192.168.0.17:8080/registration/confirm?token=" + token;
-        
+                new CustomUserDetails(
+                        request.getFullName(),
+                        request.getUsername(),
+                        request.getEmail(),
+                        request.getPassword(),
+                        UserRole.REGULAR));
+
+        String link = "http://192.168.0.18:8080/registration/confirm?token=" + token;
+
         emailSender.send(request.getEmail(), emailSender.buildEmail(request.getUsername(), link));
-        
+
         return token;
     }
@@ -75 +77 @@
         ConfirmationToken confirmationToken = confirmationTokenService
                 .getToken(token)
-                .orElseThrow(() ->
-                        new IllegalStateException("Token not found"));
+                .orElseThrow(() -> new IllegalStateException("Token not found"));
 
         if (confirmationToken.getConfirmedAt() != null) {