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

Fix websocket frame to user mapping

Browse Source
This commit is contained in:
eikek
2022-08-07 15:17:52 +02:00
parent e9e3e607d3
commit d9485355e9
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/restserver/src/main/scala/docspell/restserver/conv/AddonValidationSupport.scala
View File

@ -7,11 +7,10 @@
package docspell.restserver.conv package docspell.restserver.conv
import cats.syntax.all._ import cats.syntax.all._
import docspell.addons.AddonMeta import docspell.addons.AddonMeta
import docspell.backend.ops.AddonValidationError import docspell.backend.ops.AddonValidationError
import docspell.backend.ops.OAddons.AddonValidationResult import docspell.backend.ops.OAddons.AddonValidationResult
import docspell.common.Ident import docspell.common.CollectiveId
import docspell.restserver.ws.{OutputEvent, OutputEventEncoder} import docspell.restserver.ws.{OutputEvent, OutputEventEncoder}
import docspell.store.records.RAddonArchive import docspell.store.records.RAddonArchive
@ -51,7 +50,7 @@ trait AddonValidationSupport {
} }
def addonResultOutputEventEncoder( def addonResultOutputEventEncoder(
collective: Ident collective: CollectiveId
): OutputEventEncoder[AddonValidationResult[(RAddonArchive, AddonMeta)]] = ): OutputEventEncoder[AddonValidationResult[(RAddonArchive, AddonMeta)]] =
OutputEventEncoder.instance { OutputEventEncoder.instance {
case Right((archive, _)) => case Right((archive, _)) =>

2
modules/restserver/src/main/scala/docspell/restserver/routes/AddonArchiveRoutes.scala
View File

@ -34,7 +34,7 @@ object AddonArchiveRoutes extends AddonValidationSupport {
): HttpRoutes[F] = { ): HttpRoutes[F] = {
val dsl = new Http4sDsl[F] {} val dsl = new Http4sDsl[F] {}
import dsl._ import dsl._
implicit val wsOutputEnc = addonResultOutputEventEncoder(token.account.collective) implicit val wsOutputEnc = addonResultOutputEventEncoder(token.account.collectiveId)
HttpRoutes.of { HttpRoutes.of {
case GET -> Root => case GET -> Root =>

12
modules/restserver/src/main/scala/docspell/restserver/ws/OutputEvent.scala
View File

@ -34,7 +34,7 @@ object OutputEvent {
final case class JobSubmitted(group: Ident, task: Ident) extends OutputEvent { final case class JobSubmitted(group: Ident, task: Ident) extends OutputEvent {
def forCollective(token: AuthToken): Boolean = def forCollective(token: AuthToken): Boolean =
token.account.collective == group token.account.collectiveId.valueAsIdent == group
def asJson: Json = def asJson: Json =
Msg("job-submitted", task).asJson Msg("job-submitted", task).asJson
@ -47,7 +47,7 @@ object OutputEvent {
result: Option[Json] result: Option[Json]
) extends OutputEvent { ) extends OutputEvent {
def forCollective(token: AuthToken): Boolean = def forCollective(token: AuthToken): Boolean =
token.account.collective == group token.account.collectiveId.valueAsIdent == group
def asJson: Json = def asJson: Json =
Msg( Msg(
@ -56,23 +56,23 @@ object OutputEvent {
).asJson ).asJson
} }
final case class JobsWaiting(collective: Ident, count: Int) extends OutputEvent { final case class JobsWaiting(collective: CollectiveId, count: Int) extends OutputEvent {
def forCollective(token: AuthToken): Boolean = def forCollective(token: AuthToken): Boolean =
token.account.collective == collective token.account.collectiveId == collective
def asJson: Json = def asJson: Json =
Msg("jobs-waiting", count).asJson Msg("jobs-waiting", count).asJson
} }
final case class AddonInstalled( final case class AddonInstalled(
collective: Ident, collective: CollectiveId,
message: String, message: String,
error: Option[AddonValidationError], error: Option[AddonValidationError],
addonId: Option[Ident], addonId: Option[Ident],
originalUrl: Option[LenientUri] originalUrl: Option[LenientUri]
) extends OutputEvent { ) extends OutputEvent {
def forCollective(token: AuthToken) = def forCollective(token: AuthToken) =
token.account.collective == collective token.account.collectiveId == collective
override def asJson = override def asJson =
Msg( Msg(

2
modules/restserver/src/main/scala/docspell/restserver/ws/WebSocketRoutes.scala
View File

@ -34,7 +34,7 @@ object WebSocketRoutes {
val init = val init =
for { for {
jc <- backend.job.getUnfinishedJobCount(UserTaskScope(user.account)) jc <- backend.job.getUnfinishedJobCount(UserTaskScope(user.account))
msg = OutputEvent.JobsWaiting(user.account.collective, jc) msg = OutputEvent.JobsWaiting(user.account.collectiveId, jc)
} yield Text(msg.encode) } yield Text(msg.encode)
val toClient: Stream[F, WebSocketFrame.Text] = val toClient: Stream[F, WebSocketFrame.Text] =