@cocreate/acme 1.2.0 → 1.2.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.2.2](https://github.com/CoCreate-app/CoCreate-acme/compare/v1.2.1...v1.2.2) (2024-01-08)
+
+
+### Bug Fixes
+
+* ssl syncing ([65b226a](https://github.com/CoCreate-app/CoCreate-acme/commit/65b226a16487f3b8b6862092f6b3e83d8f119f51))
+
+## [1.2.1](https://github.com/CoCreate-app/CoCreate-acme/compare/v1.2.0...v1.2.1) (2024-01-08)
+
+
+### Bug Fixes
+
+* handling hostPosition ([fa105b1](https://github.com/CoCreate-app/CoCreate-acme/commit/fa105b1a35927380cd88549d7675eebd2d80a163))
+
 # [1.2.0](https://github.com/CoCreate-app/CoCreate-acme/compare/v1.1.3...v1.2.0) (2024-01-08)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/acme",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "An intergration with ACME and CoCreateJS.",
   "keywords": [
     "acme",

package/src/index.js

@@ -169,6 +169,8 @@ class CoCreateAcme {
             expires = expires.notAfter;
             this.setCertificate(host, expires, organization_id, hostKeyPath, cert, key)
 
+            console.log(`saving host: ${host} at postion: ${hostPosition}`)
+
             this.crud.send({
                 method: 'object.update',
                 host,
@@ -192,6 +194,7 @@ class CoCreateAcme {
 
     async getCertificate(host, organization_id) {
         const hostKeyPath = keyPath + host + '/';
+        let hostPosition
 
         if (!organization_id) {
             let org = await this.crud.getHost(host)
@@ -207,7 +210,6 @@ class CoCreateAcme {
             return false
 
         if (organization.host) {
-            let hostPosition
             for (let i = 0; i < organization.host.length; i++) {
                 if (organization.host[i].name === host) {
                     hostPosition = i
@@ -223,7 +225,7 @@ class CoCreateAcme {
                 }
             }
 
-            if (hostPosition >= 0)
+            if (!hostPosition && hostPosition !== 0)
                 return false
         }
 
@@ -241,11 +243,62 @@ class CoCreateAcme {
 
         const hostKeyPath = keyPath + host + '/';
         if (fs.existsSync(hostKeyPath + 'fullchain.pem')) {
-            let expires = fs.readFileSync(hostKeyPath + 'fullchain.pem', 'utf8');
-            expires = await forge.readCertificateInfo(expires);
+            let cert = fs.readFileSync(hostKeyPath + 'fullchain.pem', 'utf8');
+            let expires = await forge.readCertificateInfo(cert);
             expires = expires.notAfter;
             if (this.isValid(expires)) {
                 this.setCertificate(host, expires, organization_id)
+
+                // TODO: remove after certs are synced
+                let key = fs.readFileSync(hostKeyPath + 'private-key.pem', 'utf8');
+                let hostPosition, org
+
+                if (!organization_id) {
+                    let org = await this.crud.getHost(host)
+                    if (org.error)
+                        // console.log('Organization could not be found');
+                        return false
+                    else
+                        organization_id = org._id
+                }
+
+                let organization = await this.crud.getOrganization(organization_id, false);
+                if (organization.error)
+                    return false
+
+                if (organization.host) {
+                    for (let i = 0; i < organization.host.length; i++) {
+                        if (organization.host[i].name === host) {
+                            hostPosition = i
+                            console.log(`Found host: ${host} at postion: ${hostPosition}`)
+
+                            if (organization.host[i].cert && organization.host[i].key) {
+                                let expires = await forge.readCertificateInfo(organization.host[i].cert);
+                                expires = expires.notAfter;
+                                if (this.isValid(expires)) {
+                                    this.setCertificate(host, expires, organization_id, hostKeyPath, organization.host[i].cert, organization.host[i].key)
+                                    return true
+                                }
+                            }
+                            break
+                        }
+                    }
+
+                    if (!hostPosition && hostPosition !== 0)
+                        return false
+                }
+
+                this.crud.send({
+                    method: 'object.update',
+                    host,
+                    array: 'organizations',
+                    object: {
+                        _id: organization_id,
+                        [`host[${hostPosition}]`]: { name: host, cert, key, expires },
+                    },
+                    organization_id
+                });
+
                 return true
             }
         }