TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deleting users

Browse Source 
Can now be deleted by id or login. It was wrongly documented.
This commit is contained in:
eikek
2023-02-01 23:40:29 +01:00
parent b31bd01b84
commit df1526e628
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/restapi/src/main/resources/docspell-openapi.yml
View File

@ -1584,9 +1584,9 @@ paths:
$ref: "#/components/schemas/BasicResult" $ref: "#/components/schemas/BasicResult"
/sec/user/{username}: /sec/user/{username}:
delete: delete:
operationId: "sec-user-delete-by-username" operationId: "sec-user-delete-by-userid-or-login"
tags: [ Collective ] tags: [ Collective ]
summary: Delete a user. summary: Delete a user by its id or login name.
description: | description: |
Deletes a user. Deletes a user.
security: security:

10
modules/restserver/src/main/scala/docspell/restserver/routes/UserRoutes.scala
View File

@ -6,6 +6,7 @@
package docspell.restserver.routes package docspell.restserver.routes
import cats.data.OptionT
import cats.effect._ import cats.effect._
import cats.implicits._ import cats.implicits._
@ -73,8 +74,13 @@ object UserRoutes {
for { for {
users <- backend.collective.listUser(user.account.collectiveId) users <- backend.collective.listUser(user.account.collectiveId)
ar <- ar <-
if (users.exists(_.uid == id)) backend.collective.deleteUser(id) OptionT
else UpdateResult.notFound.pure[F] .fromOption[F](
users
.find(u => u.uid == id || u.login == id)
)
.semiflatMap(u => backend.collective.deleteUser(u.uid))
.getOrElse(UpdateResult.notFound)
resp <- Ok(basicResult(ar, "User deleted.")) resp <- Ok(basicResult(ar, "User deleted."))
} yield resp } yield resp