remove clients config prefix

stellar · May 9, 2024 · 524120e · 524120e
1 parent dab99af
commit 524120e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/core/src/main/java/org/stellar/anchor/sep31/Sep31Service.java b/core/src/main/java/org/stellar/anchor/sep31/Sep31Service.java
@@ -592,7 +592,7 @@ String getClientName(String account) throws BadRequestException {
       throw new BadRequestException("Client not found");
     }
 
-    if (client != null) {
+    if (client != null && client.getDomains() != null) {
       boolean hasDomainIntersection =
           new HashSet<>(sep10Config.getAllowedClientDomains()).containsAll(client.getDomains());
       if (!hasDomainIntersection) {

diff --git a/platform/src/main/java/org/stellar/anchor/platform/component/share/ClientsBeans.java b/platform/src/main/java/org/stellar/anchor/platform/component/share/ClientsBeans.java
@@ -8,7 +8,7 @@
 @Configuration
 public class ClientsBeans {
   @Bean
-  @ConfigurationProperties(prefix = "clients")
+  @ConfigurationProperties(prefix = "")
   PropertyClientsConfig clientsConfig() {
     return new PropertyClientsConfig();
   }

diff --git a/platform/src/main/java/org/stellar/anchor/platform/config/PropertyClientsConfig.java b/platform/src/main/java/org/stellar/anchor/platform/config/PropertyClientsConfig.java
@@ -104,7 +104,8 @@ private void validateClient(ClientConfig clientConfig, Errors errors) {
   }
 
   public void validateCustodialClient(ClientConfig clientConfig, Errors errors) {
-    if (clientConfig.getSigningKeys() == null || clientConfig.getSigningKeys().isEmpty()) {
+    if (isEmpty(clientConfig.getSigningKey())
+        && (clientConfig.getSigningKeys() == null || clientConfig.getSigningKeys().isEmpty())) {
       errors.reject(
           "empty-client-signing-keys",
           "The client.signingKeys cannot be empty and must be defined");
@@ -119,7 +120,8 @@ public void validateCustodialClient(ClientConfig clientConfig, Errors errors) {
   }
 
   public void validateNonCustodialClient(ClientConfig clientConfig, Errors errors) {
-    if (clientConfig.getDomains() == null || clientConfig.getDomains().isEmpty()) {
+    if (isEmpty(clientConfig.getDomain())
+        && (clientConfig.getDomains() == null || clientConfig.getDomains().isEmpty())) {
       errors.reject(
           "empty-client-domains", "The client.domains cannot be empty and must be defined");
     }

diff --git a/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep10Config.java b/platform/src/main/java/org/stellar/anchor/platform/config/PropertySep10Config.java
@@ -169,8 +169,8 @@ void validateClientAttribution(Errors errors) {
     if (clientAttributionRequired) {
       List<String> nonCustodialClientNames =
           clientsConfig.clients.stream()
-              .filter(cfg -> cfg.getType() == NONCUSTODIAL && !cfg.getDomains().isEmpty())
-              .flatMap(cfg -> cfg.getDomains().stream())
+              .filter(cfg -> cfg.getType() == NONCUSTODIAL)
+              .map(ClientConfig::getName)
               .collect(Collectors.toList());
 
       if (nonCustodialClientNames.isEmpty()) {