Changeset ac25203 for src/main

Timestamp:

02/03/23 23:11:04 (22 months ago)

Author:

DenicaKj <dkorvezir@…>

Branches:

master

Children:

eb226b2

Parents:

1b248e4

Message:

Spring Security

Location:

src/main

Files:

• java/com/example/moviezone/config/CustomUsernamePasswordAuthenticationProvider.java (added)
• java/com/example/moviezone/config/WebSecurityConfig.java (added)
• java/com/example/moviezone/model/Customer.java (modified) (2 diffs)
• java/com/example/moviezone/model/Role.java (added)
• java/com/example/moviezone/model/User.java (modified) (5 diffs)
• java/com/example/moviezone/model/Worker.java (modified) (2 diffs)
• java/com/example/moviezone/repository/UserRepository.java (modified) (1 diff)
• java/com/example/moviezone/service/Impl/UserServiceImpl.java (modified) (1 diff)
• java/com/example/moviezone/service/UserService.java (modified) (1 diff)
• java/com/example/moviezone/web/HomeController.java (added)
• resources/templates/fragments/footer.html (added)
• resources/templates/fragments/header.html (added)
• resources/templates/master-template.html (added)

src/main/java/com/example/moviezone/model/Customer.java

@@ -7 +7 @@
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+
+import java.util.Collection;
+import java.util.Collections;
 
 @Entity
@@ -19 +23 @@
     Integer points;
 
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singletonList(Role.ROLE_ADMIN);
+    }
 
 }

src/main/java/com/example/moviezone/model/User.java

@@ -5 +5 @@
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
 
+import javax.management.relation.Role;
 import java.time.LocalDateTime;
+import java.util.Collection;
 
 @Entity
@@ -14 +18 @@
 @Table(name = "users")
 @Inheritance(strategy = InheritanceType.JOINED)
-public class User {
+public class User implements UserDetails {
 
     @Id
@@ -24 +28 @@
     String address;
     String contact_number;
+    String username;
     LocalDateTime date_created;
 
+    private boolean isAccountNonExpired = true;
+    private boolean isAccountNonLocked = true;
+    private boolean isCredentialsNonExpired = true;
+    private boolean isEnabled = true;
 
-    public User(Integer id_user, String password, String first_name, String last_name, String address, String contact_number, LocalDateTime date_created) {
+    @Enumerated(value = EnumType.STRING)
+    private Role role;
+
+    public User(Integer id_user, String password, String first_name, String last_name, String address, String contact_number, String username, LocalDateTime date_created, Role role) {
         this.id_user = id_user;
         this.password = password;
@@ -34 +46 @@
         this.address = address;
         this.contact_number = contact_number;
+        this.username = username;
         this.date_created = date_created;
+        this.role = role;
     }
 
@@ -40 +54 @@
 
     }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return null;
+    }
+
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return isAccountNonExpired;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return isAccountNonLocked;
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return isCredentialsNonExpired;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return isEnabled;
+    }
+
 }

src/main/java/com/example/moviezone/model/Worker.java

@@ -5 +5 @@
 import lombok.Setter;
 import lombok.ToString;
+import org.springframework.security.core.GrantedAuthority;
+
+import java.util.Collection;
+import java.util.Collections;
 
 @Entity
@@ -21 +25 @@
     @ManyToOne()
     Cinema cinema;
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singletonList(Role.ROLE_ADMIN);
+    }
 
 }

src/main/java/com/example/moviezone/repository/UserRepository.java

@@ -5 +5 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
+
 public interface UserRepository extends JpaRepository<User,Integer> {
+    User findByUsername(String username);
+    List<User> findAllByUsernameAndPassword(String username, String password);
 }

src/main/java/com/example/moviezone/service/Impl/UserServiceImpl.java

@@ -27 +27 @@
         return userRepository.findById(id).orElseThrow(UserNotFoundException::new);
     }
+
+    @Override
+    public User findByUsername(String username) {
+        return userRepository.findByUsername(username);
+    }
+
+
 }

src/main/java/com/example/moviezone/service/UserService.java

@@ -8 +8 @@
     List<User> findAllUsers();
     User findById(Integer user_id);
+    User findByUsername(String username);
 }