JavaScriptExpert
diff --git a/‎common/reviews/api/debug-certificate-manager.api.md‎
Lines changed: 7 additions & 6 deletions b/‎common/reviews/api/debug-certificate-manager.api.md‎
Lines changed: 7 additions & 6 deletions
diff --git a/‎core-build/gulp-core-build-serve/src/ServeTask.ts‎
Lines changed: 3 additions & 2 deletions b/‎core-build/gulp-core-build-serve/src/ServeTask.ts‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎core-build/gulp-core-build-serve/src/TrustCertTask.ts‎
Lines changed: 3 additions & 2 deletions b/‎core-build/gulp-core-build-serve/src/TrustCertTask.ts‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎core-build/gulp-core-build-serve/src/UntrustCertTask.ts‎
Lines changed: 3 additions & 2 deletions b/‎core-build/gulp-core-build-serve/src/UntrustCertTask.ts‎
Lines changed: 3 additions & 2 deletions
@@ -6,6 +6,13 @@
 
 import { Terminal } from '@microsoft/node-core-library';
 
+// @public
+export class CertificateManager {
+    constructor();
+    ensureCertificate(canGenerateNewCertificate: boolean, terminal: Terminal): ICertificate;
+    untrustCertificate(terminal: Terminal): boolean;
+}
+
 // @public
 export class CertificateStore {
     constructor();
@@ -14,17 +21,11 @@ export class CertificateStore {
     keyData: string | undefined;
     }
 
-// @public
-export function ensureCertificate(canGenerateNewCertificate: boolean, terminal: Terminal): ICertificate;
-
 // @public
 export interface ICertificate {
     pemCertificate: string | undefined;
     pemKey: string | undefined;
 }
 
-// @public
-export function untrustCertificate(terminal: Terminal): boolean;
-
 
 ```
@@ -15,7 +15,7 @@ import * as ExpressType from 'express';
 
 import {
   ICertificate,
-  ensureCertificate
+  CertificateManager
 } from '@rushstack/debug-certificate-manager';
 
 /**
@@ -297,7 +297,8 @@ export class ServeTask<TExtendedConfig = {}> extends GulpTask<IServeTaskConfig &
           }
         }
       } else {
-        const devCertificate: ICertificate = ensureCertificate(
+        const certificateManager: CertificateManager = new CertificateManager();
+        const devCertificate: ICertificate = certificateManager.ensureCertificate(
           this.taskConfig.tryCreateDevCertificate,
           this._terminal
         );
 
@@ -8,7 +8,7 @@ import {
 import * as Gulp from 'gulp';
 import {
   ICertificate,
-  ensureCertificate
+  CertificateManager
 } from '@rushstack/debug-certificate-manager';
 import { Terminal } from '@microsoft/node-core-library';
 
@@ -30,7 +30,8 @@ export class TrustCertTask extends GulpTask<void> {
   }
 
   public executeTask(gulp: typeof Gulp, completeCallback: (error?: string) => void): void {
-    const certificate: ICertificate = ensureCertificate(true, this._terminal);
+    const certificateManager: CertificateManager = new CertificateManager();
+    const certificate: ICertificate = certificateManager.ensureCertificate(true, this._terminal);
 
     if (certificate.pemCertificate && certificate.pemKey) {
       completeCallback();
 
@@ -9,7 +9,7 @@ import { Terminal } from '@microsoft/node-core-library';
 import * as Gulp from 'gulp';
 import {
   CertificateStore,
-  untrustCertificate
+  CertificateManager
 } from '@rushstack/debug-certificate-manager';
 
 /**
@@ -31,7 +31,8 @@ export class UntrustCertTask extends GulpTask<void> {
   }
 
   public executeTask(gulp: typeof Gulp, completeCallback: (error?: string) => void): void {
-    const untrustCertResult: boolean = untrustCertificate(this._terminal);
+    const certificateManager: CertificateManager = new CertificateManager();
+    const untrustCertResult: boolean = certificateManager.untrustCertificate(this._terminal);
     const certificateStore: CertificateStore = new CertificateStore();
 
     // Clear out the certificate store