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

Improve logging and rename oauth->openid

Browse Source
This commit is contained in:
eikek
2021-09-05 23:43:25 +02:00
parent 984dda9da0
commit 8158e36d40
6 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,13 +45,13 @@ object CodeFlow {
for {
_ <- OptionT.liftF(
logger.debug(
logger.trace(
s"Obtaining access_token for provider ${cfg.providerId.id} and code $code"
)
)
token <- fetchAccessToken[F](c, dsl, cfg, redirectUri, code)
_ <- OptionT.liftF(
logger.debug(
logger.trace(
s"Obtaining user-info for provider ${cfg.providerId.id} and token $token"
)
)
@ -70,7 +70,7 @@ object CodeFlow {
case _ =>
OptionT
.liftF(
logger.error(
logger.warn(
s"No signature specified and no user endpoint url. Cannot obtain user info from access token!"
)
)
@ -113,7 +113,7 @@ object CodeFlow {
token <- r.attemptAs[AccessToken].value
_ <- token match {
case Right(t) =>
logger.debug(s"Got token response: $t")
logger.trace(s"Got token response: $t")
case Left(err) =>
logger.error(err)(s"Error decoding access token: ${err.getMessage}")
}

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

@ -50,18 +50,18 @@ object CodeFlowRoutes {
)
.withQuery("response_type", "code")
logger.debug(
s"Redirecting to OAuth provider ${cfg.providerId.id}: ${uri.asString}"
)
SeeOther().map(_.withHeaders(Location(Uri.unsafeFromString(uri.asString))))
s"Redirecting to OAuth/OIDC provider ${cfg.providerId.id}: ${uri.asString}"
) *>
SeeOther().map(_.withHeaders(Location(Uri.unsafeFromString(uri.asString))))
case None =>
logger.debug(s"No oauth provider found with id '$id'") *>
logger.debug(s"No OAuth/OIDC provider found with id '$id'") *>
NotFound()
}
case req @ GET -> Root / Ident(id) / "resume" =>
config.findProvider(id) match {
case None =>
logger.debug(s"No oauth provider found with id '$id'") *>
logger.debug(s"No OAuth/OIDC provider found with id '$id'") *>
NotFound()
case Some(provider) =>
val codeFromReq = OptionT.fromOption[F](req.params.get("code"))
@ -70,7 +70,7 @@ object CodeFlowRoutes {
_ <- OptionT.liftF(logger.info(s"Resume OAuth/OIDC flow for ${id.id}"))
code <- codeFromReq
_ <- OptionT.liftF(
logger.debug(
logger.trace(
s"Resume OAuth/OIDC flow from ${provider.providerId.id} with auth_code=$code"
)
)
@ -92,7 +92,7 @@ object CodeFlowRoutes {
.map(err => s": $err")
.getOrElse("")
logger.error(s"Error resuming code flow from '${id.id}'$reason") *>
logger.warn(s"Error resuming code flow from '${id.id}'$reason") *>
onUserInfo.handle(req, provider, None)
}
}