From 71822ef76313edbe58d691e4878b20a323a2c796 Mon Sep 17 00:00:00 2001
From: Ovidijus Narkevicius <ovidijus.narkevicius@nortal.com>
Date: Fri, 28 Jun 2024 13:04:22 +0300
Subject: [PATCH] fix: ensure that manual key creation works in case ACME
 failures

suggested fix

Refs: XRDDEV-2651
---
 .../restapi/service/CertificateAuthorityService.java      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/security-server/admin-service/application/src/main/java/org/niis/xroad/securityserver/restapi/service/CertificateAuthorityService.java b/src/security-server/admin-service/application/src/main/java/org/niis/xroad/securityserver/restapi/service/CertificateAuthorityService.java
index 3a991b9c2c..40a2490993 100644
--- a/src/security-server/admin-service/application/src/main/java/org/niis/xroad/securityserver/restapi/service/CertificateAuthorityService.java
+++ b/src/security-server/admin-service/application/src/main/java/org/niis/xroad/securityserver/restapi/service/CertificateAuthorityService.java
@@ -230,12 +230,8 @@ List<String> buildPath(X509Certificate certificate,
     }
 
     public boolean isAcmeExternalAccountBindingRequired(String caName) throws CertificateAuthorityNotFoundException {
-        final var approvedCAInfo = getCertificateAuthorityInfo(caName);
-        if (approvedCAInfo.getAcmeServerDirectoryUrl() != null) {
-            return acmeService.isExternalAccountBindingRequired(approvedCAInfo.getAcmeServerDirectoryUrl());
-
-        }
-        return false;
+        final var acmeUrl = getCertificateAuthorityInfo(caName).getAcmeServerDirectoryUrl();
+        return acmeUrl != null && acmeService.isExternalAccountBindingRequired(acmeUrl);
     }
 
     public boolean hasAcmeExternalAccountBindingCredentials(String caName, String memberId) {