Changeset b248810 for jobvista-backend/src/main/java/mk/ukim/finki

Timestamp:

06/10/24 22:34:32 (6 months ago)

Author:

223021 <daniel.ilievski.2@…>

Branches:

main

Children:

befb988

Parents:

28b3398

Message:

Added no access page for new recruiters and admin panel for granting access

Location:

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend

Files:

• JobvistaBackendApplication.java (modified) (1 diff)
• config/SecurityConfiguration.java (modified) (1 diff)
• controllers/AdminController.java (modified) (1 diff)
• models/users/DTO/JwtAuthResponse.java (modified) (1 diff)
• models/users/DTO/RecruiterDetailsDTO.java (modified) (1 diff)
• models/users/User.java (modified) (2 diffs)
• models/users/mappers/RecruiterMapper.java (modified) (1 diff)
• service/impl/AdminServiceImpl.java (added)
• service/impl/AuthServiceImpl.java (modified) (5 diffs)
• service/impl/JwtServiceImpl.java (modified) (2 diffs)
• service/intef/AdminService.java (added)
• service/intef/JwtService.java (modified) (2 diffs)

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/JobvistaBackendApplication.java

@@ -26 +26 @@
                         admin.setRole(Role.ROLE_ADMIN);
                         admin.setEmail("admin@admin.com");
+                        admin.setHasAccess(true);
 //                      admin.setName("admin");
 //                      admin.setSurname("admin");

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/config/SecurityConfiguration.java

@@ -32 +32 @@
                         // TO DO: FIX PERMISSIONS
                         .requestMatchers("/api/job-advertisements/**","/api/job-advertisements/view/**","/api/recruiter/info/**",
-                                "/api/job-advertisements/apply/**","/api/auth/**", "/api/resume/**", "/api/my-applications/**", "/api/applications/{id}/update").permitAll()
+                                "/api/job-advertisements/apply/**","/api/auth/**", "/api/resume/**", "/api/my-applications/**", "/api/applications/{id}/update", "/api/admin/**").permitAll()
                         //.requestMatchers("/api/job-advertisements/**").hasAnyAuthority(Role.ROLE_RECRUITER.name())
                         .anyRequest().authenticated())

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/controllers/AdminController.java

@@ -2 +2 @@
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.DTO.RecruiterDetailsDTO;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.AdminService;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 @RestController
 @RequestMapping("/api/admin")
 @RequiredArgsConstructor
+@CrossOrigin(origins = "*")
 public class AdminController {
 
+    private final AdminService adminService;
+
+    @PostMapping("/change-access/{recruiter_id}")
+    public ResponseEntity<?> changeAccess(@PathVariable("recruiter_id") Long recruiterId, @RequestBody boolean access) {
+        RecruiterDetailsDTO recruiterDetailsDTO = adminService.changeAccess(recruiterId, access);
+        return new ResponseEntity<>(recruiterDetailsDTO, HttpStatus.OK);
+    }
+
+    @GetMapping("/recruiters")
+    public ResponseEntity<?> findAllRecruiters() {
+        List<RecruiterDetailsDTO> recruiterDetailsDTOList = adminService.findAllRecruiters();
+        return new ResponseEntity<>(recruiterDetailsDTOList, HttpStatus.OK);
+    }
 }

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/JwtAuthResponse.java

@@ -14 +14 @@
     private String name;
     private String role;
+    private boolean hasAccess;
     private String token;
     private String refreshToken;

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/DTO/RecruiterDetailsDTO.java

@@ -5 +5 @@
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class RecruiterDetailsDTO {
+    private Long id;
     private String email;
     private String companyName;
     private String companyDescription;
     private String phoneNumber;
+    private boolean hasAccess;
+    private LocalDateTime registeredOn;
 }

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/User.java

@@ -11 +11 @@
 import org.springframework.security.core.userdetails.UserDetails;
 
+import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
@@ -32 +33 @@
     @Enumerated(EnumType.STRING)
     protected Role role;
+
+    @Column(name = "has_access")
+    protected boolean hasAccess;
+
+    protected LocalDateTime registeredOn;
 
 

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/models/users/mappers/RecruiterMapper.java

@@ -18 +18 @@
     public static RecruiterDetailsDTO mapToRecruiterDetailsDTO(Recruiter recruiter) {
         return new RecruiterDetailsDTO(
+                recruiter.getId(),
                 recruiter.getEmail(),
                 recruiter.getCompanyName(),
                 recruiter.getCompanyDescription(),
-                recruiter.getPhoneNumber()
+                recruiter.getPhoneNumber(),
+                recruiter.isHasAccess(),
+                recruiter.getRegisteredOn()
         );
     }

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/AuthServiceImpl.java

@@ -18 +18 @@
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 
@@ -34 +35 @@
     public User signUpJobSeeker(JobSeeker jobSeeker) {
         jobSeeker.setPassword(passwordEncoder.encode(jobSeeker.getPassword()));
+        jobSeeker.setHasAccess(true);
+        jobSeeker.setRegisteredOn(LocalDateTime.now());
         return jobSeekerRepository.save(jobSeeker);
     }
@@ -39 +42 @@
     public User signUpRecruiter(Recruiter recruiter) {
         recruiter.setPassword(passwordEncoder.encode(recruiter.getPassword()));
+        recruiter.setHasAccess(false);
+        recruiter.setRegisteredOn(LocalDateTime.now());
         return recruiterRepository.save(recruiter);
     }
@@ -49 +54 @@
         String refreshJwt = jwtService.generateRefreshToken(new HashMap<>(), user);
 
-        return new JwtAuthResponse(user.getId(), user.getEmail(), user.getName(), user.getRole().name(), jwt, refreshJwt);
+        return new JwtAuthResponse(user.getId(), user.getEmail(), user.getName(), user.getRole().name(), user.isHasAccess(), jwt, refreshJwt);
     }
     
@@ -58 +63 @@
             String jwt = jwtService.generateToken(user);
 
-            return new JwtAuthResponse(user.getId(), user.getEmail(), user.getName(), user.getRole().name(), jwt, refreshTokenRequest.getToken());
+            return new JwtAuthResponse(user.getId(), user.getEmail(), user.getName(), user.getRole().name(), user.isHasAccess(), jwt, refreshTokenRequest.getToken());
         }
         return null;

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/impl/JwtServiceImpl.java

@@ -6 +6 @@
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.User;
 import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef.JwtService;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -19 +20 @@
     private final static String SECRET_KEY = "7191b1d33668d4a2316a02f9a40798b77bccd22173bd882c93a0a916a5e921d1";
 
-    public String generateToken(UserDetails userDetails) {
-        return Jwts.builder().setSubject(userDetails.getUsername())
+    public String generateToken(User user) {
+        return Jwts.builder().setSubject(user.getUsername())
+                .claim("name", user.getName())
+                .claim("role", user.getRole())
+                .claim("access", user.isHasAccess())
                 .setIssuedAt(new Date())
                 .setExpiration(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24))

jobvista-backend/src/main/java/mk/ukim/finki/predmeti/internettehnologii/jobvistabackend/service/intef/JwtService.java

@@ -1 +1 @@
 package mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.service.intef;
 
+import mk.ukim.finki.predmeti.internettehnologii.jobvistabackend.models.users.User;
 import org.springframework.security.core.userdetails.UserDetails;
 
@@ -6 +7 @@
 
 public interface JwtService {
-    String generateToken(UserDetails userDetails);
+    String generateToken(User user);
     String generateRefreshToken(Map<String, Object> extraClaims, UserDetails userDetails);
     String extractUsername(String token);