-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
f66bdaa
commit eb7663c
Showing
5 changed files
with
188 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
src/main/kotlin/ch/schulealtendorf/sporttagpsa/controller/rest/user/Models.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* Copyright (c) 2018 by Nicolas Märchy | ||
* | ||
* This file is part of Sporttag PSA. | ||
* | ||
* Sporttag PSA is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* Sporttag PSA is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with Sporttag PSA. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
* Diese Datei ist Teil von Sporttag PSA. | ||
* | ||
* Sporttag PSA ist Freie Software: Sie können es unter den Bedingungen | ||
* der GNU General Public License, wie von der Free Software Foundation, | ||
* Version 3 der Lizenz oder (nach Ihrer Wahl) jeder späteren | ||
* veröffentlichten Version, weiterverbreiten und/oder modifizieren. | ||
* | ||
* Sporttag PSA wird in der Hoffnung, dass es nützlich sein wird, aber | ||
* OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite | ||
* Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. | ||
* Siehe die GNU General Public License für weitere Details. | ||
* | ||
* Sie sollten eine Kopie der GNU General Public License zusammen mit diesem | ||
* Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>. | ||
* | ||
* | ||
*/ | ||
|
||
package ch.schulealtendorf.sporttagpsa.controller.rest.user | ||
|
||
data class NewUser( | ||
val username: String, | ||
val enabled: Boolean, | ||
val password: String | ||
) | ||
|
||
data class UpdateUser( | ||
val username: String, | ||
val enabled: Boolean | ||
) | ||
|
||
data class PasswordWrapper( | ||
val password: String | ||
) |
109 changes: 109 additions & 0 deletions
109
src/main/kotlin/ch/schulealtendorf/sporttagpsa/controller/rest/user/UserController.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
/* | ||
* Copyright (c) 2018 by Nicolas Märchy | ||
* | ||
* This file is part of Sporttag PSA. | ||
* | ||
* Sporttag PSA is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* Sporttag PSA is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with Sporttag PSA. If not, see <http://www.gnu.org/licenses/>. | ||
* | ||
* Diese Datei ist Teil von Sporttag PSA. | ||
* | ||
* Sporttag PSA ist Freie Software: Sie können es unter den Bedingungen | ||
* der GNU General Public License, wie von der Free Software Foundation, | ||
* Version 3 der Lizenz oder (nach Ihrer Wahl) jeder späteren | ||
* veröffentlichten Version, weiterverbreiten und/oder modifizieren. | ||
* | ||
* Sporttag PSA wird in der Hoffnung, dass es nützlich sein wird, aber | ||
* OHNE JEDE GEWÄHRLEISTUNG, bereitgestellt; sogar ohne die implizite | ||
* Gewährleistung der MARKTFÄHIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK. | ||
* Siehe die GNU General Public License für weitere Details. | ||
* | ||
* Sie sollten eine Kopie der GNU General Public License zusammen mit diesem | ||
* Programm erhalten haben. Wenn nicht, siehe <http://www.gnu.org/licenses/>. | ||
* | ||
* | ||
*/ | ||
|
||
package ch.schulealtendorf.sporttagpsa.controller.rest.user | ||
|
||
import ch.schulealtendorf.sporttagpsa.business.user.UserManager | ||
import ch.schulealtendorf.sporttagpsa.business.user.validation.InvalidPasswordException | ||
import ch.schulealtendorf.sporttagpsa.controller.rest.BadRequestException | ||
import ch.schulealtendorf.sporttagpsa.controller.rest.NotFoundException | ||
import ch.schulealtendorf.sporttagpsa.controller.rest.RestUser | ||
import ch.schulealtendorf.sporttagpsa.controller.rest.json | ||
import ch.schulealtendorf.sporttagpsa.model.User | ||
import org.springframework.web.bind.annotation.* | ||
|
||
/** | ||
* Rest controller for user domain. | ||
* | ||
* @author nmaerchy <billedtrain380@gmail.com> | ||
* @since 2.0.0 | ||
*/ | ||
@RestController | ||
@RequestMapping("/api") | ||
class UserController( | ||
private val userManager: UserManager | ||
) { | ||
|
||
@GetMapping("/users") | ||
fun getUsers(): List<RestUser> { | ||
return userManager.getAll().map { json(it) } | ||
} | ||
|
||
@PostMapping("/users") | ||
fun createUser(newUser: NewUser) { | ||
|
||
val user = User(0, newUser.username, listOf("ROLE_USER"), newUser.enabled, newUser.password) | ||
userManager.save(user) | ||
} | ||
|
||
@GetMapping("/user/{user_id}") | ||
fun getUser(@PathVariable("user_id") id: Int): RestUser { | ||
return json(userManager.findOne(id)) | ||
} | ||
|
||
@PatchMapping("/user/{user_id") | ||
fun updateUser(@PathVariable("user_id") id: Int, @RequestBody updateUser: UpdateUser) { | ||
|
||
val user = userManager.findOne(id) | ||
|
||
userManager.save( | ||
user.copy(username = updateUser.username, enabled = updateUser.enabled) | ||
) | ||
} | ||
|
||
@PutMapping("/user/{user_id}") | ||
fun updateUser(@PathVariable("user_id") id: Int, @RequestBody wrapper: PasswordWrapper) { | ||
|
||
try { | ||
|
||
val user = userManager.findOne(id) | ||
userManager.changePassword(user, wrapper.password) | ||
|
||
} catch (ex: InvalidPasswordException) { | ||
throw BadRequestException(ex.message, ex) | ||
} | ||
} | ||
|
||
@DeleteMapping("/user/{user_id}") | ||
fun deleteUser(@PathVariable("user_id") id: Int) { | ||
userManager.delete(id) | ||
} | ||
|
||
private fun UserManager.findOne(id: Int): User { | ||
return getOne(id) | ||
.orElseThrow { NotFoundException("Could not find user: user_id=$id") } | ||
} | ||
} |