Remove support-cors related code

CTMBNara · CTMBNara · commit 7162ee80dfe2 · 2026-03-16T16:10:46.000+01:00
diff --git a/src/main/java/org/prebid/server/bidder/UsersyncInfoBuilder.java b/src/main/java/org/prebid/server/bidder/UsersyncInfoBuilder.java
@@ -14,7 +14,6 @@ public class UsersyncInfoBuilder {
     private String usersyncUrl;
     private String redirectUrl;
     private UsersyncMethodType type;
-    private Boolean supportCORS;
 
     public static UsersyncInfoBuilder from(UsersyncMethod usersyncMethod) {
         final UsersyncInfoBuilder usersyncInfoBuilder = new UsersyncInfoBuilder();
@@ -23,7 +22,6 @@ public static UsersyncInfoBuilder from(UsersyncMethod usersyncMethod) {
                 StringUtils.stripToEmpty(usersyncMethod.getRedirectUrl()),
                 UsersyncUtil.resolveFormat(usersyncMethod));
         usersyncInfoBuilder.type = usersyncMethod.getType();
-        usersyncInfoBuilder.supportCORS = usersyncMethod.isSupportCORS();
 
         return usersyncInfoBuilder;
     }
@@ -88,7 +86,7 @@ public UsersyncInfo build() {
         final String resolvedUsersyncUrl = usersyncUrl.replace(
                 UsersyncInfo.REDIRECT_URL_PLACEHOLDER, resolvedRedirectUrl);
 
-        return UsersyncInfo.of(resolvedUsersyncUrl, type, supportCORS);
+        return UsersyncInfo.of(resolvedUsersyncUrl, type);
     }
 
     private static String resolveQueryParams(String redirectUrl) {
diff --git a/src/main/java/org/prebid/server/bidder/UsersyncMethod.java b/src/main/java/org/prebid/server/bidder/UsersyncMethod.java
@@ -13,7 +13,5 @@ public class UsersyncMethod {
 
     String redirectUrl;
 
-    boolean supportCORS;
-
     UsersyncFormat formatOverride;
 }
diff --git a/src/main/java/org/prebid/server/proto/response/UsersyncInfo.java b/src/main/java/org/prebid/server/proto/response/UsersyncInfo.java
@@ -1,6 +1,5 @@
 package org.prebid.server.proto.response;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Value;
 import org.prebid.server.bidder.UsersyncMethodType;
 
@@ -22,7 +21,4 @@ public class UsersyncInfo {
     String url;
 
     UsersyncMethodType type;
-
-    @JsonProperty("supportCORS")
-    Boolean supportCORS;
 }
diff --git a/src/main/java/org/prebid/server/spring/config/bidder/model/usersync/UsersyncMethodConfigurationProperties.java b/src/main/java/org/prebid/server/spring/config/bidder/model/usersync/UsersyncMethodConfigurationProperties.java
@@ -6,7 +6,6 @@
 import org.springframework.validation.annotation.Validated;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 
 @Data
 @Validated
@@ -18,8 +17,5 @@ public class UsersyncMethodConfigurationProperties {
 
     String uidMacro;
 
-    @NotNull
-    Boolean supportCors;
-
     UsersyncFormat formatOverride;
 }
diff --git a/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreator.java b/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreator.java
@@ -56,7 +56,6 @@ private static UsersyncMethod toMethod(UsersyncMethodType type,
                 .type(type)
                 .usersyncUrl(Objects.requireNonNull(properties.getUrl()))
                 .redirectUrl(toRedirectUrl(cookieFamilyName, externalUrl, properties.getUidMacro()))
-                .supportCORS(properties.getSupportCors())
                 .formatOverride(properties.getFormatOverride())
                 .build();
     }
diff --git a/src/test/java/org/prebid/server/bidder/UsersyncInfoBuilderTest.java b/src/test/java/org/prebid/server/bidder/UsersyncInfoBuilderTest.java
@@ -168,7 +168,6 @@ private static UsersyncMethod createUsersyncMethod(String usersyncUrl, String re
                 .type(UsersyncMethodType.REDIRECT)
                 .usersyncUrl(usersyncUrl)
                 .redirectUrl(redirectUrl)
-                .supportCORS(false)
                 .build();
     }
 }
diff --git a/src/test/java/org/prebid/server/bidder/UsersyncMethodChooserTest.java b/src/test/java/org/prebid/server/bidder/UsersyncMethodChooserTest.java
@@ -337,7 +337,6 @@ private UsersyncMethod iframeMethod(String url) {
                 .type(UsersyncMethodType.IFRAME)
                 .usersyncUrl(url)
                 .redirectUrl(null)
-                .supportCORS(false)
                 .build();
     }
 
@@ -346,7 +345,6 @@ private UsersyncMethod redirectMethod(String url) {
                 .type(UsersyncMethodType.REDIRECT)
                 .usersyncUrl(url)
                 .redirectUrl(null)
-                .supportCORS(false)
                 .build();
     }
 }
diff --git a/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java b/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java
@@ -1029,7 +1029,7 @@ public void prepareResponseShouldReturnWarningForAliasesSyncedAsRootCookieFamily
         final BidderUsersyncStatus validStatus = BidderUsersyncStatus.builder()
                 .bidder("root-cookie-family")
                 .noCookie(true)
-                .usersync(UsersyncInfo.of("https://alias-usersync-url.com", UsersyncMethodType.IFRAME, false))
+                .usersync(UsersyncInfo.of("https://alias-usersync-url.com", UsersyncMethodType.IFRAME))
                 .build();
 
         assertThat(result.getBidderStatus()).containsExactlyInAnyOrder(validStatus, warningStatus);
@@ -1056,7 +1056,7 @@ public void prepareResponseShouldNotReturnWarningForAliasesSyncedAsAliasCookieFa
         final BidderUsersyncStatus status = BidderUsersyncStatus.builder()
                 .bidder("alias-cookie-family")
                 .noCookie(true)
-                .usersync(UsersyncInfo.of("https://alias-usersync-url.com", UsersyncMethodType.IFRAME, false))
+                .usersync(UsersyncInfo.of("https://alias-usersync-url.com", UsersyncMethodType.IFRAME))
                 .build();
 
         assertThat(result.getBidderStatus()).containsExactly(status);
@@ -1084,7 +1084,7 @@ public void prepareResponseShouldReturnErrorForBiddersThatWereNotIncludedInRespo
         final BidderUsersyncStatus validStatus = BidderUsersyncStatus.builder()
                 .bidder("bidder1-cookie-family")
                 .noCookie(true)
-                .usersync(UsersyncInfo.of("https://bidder1-usersync-url.com", UsersyncMethodType.IFRAME, false))
+                .usersync(UsersyncInfo.of("https://bidder1-usersync-url.com", UsersyncMethodType.IFRAME))
                 .build();
 
         assertThat(result.getBidderStatus()).containsExactlyInAnyOrder(validStatus, warningStatus);
@@ -1122,7 +1122,7 @@ public void prepareResponseShouldReturnCustomUsersyncUrlForHostCookieSync() {
         final BidderUsersyncStatus status = BidderUsersyncStatus.builder()
                 .noCookie(true)
                 .bidder("host-bidder-cookie-family")
-                .usersync(UsersyncInfo.of(expectedUrl, UsersyncMethodType.IFRAME, false))
+                .usersync(UsersyncInfo.of(expectedUrl, UsersyncMethodType.IFRAME))
                 .build();
 
         assertThat(result.getBidderStatus()).containsExactly(status);
@@ -1160,7 +1160,7 @@ public void prepareResponseShouldReturnResponseWithWarningsIfNotEmpty() {
         final BidderUsersyncStatus status = BidderUsersyncStatus.builder()
                 .noCookie(true)
                 .bidder("host-bidder-cookie-family")
-                .usersync(UsersyncInfo.of(expectedUrl, UsersyncMethodType.IFRAME, false))
+                .usersync(UsersyncInfo.of(expectedUrl, UsersyncMethodType.IFRAME))
                 .build();
 
         assertThat(result.getBidderStatus()).containsExactly(status);
@@ -1199,7 +1199,7 @@ public void prepareResponseShouldReturnResponseWithoutWarningsIfEmpty() {
         final BidderUsersyncStatus status = BidderUsersyncStatus.builder()
                 .noCookie(true)
                 .bidder("host-bidder-cookie-family")
-                .usersync(UsersyncInfo.of(expectedUrl, UsersyncMethodType.IFRAME, false))
+                .usersync(UsersyncInfo.of(expectedUrl, UsersyncMethodType.IFRAME))
                 .build();
 
         assertThat(result.getBidderStatus()).containsExactly(status);
diff --git a/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java b/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java
@@ -897,10 +897,10 @@ private static UidsCookie emptyUidsCookie() {
     }
 
     private static UsersyncMethod iframeMethod() {
-        return UsersyncMethod.builder().type(UsersyncMethodType.IFRAME).supportCORS(false).build();
+        return UsersyncMethod.builder().type(UsersyncMethodType.IFRAME).build();
     }
 
     private static UsersyncMethod redirectMethod() {
-        return UsersyncMethod.builder().type(UsersyncMethodType.REDIRECT).supportCORS(false).build();
+        return UsersyncMethod.builder().type(UsersyncMethodType.REDIRECT).build();
     }
 }
diff --git a/src/test/java/org/prebid/server/it/ApplicationTest.java b/src/test/java/org/prebid/server/it/ApplicationTest.java
@@ -326,7 +326,7 @@ public void cookieSyncShouldReturnBidderStatusWithExpectedUsersyncInfo() {
                                         + "&gpp_sid="
                                         + "&f=i"
                                         + "&uid=host-cookie-uid",
-                                UsersyncMethodType.REDIRECT, false))
+                                UsersyncMethodType.REDIRECT))
                         .build(),
                 BidderUsersyncStatus.builder()
                         .bidder(APPNEXUS_COOKIE_FAMILY)
@@ -339,7 +339,7 @@ public void cookieSyncShouldReturnBidderStatusWithExpectedUsersyncInfo() {
                                         + "%26gpp_sid%3D"
                                         + "%26f%3Db"
                                         + "%26uid%3D%24UID",
-                                UsersyncMethodType.IFRAME, false))
+                                UsersyncMethodType.IFRAME))
                         .build());
     }
 
diff --git a/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreatorTest.java b/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreatorTest.java
@@ -22,7 +22,6 @@ public void createShouldReturnUsersyncerWithConcatenatedExternalAndRedirectUrl()
         final UsersyncMethodConfigurationProperties methodConfig = new UsersyncMethodConfigurationProperties();
         methodConfig.setUrl("//redirect-url?uid=");
         methodConfig.setUidMacro("uid-macro");
-        methodConfig.setSupportCors(false);
 
         config.setEnabled(true);
         config.setCookieFamilyName("rubicon");
@@ -50,7 +49,6 @@ public void createShouldValidateExternalUrl() {
         final UsersyncMethodConfigurationProperties methodConfig = new UsersyncMethodConfigurationProperties();
         methodConfig.setUrl("//usersync-url");
         methodConfig.setUidMacro("not-valid-macro");
-        methodConfig.setSupportCors(true);
 
         config.setEnabled(true);
         config.setRedirect(methodConfig);
@@ -70,12 +68,10 @@ public void createShouldReturnUsersyncerWithPrimaryAndSecondaryMethods() {
         final UsersyncMethodConfigurationProperties iframeConfig = new UsersyncMethodConfigurationProperties();
         iframeConfig.setUrl("//usersync-url-iframe?uid=");
         iframeConfig.setUidMacro("uid-macro-iframe");
-        iframeConfig.setSupportCors(true);
 
         final UsersyncMethodConfigurationProperties redirectConfig = new UsersyncMethodConfigurationProperties();
         redirectConfig.setUrl("//usersync-url-redirect?u=");
         redirectConfig.setUidMacro("uid-macro-redirect");
-        redirectConfig.setSupportCors(false);
 
         config.setEnabled(true);
         config.setIframe(iframeConfig);
@@ -98,7 +94,6 @@ public void createShouldReturnUsersyncerWithPrimaryAndSecondaryMethods() {
                         &gpp_sid={{gpp_sid}}\
                         &uid=uid-macro-iframe\
                         """)
-                .supportCORS(true)
                 .build();
 
         final UsersyncMethod expectedRedirectMethod = UsersyncMethod.builder()
@@ -113,7 +108,6 @@ public void createShouldReturnUsersyncerWithPrimaryAndSecondaryMethods() {
                         &gpp_sid={{gpp_sid}}\
                         &uid=uid-macro-redirect\
                         """)
-                .supportCORS(false)
                 .build();
 
         assertThat(result).isEqualTo(
@@ -126,7 +120,6 @@ public void createShouldTolerateMissingUid() {
         final UsersyncConfigurationProperties config = new UsersyncConfigurationProperties();
         final UsersyncMethodConfigurationProperties methodConfig = new UsersyncMethodConfigurationProperties();
         methodConfig.setUrl("//redirect-url?uid=");
-        methodConfig.setSupportCors(false);
 
         config.setEnabled(true);
         config.setCookieFamilyName("rubicon");

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,5 @@ public class UsersyncMethod {`
`13`	`13`
`14`	`14`	`String redirectUrl;`
`15`	`15`
`16`		`- boolean supportCORS;`
`17`		`-`
`18`	`16`	`UsersyncFormat formatOverride;`
`19`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ private static UsersyncMethod toMethod(UsersyncMethodType type,`
`56`	`56`	`.type(type)`
`57`	`57`	`.usersyncUrl(Objects.requireNonNull(properties.getUrl()))`
`58`	`58`	`.redirectUrl(toRedirectUrl(cookieFamilyName, externalUrl, properties.getUidMacro()))`
`59`		`- .supportCORS(properties.getSupportCors())`
`60`	`59`	`.formatOverride(properties.getFormatOverride())`
`61`	`60`	`.build();`
`62`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,6 @@ private static UsersyncMethod createUsersyncMethod(String usersyncUrl, String re`
`168`	`168`	`.type(UsersyncMethodType.REDIRECT)`
`169`	`169`	`.usersyncUrl(usersyncUrl)`
`170`	`170`	`.redirectUrl(redirectUrl)`
`171`		`- .supportCORS(false)`
`172`	`171`	`.build();`
`173`	`172`	`}`
`174`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,6 @@ private UsersyncMethod iframeMethod(String url) {`
`337`	`337`	`.type(UsersyncMethodType.IFRAME)`
`338`	`338`	`.usersyncUrl(url)`
`339`	`339`	`.redirectUrl(null)`
`340`		`- .supportCORS(false)`
`341`	`340`	`.build();`
`342`	`341`	`}`
`343`	`342`
`@@ -346,7 +345,6 @@ private UsersyncMethod redirectMethod(String url) {`
`346`	`345`	`.type(UsersyncMethodType.REDIRECT)`
`347`	`346`	`.usersyncUrl(url)`
`348`	`347`	`.redirectUrl(null)`
`349`		`- .supportCORS(false)`
`350`	`348`	`.build();`
`351`	`349`	`}`
`352`	`350`	`}`
Original file line number	Diff line number	Diff line change
`@@ -897,10 +897,10 @@ private static UidsCookie emptyUidsCookie() {`
`897`	`897`	`}`
`898`	`898`
`899`	`899`	`private static UsersyncMethod iframeMethod() {`
`900`		`- return UsersyncMethod.builder().type(UsersyncMethodType.IFRAME).supportCORS(false).build();`
	`900`	`+ return UsersyncMethod.builder().type(UsersyncMethodType.IFRAME).build();`
`901`	`901`	`}`
`902`	`902`
`903`	`903`	`private static UsersyncMethod redirectMethod() {`
`904`		`- return UsersyncMethod.builder().type(UsersyncMethodType.REDIRECT).supportCORS(false).build();`
	`904`	`+ return UsersyncMethod.builder().type(UsersyncMethodType.REDIRECT).build();`
`905`	`905`	`}`
`906`	`906`	`}`