TSPS-404 Throw correct exception for Sam user not found (#223)

* TSPS-404 Throw correct exception for Sam user not found * spotless
DataBiosphere · Feb 18, 2025 · b3c133c · b3c133c
1 parent 08af612
commit b3c133c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/bio/terra/common/iam/SamUserFactory.java b/src/main/java/bio/terra/common/iam/SamUserFactory.java
@@ -64,7 +64,8 @@ public SamUser from(BearerToken bearerToken, String samBasePath) {
     } catch (final NullPointerException e) {
       throw new UnauthorizedException(e.getMessage(), e);
     } catch (final ApiException e) {
-      if (e.getCode() == HttpStatus.NOT_FOUND.value()) {
+      if (e.getCode() == HttpStatus.NOT_FOUND.value()
+          || e.getCode() == HttpStatus.FORBIDDEN.value()) {
         throw new UnauthorizedException("User not found", e);
       } else {
         throw new InternalServerErrorException(e);

diff --git a/src/test/java/bio/terra/common/iam/SamUserFactoryTest.java b/src/test/java/bio/terra/common/iam/SamUserFactoryTest.java
@@ -65,4 +65,16 @@ public void notFoundUser() throws ApiException {
     assertThrows(
         UnauthorizedException.class, () -> factory.from(SAM_USER.getBearerToken(), SAM_BASE_PATH));
   }
+
+  @Test
+  public void forbiddenUser() throws ApiException {
+    SamUserFactory factory = spy(new SamUserFactory(new BearerTokenFactory(), Optional.empty()));
+    UsersApi usersApi = mock(UsersApi.class);
+    when(factory.createUsersApi(SAM_USER.getBearerToken(), SAM_BASE_PATH)).thenReturn(usersApi);
+    when(usersApi.getSamUserSelf())
+        .thenThrow(new ApiException(HttpStatus.FORBIDDEN.value(), "not found"));
+
+    assertThrows(
+        UnauthorizedException.class, () -> factory.from(SAM_USER.getBearerToken(), SAM_BASE_PATH));
+  }
 }