From 70dcf09ea17d4b28ca56524823bc91028a80b511 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Tue, 27 Oct 2020 17:02:25 +0100 Subject: [PATCH] #264 Fix OAuth scope config type --- app/org/thp/cortex/services/OAuth2Srv.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/org/thp/cortex/services/OAuth2Srv.scala b/app/org/thp/cortex/services/OAuth2Srv.scala index ae30d3348..27ea7f9b6 100644 --- a/app/org/thp/cortex/services/OAuth2Srv.scala +++ b/app/org/thp/cortex/services/OAuth2Srv.scala @@ -23,7 +23,7 @@ case class OAuth2Config( authorizationUrl: String, tokenUrl: String, userUrl: String, - scope: String, + scope: Seq[String], authorizationHeader: String, autoupdate: Boolean, autocreate: Boolean @@ -41,7 +41,7 @@ object OAuth2Config { authorizationUrl <- configuration.getOptional[String]("auth.oauth2.authorizationUrl") tokenUrl <- configuration.getOptional[String]("auth.oauth2.tokenUrl") userUrl <- configuration.getOptional[String]("auth.oauth2.userUrl") - scope <- configuration.getOptional[String]("auth.oauth2.scope") + scope <- configuration.getOptional[Seq[String]]("auth.oauth2.scope") authorizationHeader = configuration.getOptional[String]("auth.oauth2.authorizationHeader").getOrElse("Bearer") autocreate = configuration.getOptional[Boolean]("auth.sso.autocreate").getOrElse(false) autoupdate = configuration.getOptional[Boolean]("auth.sso.autoupdate").getOrElse(false) @@ -109,7 +109,7 @@ class OAuth2Srv( private def authRedirect(oauth2Config: OAuth2Config): Result = { val state = UUID.randomUUID().toString val queryStringParams = Map[String, Seq[String]]( - "scope" -> Seq(oauth2Config.scope), + "scope" -> Seq(oauth2Config.scope.mkString(" ")), "response_type" -> Seq(oauth2Config.responseType), "redirect_uri" -> Seq(oauth2Config.redirectUri), "client_id" -> Seq(oauth2Config.clientId),