add externalId if user is authenticated with System API Key

cbellone · cbellone · commit 367c60ad4df0 · 2025-03-05T16:00:11.000+01:00
diff --git a/src/main/java/alfio/model/user/Organization.java b/src/main/java/alfio/model/user/Organization.java
@@ -25,6 +25,7 @@
 import lombok.Getter;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 
 import java.io.IOException;
@@ -79,7 +80,7 @@ public int hashCode() {
      * @deprecated use {@link #getExternalId()}
      * @return the external ID, if present
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     public String getNameOpenId() {
         return externalId;
     }
@@ -104,7 +105,8 @@ public void serialize(Organization value, JsonGenerator gen, SerializerProvider
                 gen.writeStringField("name", value.getName());
                 gen.writeStringField("email", value.getEmail());
                 gen.writeStringField("description", value.getDescription());
-                if(RequestUtils.isAdmin(SecurityContextHolder.getContext().getAuthentication())) {
+                var authentication = SecurityContextHolder.getContext().getAuthentication();
+                if(RequestUtils.isAdmin(authentication) || RequestUtils.isSystemApiKey(authentication)) {
                     gen.writeStringField("externalId", value.getExternalId());
                     gen.writeStringField("slug", value.getSlug());
                 } else {
