Unverified Commit 2dd272f0 authored by RoxaneCarraux's avatar RoxaneCarraux Committed by GitHub
Browse files

Merge pull request #22 from Zegorax/fix 

Fix
parents ce3c77ec 518998f1

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

+2 −3
Original line number Diff line number Diff line
@@ -65,5 +65,4 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { 
    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/HelpPropositionController.java

+10 −0
Original line number Diff line number Diff line
@@ -60,6 +60,16 @@ public class HelpPropositionController { 
        return "ProfileHelpProposition";

    }

    

    @GetMapping("/allPropositionByPoulain")

    public String getallPropositionByPoulain(Map<String, Object> model, HttpSession session, Principal principal) {



        String email = SecurityContextHolder.getContext().getAuthentication().getName();

        User user = userService.findByEmail(email);

        

        model.put("helpPropositions", helpPropositionRepository.findByPoulain(user));

        return "ProfileHelpProposition";

    }



    @GetMapping("/editProposition/{id}")

    public String editProposition(@PathVariable("id") Integer helpId, Model model, HttpSession session, Principal principal) {

        HelpProposition helpProposition = helpPropositionRepository.findById(helpId);

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

+7 −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
@@ -58,6 +56,13 @@ public class HelpRequestController { 
        model.put("helpRequests", helpRequestRepository.findByPoulain(user));

        return "ProfileHelpRequest";

    }

    @GetMapping("/allRequestByMentor")

    public String getallPropositionByMentor(Map<String, Object> model, HttpSession session, Principal principal) {

        String email = SecurityContextHolder.getContext().getAuthentication().getName();

        User user = userService.findByEmail(email);

        model.put("helpRequests", helpRequestRepository.findByMentor(user));

        return "ProfileHelpRequest";

    }

    

    @PostMapping("/acceptRequest")

    public String acceptRequest(@ModelAttribute HelpRequest helpRequest, Model model, HttpSession session, Principal principal) {
@@ -79,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

+7 −4
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class UserController { 
    }



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

    public ModelAndView registerUser(@Valid User user, @RequestParam("roleWanted") String roleWanted, BindingResult bindingResult, ModelMap modelMap) {

    public ModelAndView registerUser(@Valid User user, @RequestParam(defaultValue = "false") boolean poulain, @RequestParam(defaultValue = "false") boolean mentor, BindingResult bindingResult, ModelMap modelMap) {

        ModelAndView modelAndView = new ModelAndView();



        //userSignupValidator.validate(o, errors);
@@ -53,7 +53,12 @@ public class UserController { 
            modelMap.addAttribute("bindingResult", bindingResult);

        }

        else { // Saving the users

            userService.save(user, roleWanted);

            if (poulain) {

                userService.save(user, "poulain");

            }

            if(mentor){

                userService.save(user, "mentor");

            }

            //securityService.autoLogin(user.getEmail(), user.getPassword());

            return new ModelAndView("redirect:" + "/");

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

        return modelAndView;

    }





}