Changeset e8b1076

Timestamp:

02/13/22 22:26:06 (2 years ago)

Author:

DavidTrajkovski <davidtrajkovski11@…>

Branches:

master

Children:

bc20307

Parents:

b519b38

Message:

guest login

Location:

sources/app/src/main/java/parkup

Files:

• configs/CustomAuthenticationFilter.java (modified) (3 diffs)
• configs/webConfigs/WebSecurityConfig.java (modified) (1 diff)
• services/GuestService.java (modified) (1 diff)
• services/ParkingSpaceService.java (modified) (2 diffs)
• services/RegisteredUserService.java (modified) (1 diff)

sources/app/src/main/java/parkup/configs/CustomAuthenticationFilter.java

@@ -5 +5 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 
 import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
@@ -17 +16 @@
 import org.springframework.web.bind.annotation.CrossOrigin;
 import parkup.entities.Administrator;
+import parkup.entities.Guest;
 import parkup.entities.RegisteredUser;
 import parkup.entities.Worker;
@@ -79 +79 @@
                 break;
             }
+            case "Guest":{
+                Guest user = (Guest) authentication.getAuthorities();
+                email = user.getEmail();
+                fullName="GuestUser";
+                id=user.getGuestId();
+                roles = user.getAuthorities();
+                break;
+            }
         }
         //TODO see if guest needs to go through authentication

sources/app/src/main/java/parkup/configs/webConfigs/WebSecurityConfig.java

@@ -42 +42 @@
             auth.userDetailsService(workerService).passwordEncoder(bCryptPasswordEncoder);
             auth.userDetailsService(administratorService).passwordEncoder(bCryptPasswordEncoder);
-            auth.userDetailsService(guestService).passwordEncoder(bCryptPasswordEncoder);
+            auth.userDetailsService(guestService);
         }
 

sources/app/src/main/java/parkup/services/GuestService.java

@@ -32 +32 @@
     }
 
-    public void addGuest(Guest guest) {
+    public Guest addGuest(Guest guest) {
         Optional<Guest> guestOpt = this.guestRepository.findGuestByEmail(guest.getEmail());
         if (guestOpt.isPresent()) {
             throw new IllegalStateException("Email already taken, try adding a guest with a different valid email address");
         } else {
-            double random = Math.random()*100;
-            guest.setPassword(passwordEncoder.encode(Double.toString(random)));
-            this.guestRepository.save(guest);
+            double random = Math.random()*10000;
+            guest.setPassword(Integer.toString((int)random));
+           return  this.guestRepository.save(guest);
         }
     }

sources/app/src/main/java/parkup/services/ParkingSpaceService.java

@@ -9 +9 @@
 
 import javax.transaction.Transactional;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
@@ -75 +73 @@
             throw new IllegalStateException("ParkingSpace does not exist");
         }
+
+
     }
 

sources/app/src/main/java/parkup/services/RegisteredUserService.java

@@ -166 +166 @@
     public String deleteTablica(int regParkId, String plate) {
         RegisteredUser user = registeredUserRepository.findByRegParkId(regParkId);
-        Plate p =plateRepository.findByPlate(plate);
+        Plate p = plateRepository.findByPlate(plate);
         user.getPlates().remove(p);
         return plate;