Merge pull request #123 from georchestra/fix-missing-org-exception

Fixed exception when a user has no organization
georchestra · May 30, 2024 · 3edf6bf · 3edf6bf
2 parents e331633 + 03a42e9
commit 3edf6bf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/...ay/src/main/java/org/georchestra/gateway/security/ResolveGeorchestraUserGlobalFilter.java b/...ay/src/main/java/org/georchestra/gateway/security/ResolveGeorchestraUserGlobalFilter.java
@@ -98,7 +98,9 @@ public class ResolveGeorchestraUserGlobalFilter implements GlobalFilter, Ordered
                     if (usr != null && usr instanceof ExtendedGeorchestraUser) {
                         ExtendedGeorchestraUser eu = (ExtendedGeorchestraUser) usr;
                         Organization org = eu.getOrg();
-                        GeorchestraOrganizations.store(exchange, org);
+                        if (org != null) {
+                            GeorchestraOrganizations.store(exchange, org);
+                        }
                     }
                     return exchange;
                 })//

diff --git a/...rc/test/java/org/georchestra/gateway/security/ResolveGeorchestraUserGlobalFilterTest.java b/...rc/test/java/org/georchestra/gateway/security/ResolveGeorchestraUserGlobalFilterTest.java
@@ -34,6 +34,7 @@
 import java.util.Optional;
 
 import org.georchestra.gateway.model.GeorchestraUsers;
+import org.georchestra.gateway.security.ldap.extended.ExtendedGeorchestraUser;
 import org.georchestra.security.model.GeorchestraUser;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -121,4 +122,22 @@ void testFilter_UseResolved() {
         Optional<GeorchestraUser> resolved = GeorchestraUsers.resolve(exchange);
         assertSame(user1, resolved.orElseThrow());
     }
+
+    @Test
+    void testFilter_UseResolvedWithoutOrganization() {
+        Authentication auth1 = mock(Authentication.class);
+        ExtendedGeorchestraUser user1 = mock(ExtendedGeorchestraUser.class);
+        when(mockMapper.resolve(same(auth1))).thenReturn(Optional.of(user1));
+        when(user1.getOrg()).thenReturn(null);
+
+        ServerWebExchange exchange = this.exchange.mutate().principal(Mono.just(auth1)).build();
+
+        filter.filter(exchange, mockChain).block();
+
+        verify(mockChain, times(1)).filter(same(exchange));
+        verify(mockMapper, times(1)).resolve(any());
+
+        Optional<GeorchestraUser> resolved = GeorchestraUsers.resolve(exchange);
+        assertSame(user1, resolved.orElseThrow());
+    }
 }