test

broadinstitute · Aug 22, 2018 · a4eac7d · a4eac7d
1 parent 62a3d10
commit a4eac7d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/StandardUserInfoDirectives.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/StandardUserInfoDirectives.scala
@@ -2,7 +2,7 @@ package org.broadinstitute.dsde.workbench.sam.api
 
 import akka.http.scaladsl.model.headers.OAuth2BearerToken
 import akka.http.scaladsl.server._
-import akka.http.scaladsl.server.Directives.{headerValueByName, onSuccess}
+import akka.http.scaladsl.server.Directives.{headerValueByName, optionalHeaderValueByName, onSuccess}
 import org.broadinstitute.dsde.workbench.model._
 import akka.http.scaladsl.server.Directives.headerValueByName
 import org.broadinstitute.dsde.workbench.model.google.ServiceAccountSubjectId
@@ -24,10 +24,12 @@ trait StandardUserInfoDirectives extends UserInfoDirectives {
   def requireUserInfo: Directive1[UserInfo] = (
     headerValueByName("OIDC_access_token") &
       headerValueByName("OIDC_CLAIM_user_id") &
+      optionalHeaderValueByName("OIDC_CLAIM_google_subject_id") &
       headerValueByName("OIDC_CLAIM_expires_in") &
       headerValueByName("OIDC_CLAIM_email")
     ) tflatMap {
-    case (token, userId, expiresIn, email) => {
+    case (token, userId, googleSubjectId, expiresIn, email) => {
+      println(s"11111: $googleSubjectId")
       val userInfo = UserInfo(OAuth2BearerToken(token), WorkbenchUserId(userId), WorkbenchEmail(email), expiresIn.toLong)
       onSuccess(getUserFromPetServiceAccount(userInfo).map {
         case Some(petOwnerUser) => UserInfo(OAuth2BearerToken(token), petOwnerUser.id, petOwnerUser.email, expiresIn.toLong)