diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ea084fb..5bbfbd3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,11 +4,15 @@ <option name="autoReloadType" value="SELECTIVE" /> </component> <component name="ChangeListManager"> - <list default="true" id="067ac1f0-be04-4fe4-85c6-f870334053b8" name="Changes" comment="setup web security"> + <list default="true" id="067ac1f0-be04-4fe4-85c6-f870334053b8" name="Changes" comment="migrate to postgres"> + <change afterPath="$PROJECT_DIR$/src/main/java/com/example/nto/controller/AuthController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/src/main/java/com/example/nto/App.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/nto/App.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/example/nto/entity/Employee.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/nto/entity/Employee.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/example/nto/repository/EmployeeRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/nto/repository/EmployeeRepository.java" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/example/nto/websecurity/UserDetailsServiceImpl.java" beforeDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" /> + <change beforePath="$PROJECT_DIR$/src/main/resources/data.sql" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/data.sql" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> @@ -43,6 +47,9 @@ "git-widget-placeholder": "main", "kotlin-language-version-configured": "true", "last_opened_file_path": "C:/Users/User/Desktop/NTO-2024-Backend", + "project.structure.last.edited": "Modules", + "project.structure.proportion": "0.0", + "project.structure.side.proportion": "0.0", "settings.editor.selected.configurable": "MavenSettings" } }]]></component> @@ -110,14 +117,23 @@ <option name="project" value="LOCAL" /> <updated>1739954165708</updated> </task> - <option name="localTasksCounter" value="4" /> + <task id="LOCAL-00004" summary="migrate to postgres"> + <option name="closed" value="true" /> + <created>1739956546840</created> + <option name="number" value="00004" /> + <option name="presentableId" value="LOCAL-00004" /> + <option name="project" value="LOCAL" /> + <updated>1739956546840</updated> + </task> + <option name="localTasksCounter" value="5" /> <servers /> </component> <component name="VcsManagerConfiguration"> <MESSAGE value="core :pig:" /> <MESSAGE value="bugfix and write last endpoint" /> <MESSAGE value="setup web security" /> - <option name="LAST_COMMIT_MESSAGE" value="setup web security" /> + <MESSAGE value="migrate to postgres" /> + <option name="LAST_COMMIT_MESSAGE" value="migrate to postgres" /> </component> <component name="XDebuggerManager"> <breakpoint-manager> @@ -138,6 +154,11 @@ <line>12</line> <option name="timeStamp" value="7" /> </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java</url> + <line>30</line> + <option name="timeStamp" value="8" /> + </line-breakpoint> </breakpoints> </breakpoint-manager> </component> diff --git a/src/main/java/com/example/nto/controller/AuthController.java b/src/main/java/com/example/nto/controller/AuthController.java new file mode 100644 index 0000000..5507420 --- /dev/null +++ b/src/main/java/com/example/nto/controller/AuthController.java @@ -0,0 +1,10 @@ +package com.example.nto.controller; + +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class AuthController { +// @PostMapping("/api/login/") +// public ResponseEntity<?> login() {} + +} diff --git a/src/main/java/com/example/nto/entity/Employee.java b/src/main/java/com/example/nto/entity/Employee.java index fd4102d..3fa4d29 100644 --- a/src/main/java/com/example/nto/entity/Employee.java +++ b/src/main/java/com/example/nto/entity/Employee.java @@ -19,6 +19,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class Employee { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private long id; @@ -26,7 +27,6 @@ public class Employee { private String login; private String name; private String password; - private String role; private String photo; private String position; private LocalDateTime lastVisit; @@ -90,20 +90,4 @@ public class Employee { public void setPassword(String password) { this.password = password; } - - public String getRole() { - return role; - } - - public void setRole(String role) { - this.role = role; - } - -// public List<AdminsEmployee> getAdminsEmployees() { -// return adminsEmployees; -// } -// -// public void setAdminsEmployees(List<AdminsEmployee> adminsEmployees) { -// this.adminsEmployees = adminsEmployees; -// } } diff --git a/src/main/java/com/example/nto/repository/EmployeeRepository.java b/src/main/java/com/example/nto/repository/EmployeeRepository.java index 866a0b0..2cf302a 100644 --- a/src/main/java/com/example/nto/repository/EmployeeRepository.java +++ b/src/main/java/com/example/nto/repository/EmployeeRepository.java @@ -3,6 +3,7 @@ package com.example.nto.repository; import com.example.nto.entity.Employee; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.Optional; public interface EmployeeRepository extends JpaRepository<Employee, Long> { diff --git a/src/main/java/com/example/nto/websecurity/UserDetailsServiceImpl.java b/src/main/java/com/example/nto/websecurity/UserDetailsServiceImpl.java deleted file mode 100644 index f8b3bb6..0000000 --- a/src/main/java/com/example/nto/websecurity/UserDetailsServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.example.nto.websecurity; - -import com.example.nto.entity.Employee; -import com.example.nto.repository.EmployeeRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; - -public class UserDetailsServiceImpl implements UserDetailsService { - - - @Autowired - private EmployeeRepository repository; - - @Override - public UserDetails loadUserByUsername(String s) throws UsernameNotFoundException { - Employee employee = repository.findByLogin(s).orElseThrow(() -> new UsernameNotFoundException(s)); - return new CustomUserDetails(employee); - } -} diff --git a/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java b/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java index fa58cba..5d8a497 100644 --- a/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java +++ b/src/main/java/com/example/nto/websecurity/WebSecurityConfig.java @@ -1,5 +1,8 @@ package com.example.nto.websecurity; +import com.example.nto.entity.Employee; +import com.example.nto.repository.EmployeeRepository; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; @@ -9,13 +12,26 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; + +import java.util.List; @Configuration @EnableWebSecurity public class WebSecurityConfig extends WebSecurityConfigurerAdapter { + + @Autowired + private EmployeeRepository employeeRepository; + @Bean public UserDetailsService userDetailsService() { - return new UserDetailsServiceImpl(); + List<Employee> employees = employeeRepository.findAll(); + InMemoryUserDetailsManager inMemoryUserDetailsManager = new InMemoryUserDetailsManager(); + for (int i = 0; i < employees.size(); i++) { + inMemoryUserDetailsManager.createUser(new CustomUserDetails(employees.get(i))); + } + + return inMemoryUserDetailsManager; } @Bean diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5b5bbc9..df608bf 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,6 +5,7 @@ spring: username: postgres password: MobileDev driver-class-name: org.postgresql.Driver + initialization-mode: always jpa: diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 03720a9..058124e 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -1,9 +1,9 @@ -INSERT INTO employee (id, login, name, photo, position, last_visit) +INSERT INTO employee (id, login, password, name, photo, position, last_visit) VALUES -(1, 'pivanov', 'Иванов Петр Федорович', 'https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg', 'Разработчик', '2024-02-12T08:30'), -(2, 'ipetrov', 'Петров Иван Константинович', 'https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg', 'Аналитик', '2024-02-13T08:35'), -(3, 'asemenov', 'Семенов Анатолий Анатольевич', 'https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg', 'Разработчик', '2024-02-13T08:31'), -(4, 'afedorov', 'Федоров Александр Сергеевич', 'https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg', 'Тестировщик', '2024-02-12T08:36'); +(1, 'pivanov', '$2a$10$6ZWoYJApXdPQYMeUI0BTs.Lf8Tos9HSLESy5Xg4xmJpvCJwtHaKfC', 'Иванов Петр Федорович', 'https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg', 'Разработчик', '2024-02-12T08:30'), +(2, 'ipetrov', '$2a$10$PRWHGoiil0XIipjWzu0MK.vMAxkdyoZQQliLtGh1TUhik7MyN2mje', 'Петров Иван Константинович', 'https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg', 'Аналитик', '2024-02-13T08:35'), +(3, 'asemenov', '$2a$10$PRWHGoiil0XIipjWzu0MK.vMAxkdyoZQQliLtGh1TUhik7MyN2mje', 'Семенов Анатолий Анатольевич', 'https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg', 'Разработчик', '2024-02-13T08:31'), +(4, 'afedorov', '$2a$10$PRWHGoiil0XIipjWzu0MK.vMAxkdyoZQQliLtGh1TUhik7MyN2mje', 'Федоров Александр Сергеевич', 'https://funnyducks.ru/upload/iblock/0cd/0cdeb7ec3ed6fddda0f90fccee05557d.jpg', 'Тестировщик', '2024-02-12T08:36'); INSERT INTO code (value) VALUES