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

Update scalafmt settings

Browse Source
This commit is contained in:
eikek
2021-09-22 17:23:24 +02:00
parent c37f1d7c31
commit 9013f2de5b
277 changed files with 1579 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/oidc/src/main/scala/docspell/oidc/AccessToken.scala
View File

@ -51,13 +51,13 @@ object AccessToken {
implicit val decoder: Decoder[AccessToken] =
Decoder.instance { c =>
for {
atoken <- c.get[String]("access_token")
ttype <- c.get[String]("token_type")
expire <- c.get[Option[Long]]("expires_in")
rtoken <- c.get[Option[String]]("refresh_token")
atoken <- c.get[String]("access_token")
ttype <- c.get[String]("token_type")
expire <- c.get[Option[Long]]("expires_in")
rtoken <- c.get[Option[String]]("refresh_token")
rexpire <- c.get[Option[Long]]("refresh_expires_in")
sstate <- c.get[Option[String]]("session_state")
scope <- c.get[Option[String]]("scope")
sstate <- c.get[Option[String]]("session_state")
scope <- c.get[Option[String]]("scope")
} yield AccessToken(atoken, ttype, expire, rtoken, rexpire, sstate, scope)
}
}

12
modules/oidc/src/main/scala/docspell/oidc/CodeFlow.scala
View File

@ -40,8 +40,8 @@ object CodeFlow {
code: String
): OptionT[F, Json] = {
val logger = Logger.log4s[F](log4sLogger)
val dsl = new Http4sClientDsl[F] {}
val c = logRequests[F](logResponses[F](client))
val dsl = new Http4sClientDsl[F] {}
val c = logRequests[F](logResponses[F](client))
for {
_ <- OptionT.liftF(
@ -97,11 +97,11 @@ object CodeFlow {
val req = POST(
UrlForm(
"client_id" -> cfg.clientId,
"client_id" -> cfg.clientId,
"client_secret" -> cfg.clientSecret,
"code" -> code,
"grant_type" -> "authorization_code",
"redirect_uri" -> redirectUri
"code" -> code,
"grant_type" -> "authorization_code",
"redirect_uri" -> redirectUri
),
Uri.unsafeFromString(cfg.tokenUrl.asString),
Accept(MediaType.application.json)

2
modules/oidc/src/main/scala/docspell/oidc/CodeFlowConfig.scala
View File

@ -31,7 +31,7 @@ object CodeFlowConfig {
provider: Ident => Option[ProviderConfig]
): CodeFlowConfig[F] =
new CodeFlowConfig[F] {
def getEndpointUrl(req: Request[F]): LenientUri = url(req)
def getEndpointUrl(req: Request[F]): LenientUri = url(req)
def findProvider(id: Ident): Option[ProviderConfig] = provider(id)
}

2
modules/oidc/src/main/scala/docspell/oidc/CodeFlowRoutes.scala
View File

@ -69,7 +69,7 @@ object CodeFlowRoutes {
val codeFromReq = OptionT.fromOption[F](req.params.get("code"))
val userInfo = for {
_ <- OptionT.liftF(logger.info(s"Resume OAuth/OIDC flow for ${id.id}"))
_ <- OptionT.liftF(logger.info(s"Resume OAuth/OIDC flow for ${id.id}"))
code <- codeFromReq
_ <- OptionT.liftF(
logger.trace(

18
modules/oidc/src/main/scala/docspell/oidc/SignatureAlgo.scala
View File

@ -29,12 +29,12 @@ object SignatureAlgo {
case object RS384 extends SignatureAlgo
case object RS512 extends SignatureAlgo
case object ES256 extends SignatureAlgo
case object ES384 extends SignatureAlgo
case object ES512 extends SignatureAlgo
case object ES256 extends SignatureAlgo
case object ES384 extends SignatureAlgo
case object ES512 extends SignatureAlgo
case object Ed25519 extends SignatureAlgo
case object HMD5 extends SignatureAlgo
case object HMD5 extends SignatureAlgo
case object HS224 extends SignatureAlgo
case object HS256 extends SignatureAlgo
case object HS384 extends SignatureAlgo
@ -137,31 +137,31 @@ object SignatureAlgo {
case HMD5 =>
for {
key <- createSecretKey(sigKey, JwtAlgorithm.HMD5.fullName)
key <- createSecretKey(sigKey, JwtAlgorithm.HMD5.fullName)
decoded <- JwtCirce.decodeJsonAll(token, key, Seq(JwtAlgorithm.HMD5)).toEither
} yield Jwt.create(decoded)
case HS224 =>
for {
key <- createSecretKey(sigKey, JwtAlgorithm.HS224.fullName)
key <- createSecretKey(sigKey, JwtAlgorithm.HS224.fullName)
decoded <- JwtCirce.decodeJsonAll(token, key, Seq(JwtAlgorithm.HS224)).toEither
} yield Jwt.create(decoded)
case HS256 =>
for {
key <- createSecretKey(sigKey, JwtAlgorithm.HS256.fullName)
key <- createSecretKey(sigKey, JwtAlgorithm.HS256.fullName)
decoded <- JwtCirce.decodeJsonAll(token, key, Seq(JwtAlgorithm.HS256)).toEither
} yield Jwt.create(decoded)
case HS384 =>
for {
key <- createSecretKey(sigKey, JwtAlgorithm.HS384.fullName)
key <- createSecretKey(sigKey, JwtAlgorithm.HS384.fullName)
decoded <- JwtCirce.decodeJsonAll(token, key, Seq(JwtAlgorithm.HS384)).toEither
} yield Jwt.create(decoded)
case HS512 =>
for {
key <- createSecretKey(sigKey, JwtAlgorithm.HS512.fullName)
key <- createSecretKey(sigKey, JwtAlgorithm.HS512.fullName)
decoded <- JwtCirce.decodeJsonAll(token, key, Seq(JwtAlgorithm.HS512)).toEither
} yield Jwt.create(decoded)
}