Merge pull request #10 from Microsoft/ianc/dev-cert-revisions

Feedback from the previous PR: https://github.com/Microsoft/gulp-core…

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/gulp-core-build-serve",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

src/CertificateStore.ts

@@ -1,5 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs';
+import { homedir } from 'os';
 
 const encoding: string = 'utf8';
 
@@ -72,7 +73,7 @@ export default class CertificateStore {
   }
 
   private _initialize(): void {
-    const unresolvedUserFolder: string = process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'];
+    const unresolvedUserFolder: string = homedir();
     this._userProfilePath = path.resolve(unresolvedUserFolder);
     if (!fs.existsSync(this._userProfilePath)) {
       throw new Error('Unable to determine the current user\'s home directory');

src/NodeForgeExtensions.d.ts

@@ -0,0 +1,39 @@
+interface IAttr {
+  name: string;
+  value: string;
+}
+
+interface IForgeCertificate {
+  publicKey: any; // tslint:disable-line:no-any
+
+  validity: {
+    notBefore: Date;
+    notAfter: Date;
+  };
+
+  serialNumber: string;
+
+  setSubject(attrs: IAttr[]): void;
+
+  setIssuer(attrs: IAttr[]): void;
+
+  setExtensions(extensions: any[]): void; // tslint:disable-line:no-any
+
+  sign(privateKey: string, algorithm: IForgeSignatureAlgorithm): void; // tslint:disable-line:no-any
+}
+
+interface IForgeSignatureAlgorithm {
+}
+
+interface IForgeExtensions {
+  pki: {
+    createCertificate(): IForgeCertificate;
+    certificateToPem(certificate: IForgeCertificate): string;
+  };
+
+  md: {
+    sha256: {
+      create(): IForgeSignatureAlgorithm;
+    }
+  };
+}

src/TrustCertTask.ts

@@ -4,7 +4,7 @@ import * as gulp from 'gulp';
 import { ensureCertificate, ICertificate } from './certificates';
 
 /**
- * This task gnerates and trusts a development certificate. The certificate is self-signed
+ * This task generates and trusts a development certificate. The certificate is self-signed
  *  and stored, along with its private key, in the user's home directory. On Windows, it's
  *  trusted as a root certification authority in the user certificate store. On macOS, it's
  *  trusted as a root cert in the keychain. On other platforms, the certificate is generated

src/certificates.ts

@@ -1,3 +1,5 @@
+/// <reference path="./NodeForgeExtensions.d.ts" />
+
 import { GulpTask } from '@microsoft/gulp-core-build';
 import * as forgeType from 'node-forge';
 const forge: typeof forgeType & IForgeExtensions = require('node-forge');
@@ -21,46 +23,6 @@ export interface ICertificate {
   pemKey: string;
 }
 
-interface IAttr {
-  name: string;
-  value: string;
-}
-
-interface IForgeCertificate {
-  publicKey: any; // tslint:disable-line:no-any
-
-  validity: {
-    notBefore: Date;
-    notAfter: Date;
-  };
-
-  serialNumber: string;
-
-  setSubject(attrs: IAttr[]): void;
-
-  setIssuer(attrs: IAttr[]): void;
-
-  setExtensions(extensions: any[]): void; // tslint:disable-line:no-any
-
-  sign(privateKey: string, algorithm: IForgeSignatureAlgorithm): void; // tslint:disable-line:no-any
-}
-
-interface IForgeSignatureAlgorithm {
-}
-
-interface IForgeExtensions {
-  pki: {
-    createCertificate(): IForgeCertificate;
-    certificateToPem(certificate: IForgeCertificate): string;
-  };
-
-  md: {
-    sha256: {
-      create(): IForgeSignatureAlgorithm;
-    }
-  };
-}
-
 function createDevelopmentCertificate(): ICertificate {
   const keys: forgeType.pki.KeyPair = forge.pki.rsa.generateKeyPair(2048);
   const certificate: IForgeCertificate = forge.pki.createCertificate();
@@ -186,7 +148,8 @@ function tryTrustCertificate(certificatePath: string, parentTask: GulpTask<{}>):
           parentTask.log('Certificate trust cancelled.');
           return false;
         } else {
-          parentTask.logError('Certificate trust failed with an unknown error.');
+          parentTask.logError(`Certificate trust failed with an unknown error. Exit code: ${result.code}. ` +
+                              `Error: ${result.stderr.join(' ')}`);
           return false;
         }
       }