Merge 416e645 into b8870b9

broadinstitute · Nov 20, 2018 · 299f71b · 299f71b
2 parents b8870b9 + 416e645
commit 299f71b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/ManagedGroupRoutes.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/ManagedGroupRoutes.scala
@@ -44,7 +44,8 @@ trait ManagedGroupRoutes extends UserInfoDirectives with SecurityDirectives with
           }
         } ~ path("accessInstructions") {
           put {
-            entity(as[ManagedGroupAccessInstructions]) { accessInstructions => handleSetAccessInstructions(managedGroup, accessInstructions, userInfo)
+            entity(as[ManagedGroupAccessInstructions]) { accessInstructions =>
+              handleSetAccessInstructions(managedGroup, accessInstructions, userInfo)
             }
           } ~ get {
             handleGetAccessInstructions(managedGroup)

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/ResourceRoutes.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/api/ResourceRoutes.scala
@@ -153,15 +153,17 @@ trait ResourceRoutes extends UserInfoDirectives with SecurityDirectives with Sam
   def getResourceAuthDomain(resource: FullyQualifiedResourceId, userInfo: UserInfo): server.Route =
     get {
       requireAction(resource, SamResourceActions.readAuthDomain, userInfo.userId) {
-        complete(resourceService.loadResourceAuthDomain(resource).map { response => StatusCodes.OK -> response
+        complete(resourceService.loadResourceAuthDomain(resource).map { response =>
+          StatusCodes.OK -> response
         })
       }
     }
 
   def getResourcePolicies(resource: FullyQualifiedResourceId, userInfo: UserInfo): server.Route =
     get {
       requireAction(resource, SamResourceActions.readPolicies, userInfo.userId) {
-        complete(resourceService.listResourcePolicies(resource).map { response => StatusCodes.OK -> response.toSet
+        complete(resourceService.listResourcePolicies(resource).map { response =>
+          StatusCodes.OK -> response.toSet
         })
       }
     }
@@ -229,14 +231,16 @@ trait ResourceRoutes extends UserInfoDirectives with SecurityDirectives with Sam
 
   def getUserResourceRoles(resource: FullyQualifiedResourceId, userInfo: UserInfo): server.Route =
     get {
-      complete(resourceService.listUserResourceRoles(resource, userInfo).map { roles => StatusCodes.OK -> roles
+      complete(resourceService.listUserResourceRoles(resource, userInfo).map { roles =>
+        StatusCodes.OK -> roles
       })
     }
 
   def getAllResourceUsers(resource: FullyQualifiedResourceId, userInfo: UserInfo): server.Route =
     get {
       requireAction(resource, SamResourceActions.readPolicies, userInfo.userId) {
-        complete(resourceService.listAllFlattenedResourceUsers(resource).map { allUsers => StatusCodes.OK -> allUsers
+        complete(resourceService.listAllFlattenedResourceUsers(resource).map { allUsers =>
+          StatusCodes.OK -> allUsers
         })
       }
     }

diff --git a/src/main/scala/org/broadinstitute/dsde/workbench/sam/directory/LdapDirectoryDAO.scala b/src/main/scala/org/broadinstitute/dsde/workbench/sam/directory/LdapDirectoryDAO.scala
@@ -157,11 +157,11 @@ class LdapDirectoryDAO(
       entry <- OptionT(
         executeLdap(IO(ldapConnectionPool.search(directoryConfig.baseDn, SearchScope.SUB, Filter.createEqualityFilter(Attr.email, email.value))))
           .map(Option.apply))
-      res <- Option(entry.getSearchEntries).map(_.asScala) match {
-        case None => OptionT.none[IO, WorkbenchSubject]
-        case Some(Seq()) => OptionT.none[IO, WorkbenchSubject]
-        case Some(Seq(subject)) => OptionT.some[IO](dnToSubject(subject.getDN))
-        case Some(subjects) =>
+      entries <- OptionT.fromOption[IO](Option(entry.getSearchEntries))
+      res <- entries.asScala match {
+        case Seq() => OptionT.none[IO, WorkbenchSubject]
+        case Seq(subject) => OptionT.some[IO](dnToSubject(subject.getDN))
+        case subjects =>
           OptionT.liftF(
             IO.raiseError[WorkbenchSubject](new WorkbenchException(s"Database error: email $email refers to too many subjects: ${subjects.map(_.getDN)}")))
       }

diff --git a/src/test/scala/org/broadinstitute/dsde/workbench/sam/directory/LdapDirectoryDAOSpec.scala b/src/test/scala/org/broadinstitute/dsde/workbench/sam/directory/LdapDirectoryDAOSpec.scala
@@ -434,6 +434,20 @@ class LdapDirectoryDAOSpec extends FlatSpec with Matchers with TestSupport with
   }
 
   "loadSubjectFromEmail" should "be able to load subject given an email" in {
+    val user1 = Generator.genWorkbenchUser.sample.get
+    val user2 = user1.copy(email = WorkbenchEmail(user1.email.value + "2"))
+    val res = for {
+      _ <- dao.createUser(user1)
+      subject1 <- dao.loadSubjectFromEmail(user1.email)
+      subject2 <- dao.loadSubjectFromEmail(user2.email)
+    } yield {
+      subject1 shouldEqual(Some(user1.id))
+      subject2 shouldEqual(None)
+    }
+    res.unsafeRunSync()
+  }
+
+  "loadSubjectEmail" should "be able to load subject given an email" in {
     val user1 = Generator.genWorkbenchUser.sample.get
     val user2 = user1.copy(id = WorkbenchUserId(user1.id.value + "2"))
     val res = for {