Skip to content

Commit d49fe6d

Browse files
Recover when enterpriseFeatures not found
1 parent a9475cf commit d49fe6d

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/main/scala/org/broadinstitute/dsde/workbench/sam/api/UserRoutesV2.scala

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.broadinstitute.dsde.workbench.model._
1010
import org.broadinstitute.dsde.workbench.sam.model.{ResourceRoleName, ResourceTypeName}
1111
import org.broadinstitute.dsde.workbench.sam.model.api.SamUserResponse._
1212
import org.broadinstitute.dsde.workbench.sam.model.api.{
13+
FilteredResourcesFlat,
1314
SamUser,
1415
SamUserAttributesRequest,
1516
SamUserCombinedStateResponse,
@@ -200,6 +201,7 @@ trait UserRoutesV2 extends SamUserDirectives with SamRequestContextDirectives {
200201
includePublic = false,
201202
samRequestContext
202203
)
204+
.recover(_ => FilteredResourcesFlat(Set.empty))
203205
} yield maybeAttributes.map(
204206
SamUserCombinedStateResponse(samUser, allowances, _, termsOfServiceDetails, Map("enterpriseFeatures" -> enterpriseFeatures.toJson))
205207
)

0 commit comments

Comments
 (0)