Max/Backend/ReturnUserPasswordIssue #137
| @ -83,7 +83,6 @@ public class UserController { | |||||||
|  |  | ||||||
|     @GetMapping("/teachers") |     @GetMapping("/teachers") | ||||||
|     public ResponseEntity<Iterable<HashMap<String,Object>>> getAllTeachers(@RequestHeader("Authorization") String token){ |     public ResponseEntity<Iterable<HashMap<String,Object>>> getAllTeachers(@RequestHeader("Authorization") String token){ | ||||||
|  |  | ||||||
|         if (authServ.getUserFromToken(token) == null) |         if (authServ.getUserFromToken(token) == null) | ||||||
|             return new UnauthorizedResponse<>(null); |             return new UnauthorizedResponse<>(null); | ||||||
|  |  | ||||||
| @ -91,5 +90,15 @@ public class UserController { | |||||||
|  |  | ||||||
|         return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(teachers), HttpStatus.OK); |         return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(teachers), HttpStatus.OK); | ||||||
|     } |     } | ||||||
| } |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |     @GetMapping("/students") | ||||||
|  |     public ResponseEntity<Iterable<HashMap<String,Object>>> getAllStudent(@RequestHeader("Authorization") String token){ | ||||||
|  |         if (authServ.getUserFromToken(token) == null) | ||||||
|  |             return new UnauthorizedResponse<>(null); | ||||||
|  |  | ||||||
|  |         Iterable<User> students = userService.getAllStudents(); | ||||||
|  |  | ||||||
|  |         return new ResponseEntity<>(ProtectionService.usersWithoutPasswords(students), HttpStatus.OK); | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -12,4 +12,7 @@ public interface UserRepository extends CrudRepository<User, Long> { | |||||||
|  |  | ||||||
|     @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Teacher") |     @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Teacher") | ||||||
|     Iterable<User> findAllTeachers(); |     Iterable<User> findAllTeachers(); | ||||||
|  |  | ||||||
|  |     @Query("select u from User u where u.role = ovh.herisson.Clyde.Tables.Role.Student") | ||||||
|  |     Iterable<User> findAllStudents(); | ||||||
| } | } | ||||||
| @ -115,6 +115,7 @@ public class UserService { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|     public Iterable<User> getAllTeachers (){return userRepo.findAllTeachers();} |     public Iterable<User> getAllTeachers (){return userRepo.findAllTeachers();} | ||||||
|  |  | ||||||
|  |     public Iterable<User> getAllStudents(){return userRepo.findAllStudents();} | ||||||
| } | } | ||||||
		Reference in New Issue
	
	Block a user