Skip to content

Commit 475fcf0

Browse files
authored
App Config Webhook Fix (Azure#37141)
* Updated Auto Configuration * Update spring.factories * Fixing Push Refresh
1 parent a93e9eb commit 475fcf0

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

sdk/spring/spring-cloud-azure-appconfiguration-config-web/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
### Bugs Fixed
1010

11+
* Fixed Event Hook validation
12+
1113
### Other Changes
1214

1315
## 4.11.0 (2023-08-25)

sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEndpoint.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ public String refresh(HttpServletRequest request, HttpServletResponse response,
7676
return HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase();
7777
}
7878

79-
if (!endpoint.authenticate()) {
80-
return HttpStatus.UNAUTHORIZED.getReasonPhrase();
81-
}
82-
8379
String syncToken = endpoint.getSyncToken();
8480

8581
JsonNode validationResponse = endpoint.getValidationResponse();
8682
if (validationResponse != null) {
8783
// Validating Web Hook
8884
return VALIDATION_CODE_FORMAT_START + validationResponse.asText() + "\"}";
8985
} else {
86+
if (!endpoint.authenticate()) {
87+
return HttpStatus.UNAUTHORIZED.getReasonPhrase();
88+
}
89+
9090
if (endpoint.triggerRefresh()) {
9191
// Spring Bus is in use, will publish a RefreshRemoteApplicationEvent
9292

9393
publish(new AppConfigurationBusRefreshEvent(endpoint.getEndpoint(), syncToken, this, getInstanceId(),
94-
new PathDestinationFactory().getDestination(null)));
94+
new PathDestinationFactory().getDestination(null)));
9595
return HttpStatus.OK.getReasonPhrase();
9696
} else {
9797
LOGGER.debug("Non Refreshable notification");

sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ public String refresh(HttpServletRequest request, HttpServletResponse response,
7777
return HttpStatus.INTERNAL_SERVER_ERROR.getReasonPhrase();
7878
}
7979

80-
if (!endpoint.authenticate()) {
81-
return HttpStatus.UNAUTHORIZED.getReasonPhrase();
82-
}
83-
8480
String syncToken = endpoint.getSyncToken();
8581

8682
JsonNode validationResponse = endpoint.getValidationResponse();
8783
if (validationResponse != null) {
8884
// Validating Web Hook
8985
return String.format("%s%s\"}", VALIDATION_CODE_FORMAT_START, validationResponse.asText());
9086
} else {
87+
if (!endpoint.authenticate()) {
88+
return HttpStatus.UNAUTHORIZED.getReasonPhrase();
89+
}
90+
9191
if (contextRefresher != null) {
9292
if (endpoint.triggerRefresh()) {
9393
publisher.publishEvent(new AppConfigurationRefreshEvent(endpoint.getEndpoint(), syncToken));

0 commit comments

Comments
 (0)