Commit 47ed61db authored by roxane.carraux's avatar roxane.carraux
Browse files

clean code and fix admin page and access to pages when user has roles

parent 17313e64

src/main/java/com/example/demo/CustomLoginSuccessHandler.java

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ public class CustomLoginSuccessHandler extends SimpleUrlAuthenticationSuccessHan 
    

    protected String determineTargetUrl(Authentication authentication) {

        String url = "/login?error=true";

        System.out.println("coucou");



        // Fetch the roles from Authentication object

        Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();

src/main/java/com/example/demo/WebSecurityConfig.java

+0 −2
Original line number Diff line number Diff line
@@ -64,7 +64,5 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { 
    @Autowired

    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {

        auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder());

        

    }



}
 
 No newline at end of file

src/main/java/com/example/demo/controller/HelpRequestController.java

+0 −3
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ import com.example.demo.model.User; 
import com.example.demo.repository.HelpRequestRepository;

import com.example.demo.service.IUserService;







@Controller

public class HelpRequestController {

    @Autowired
@@ -86,5 +84,4 @@ public class HelpRequestController { 
        helpRequestRepository.save(helpRequest);

        return "allHelpRequest";

    }



}

src/main/java/com/example/demo/controller/MVCController.java

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
package com.example.demo.controller;



import org.springframework.context.annotation.Configuration;

import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;

import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;



@Configuration

public class MVCController implements WebMvcConfigurer {

    public void addViewControllers(ViewControllerRegistry registry) {

        registry.addViewController("/login").setViewName("login");

    }



}

src/main/java/com/example/demo/controller/UserController.java

+0 −7
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ import org.springframework.web.servlet.ModelAndView; 
import com.example.demo.model.User;

import com.example.demo.repository.HelpPropositionRepository;

import com.example.demo.repository.HelpRequestRepository;

import com.example.demo.repository.RoleRepository;

import com.example.demo.repository.UserRepository;

import com.example.demo.service.IUserService;
@@ -34,9 +33,6 @@ public class UserController { 
    @Autowired 

    UserRepository userRepository;



    @Autowired 

    RoleRepository roleRepository;



    @RequestMapping(value = "/register", method = RequestMethod.GET)

    public ModelAndView register() {

        ModelAndView modelAndView = new ModelAndView();
@@ -58,7 +54,6 @@ public class UserController { 
        }

        else { // Saving the users

            if (poulain) {

                System.out.println("poulain");

                userService.save(user, "poulain");

            }

            if(mentor){
@@ -114,6 +109,4 @@ public class UserController { 
        modelAndView.setViewName("admin"); // resources/template/admin.html

        return modelAndView;

    }





}