@cocreate/acme 1.2.2 → 1.2.4

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.2.4](https://github.com/CoCreate-app/CoCreate-acme/compare/v1.2.3...v1.2.4) (2024-01-30)
+
+
+### Bug Fixes
+
+* removed getHost ([3d58b30](https://github.com/CoCreate-app/CoCreate-acme/commit/3d58b3046f2444b76c9ce6a3f5dd78c6a17d3ca6))
+
+## [1.2.3](https://github.com/CoCreate-app/CoCreate-acme/compare/v1.2.2...v1.2.3) (2024-01-08)
+
+
+### Bug Fixes
+
+* update to logging ([8e3946d](https://github.com/CoCreate-app/CoCreate-acme/commit/8e3946d6dc8af2719c9d76484e2f35d5b3dbee7b))
+
 ## [1.2.2](https://github.com/CoCreate-app/CoCreate-acme/compare/v1.2.1...v1.2.2) (2024-01-08)
 
 

package/package.json

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

package/src/index.js

@@ -169,8 +169,6 @@ 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,
@@ -196,16 +194,7 @@ class CoCreateAcme {
         const hostKeyPath = keyPath + host + '/';
         let hostPosition
 
-        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);
+        let organization = await this.crud.getOrganization({ host, organization_id });
         if (organization.error)
             return false
 
@@ -248,57 +237,6 @@ class CoCreateAcme {
             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
             }
         }