TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix adding a new user and don't allow to add non-local users

Browse Source 
The user structure must provide the correct account source now.
This commit is contained in:
eikek 2021-09-07 21:59:38 +02:00
parent 8df235e9db
commit 736968b049
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/backend/src/main/scala/docspell/backend/ops/OCollective.scala
View File

@ -214,10 +214,13 @@ object OCollective {
store.transact(RUser.findAll(collective, _.login)) store.transact(RUser.findAll(collective, _.login))
def add(s: RUser): F[AddResult] = def add(s: RUser): F[AddResult] =
store.add( if (s.source != AccountSource.Local)
RUser.insert(s.copy(password = PasswordCrypt.crypt(s.password))), AddResult.failure(new Exception("Only local accounts can be created!")).pure[F]
RUser.exists(s.login) else
) store.add(
RUser.insert(s.copy(password = PasswordCrypt.crypt(s.password))),
RUser.exists(s.login)
)
def update(s: RUser): F[AddResult] = def update(s: RUser): F[AddResult] =
store.add(RUser.update(s), RUser.exists(s.login)) store.add(RUser.update(s), RUser.exists(s.login))

2
modules/store/src/main/scala/docspell/store/AddResult.scala
View File

@ -50,4 +50,6 @@ object AddResult {
def fold[A](fa: Success.type => A, fb: EntityExists => A, fc: Failure => A): A = def fold[A](fa: Success.type => A, fb: EntityExists => A, fc: Failure => A): A =
fc(this) fc(this)
} }
def failure(ex: Exception): AddResult =
Failure(ex)
} }

1
modules/webapp/src/main/elm/Comp/UserForm.elm
View File

@ -85,6 +85,7 @@ getUser model =
, email = model.email , email = model.email
, state = state , state = state
, password = model.password , password = model.password
, source = "local"
} }