From: Ray Lee <ray.lee@lyrasis.org>
Date: Fri, 22 Sep 2023 19:13:53 +0000 (-0400)
Subject: Revert "Add temporary debugging."
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=56de0f3ae477a35430ac48967d23df0701e8dc96;p=tmp%2Fjakarta-migration.git

Revert "Add temporary debugging."

This reverts commit 6f602f25ed6251097a889e48c2c2794ca25afe16.
---

diff --git a/services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceCorsConfiguration.java b/services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceCorsConfiguration.java
deleted file mode 100644
index ee47b7352..000000000
--- a/services/authentication/service/src/main/java/org/collectionspace/authentication/spring/CSpaceCorsConfiguration.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.collectionspace.authentication.spring;
-
-import org.springframework.web.cors.CorsConfiguration;
-
-public class CSpaceCorsConfiguration extends CorsConfiguration {
-    @Override
-    public String checkOrigin(String origin) {
-      System.out.println("origin=[" + origin + "]");
-
-      return super.checkOrigin(origin);
-    }
-}
diff --git a/services/common/src/main/java/org/collectionspace/services/common/security/SecurityConfig.java b/services/common/src/main/java/org/collectionspace/services/common/security/SecurityConfig.java
index efc0e41b0..9056f5140 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/security/SecurityConfig.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/security/SecurityConfig.java
@@ -32,7 +32,6 @@ import javax.sql.DataSource;
 
 import org.apache.commons.io.IOUtils;
 import org.collectionspace.authentication.CSpaceUser;
-import org.collectionspace.authentication.spring.CSpaceCorsConfiguration;
 import org.collectionspace.authentication.spring.CSpaceDaoAuthenticationProvider;
 import org.collectionspace.authentication.spring.CSpaceJwtAuthenticationToken;
 import org.collectionspace.authentication.spring.CSpaceLogoutSuccessHandler;
@@ -169,7 +168,7 @@ public class SecurityConfig {
 	}
 
 	private CorsConfiguration defaultCorsConfiguration(List<String> allowedOrigins, Duration maxAge) {
-		CorsConfiguration configuration = new CSpaceCorsConfiguration();
+		CorsConfiguration configuration = new CorsConfiguration();
 
 		configuration.setAllowedOrigins(allowedOrigins);
 
@@ -199,7 +198,7 @@ public class SecurityConfig {
 	}
 
 	private CorsConfiguration oauthServerCorsConfiguration(List<String> allowedOrigins, Duration maxAge) {
-		CorsConfiguration configuration = new CSpaceCorsConfiguration();
+		CorsConfiguration configuration = new CorsConfiguration();
 
 		configuration.setAllowedOrigins(allowedOrigins);
 
@@ -251,14 +250,6 @@ public class SecurityConfig {
 						@Override
 						@Nullable
 						public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
-							String scheme = request.getScheme();
-							String host = request.getServerName();
-							int port = request.getServerPort();
-
-							System.out.println("scheme=[" + scheme + "]");
-							System.out.println("host=[" + host + "]");
-							System.out.println("port=[" + port + "]");
-
 							return SecurityConfig.this.oauthServerCorsConfiguration;
 						}
 					});
@@ -404,14 +395,6 @@ public class SecurityConfig {
 						@Override
 						@Nullable
 						public CorsConfiguration getCorsConfiguration(HttpServletRequest request) {
-							String scheme = request.getScheme();
-							String host = request.getServerName();
-							int port = request.getServerPort();
-
-							System.out.println("scheme=[" + scheme + "]");
-							System.out.println("host=[" + host + "]");
-							System.out.println("port=[" + port + "]");
-
 							return SecurityConfig.this.defaultCorsConfiguration;
 						}
 					});