Skip to content

fix(dashmate): zero ssl certificate draft not saved #2297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shumkov merged 1 commit into from
Oct 31, 2024
Merged

fix(dashmate): zero ssl certificate draft not saved #2297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions packages/dashmate/src/listr/tasks/ssl/zerossl/obtainZeroSSLCertificateTaskFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import { ERRORS } from '../../../../ssl/zerossl/validateZeroSslCertificateFactor
* @param {VerificationServer} verificationServer
* @param {HomeDir} homeDir
* @param {validateZeroSslCertificate} validateZeroSslCertificate
* @param {ConfigFileJsonRepository} configFileRepository
* @param {ConfigFile} configFile
* @return {obtainZeroSSLCertificateTask}
*/
export default function obtainZeroSSLCertificateTaskFactory(
Expand All @@ -32,6 +34,8 @@ export default function obtainZeroSSLCertificateTaskFactory(
verificationServer,
homeDir,
validateZeroSslCertificate,
configFileRepository,
configFile,
) {
/**
* @typedef {obtainZeroSSLCertificateTask}
Expand Down Expand Up @@ -141,6 +145,9 @@ export default function obtainZeroSSLCertificateTaskFactory(
config.set('platform.gateway.ssl.enabled', true);
config.set('platform.gateway.ssl.provider', 'zerossl');
config.set('platform.gateway.ssl.providerConfigs.zerossl.id', ctx.certificate.id);

// Save config file
configFileRepository.write(configFile);
Comment thread
shumkov marked this conversation as resolved.
},
},
{
Expand Down
8 changes: 4 additions & 4 deletions packages/dashmate/src/ssl/zerossl/validateZeroSslCertificateFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,7 @@ export default function validateZeroSslCertificateFactory(homeDir, getCertificat
}

if (['pending_validation', 'draft'].includes(data.certificate.status)) {
// Certificate is already created, so we just need to pass validation
// and download certificate file

// We need to download new certificate bundle
// We need to validate and download new certificate bundle
data.isBundleFilePresent = false;

return {
Expand All @@ -116,6 +113,9 @@ export default function validateZeroSslCertificateFactory(homeDir, getCertificat
};
}

// Certificate is already created at this point, so we just need to pass validation
// and download certificate file

if (data.certificate.status !== 'issued' || data.isExpiresSoon) {
// Certificate is going to expire soon, or current certificate is not valid
// we need to obtain a new one
Expand Down