diff --git a/src/main/java/ru/ldeloff/hedgehogcloud/config/AuthenticationSuccessUserHandler.java b/src/main/java/ru/ldeloff/hedgehogcloud/config/AuthenticationSuccessUserHandler.java index 74e28cd..ad7349d 100644 --- a/src/main/java/ru/ldeloff/hedgehogcloud/config/AuthenticationSuccessUserHandler.java +++ b/src/main/java/ru/ldeloff/hedgehogcloud/config/AuthenticationSuccessUserHandler.java @@ -1,7 +1,6 @@ package ru.ldeloff.hedgehogcloud.config; import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.stereotype.Component; @@ -9,17 +8,11 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.Set; @Component public class AuthenticationSuccessUserHandler implements AuthenticationSuccessHandler { @Override public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException { - Set roles = AuthorityUtils.authorityListToSet(authentication.getAuthorities()); - if (roles.contains("ROLE_ADMIN")) { - response.sendRedirect("/admin"); - } else { - response.sendRedirect("/user"); - } + response.sendRedirect("/files"); } } diff --git a/src/main/java/ru/ldeloff/hedgehogcloud/config/WebSecurityConfig.java b/src/main/java/ru/ldeloff/hedgehogcloud/config/WebSecurityConfig.java index 83fa1b4..b81d307 100644 --- a/src/main/java/ru/ldeloff/hedgehogcloud/config/WebSecurityConfig.java +++ b/src/main/java/ru/ldeloff/hedgehogcloud/config/WebSecurityConfig.java @@ -49,8 +49,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/login").anonymous() .antMatchers("/").authenticated() // защищенные URL - .antMatchers("/admin/**").access("hasAnyRole('ROLE_ADMIN')") - .antMatchers("/user").permitAll() + //.antMatchers("/admin/**").access("hasAnyRole('ROLE_ADMIN')") + //.antMatchers("/files").permitAll() .and().formLogin(); } diff --git a/src/main/java/ru/ldeloff/hedgehogcloud/controller/FilesController.java b/src/main/java/ru/ldeloff/hedgehogcloud/controller/FilesController.java new file mode 100644 index 0000000..a9b676c --- /dev/null +++ b/src/main/java/ru/ldeloff/hedgehogcloud/controller/FilesController.java @@ -0,0 +1,15 @@ +package ru.ldeloff.hedgehogcloud.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/files") +public class FilesController { + + @GetMapping(value = "") + public String mainPage() { + return "files"; + } +} diff --git a/src/main/java/ru/ldeloff/hedgehogcloud/controller/LoginController.java b/src/main/java/ru/ldeloff/hedgehogcloud/controller/LoginController.java index ba5629c..9272aa7 100644 --- a/src/main/java/ru/ldeloff/hedgehogcloud/controller/LoginController.java +++ b/src/main/java/ru/ldeloff/hedgehogcloud/controller/LoginController.java @@ -2,11 +2,13 @@ package ru.ldeloff.hedgehogcloud.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; @Controller +@RequestMapping("/login") public class LoginController { - @GetMapping(value = "/login") + @GetMapping(value = "") public String loginPage() { return "login"; } diff --git a/src/main/resources/static/img/gif.gif b/src/main/resources/static/img/gif.gif new file mode 100644 index 0000000..877f76c Binary files /dev/null and b/src/main/resources/static/img/gif.gif differ diff --git a/src/main/resources/templates/files.html b/src/main/resources/templates/files.html new file mode 100644 index 0000000..bab045e --- /dev/null +++ b/src/main/resources/templates/files.html @@ -0,0 +1,12 @@ + + + + + Файлы + + + + + + + \ No newline at end of file