Changeset 47f4eaf for phonelux-backend/src/main/java/finki

Timestamp:

11/20/22 16:34:52 (2 years ago)

Author:

Marko <Marko@…>

Branches:

master

Parents:

ffd50db

Message:

Final features implemented

Location:

phonelux-backend/src/main/java/finki/it/phoneluxbackend

Files:

• controllers/OfferReportController.java (added)
• controllers/ScrapperInfoController.java (added)
• entities/OfferReport.java (added)
• entities/ScrapperInfo.java (added)
• entities/User.java (modified) (1 diff)
• repositories/OfferReportRepository.java (added)
• repositories/ScrapperInfoRepository.java (added)
• security/configs/WebSecurityConfig.java (modified) (5 diffs)
• services/OfferReportService.java (added)
• services/RegistrationService.java (modified) (3 diffs)
• services/ScrapperInfoService.java (added)
• services/UserService.java (modified) (1 diff)

phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities/User.java

@@ -78 +78 @@
     }
 
+    public User(String firstName, String lastName, String email, UserRole userRole) {
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.email = email;
+        this.userRole = userRole;
+    }
+
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {

phonelux-backend/src/main/java/finki/it/phoneluxbackend/security/configs/WebSecurityConfig.java

@@ -5 +5 @@
 import finki.it.phoneluxbackend.services.UserService;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17 +18 @@
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
-import static org.springframework.http.HttpMethod.GET;
-
 @Configuration
 @AllArgsConstructor
@@ -26 +25 @@
     private final UserService userService;
     private final BCryptPasswordEncoder bCryptPasswordEncoder;
-
     @Override
     protected void configure(HttpSecurity http) throws Exception {
@@ -47 +45 @@
                 .antMatchers("/admin/**")
                 .hasAnyAuthority("ADMIN","SUPERADMIN")
+                .and()
+                .authorizeRequests()
+                .antMatchers("/offerreport/**")
+                .hasAnyAuthority("USER", "ADMIN", "SUPERADMIN")
+                .and()
+                .authorizeRequests()
+                .antMatchers("/scrapperinfo/**")
+                .hasAnyAuthority("SUPERADMIN")
+                .and()
+                .authorizeRequests()
                 .anyRequest().permitAll();
-
 
 
@@ -55 +62 @@
 
     }
+
 
     @Override

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/RegistrationService.java

@@ -1 +1 @@
 package finki.it.phoneluxbackend.services;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.io.JsonStringEncoder;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.util.JSONPObject;
 import finki.it.phoneluxbackend.data.RegistrationRequest;
 import finki.it.phoneluxbackend.data.UserRole;
@@ -12 +8 @@
 import finki.it.phoneluxbackend.security.email.EmailValidator;
 import lombok.AllArgsConstructor;
-import org.apache.coyote.Response;
-import org.apache.tomcat.util.json.JSONParser;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -20 +14 @@
 
 import java.time.LocalDateTime;
-import java.util.HashMap;
 
 @Service

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/UserService.java

@@ -41 +41 @@
     }
 
+
+
     public ResponseEntity<Object> signUpUser(User user)
     {