Changeset 702ca77 for springapp/src/main/java/mk/profesori

Timestamp:

08/19/22 19:10:24 (2 years ago)

Author:

unknown <mlviktor23@…>

Branches:

main

Children:

6221ab6

Parents:

6eba109

Message:

added current user/logout in header, display karma on user dashboard, started add post functionality in react

Location:

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

Files:

• Controller/PublicController.java (modified) (1 diff)
• Controller/SecureController.java (modified) (2 diffs)
• Model/CustomUserDetails.java (modified) (2 diffs)
• Security/SecurityConfiguration.java (modified) (1 diff)
• Service/RegistrationService.java (modified) (2 diffs)

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

@@ -23 +23 @@
 @RestController
 @RequestMapping("/public")
-@CrossOrigin(origins = { "http://192.168.0.18:3000", "http://192.168.0.24:3000" })
+@CrossOrigin(origins = { "http://192.168.0.17:3000", "http://192.168.0.24:3000" })
 public class PublicController {
 

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

@@ -25 +25 @@
 @RestController
 @RequestMapping("/secure")
-@CrossOrigin(origins = { "http://192.168.0.18:3000", "http://192.168.0.24:3000" })
+@CrossOrigin(origins = { "http://192.168.0.17:3000", "http://192.168.0.24:3000" })
 public class SecureController {
 
@@ -60 +60 @@
     }
 
-    @RequestMapping(value = "/user", method = RequestMethod.GET)
+    @RequestMapping(value = "/currentUser", method = RequestMethod.GET)
     public UserDetails getUserDetails(@CurrentSecurityContext SecurityContext context) {
 

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

@@ -54 +54 @@
     @OneToMany(mappedBy = "author", cascade = CascadeType.ALL)
     private Set<Post> authoredPosts = new HashSet<>();
+    private Integer karma;
 
     public CustomUserDetails(String fullName, String username, String email, String password, UserRole userRole) {
@@ -103 +104 @@
     }
 
+    public Integer getKarma() {
+        Integer karma = 0;
+        for (Post post : this.authoredPosts) {
+            karma += post.getUpvoteCount() - post.getDownvoteCount();
+        }
+        return karma;
+    }
+
 }

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

@@ -37 +37 @@
             @Override
             public void addCorsMappings(CorsRegistry registry) {
-                registry.addMapping("/**").allowedOrigins("http://192.168.0.18:3000", "http://192.168.0.24:3000")
+                registry.addMapping("/**").allowedOrigins("http://192.168.0.17:3000", "http://192.168.0.24:3000")
                         .allowCredentials(true);
             }

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

@@ -45 +45 @@
                 String tokenToResend = customUserDetailsService
                         .createToken(userRepository.findByEmail(request.getEmail()).get());
-                String link = "http://192.168.0.18:8080/registration/confirm?token=" + tokenToResend;
+                String link = "http://192.168.0.17:8080/registration/confirm?token=" + tokenToResend;
                 emailSender.send(request.getEmail(), emailSender.buildEmail(request.getUsername(), link));
                 return tokenToResend;
@@ -66 +66 @@
                         UserRole.REGULAR));
 
-        String link = "http://192.168.0.18:8080/registration/confirm?token=" + token;
+        String link = "http://192.168.0.17:8080/registration/confirm?token=" + token;
 
         emailSender.send(request.getEmail(), emailSender.buildEmail(request.getUsername(), link));