mirror of
https://github.com/TheAnachronism/docspell.git
synced 2025-06-03 05:52:51 +00:00
Transport user-id to client
This commit is contained in:
parent
c12201c4a5
commit
d43e17d9fb
@ -3360,11 +3360,15 @@ components:
|
||||
description: |
|
||||
A user of a collective.
|
||||
required:
|
||||
- id
|
||||
- login
|
||||
- state
|
||||
- loginCount
|
||||
- created
|
||||
properties:
|
||||
id:
|
||||
type: string
|
||||
format: ident
|
||||
login:
|
||||
type: string
|
||||
format: ident
|
||||
|
@ -431,7 +431,16 @@ trait Conversions {
|
||||
|
||||
// users
|
||||
def mkUser(ru: RUser): User =
|
||||
User(ru.login, ru.state, None, ru.email, ru.lastLogin, ru.loginCount, ru.created)
|
||||
User(
|
||||
ru.uid,
|
||||
ru.login,
|
||||
ru.state,
|
||||
None,
|
||||
ru.email,
|
||||
ru.lastLogin,
|
||||
ru.loginCount,
|
||||
ru.created
|
||||
)
|
||||
|
||||
def newUser[F[_]: Sync](u: User, cid: Ident): F[RUser] =
|
||||
timeId.map {
|
||||
@ -451,7 +460,7 @@ trait Conversions {
|
||||
|
||||
def changeUser(u: User, cid: Ident): RUser =
|
||||
RUser(
|
||||
Ident.unsafe(""),
|
||||
u.id,
|
||||
u.login,
|
||||
cid,
|
||||
u.password.getOrElse(Password.empty),
|
||||
|
Loading…
x
Reference in New Issue
Block a user