3.0.2

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartacme",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "private": false,
   "description": "acme with an easy yet powerful interface in TypeScript",
   "main": "dist/index.js",

ts/interfaces/cert.ts

@@ -1,10 +0,0 @@
-export type TCertStatus = 'existing' | 'nonexisting' | 'pending' | 'failed';
-
-export interface IOldCert {
-  id: string;
-  domainName: string;
-  created: number;
-  privateKey: string;
-  publicKey: string;
-  csr: string;
-}

ts/interfaces/certremote.ts

@@ -1,11 +0,0 @@
-import { ICert, TCertStatus } from './cert';
-
-export interface ICertRemoteRequest {
-  secret: string;
-  domainName: string;
-}
-
-export interface ICertRemoteResponse {
-  status: TCertStatus;
-  certificate?: ICert;
-}

ts/interfaces/index.ts

@@ -1,3 +1 @@
 export * from './accountdata';
-export * from './cert';
-export * from './certremote';

ts/smartacme.classes.cert.ts

@@ -41,7 +41,7 @@ export class Cert extends plugins.smartdata.SmartDataDbDoc<Cert> implements plug
       plugins.smarttime.getMilliSecondsFromUnits({
         days: 10
       });
-    return this.validUntil >= shouldBeValidAtLeastUntil;
+    return !(this.validUntil >= shouldBeValidAtLeastUntil);
   }
 
   public update(certDataArg: plugins.tsclass.network.ICert) {

ts/smartacme.classes.smartacme.ts

@@ -3,9 +3,6 @@ import { Cert } from './smartacme.classes.cert';
 import { CertManager } from './smartacme.classes.certmanager';
 import { CertMatcher } from './smartacme.classes.certmatcher';
 
-import * as interfaces from './interfaces';
-import { request } from 'http';
-
 /**
  * the options for the class @see SmartAcme
  */
@@ -117,14 +114,17 @@ export class SmartAcme {
     const certDomainName = this.certmatcher.getCertificateDomainNameByDomainName(domainArg);
     const retrievedCertificate = await this.certmanager.retrieveCertificate(certDomainName);
 
+    const shouldberenewed = retrievedCertificate.shouldBeRenewed();
+    const isStillValid = retrievedCertificate.isStillValid();
+
     if (!retrievedCertificate && await this.certmanager.interestMap.checkInterest(certDomainName)) {
       const existingCertificateInterest = this.certmanager.interestMap.findInterest(certDomainName);
       const certificate = existingCertificateInterest.interestFullfilled;
       return certificate;
     } else if (retrievedCertificate && !retrievedCertificate.shouldBeRenewed()) {
       return retrievedCertificate;
-    } else if (retrievedCertificate && retrievedCertificate.shouldBeRenewed) {
+    } else if (retrievedCertificate && retrievedCertificate.shouldBeRenewed()) {
-      await retrievedCertificate.delete();
+      // await retrievedCertificate.delete();
     }
 
     // lets make sure others get the same interest