Changeset bc20307 for sources/app/src/main/java

Timestamp:

02/14/22 01:41:41 (2 years ago)

Author:

Tasevski2 <39170279+Tasevski2@…>

Branches:

master

Children:

747e0ab

Parents:

e8b1076

Message:

Push before video

Location:

sources/app/src/main/java/parkup

Files:

• configs/CustomAuthenticationFilter.java (modified) (1 diff)
• configs/webConfigs/WebSecurityConfig.java (modified) (1 diff)
• controllers/GuestController.java (modified) (1 diff)
• entities/Guest.java (modified) (6 diffs)
• entities/RegisteredUser.java (modified) (1 diff)
• services/GuestService.java (modified) (1 diff)

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

@@ -80 +80 @@
             }
             case "Guest":{
-                Guest user = (Guest) authentication.getAuthorities();
+                Guest user = (Guest) authentication.getPrincipal();
                 email = user.getEmail();
                 fullName="GuestUser";

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);
+            auth.userDetailsService(guestService).passwordEncoder(bCryptPasswordEncoder);
         }
 

sources/app/src/main/java/parkup/controllers/GuestController.java

@@ -38 +38 @@
 
     @PostMapping({"/guest"})
-    public void addGuest(@RequestBody Guest guest) {
-        this.guestService.addGuest(guest);
+    public Guest addGuest(@RequestBody Guest guest) {
+        Guest guestToReturn = this.guestService.addGuest(guest);
+        return guestToReturn;
     }
 

sources/app/src/main/java/parkup/entities/Guest.java

@@ -29 +29 @@
     private int guestId;
 
-    @OneToOne
+    @OneToOne(cascade = {CascadeType.ALL})
     @JoinColumn(name = "tablickaId", nullable = false)
     private Plate plate;
@@ -39 +39 @@
     private String mobile;
 
-    @Column(name = "password")
+    @Column(name="password")
     private String password;
 
@@ -49 +49 @@
 
 
-    public Guest() {this.role=UserRole.ROLE_USER;}
-
-    public Guest(int guestId, Plate plate,String password, String email, String mobile) {
-        this.guestId = guestId;
-        this.plate = plate;
-        this.email = email;
+    public Guest() {
+        this.role = UserRole.ROLE_USER;
+        this.session = null;
+    }
+    public Guest(Plate plate, String email,String mobile,String password,ParkingSession session){
+        this.plate=plate;
+        this.email=email;
+        this.mobile=mobile;
         this.password=password;
-        this.mobile = mobile;
+        this.session=session;
         this.role=UserRole.ROLE_USER;
     }
@@ -64 +66 @@
         this.email = email;
         this.mobile = mobile;
+        this.password = "";
         this.role=UserRole.ROLE_USER;
     }
@@ -135 +138 @@
     @Override
     public String getPassword() {
-        return null;
+        return this.password;
     }
 
@@ -145 +148 @@
     @Override
     public boolean isAccountNonExpired() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isAccountNonLocked() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isCredentialsNonExpired() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isEnabled() {
-        return false;
+        return true;
     }
 }

sources/app/src/main/java/parkup/entities/RegisteredUser.java

@@ -63 +63 @@
         this.plates = new ArrayList<Plate>();
         this.role = UserRole.ROLE_REG_USER;
-        session=null;
+        this.session=null;
     }
 

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

@@ -38 +38 @@
         } else {
             double random = Math.random()*10000;
+            guest.setPassword(passwordEncoder.encode(Integer.toString((int)random)));
+            this.guestRepository.save(guest);
             guest.setPassword(Integer.toString((int)random));
-           return  this.guestRepository.save(guest);
+           return  guest;
         }
     }