App Config Webhook Fix (Azure#37141)

* Updated Auto Configuration * Update spring.factories * Fixing Push Refresh
azure-sdk · Oct 11, 2023 · 475fcf0 · 475fcf0
1 parent a93e9eb
commit 475fcf0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/CHANGELOG.md b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+* Fixed Event Hook validation
+
 ### Other Changes
 
 ## 4.11.0 (2023-08-25)

diff --git a/...guration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEndpoint.java b/...guration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEndpoint.java
@@ -76,22 +76,22 @@ public String refresh(HttpServletRequest request, HttpServletResponse response,
             return HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase();
         }
 
-        if (!endpoint.authenticate()) {
-            return HttpStatus.UNAUTHORIZED.getReasonPhrase();
-        }
-
         String syncToken = endpoint.getSyncToken();
 
         JsonNode validationResponse = endpoint.getValidationResponse();
         if (validationResponse != null) {
             // Validating Web Hook
             return VALIDATION_CODE_FORMAT_START + validationResponse.asText() + "\"}";
         } else {
+            if (!endpoint.authenticate()) {
+                return HttpStatus.UNAUTHORIZED.getReasonPhrase();
+            }
+
             if (endpoint.triggerRefresh()) {
                 // Spring Bus is in use, will publish a RefreshRemoteApplicationEvent
 
                 publish(new AppConfigurationBusRefreshEvent(endpoint.getEndpoint(), syncToken, this, getInstanceId(),
-                        new PathDestinationFactory().getDestination(null)));
+                    new PathDestinationFactory().getDestination(null)));
                 return HttpStatus.OK.getReasonPhrase();
             } else {
                 LOGGER.debug("Non Refreshable notification");

diff --git a/...pconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java b/...pconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java
@@ -77,17 +77,17 @@ public String refresh(HttpServletRequest request, HttpServletResponse response,
             return HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase();
         }
 
-        if (!endpoint.authenticate()) {
-            return HttpStatus.UNAUTHORIZED.getReasonPhrase();
-        }
-
         String syncToken = endpoint.getSyncToken();
 
         JsonNode validationResponse = endpoint.getValidationResponse();
         if (validationResponse != null) {
             // Validating Web Hook
             return String.format("%s%s\"}", VALIDATION_CODE_FORMAT_START, validationResponse.asText());
         } else {
+            if (!endpoint.authenticate()) {
+                return HttpStatus.UNAUTHORIZED.getReasonPhrase();
+            }
+
             if (contextRefresher != null) {
                 if (endpoint.triggerRefresh()) {
                     publisher.publishEvent(new AppConfigurationRefreshEvent(endpoint.getEndpoint(), syncToken));