refactor to tkdApp
This commit is contained in:
parent
be0af7d86f
commit
fcd94bfba0
|
|
@ -1,4 +1,4 @@
|
|||
package it.boergmann.tkd_api;
|
||||
package it.boergmann.tkdApp;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package it.boergmann.tkd_api.config;
|
||||
package it.boergmann.tkdApp.config;
|
||||
|
||||
import it.boergmann.tkd_api.security.CustomUserDetailsService;
|
||||
import it.boergmann.tkd_api.security.JwtAuthenticationFilter;
|
||||
import it.boergmann.tkdApp.security.CustomUserDetailsService;
|
||||
import it.boergmann.tkdApp.security.JwtAuthenticationFilter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
package it.boergmann.tkd_api.controller.api;
|
||||
package it.boergmann.tkdApp.controller.api;
|
||||
|
||||
import it.boergmann.tkd_api.domain.AppUser;
|
||||
import it.boergmann.tkd_api.domain.Role;
|
||||
import it.boergmann.tkd_api.dto.LoginRequest;
|
||||
import it.boergmann.tkd_api.dto.LoginResponse;
|
||||
import it.boergmann.tkd_api.dto.RegisterRequest;
|
||||
import it.boergmann.tkd_api.repository.AppUserRepository;
|
||||
import it.boergmann.tkd_api.security.JwtTokenProvider;
|
||||
import it.boergmann.tkdApp.domain.AppUser;
|
||||
import it.boergmann.tkdApp.domain.Role;
|
||||
import it.boergmann.tkdApp.dto.LoginRequest;
|
||||
import it.boergmann.tkdApp.dto.LoginResponse;
|
||||
import it.boergmann.tkdApp.dto.RegisterRequest;
|
||||
import it.boergmann.tkdApp.repository.AppUserRepository;
|
||||
import it.boergmann.tkdApp.security.JwtTokenProvider;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package it.boergmann.tkd_api.controller.api;
|
||||
package it.boergmann.tkdApp.controller.api;
|
||||
|
||||
import it.boergmann.tkd_api.domain.Role;
|
||||
import it.boergmann.tkd_api.service.AppUserService;
|
||||
import it.boergmann.tkdApp.domain.Role;
|
||||
import it.boergmann.tkdApp.service.AppUserService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package it.boergmann.tkd_api.controller.api;
|
||||
package it.boergmann.tkdApp.controller.api;
|
||||
|
||||
import it.boergmann.tkd_api.dto.AppUserResponse;
|
||||
import it.boergmann.tkd_api.domain.AppUser;
|
||||
import it.boergmann.tkd_api.service.AppUserService;
|
||||
import it.boergmann.tkdApp.dto.AppUserResponse;
|
||||
import it.boergmann.tkdApp.domain.AppUser;
|
||||
import it.boergmann.tkdApp.service.AppUserService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package it.boergmann.tkd_api.controller.web;
|
||||
package it.boergmann.tkdApp.controller.web;
|
||||
|
||||
import it.boergmann.tkd_api.domain.AppUser;
|
||||
import it.boergmann.tkd_api.domain.Role;
|
||||
import it.boergmann.tkd_api.service.AppUserService;
|
||||
import it.boergmann.tkd_api.repository.AppUserRepository;
|
||||
import it.boergmann.tkdApp.domain.AppUser;
|
||||
import it.boergmann.tkdApp.domain.Role;
|
||||
import it.boergmann.tkdApp.service.AppUserService;
|
||||
import it.boergmann.tkdApp.repository.AppUserRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.stereotype.Controller;
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
package it.boergmann.tkdApp.controller.web;
|
||||
|
||||
|
||||
public class HomeController {
|
||||
}
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
package it.boergmann.tkd_api.controller.web;
|
||||
package it.boergmann.tkdApp.controller.web;
|
||||
|
||||
import it.boergmann.tkd_api.dto.RegisterRequest;
|
||||
import it.boergmann.tkd_api.domain.AppUser;
|
||||
import it.boergmann.tkd_api.domain.Role;
|
||||
import it.boergmann.tkd_api.repository.AppUserRepository;
|
||||
import it.boergmann.tkdApp.dto.RegisterRequest;
|
||||
import it.boergmann.tkdApp.domain.AppUser;
|
||||
import it.boergmann.tkdApp.domain.Role;
|
||||
import it.boergmann.tkdApp.repository.AppUserRepository;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package it.boergmann.tkd_api.controller.web;
|
||||
package it.boergmann.tkdApp.controller.web;
|
||||
|
||||
import it.boergmann.tkd_api.service.AppUserService;
|
||||
import it.boergmann.tkd_api.domain.AppUser;
|
||||
import it.boergmann.tkdApp.service.AppUserService;
|
||||
import it.boergmann.tkdApp.domain.AppUser;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package it.boergmann.tkd_api.domain;
|
||||
package it.boergmann.tkdApp.domain;
|
||||
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package it.boergmann.tkd_api.domain;
|
||||
package it.boergmann.tkdApp.domain;
|
||||
|
||||
public enum Role {
|
||||
NONE,
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package it.boergmann.tkd_api.dto;
|
||||
package it.boergmann.tkdApp.dto;
|
||||
|
||||
import it.boergmann.tkd_api.domain.Role;
|
||||
import it.boergmann.tkdApp.domain.Role;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package it.boergmann.tkd_api.dto;
|
||||
package it.boergmann.tkdApp.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package it.boergmann.tkd_api.dto;
|
||||
package it.boergmann.tkdApp.dto;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package it.boergmann.tkd_api.dto;
|
||||
package it.boergmann.tkdApp.dto;
|
||||
|
||||
|
||||
import jakarta.validation.constraints.Email;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package it.boergmann.tkd_api.repository;
|
||||
package it.boergmann.tkdApp.repository;
|
||||
|
||||
import it.boergmann.tkd_api.domain.AppUser;
|
||||
import it.boergmann.tkdApp.domain.AppUser;
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
|
||||
import java.util.Optional;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package it.boergmann.tkd_api.security;
|
||||
package it.boergmann.tkdApp.security;
|
||||
|
||||
import it.boergmann.tkd_api.domain.AppUser;
|
||||
import it.boergmann.tkd_api.domain.Role;
|
||||
import it.boergmann.tkd_api.repository.AppUserRepository;
|
||||
import it.boergmann.tkdApp.domain.AppUser;
|
||||
import it.boergmann.tkdApp.domain.Role;
|
||||
import it.boergmann.tkdApp.repository.AppUserRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.userdetails.UserDetails;
|
||||
import org.springframework.security.core.userdetails.UserDetailsService;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package it.boergmann.tkd_api.security;
|
||||
package it.boergmann.tkdApp.security;
|
||||
|
||||
import jakarta.servlet.FilterChain;
|
||||
import jakarta.servlet.ServletException;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package it.boergmann.tkd_api.security;
|
||||
package it.boergmann.tkdApp.security;
|
||||
|
||||
import io.jsonwebtoken.*;
|
||||
import io.jsonwebtoken.security.Keys;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
package it.boergmann.tkd_api.service;
|
||||
package it.boergmann.tkdApp.service;
|
||||
|
||||
import it.boergmann.tkd_api.domain.AppUser;
|
||||
import it.boergmann.tkd_api.domain.Role;
|
||||
import it.boergmann.tkd_api.repository.AppUserRepository;
|
||||
import it.boergmann.tkdApp.domain.AppUser;
|
||||
import it.boergmann.tkdApp.domain.Role;
|
||||
import it.boergmann.tkdApp.repository.AppUserRepository;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.security.core.context.SecurityContextHolder;
|
||||
import org.springframework.security.core.userdetails.UsernameNotFoundException;
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
package it.boergmann.tkd_api.controller.web;
|
||||
|
||||
|
||||
public class HomeController {
|
||||
}
|
||||
|
|
@ -18,9 +18,9 @@
|
|||
<td>
|
||||
<form th:action="@{'/admin/users/' + ${user.id} + '/role'}" method="post">
|
||||
<select name="role">
|
||||
<option th:selected="${user.roles.contains(T(it.boergmann.tkd_api.domain.Role).USER)}" value="USER">USER</option>
|
||||
<option th:selected="${user.roles.contains(T(it.boergmann.tkd_api.domain.Role).ADMIN)}" value="ADMIN">ADMIN</option>
|
||||
<option th:selected="${user.roles.contains(T(it.boergmann.tkd_api.domain.Role).NONE)}" value="NONE">NONE</option>
|
||||
<option th:selected="${user.roles.contains(T(it.boergmann.tkdApp.domain.Role).USER)}" value="USER">USER</option>
|
||||
<option th:selected="${user.roles.contains(T(it.boergmann.tkdApp.domain.Role).ADMIN)}" value="ADMIN">ADMIN</option>
|
||||
<option th:selected="${user.roles.contains(T(it.boergmann.tkdApp.domain.Role).NONE)}" value="NONE">NONE</option>
|
||||
</select>
|
||||
<button type="submit">Rolle ändern</button>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package it.boergmann.tkd_api;
|
||||
package it.boergmann.tkdApp;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
Loading…
Reference in New Issue