Merge staging into production (#1041)

* Update dependencies (#1013)

* Update dependencies

* Fix tests

* Workdarounds and go back to previous versions

* Remove ZMX for now

* Remove zio's Duration

* Combine user and key perms correctly

* Add build info to health report page (#1018)

* Fix a bunch of warnings from Slick and it's outdated syntax (#1017)

* Fix discourse auth params (#1019)

* Fix discourse auth params

* Fix stack overflow

* Use Api-Key in the header for sync sso (#1022)

* add support for API8 sponge plugins (#1039)

* Update a bunch of dependencies

Co-authored-by: Katrix <katrix97@hotmail.com>
Co-authored-by: Faithcaio <Faithcaio@users.noreply.github.com>
Co-authored-by: Chris Sanders <zidane@spongepowered.org>

Author: 4 people

.gitignore

@@ -77,6 +77,7 @@ src_managed/
 project/boot/
 project/plugins/project/
 /.jvmopts
+.bsp
 
 # Scala-IDE specific
 .scala_dependencies

apiV2/app/db/impl/query/APIV2Queries.scala

@@ -21,7 +21,6 @@ import ore.permission.Permission
 
 import cats.Reducible
 import cats.data.NonEmptyList
-import cats.instances.list._
 import cats.syntax.all._
 import doobie._
 import doobie.implicits._
@@ -191,7 +190,7 @@ object APIV2Queries extends WebDoobieOreProtocol {
       limit: Long,
       offset: Long
   )(
-      implicit projectFiles: ProjectFiles[ZIO[Blocking, Nothing, ?]],
+      implicit projectFiles: ProjectFiles[ZIO[Blocking, Nothing, *]],
       requestHeader: RequestHeader,
       config: OreConfig
   ): Query0[ZIO[Blocking, Nothing, APIV2.Project]] = {

apiV2/app/models/querymodels/apiV2QueryModels.scala

@@ -17,8 +17,6 @@ import ore.models.user.User
 import ore.permission.role.Role
 import util.syntax._
 
-import cats.instances.either._
-import cats.instances.vector._
 import cats.kernel.Order
 import cats.syntax.all._
 import io.circe.{DecodingFailure, Json}

auth/src/main/scala/ore/auth/AkkaSpongeAuthApi.scala

@@ -13,7 +13,6 @@ import akka.http.scaladsl.model._
 import akka.stream.Materializer
 import cats.effect.Concurrent
 import cats.effect.concurrent.Ref
-import cats.instances.list._
 import cats.syntax.all._
 import com.typesafe.scalalogging
 import io.circe.{Decoder, Json}

build.sbt

@@ -1,9 +1,7 @@
 ThisBuild / turbo := true
+ThisBuild / usePipelining := true
 ThisBuild / scalaVersion := Settings.scalaVer
 
-//ThisBuild / semanticdbEnabled := true
-Global / semanticdbVersion := "4.2.3"
-
 lazy val db = project.settings(
   Settings.commonSettings,
   name := "ore-db",
@@ -136,15 +134,15 @@ lazy val oreClient = project
     useYarn := true,
     scalaJSUseMainModuleInitializer := false,
     scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) },
-    webpackConfigFile in fastOptJS := Some(baseDirectory.value / "webpack.config.dev.js"),
-    webpackConfigFile in fullOptJS := Some(baseDirectory.value / "webpack.config.prod.js"),
+    fastOptJS / webpackConfigFile := Some(baseDirectory.value / "webpack.config.dev.js"),
+    fullOptJS / webpackConfigFile := Some(baseDirectory.value / "webpack.config.prod.js"),
     webpackMonitoredDirectories += baseDirectory.value / "assets",
-    includeFilter in webpackMonitoredFiles := "*.vue" || "*.js",
-    webpackBundlingMode in fastOptJS := BundlingMode.LibraryOnly(),
-    webpackBundlingMode in fullOptJS := BundlingMode.LibraryOnly(),
-    version in startWebpackDevServer := NPMDeps.webpackDevServer,
-    version in webpack := NPMDeps.webpack,
-    npmDependencies in Compile ++= Seq(
+    webpackMonitoredFiles / includeFilter := "*.vue" || "*.js",
+    fastOptJS / webpackBundlingMode := BundlingMode.LibraryOnly(),
+    fullOptJS / webpackBundlingMode := BundlingMode.LibraryOnly(),
+    startWebpackDevServer / version := NPMDeps.webpackDevServer,
+    webpack / version := NPMDeps.webpack,
+    Compile / npmDependencies ++= Seq(
       NPMDeps.vue,
       NPMDeps.lodash,
       NPMDeps.queryString,
@@ -153,7 +151,7 @@ lazy val oreClient = project
       NPMDeps.fontAwesomeRegular,
       NPMDeps.fontAwesomeBrands
     ),
-    npmDevDependencies in Compile ++= Seq(
+    Compile / npmDevDependencies ++= Seq(
       NPMDeps.webpackMerge,
       NPMDeps.vueLoader,
       NPMDeps.vueTemplateCompiler,
@@ -175,7 +173,7 @@ lazy val oreClient = project
   )
 
 lazy val ore = project
-  .enablePlugins(PlayScala, SwaggerPlugin, WebScalaJSBundlerPlugin)
+  .enablePlugins(PlayScala, SwaggerPlugin, WebScalaJSBundlerPlugin, BuildInfoPlugin)
   .dependsOn(orePlayCommon, apiV2)
   .settings(
     Settings.commonSettings,
@@ -190,8 +188,7 @@ lazy val ore = project
       Deps.circeDerivation,
       Deps.circeParser,
       Deps.macwire,
-      Deps.periscopeAkka,
-      Deps.zioZmx
+      Deps.periscopeAkka
     ),
     libraryDependencies ++= Deps.flexmarkDeps,
     libraryDependencies ++= Seq(
@@ -215,9 +212,16 @@ lazy val ore = project
     PlayKeys.playMonitoredFiles += baseDirectory.value / "swagger.yml",
     PlayKeys.playMonitoredFiles += baseDirectory.value / "swagger-custom-mappings.yml",
     scalaJSProjects := Seq(oreClient),
-    pipelineStages in Assets += scalaJSPipeline,
-    WebKeys.exportedMappings in Assets := Seq(),
-    PlayKeys.playMonitoredFiles += (oreClient / baseDirectory).value / "assets"
+    Assets / pipelineStages += scalaJSPipeline,
+    Assets / WebKeys.exportedMappings := Seq(),
+    PlayKeys.playMonitoredFiles += (oreClient / baseDirectory).value / "assets",
+    buildInfoKeys := Seq[BuildInfoKey](version, scalaVersion, resolvers, libraryDependencies),
+    buildInfoOptions += BuildInfoOption.BuildTime,
+    buildInfoPackage := "ore",
+    //sbt 1.4 workaround
+    play.sbt.PlayInternalKeys.playCompileEverything ~= (_.map(
+      _.copy(compilations = sbt.internal.inc.Compilations.of(Seq.empty))
+    ))
   )
 
 lazy val oreAll =

db/src/main/scala/ore/db/access/DefaultRunningView.scala

@@ -46,8 +46,8 @@ class DefaultRunningView[F[_], T, M](val profile: JdbcProfile)(
   ): DefaultRunningView[F, T, M] = new DefaultRunningView[F, T, M](profile)(queryView.modifyingQuery(f), runAction)
 }
 object DefaultRunningView {
-  implicit def defaultRunningViewIsQueryView[F[_]]: QueryView[DefaultRunningView[F, ?, ?]] =
-    new QueryView[DefaultRunningView[F, ?, ?]] {
+  implicit def defaultRunningViewIsQueryView[F[_]]: QueryView[DefaultRunningView[F, *, *]] =
+    new QueryView[DefaultRunningView[F, *, *]] {
       override def modifyingView[T, M](fa: DefaultRunningView[F, T, M])(
           f: fa.profile.api.Query[T, M, Seq] => fa.profile.api.Query[T, M, Seq]
       ): DefaultRunningView[F, T, M] = fa.modifyingQuery(f)

db/src/main/scala/ore/db/access/ModelView.scala

@@ -100,8 +100,8 @@ object ModelView {
   type Later[T, M]     = ModelView[Query[T, M, Seq], Rep, T, M]
   type Raw[T, M]       = Query[T, M, Seq]
 
-  implicit def modelViewIsQueryView[QueryOptRet, SingleRet[_]]: QueryView[ModelView[QueryOptRet, SingleRet, ?, ?]] =
-    new QueryView[ModelView[QueryOptRet, SingleRet, ?, ?]] {
+  implicit def modelViewIsQueryView[QueryOptRet, SingleRet[_]]: QueryView[ModelView[QueryOptRet, SingleRet, *, *]] =
+    new QueryView[ModelView[QueryOptRet, SingleRet, *, *]] {
       override def modifyingView[T, M](fa: ModelView[QueryOptRet, SingleRet, T, M])(
           f: Query[T, M, Seq] => Query[T, M, Seq]
       ): ModelView[QueryOptRet, SingleRet, T, M] = fa.modifyingQuery(f)

db/src/main/scala/ore/db/access/QueryView.scala

@@ -15,7 +15,7 @@ trait QueryView[F[_, _]] {
 }
 object QueryView {
 
-  implicit val queryIsQueryView: QueryView[Query[?, ?, Seq]] = new QueryView[Query[?, ?, Seq]] {
+  implicit val queryIsQueryView: QueryView[Query[*, *, Seq]] = new QueryView[Query[*, *, Seq]] {
     override def modifyingView[T, M](fa: Query[T, M, Seq])(
         f: Query[T, M, Seq] => Query[T, M, Seq]
     ): Query[T, M, Seq] = f(fa)

discourse/src/main/scala/ore/discourse/AkkaDiscourseApi.scala

@@ -1,7 +1,5 @@
 package ore.discourse
 
-import scala.language.higherKinds
-
 import scala.concurrent.duration._
 
 import ore.discourse.AkkaDiscourseApi.AkkaDiscourseSettings
@@ -13,9 +11,9 @@ import akka.stream.Materializer
 import cats.data.EitherT
 import cats.effect.Concurrent
 import cats.effect.concurrent.Ref
-import cats.instances.either._
 import cats.syntax.all._
 import com.typesafe.scalalogging
+import com.typesafe.scalalogging.Logger
 import io.circe._
 
 class AkkaDiscourseApi[F[_]] private (
@@ -28,16 +26,13 @@ class AkkaDiscourseApi[F[_]] private (
 ) extends AkkaClientApi[F, cats.Id, DiscourseError]("Discourse", counter, settings)
     with DiscourseApi[F] {
 
-  protected val Logger = scalalogging.Logger("DiscourseApi")
+  protected val Logger: Logger = scalalogging.Logger("DiscourseApi")
 
-  private def startParams(poster: Option[String]) = Seq(
-    "api_key"      -> settings.apiKey,
-    "api_username" -> poster.getOrElse(settings.adminUser)
+  private def authHeaders(poster: Option[String]) = Seq(
+    `Api-Key`(settings.apiKey),
+    `Api-Username`(poster.getOrElse(settings.adminUser))
   )
 
-  private def apiQuery(poster: Option[String]) =
-    Uri.Query("api_key" -> settings.apiKey, "api_username" -> poster.getOrElse(settings.adminUser))
-
   override def createStatusError(statusCode: StatusCode, message: Option[String]): DiscourseError = statusCode match {
     case StatusCodes.TooManyRequests =>
       message match {
@@ -89,7 +84,7 @@ class AkkaDiscourseApi[F[_]] private (
       content: String,
       categoryId: Option[Int]
   ): F[Either[DiscourseError, DiscoursePost]] = {
-    val base = startParams(Some(poster)) ++ Seq(
+    val base = Seq(
       "title" -> title,
       "raw"   -> content
     )
@@ -100,13 +95,14 @@ class AkkaDiscourseApi[F[_]] private (
       HttpRequest(
         HttpMethods.POST,
         apiUri(_ / "posts.json"),
+        headers = authHeaders(Some(poster)),
         entity = FormData(withCat: _*).toEntity
       )
     )
   }
 
   override def createPost(poster: String, topicId: Int, content: String): F[Either[DiscourseError, DiscoursePost]] = {
-    val params = startParams(Some(poster)) ++ Seq(
+    val params = Seq(
       "topic_id" -> topicId.toString,
       "raw"      -> content
     )
@@ -115,6 +111,7 @@ class AkkaDiscourseApi[F[_]] private (
       HttpRequest(
         HttpMethods.POST,
         apiUri(_ / "posts.json"),
+        headers = authHeaders(Some(poster)),
         entity = FormData(params: _*).toEntity
       )
     )
@@ -128,7 +125,7 @@ class AkkaDiscourseApi[F[_]] private (
   ): F[Either[DiscourseError, Unit]] = {
     if (title.isEmpty && categoryId.isEmpty) F.pure(Right(()))
     else {
-      val base = startParams(Some(poster)) :+ ("topic_id" -> topicId.toString)
+      val base = Seq("topic_id" -> topicId.toString)
 
       val withTitle = title.fold(base)(t => base :+ ("title"                      -> t))
       val withCat   = categoryId.fold(withTitle)(c => withTitle :+ ("category_id" -> c.toString))
@@ -137,20 +134,20 @@ class AkkaDiscourseApi[F[_]] private (
         HttpRequest(
           HttpMethods.PUT,
           apiUri(_ / "t" / "-" / s"$topicId.json"),
+          headers = authHeaders(Some(poster)),
           entity = FormData(withCat: _*).toEntity
         )
       ).map(_.void)
     }
   }
 
   override def updatePost(poster: String, postId: Int, content: String): F[Either[DiscourseError, Unit]] = {
-    val params = startParams(Some(poster)) :+ ("post[raw]" -> content)
-
     makeUnmarshallRequestEither[Json](
       HttpRequest(
         HttpMethods.PUT,
         apiUri(_ / "posts" / s"$postId.json"),
-        entity = FormData(params: _*).toEntity
+        headers = authHeaders(Some(poster)),
+        entity = FormData("post[raw]" -> content).toEntity
       )
     ).map(_.void)
   }
@@ -161,7 +158,8 @@ class AkkaDiscourseApi[F[_]] private (
         makeRequest(
           HttpRequest(
             HttpMethods.DELETE,
-            apiUri(_ / "t" / s"$topicId.json").withQuery(apiQuery(Some(poster)))
+            apiUri(_ / "t" / s"$topicId.json"),
+            headers = authHeaders(Some(poster))
           )
         )
       )

discourse/src/main/scala/ore/discourse/headers.scala

@@ -0,0 +1,29 @@
+package ore.discourse
+
+import scala.util.{Success, Try}
+
+import akka.http.scaladsl.model.headers.{ModeledCustomHeader, ModeledCustomHeaderCompanion}
+
+case class `Api-Key`(key: String) extends ModeledCustomHeader[`Api-Key`] {
+  override def companion: ModeledCustomHeaderCompanion[`Api-Key`] = `Api-Key`
+
+  override def value: String              = key
+  override def renderInRequests: Boolean  = true
+  override def renderInResponses: Boolean = false
+}
+object `Api-Key` extends ModeledCustomHeaderCompanion[`Api-Key`] {
+  override def name: String                         = "Api-Key"
+  override def parse(value: String): Try[`Api-Key`] = Success(new `Api-Key`(value))
+}
+
+case class `Api-Username`(username: String) extends ModeledCustomHeader[`Api-Username`] {
+  override def companion: ModeledCustomHeaderCompanion[`Api-Username`] = `Api-Username`
+
+  override def value: String              = username
+  override def renderInRequests: Boolean  = true
+  override def renderInResponses: Boolean = false
+}
+object `Api-Username` extends ModeledCustomHeaderCompanion[`Api-Username`] {
+  override def name: String                              = "Api-Username"
+  override def parse(value: String): Try[`Api-Username`] = Success(new `Api-Username`(value))
+}