From 870a20721c8fe09303051996cc6b64c97b49de1a Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 30 Dec 2020 00:36:04 +0900 Subject: [PATCH] Bump oauth2-oidc-sdk to 8.29.1 (#2617) --- build.sbt | 2 +- .../scala/gitbucket/core/service/OpenIDConnectService.scala | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index f1c1a7628..e7a0fe1f0 100644 --- a/build.sbt +++ b/build.sbt @@ -59,7 +59,7 @@ libraryDependencies ++= Seq( "org.cache2k" % "cache2k-all" % "1.2.4.Final", "net.coobird" % "thumbnailator" % "0.4.12", "com.github.zafarkhaja" % "java-semver" % "0.9.0", - "com.nimbusds" % "oauth2-oidc-sdk" % "5.64.4", + "com.nimbusds" % "oauth2-oidc-sdk" % "8.29.1", "org.eclipse.jetty" % "jetty-webapp" % JettyVersion % "provided", "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided", "junit" % "junit" % "4.13" % "test", diff --git a/src/main/scala/gitbucket/core/service/OpenIDConnectService.scala b/src/main/scala/gitbucket/core/service/OpenIDConnectService.scala index 36ace5d95..063561fd2 100644 --- a/src/main/scala/gitbucket/core/service/OpenIDConnectService.scala +++ b/src/main/scala/gitbucket/core/service/OpenIDConnectService.scala @@ -101,7 +101,10 @@ trait OpenIDConnectService { redirectURI: URI ): Option[AuthenticationSuccessResponse] = try { - AuthenticationResponseParser.parse(redirectURI, params.asJava) match { + AuthenticationResponseParser.parse( + redirectURI, + params.map { case (key, value) => (key, List(value).asJava) }.asJava + ) match { case response: AuthenticationSuccessResponse => if (response.getState == state) { Some(response)