Merge pull request #4196 from LibreSign/backport/4194/stable29

[stable29] fix: display certificate data after regenerate certificate
LibreSign · Dec 29, 2024 · 26f0426 · 26f0426
2 parents 4bbcffe + 3d072fc
commit 26f0426
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/Handler/CertificateEngine/AEngineHandler.php b/lib/Handler/CertificateEngine/AEngineHandler.php
@@ -315,6 +315,7 @@ public function configureCheck(): array {
 	public function toArray(): array {
 		$return = [
 			'configPath' => $this->getConfigPath(),
+			'generated' => $this->isSetupOk(),
 			'rootCert' => [
 				'commonName' => $this->getCommonName(),
 				'names' => [],

diff --git a/src/views/Settings/RootCertificateOpenSsl.vue b/src/views/Settings/RootCertificateOpenSsl.vue
@@ -25,7 +25,7 @@
 	<NcSettingsSection v-if="isThisEngine && loaded"
 		:name="name"
 		:description="description">
-		<div v-if="configureOk && !isCertificateGenerated" id="tableRootCertificateOpenSsl" class="form-libresign">
+		<div v-if="configureOk && isCertificateGenerated" id="tableRootCertificateOpenSsl" class="form-libresign">
 			<table class="grid">
 				<tbody>
 					<tr>
@@ -155,7 +155,7 @@ export default {
 			return this.configureCheckStore.isConfigureOk('openssl')
 		},
 		isCertificateGenerated() {
-			return this.certificate.rootCert.names.length > 0
+			return this.certificate.generated
 		},
 		loaded() {
 			return this.configureCheckStore.items.length > 0