@api-client/core 0.6.28 → 0.6.29

package/src/models/ClientCertificate.ts

@@ -71,7 +71,7 @@ export interface IPemCertificate extends ICertificate {
   certKey: ICertificateData;
 }
 
-export type HttpCertificate = IP12Certificate | IPemCertificate;
+export type HttpCertificate = IP12Certificate | IPemCertificate | ICertificate;
 
 export interface IPemCreateOptions {
   type: 'p12';
@@ -128,7 +128,7 @@ export class Certificate {
    * Timestamp when the certificate was inserted into the data store.
    * Required when returning a result. Auto-generated when inserting, if missing.
    */
-  created?: number;
+  created = 0;
   /**
    * Certificate type. Either `p12` or `pem`.
    */
@@ -162,6 +162,7 @@ export class Certificate {
       key: v4(),
       name,
       type: 'pem',
+      created: Date.now(),
     };
     if (keyPassphrase) {
       init.certKey.passphrase = keyPassphrase;
@@ -185,6 +186,7 @@ export class Certificate {
       key: v4(),
       name,
       type: 'p12',
+      created: Date.now(),
     };
     if (passphrase) {
       init.cert.passphrase = passphrase;
@@ -224,6 +226,7 @@ export class Certificate {
         key: _id,
         name,
         type: 'p12',
+        created,
       };
       return new Certificate(init);
     }
@@ -231,16 +234,15 @@ export class Certificate {
   }
 
   constructor(certificate: HttpCertificate) {
-    const { type, cert, key = v4(), name = '', created } = certificate;
+    const { type, cert, key = v4(), name = '', created = Date.now() } = certificate;
     this.key = key;
     this.name = name;
     this.type = type;
     this.cert = Certificate.fromStore(cert);
-    if (typeof created === 'number') {
-      this.created = created;
-    }
+    this.created = created;
     if (type === 'pem') {
-      this.certKey = Certificate.fromStore(certificate.certKey);
+      const typed = certificate as IPemCertificate;
+      this.certKey = Certificate.fromStore(typed.certKey);
     }
   }
 
@@ -288,12 +290,13 @@ export class Certificate {
   }
 
   toJSON(): HttpCertificate {
-    const result: IP12Certificate = {
+    const result: HttpCertificate = {
       kind: Kind,
       key: this.key,
       cert: Certificate.toStore(this.cert),
       name: this.name,
-      type: 'p12',
+      type: this.type,
+      created: this.created,
     };
 
     if (this.type === 'pem' && this.certKey) {

package/src/models/arc/ArcProject.ts

@@ -951,12 +951,15 @@ export class ArcProject extends ArcProjectParent {
         init.kind = ArcProjectKind;
       }
     } else {
+      const now = Date.now();
       init = {
         kind: ArcProjectKind,
         key: v4(),
         definitions: {},
         items: [],
         info: Thing.fromName('').toJSON(),
+        created: now,
+        updated: now,
       }
     }
     this.new(init);
@@ -1001,6 +1004,8 @@ export class ArcProject extends ArcProjectParent {
       definitions: {},
       items: [],
       info: this.info.toJSON(),
+      created: this.created,
+      updated: this.updated,
     };
     if (Array.isArray(this.definitions.requests) && this.definitions.requests.length) {
       result.definitions.requests = this.definitions.requests.map(i => i.toJSON());

package/src/runtime/http-engine/HttpEngine.ts

@@ -10,7 +10,7 @@ import { IHttpRequest, HttpRequest } from '../../models/HttpRequest.js';
 import { IRequestBaseConfig } from '../../models/RequestConfig.js';
 import { IRequestAuthorization } from '../../models/RequestAuthorization.js';
 import { HostRule } from '../../models/HostRule.js';
-import { HttpCertificate } from '../../models/ClientCertificate.js';
+import { HttpCertificate, IPemCertificate } from '../../models/ClientCertificate.js';
 import { SentRequest } from '../../models/SentRequest.js';
 import { Response } from '../../models/Response.js';
 import { ErrorResponse } from '../../models/ErrorResponse.js';
@@ -645,6 +645,7 @@ Check your request parameters.`);
       this.finalizeRequest(result);
     } catch (e) {
       const error = e as Error;
+      // eslint-disable-next-line no-console
       console.error(error);
       this._errorRequest({
         message: (error && error.message) || 'Unknown error occurred',
@@ -797,6 +798,7 @@ Check your request parameters.`);
       }
       options.pfx.push(struct);
     } else if (cert.type === 'pem') {
+      const typed = cert as IPemCertificate;
       if (!options.cert) {
         options.cert = [];
       }
@@ -807,9 +809,9 @@ Check your request parameters.`);
           options.cert = [];
         }
       }
-      const added = Buffer.from(cert.cert.data as string);
+      const added = Buffer.from(typed.cert.data as string);
       options.cert.push(added);
-      if (cert.certKey) {
+      if (typed.certKey) {
         if (!Array.isArray(options.key)) {
           if (options.key) {
             options.key = [options.key];
@@ -818,10 +820,10 @@ Check your request parameters.`);
           }
         }
         const struct: tls.KeyObject = {
-          pem: Buffer.from(cert.certKey.data as string),
+          pem: Buffer.from(typed.certKey.data as string),
         };
-        if (cert.certKey.passphrase) {
-          struct.passphrase = cert.certKey.passphrase;
+        if (typed.certKey.passphrase) {
+          struct.passphrase = typed.certKey.passphrase;
         }
         options.key.push(struct);
       }