TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-03-28 17:55:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set stricter compile options and fix cookie data

Browse Source
This commit is contained in:
Eike Kettner 2019-09-28 22:17:45 +02:00
parent 46f1476418
commit 2ad1586d00
29 changed files with 94 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.sbt
View File

@ -10,14 +10,14 @@ val sharedSettings = Seq(
"-deprecation", "-deprecation",
"-encoding", "UTF-8", "-encoding", "UTF-8",
"-language:higherKinds", "-language:higherKinds",
"-language:postfixOps",
"-feature", "-feature",
"-Werror", // fail when there are warnings "-Werror", // fail when there are warnings
"-unchecked", "-unchecked",
"-Xlint:_", "-Xlint:_",
"-Ywarn-dead-code", "-Wdead-code",
"-Ywarn-numeric-widen", "-Wunused",
"-Ywarn-value-discard" "-Wvalue-discard",
"-Wnumeric-widen"
), ),
scalacOptions in (Compile, console) := scalacOptions in (Compile, console) :=
(scalacOptions.value.filter(o => !o.contains("Xlint")) ++ Seq("-Xlint:_,-unused")), (scalacOptions.value.filter(o => !o.contains("Xlint")) ++ Seq("-Xlint:_,-unused")),

4
modules/backend/src/main/scala/docspell/backend/auth/Login.scala
View File

@ -57,7 +57,7 @@ object Login {
if (at.sigInvalid(config.serverSecret)) Result.invalidAuth.pure[F] if (at.sigInvalid(config.serverSecret)) Result.invalidAuth.pure[F]
else if (at.isExpired(config.sessionValid)) Result.invalidTime.pure[F] else if (at.isExpired(config.sessionValid)) Result.invalidTime.pure[F]
else Result.ok(at).pure[F] else Result.ok(at).pure[F]
case Left(err) => case Left(_) =>
Result.invalidAuth.pure[F] Result.invalidAuth.pure[F]
} }
@ -73,7 +73,7 @@ object Login {
res <- if (data.exists(check(up.pass))) okResult res <- if (data.exists(check(up.pass))) okResult
else Result.invalidAuth.pure[F] else Result.invalidAuth.pure[F]
} yield res } yield res
case Left(err) => case Left(_) =>
Result.invalidAuth.pure[F] Result.invalidAuth.pure[F]
} }
} }

2
modules/backend/src/main/scala/docspell/backend/ops/OJob.scala
View File

@ -61,7 +61,7 @@ object OJob {
jobm = job.filter(canDelete) jobm = job.filter(canDelete)
del <- jobm.traverse(j => RJob.delete(j.id)) del <- jobm.traverse(j => RJob.delete(j.id))
} yield del match { } yield del match {
case Some(n) => Right(JobCancelResult.Removed: JobCancelResult) case Some(_) => Right(JobCancelResult.Removed: JobCancelResult)
case None => Left(mustCancel(job)) case None => Left(mustCancel(job))
} }

7
modules/common/src/main/scala/docspell/common/LenientUri.scala
View File

@ -39,6 +39,13 @@ case class LenientUri(scheme: NonEmptyList[String]
rethrow. rethrow.
flatMap(url => fs2.io.readInputStream(Sync[F].delay(url.openStream()), chunkSize, blocker, true)) flatMap(url => fs2.io.readInputStream(Sync[F].delay(url.openStream()), chunkSize, blocker, true))
def host: Option[String] =
authority.
map(a => a.indexOf(':') match {
case -1 => a
case n => a.substring(0, n)
})
def asString: String = { def asString: String = {
val schemePart = scheme.toList.mkString(":") val schemePart = scheme.toList.mkString(":")
val authPart = authority.map(a => s"//$a").getOrElse("") val authPart = authority.map(a => s"//$a").getOrElse("")

2
modules/common/src/main/scala/docspell/common/ProcessItemArgs.scala
View File

@ -11,7 +11,7 @@ case class ProcessItemArgs(meta: ProcessMeta, files: List[File]) {
case Nil => s"${meta.sourceAbbrev}: No files" case Nil => s"${meta.sourceAbbrev}: No files"
case n :: Nil => n case n :: Nil => n
case n1 :: n2 :: Nil => s"$n1, $n2" case n1 :: n2 :: Nil => s"$n1, $n2"
case more => s"${files.size} files from ${meta.sourceAbbrev}" case _ => s"${files.size} files from ${meta.sourceAbbrev}"
} }
} }

4
modules/joex/src/main/scala/docspell/joex/JoexServer.scala
View File

@ -27,8 +27,8 @@ object JoexServer {
joexApp <- JoexAppImpl.create[F](cfg, signal, connectEC, blocker) joexApp <- JoexAppImpl.create[F](cfg, signal, connectEC, blocker)
httpApp = Router( httpApp = Router(
"/api/info" -> InfoRoutes(cfg), "/api/info" -> InfoRoutes(),
"/api/v1" -> JoexRoutes(cfg, joexApp) "/api/v1" -> JoexRoutes(joexApp)
).orNotFound ).orNotFound
// With Middlewares in place // With Middlewares in place

10
modules/joex/src/main/scala/docspell/joex/process/CreateItem.scala
View File

@ -25,9 +25,9 @@ object CreateItem {
def fileMetas(itemId: Ident, now: Timestamp) = Stream.emits(ctx.args.files). def fileMetas(itemId: Ident, now: Timestamp) = Stream.emits(ctx.args.files).
flatMap(f => ctx.store.bitpeace.get(f.fileMetaId.id).map(fm => (f, fm))). flatMap(f => ctx.store.bitpeace.get(f.fileMetaId.id).map(fm => (f, fm))).
collect({ case (f, Some(fm)) if validFiles.contains(fm.mimetype.baseType) => (f, fm) }). collect({ case (f, Some(fm)) if validFiles.contains(fm.mimetype.baseType) => f }).
zipWithIndex. zipWithIndex.
evalMap({ case ((f, fm), index) => evalMap({ case (f, index) =>
Ident.randomId[F].map(id => RAttachment(id, itemId, f.fileMetaId, index.toInt, now, f.name)) Ident.randomId[F].map(id => RAttachment(id, itemId, f.fileMetaId, index.toInt, now, f.name))
}). }).
compile.toVector compile.toVector
@ -64,7 +64,11 @@ object CreateItem {
} }
private def logDifferences[F[_]: Sync](ctx: Context[F, ProcessItemArgs], saved: Vector[RAttachment], saveCount: Int): F[Unit] = private def logDifferences[F[_]: Sync](ctx: Context[F, ProcessItemArgs], saved: Vector[RAttachment], saveCount: Int): F[Unit] =
ctx.logger.info("TODO log diffs") if (ctx.args.files.size != saved.size) {
ctx.logger.warn(s"Not all given files (${ctx.args.files.size}) have been stored. Files retained: ${saved.size}; saveCount=$saveCount")
} else {
().pure[F]
}
private def storeItemError[F[_]: Sync](ctx: Context[F, ProcessItemArgs]): F[Unit] = { private def storeItemError[F[_]: Sync](ctx: Context[F, ProcessItemArgs]): F[Unit] = {
val msg = "Inserting item failed. DB returned 0 update count!" val msg = "Inserting item failed. DB returned 0 update count!"

6
modules/joex/src/main/scala/docspell/joex/routes/InfoRoutes.scala
View File

@ -1,15 +1,15 @@
package docspell.joex.routes package docspell.joex.routes
import cats.effect.Sync import cats.effect.Sync
import docspell.joex.{BuildInfo, Config} import docspell.joex.BuildInfo
import docspell.joexapi.model.VersionInfo import docspell.joexapi.model.VersionInfo
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
import org.http4s.dsl.Http4sDsl
import org.http4s.circe.CirceEntityEncoder._ import org.http4s.circe.CirceEntityEncoder._
import org.http4s.dsl.Http4sDsl
object InfoRoutes { object InfoRoutes {
def apply[F[_]: Sync](cfg: Config): HttpRoutes[F] = { def apply[F[_]: Sync](): HttpRoutes[F] = {
val dsl = new Http4sDsl[F]{} val dsl = new Http4sDsl[F]{}
import dsl._ import dsl._
HttpRoutes.of[F] { HttpRoutes.of[F] {

8
modules/joex/src/main/scala/docspell/joex/routes/JoexRoutes.scala
View File

@ -1,18 +1,18 @@
package docspell.joex.routes package docspell.joex.routes
import cats.implicits._
import cats.effect._ import cats.effect._
import cats.implicits._
import docspell.common.{Duration, Ident, Timestamp} import docspell.common.{Duration, Ident, Timestamp}
import docspell.joex.{Config, JoexApp} import docspell.joex.JoexApp
import docspell.joexapi.model._ import docspell.joexapi.model._
import docspell.store.records.{RJob, RJobLog} import docspell.store.records.{RJob, RJobLog}
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
import org.http4s.dsl.Http4sDsl
import org.http4s.circe.CirceEntityEncoder._ import org.http4s.circe.CirceEntityEncoder._
import org.http4s.dsl.Http4sDsl
object JoexRoutes { object JoexRoutes {
def apply[F[_]: ConcurrentEffect: Timer](cfg: Config, app: JoexApp[F]): HttpRoutes[F] = { def apply[F[_]: ConcurrentEffect: Timer](app: JoexApp[F]): HttpRoutes[F] = {
val dsl = new Http4sDsl[F]{} val dsl = new Http4sDsl[F]{}
import dsl._ import dsl._
HttpRoutes.of[F] { HttpRoutes.of[F] {

2
modules/joex/src/main/scala/docspell/joex/scheduler/Logger.scala
View File

@ -43,7 +43,7 @@ object Logger {
for { for {
q <- Queue.circularBuffer[F, LogEvent](bufferSize) q <- Queue.circularBuffer[F, LogEvent](bufferSize)
log = create(jobId, jobInfo, q) log = create(jobId, jobInfo, q)
fib <- Concurrent[F].start(q.dequeue.through(sink.receive).compile.drain) _ <- Concurrent[F].start(q.dequeue.through(sink.receive).compile.drain)
} yield log } yield log
} }

36
modules/restserver/src/main/scala/docspell/restserver/RestServer.scala
View File

@ -2,14 +2,14 @@ package docspell.restserver
import cats.effect._ import cats.effect._
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import org.http4s.server.blaze.BlazeServerBuilder
import org.http4s.implicits._
import fs2.Stream
import org.http4s.server.middleware.Logger
import org.http4s.server.Router
import docspell.restserver.webapp._
import docspell.restserver.routes._ import docspell.restserver.routes._
import docspell.restserver.webapp._
import fs2.Stream
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
import org.http4s.implicits._
import org.http4s.server.Router
import org.http4s.server.blaze.BlazeServerBuilder
import org.http4s.server.middleware.Logger
import scala.concurrent.ExecutionContext import scala.concurrent.ExecutionContext
@ -22,12 +22,12 @@ object RestServer {
restApp <- RestAppImpl.create[F](cfg, connectEC, httpClientEc, blocker) restApp <- RestAppImpl.create[F](cfg, connectEC, httpClientEc, blocker)
httpApp = Router( httpApp = Router(
"/api/info" -> routes.InfoRoutes(cfg), "/api/info" -> routes.InfoRoutes(),
"/api/v1/open/" -> openRoutes(cfg, restApp), "/api/v1/open/" -> openRoutes(cfg, restApp),
"/api/v1/sec/" -> Authenticate(restApp.backend.login, cfg.auth) { "/api/v1/sec/" -> Authenticate(restApp.backend.login, cfg.auth) {
token => securedRoutes(cfg, restApp, token) token => securedRoutes(cfg, restApp, token)
}, },
"/app/assets" -> WebjarRoutes.appRoutes[F](blocker, cfg), "/app/assets" -> WebjarRoutes.appRoutes[F](blocker),
"/app" -> TemplateRoutes[F](blocker, cfg) "/app" -> TemplateRoutes[F](blocker, cfg)
).orNotFound ).orNotFound
@ -47,16 +47,16 @@ object RestServer {
def securedRoutes[F[_]: Effect](cfg: Config, restApp: RestApp[F], token: AuthToken): HttpRoutes[F] = def securedRoutes[F[_]: Effect](cfg: Config, restApp: RestApp[F], token: AuthToken): HttpRoutes[F] =
Router( Router(
"auth" -> LoginRoutes.session(restApp.backend.login, cfg), "auth" -> LoginRoutes.session(restApp.backend.login, cfg),
"tag" -> TagRoutes(restApp.backend, cfg, token), "tag" -> TagRoutes(restApp.backend, token),
"equipment" -> EquipmentRoutes(restApp.backend, cfg, token), "equipment" -> EquipmentRoutes(restApp.backend, token),
"organization" -> OrganizationRoutes(restApp.backend, cfg, token), "organization" -> OrganizationRoutes(restApp.backend, token),
"person" -> PersonRoutes(restApp.backend, cfg, token), "person" -> PersonRoutes(restApp.backend, token),
"source" -> SourceRoutes(restApp.backend, cfg, token), "source" -> SourceRoutes(restApp.backend, token),
"user" -> UserRoutes(restApp.backend, cfg, token), "user" -> UserRoutes(restApp.backend, token),
"collective" -> CollectiveRoutes(restApp.backend, cfg, token), "collective" -> CollectiveRoutes(restApp.backend, token),
"queue" -> JobQueueRoutes(restApp.backend, cfg, token), "queue" -> JobQueueRoutes(restApp.backend, token),
"item" -> ItemRoutes(restApp.backend, cfg, token), "item" -> ItemRoutes(restApp.backend, token),
"attachment" -> AttachmentRoutes(restApp.backend, cfg, token), "attachment" -> AttachmentRoutes(restApp.backend, token),
"upload" -> UploadRoutes.secured(restApp.backend, cfg, token) "upload" -> UploadRoutes.secured(restApp.backend, cfg, token)
) )

7
modules/restserver/src/main/scala/docspell/restserver/auth/CookieData.scala
View File

@ -11,9 +11,10 @@ case class CookieData(auth: AuthToken) {
def asString: String = auth.asString def asString: String = auth.asString
def asCookie(cfg: Config): ResponseCookie = { def asCookie(cfg: Config): ResponseCookie = {
val domain = "" //cfg.baseUrl.hostAndPort val domain = cfg.baseUrl.host
val sec = false //cfg.baseUrl.protocol.exists(_.endsWith("s")) val sec = cfg.baseUrl.scheme.exists(_.endsWith("s"))
ResponseCookie(CookieData.cookieName, asString, domain = Some(domain), path = Some("/api/v1"), httpOnly = true, secure = sec) val path = cfg.baseUrl.path/"api"/"v1"/"sec"
ResponseCookie(CookieData.cookieName, asString, domain = domain, path = Some(path.asString), httpOnly = true, secure = sec)
} }
} }
object CookieData { object CookieData {

2
modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
View File

@ -243,7 +243,7 @@ trait Conversions {
def newUser[F[_]: Sync](u: User, cid: Ident): F[RUser] = def newUser[F[_]: Sync](u: User, cid: Ident): F[RUser] =
timeId.map { case (id, now) => timeId.map { case (id, now) =>
RUser(id, u.login, cid, u.password.getOrElse(Password.empty), u.state, u.email, u.loginCount, u.lastLogin, u.created) RUser(id, u.login, cid, u.password.getOrElse(Password.empty), u.state, u.email, 0, None, now)
} }
def changeUser(u: User, cid: Ident): RUser = def changeUser(u: User, cid: Ident): RUser =

5
modules/restserver/src/main/scala/docspell/restserver/http4s/ResponseGenerator.scala
View File

@ -1,5 +1,6 @@
package docspell.restserver.http4s package docspell.restserver.http4s
import cats.implicits._
import cats.Applicative import cats.Applicative
import org.http4s.{EntityEncoder, Header, Response} import org.http4s.{EntityEncoder, Header, Response}
import org.http4s.dsl.Http4sDsl import org.http4s.dsl.Http4sDsl
@ -16,14 +17,14 @@ trait ResponseGenerator[F[_]] {
e.fold( e.fold(
a => UnprocessableEntity(a), a => UnprocessableEntity(a),
b => Ok(b) b => Ok(b)
) ).map(_.withHeaders(headers: _*))
} }
implicit final class OptionResponse[A](o: Option[A]) { implicit final class OptionResponse[A](o: Option[A]) {
def toResponse(headers: Header*) def toResponse(headers: Header*)
(implicit F: Applicative[F] (implicit F: Applicative[F]
, w0: EntityEncoder[F, A]): F[Response[F]] = , w0: EntityEncoder[F, A]): F[Response[F]] =
o.map(a => Ok(a)).getOrElse(NotFound()) o.map(a => Ok(a)).getOrElse(NotFound()).map(_.withHeaders(headers: _*))
} }
} }

3
modules/restserver/src/main/scala/docspell/restserver/routes/AttachmentRoutes.scala
View File

@ -12,13 +12,12 @@ import org.http4s.dsl.Http4sDsl
import org.http4s.headers._ import org.http4s.headers._
import org.http4s.circe.CirceEntityEncoder._ import org.http4s.circe.CirceEntityEncoder._
import docspell.restapi.model._ import docspell.restapi.model._
import docspell.restserver.Config
import docspell.restserver.conv.Conversions import docspell.restserver.conv.Conversions
import org.http4s.headers.ETag.EntityTag import org.http4s.headers.ETag.EntityTag
object AttachmentRoutes { object AttachmentRoutes {
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F]{} val dsl = new Http4sDsl[F]{}
import dsl._ import dsl._

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

@ -15,7 +15,7 @@ object Authenticate {
def authenticateRequest[F[_]: Effect](auth: String => F[Login.Result])(req: Request[F]): F[Login.Result] = def authenticateRequest[F[_]: Effect](auth: String => F[Login.Result])(req: Request[F]): F[Login.Result] =
CookieData.authenticator(req) match { CookieData.authenticator(req) match {
case Right(str) => auth(str) case Right(str) => auth(str)
case Left(err) => Login.Result.invalidAuth.pure[F] case Left(_) => Login.Result.invalidAuth.pure[F]
} }

5
modules/restserver/src/main/scala/docspell/restserver/routes/CollectiveRoutes.scala
View File

@ -5,17 +5,16 @@ import cats.implicits._
import docspell.backend.BackendApp import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import docspell.restapi.model._ import docspell.restapi.model._
import docspell.restserver.Config
import docspell.restserver.conv.Conversions import docspell.restserver.conv.Conversions
import docspell.restserver.http4s.ResponseGenerator import docspell.restserver.http4s.ResponseGenerator
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
import org.http4s.circe.CirceEntityEncoder._
import org.http4s.circe.CirceEntityDecoder._ import org.http4s.circe.CirceEntityDecoder._
import org.http4s.circe.CirceEntityEncoder._
import org.http4s.dsl.Http4sDsl import org.http4s.dsl.Http4sDsl
object CollectiveRoutes { object CollectiveRoutes {
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F] with ResponseGenerator[F] {} val dsl = new Http4sDsl[F] with ResponseGenerator[F] {}
import dsl._ import dsl._

3
modules/restserver/src/main/scala/docspell/restserver/routes/EquipmentRoutes.scala
View File

@ -6,7 +6,6 @@ import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import docspell.common.Ident import docspell.common.Ident
import docspell.restapi.model._ import docspell.restapi.model._
import docspell.restserver.Config
import docspell.restserver.conv.Conversions._ import docspell.restserver.conv.Conversions._
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
import org.http4s.circe.CirceEntityDecoder._ import org.http4s.circe.CirceEntityDecoder._
@ -15,7 +14,7 @@ import org.http4s.dsl.Http4sDsl
object EquipmentRoutes { object EquipmentRoutes {
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F]{} val dsl = new Http4sDsl[F]{}
import dsl._ import dsl._

6
modules/restserver/src/main/scala/docspell/restserver/routes/InfoRoutes.scala
View File

@ -2,14 +2,14 @@ package docspell.restserver.routes
import cats.effect.Sync import cats.effect.Sync
import docspell.restapi.model.VersionInfo import docspell.restapi.model.VersionInfo
import docspell.restserver.{BuildInfo, Config} import docspell.restserver.BuildInfo
import org.http4s.circe.CirceEntityEncoder._
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
import org.http4s.circe.CirceEntityEncoder._
import org.http4s.dsl.Http4sDsl import org.http4s.dsl.Http4sDsl
object InfoRoutes { object InfoRoutes {
def apply[F[_]: Sync](cfg: Config): HttpRoutes[F] = { def apply[F[_]: Sync](): HttpRoutes[F] = {
val dsl = new Http4sDsl[F]{} val dsl = new Http4sDsl[F]{}
import dsl._ import dsl._
HttpRoutes.of[F] { HttpRoutes.of[F] {

7
modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
View File

@ -10,7 +10,6 @@ import org.http4s.dsl.Http4sDsl
import org.http4s.circe.CirceEntityEncoder._ import org.http4s.circe.CirceEntityEncoder._
import org.http4s.circe.CirceEntityDecoder._ import org.http4s.circe.CirceEntityDecoder._
import docspell.restapi.model._ import docspell.restapi.model._
import docspell.restserver.Config
import docspell.common.syntax.all._ import docspell.common.syntax.all._
import docspell.restserver.conv.Conversions import docspell.restserver.conv.Conversions
import org.log4s._ import org.log4s._
@ -18,7 +17,7 @@ import org.log4s._
object ItemRoutes { object ItemRoutes {
private[this] val logger = getLogger private[this] val logger = getLogger
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F]{} val dsl = new Http4sDsl[F]{}
import dsl._ import dsl._
@ -40,13 +39,13 @@ object ItemRoutes {
resp <- result.map(r => Ok(r)).getOrElse(NotFound(BasicResult(false, "Not found."))) resp <- result.map(r => Ok(r)).getOrElse(NotFound(BasicResult(false, "Not found.")))
} yield resp } yield resp
case req@POST -> Root / Ident(id) / "confirm" => case POST -> Root / Ident(id) / "confirm" =>
for { for {
res <- backend.item.setState(id, ItemState.Confirmed, user.account.collective) res <- backend.item.setState(id, ItemState.Confirmed, user.account.collective)
resp <- Ok(Conversions.basicResult(res, "Item data confirmed")) resp <- Ok(Conversions.basicResult(res, "Item data confirmed"))
} yield resp } yield resp
case req@POST -> Root / Ident(id) / "unconfirm" => case POST -> Root / Ident(id) / "unconfirm" =>
for { for {
res <- backend.item.setState(id, ItemState.Created, user.account.collective) res <- backend.item.setState(id, ItemState.Created, user.account.collective)
resp <- Ok(Conversions.basicResult(res, "Item back to created.")) resp <- Ok(Conversions.basicResult(res, "Item back to created."))

3
modules/restserver/src/main/scala/docspell/restserver/routes/JobQueueRoutes.scala
View File

@ -5,7 +5,6 @@ import cats.implicits._
import docspell.backend.BackendApp import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import docspell.common.Ident import docspell.common.Ident
import docspell.restserver.Config
import docspell.restserver.conv.Conversions import docspell.restserver.conv.Conversions
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
import org.http4s.circe.CirceEntityEncoder._ import org.http4s.circe.CirceEntityEncoder._
@ -13,7 +12,7 @@ import org.http4s.dsl.Http4sDsl
object JobQueueRoutes { object JobQueueRoutes {
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F] {} val dsl = new Http4sDsl[F] {}
import dsl._ import dsl._

17
modules/restserver/src/main/scala/docspell/restserver/routes/OrganizationRoutes.scala
View File

@ -4,19 +4,18 @@ import cats.effect._
import cats.implicits._ import cats.implicits._
import docspell.backend.BackendApp import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import org.http4s.HttpRoutes
import org.http4s.dsl.Http4sDsl
import org.http4s.circe.CirceEntityEncoder._
import org.http4s.circe.CirceEntityDecoder._
import docspell.restapi.model._
import docspell.restserver.Config
import docspell.restserver.conv.Conversions._
import ParamDecoder._
import docspell.common.Ident import docspell.common.Ident
import docspell.restapi.model._
import docspell.restserver.conv.Conversions._
import docspell.restserver.routes.ParamDecoder._
import org.http4s.HttpRoutes
import org.http4s.circe.CirceEntityDecoder._
import org.http4s.circe.CirceEntityEncoder._
import org.http4s.dsl.Http4sDsl
object OrganizationRoutes { object OrganizationRoutes {
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F]{} val dsl = new Http4sDsl[F]{}
import dsl._ import dsl._

17
modules/restserver/src/main/scala/docspell/restserver/routes/PersonRoutes.scala
View File

@ -4,22 +4,21 @@ import cats.effect._
import cats.implicits._ import cats.implicits._
import docspell.backend.BackendApp import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import org.http4s.HttpRoutes
import org.http4s.dsl.Http4sDsl
import org.http4s.circe.CirceEntityEncoder._
import org.http4s.circe.CirceEntityDecoder._
import docspell.restapi.model._
import docspell.restserver.Config
import docspell.restserver.conv.Conversions._
import docspell.common.Ident import docspell.common.Ident
import docspell.common.syntax.all._ import docspell.common.syntax.all._
import ParamDecoder._ import docspell.restapi.model._
import docspell.restserver.conv.Conversions._
import docspell.restserver.routes.ParamDecoder._
import org.http4s.HttpRoutes
import org.http4s.circe.CirceEntityDecoder._
import org.http4s.circe.CirceEntityEncoder._
import org.http4s.dsl.Http4sDsl
import org.log4s._ import org.log4s._
object PersonRoutes { object PersonRoutes {
private[this] val logger = getLogger private[this] val logger = getLogger
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F]{} val dsl = new Http4sDsl[F]{}
import dsl._ import dsl._

3
modules/restserver/src/main/scala/docspell/restserver/routes/SourceRoutes.scala
View File

@ -6,7 +6,6 @@ import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import docspell.common.Ident import docspell.common.Ident
import docspell.restapi.model._ import docspell.restapi.model._
import docspell.restserver.Config
import docspell.restserver.conv.Conversions._ import docspell.restserver.conv.Conversions._
import docspell.restserver.http4s.ResponseGenerator import docspell.restserver.http4s.ResponseGenerator
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
@ -16,7 +15,7 @@ import org.http4s.dsl.Http4sDsl
object SourceRoutes { object SourceRoutes {
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F] with ResponseGenerator[F] {} val dsl = new Http4sDsl[F] with ResponseGenerator[F] {}
import dsl._ import dsl._

3
modules/restserver/src/main/scala/docspell/restserver/routes/TagRoutes.scala
View File

@ -6,7 +6,6 @@ import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import docspell.common.Ident import docspell.common.Ident
import docspell.restapi.model._ import docspell.restapi.model._
import docspell.restserver.Config
import docspell.restserver.conv.Conversions._ import docspell.restserver.conv.Conversions._
import docspell.restserver.http4s.ResponseGenerator import docspell.restserver.http4s.ResponseGenerator
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
@ -16,7 +15,7 @@ import org.http4s.dsl.Http4sDsl
object TagRoutes { object TagRoutes {
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F] with ResponseGenerator[F] {} val dsl = new Http4sDsl[F] with ResponseGenerator[F] {}
import dsl._ import dsl._

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

@ -6,7 +6,6 @@ import docspell.backend.BackendApp
import docspell.backend.auth.AuthToken import docspell.backend.auth.AuthToken
import docspell.common.Ident import docspell.common.Ident
import docspell.restapi.model._ import docspell.restapi.model._
import docspell.restserver.Config
import docspell.restserver.conv.Conversions._ import docspell.restserver.conv.Conversions._
import docspell.restserver.http4s.ResponseGenerator import docspell.restserver.http4s.ResponseGenerator
import org.http4s.HttpRoutes import org.http4s.HttpRoutes
@ -16,7 +15,7 @@ import org.http4s.dsl.Http4sDsl
object UserRoutes { object UserRoutes {
def apply[F[_]: Effect](backend: BackendApp[F], cfg: Config, user: AuthToken): HttpRoutes[F] = { def apply[F[_]: Effect](backend: BackendApp[F], user: AuthToken): HttpRoutes[F] = {
val dsl = new Http4sDsl[F] with ResponseGenerator[F] {} val dsl = new Http4sDsl[F] with ResponseGenerator[F] {}
import dsl._ import dsl._

6
modules/restserver/src/main/scala/docspell/restserver/webapp/TemplateRoutes.scala
View File

@ -36,7 +36,7 @@ object TemplateRoutes {
case GET -> Root / "doc" => case GET -> Root / "doc" =>
for { for {
templ <- docTemplate templ <- docTemplate
resp <- Ok(DocData(cfg).render(templ), `Content-Type`(`text/html`)) resp <- Ok(DocData().render(templ), `Content-Type`(`text/html`))
} yield resp } yield resp
} }
} }
@ -51,7 +51,7 @@ object TemplateRoutes {
} }
def loadUrl[F[_]: Sync](url: URL, blocker: Blocker)(implicit C: ContextShift[F]): F[String] = def loadUrl[F[_]: Sync](url: URL, blocker: Blocker)(implicit C: ContextShift[F]): F[String] =
Stream.bracket(Sync[F].delay(url.openStream))(in => Sync[F].delay(in.close)). Stream.bracket(Sync[F].delay(url.openStream))(in => Sync[F].delay(in.close())).
flatMap(in => io.readInputStream(in.pure[F], 64 * 1024, blocker, false)). flatMap(in => io.readInputStream(in.pure[F], 64 * 1024, blocker, false)).
through(text.utf8Decode). through(text.utf8Decode).
compile.fold("")(_ + _) compile.fold("")(_ + _)
@ -75,7 +75,7 @@ object TemplateRoutes {
case class DocData(swaggerRoot: String, openapiSpec: String) case class DocData(swaggerRoot: String, openapiSpec: String)
object DocData { object DocData {
def apply(cfg: Config): DocData = def apply(): DocData =
DocData("/app/assets" + Webjars.swaggerui, s"/app/assets/${BuildInfo.name}/${BuildInfo.version}/docspell-openapi.yml") DocData("/app/assets" + Webjars.swaggerui, s"/app/assets/${BuildInfo.name}/${BuildInfo.version}/docspell-openapi.yml")
implicit def yamuscaValueConverter: ValueConverter[DocData] = implicit def yamuscaValueConverter: ValueConverter[DocData] =

4
modules/restserver/src/main/scala/docspell/restserver/webapp/WebjarRoutes.scala
View File

@ -7,11 +7,9 @@ import org.http4s.server.staticcontent.webjarService
import org.http4s.server.staticcontent.NoopCacheStrategy import org.http4s.server.staticcontent.NoopCacheStrategy
import org.http4s.server.staticcontent.WebjarService.{WebjarAsset, Config => WebjarConfig} import org.http4s.server.staticcontent.WebjarService.{WebjarAsset, Config => WebjarConfig}
import docspell.restserver.Config
object WebjarRoutes { object WebjarRoutes {
def appRoutes[F[_]: Effect](blocker: Blocker, cfg: Config)(implicit C: ContextShift[F]): HttpRoutes[F] = { def appRoutes[F[_]: Effect](blocker: Blocker)(implicit C: ContextShift[F]): HttpRoutes[F] = {
webjarService( webjarService(
WebjarConfig( WebjarConfig(
filter = assetFilter, filter = assetFilter,

2
modules/store/src/main/scala/docspell/store/records/RJob.scala
View File

@ -109,7 +109,7 @@ object RJob {
def setScheduled(jobId: Ident, workerId: Ident): ConnectionIO[Int] = { def setScheduled(jobId: Ident, workerId: Ident): ConnectionIO[Int] = {
for { for {
_ <- incrementRetries(jobId) _ <- incrementRetries(jobId)
n <- updateRow(table, and(id is jobId, or(worker isNull, worker is workerId), state isOneOf Seq[JobState](JobState.Waiting, JobState.Stuck)), commas( n <- updateRow(table, and(id is jobId, or(worker.isNull, worker is workerId), state isOneOf Seq[JobState](JobState.Waiting, JobState.Stuck)), commas(
state setTo (JobState.Scheduled: JobState), state setTo (JobState.Scheduled: JobState),
worker setTo workerId worker setTo workerId
)).update.run )).update.run