Add back createCryptoProvider and createHttpClient, remove non-null a…

…ssertion, more specific return type on createStripe

src/Webhooks.ts

@@ -1,6 +1,6 @@
+import CryptoProvider = require('./crypto/CryptoProvider');
 import _Error = require('./Error');
 import PlatformFunctions = require('./platform/PlatformFunctions');
-import CryptoProvider = require('./crypto/CryptoProvider');
 const {StripeError, StripeSignatureVerificationError} = _Error;
 
 type WebhookHeader = string | Uint8Array;
@@ -131,7 +131,7 @@ function createWebhooks(platformFunctions: PlatformFunctions): WebhookObject {
         Math.floor(opts.timestamp) || Math.floor(Date.now() / 1000);
       opts.scheme = opts.scheme || signature.EXPECTED_SCHEME;
 
-      opts.cryptoProvider = opts.cryptoProvider || getNodeCryptoProvider();
+      opts.cryptoProvider = opts.cryptoProvider || getCryptoProvider();
 
       opts.signature =
         opts.signature ||
@@ -169,7 +169,7 @@ function createWebhooks(platformFunctions: PlatformFunctions): WebhookObject {
         this.EXPECTED_SCHEME
       );
 
-      cryptoProvider = cryptoProvider || getNodeCryptoProvider();
+      cryptoProvider = cryptoProvider || getCryptoProvider();
       const expectedSignature = cryptoProvider.computeHMACSignature(
         makeHMACContent(payload, details),
         secret
@@ -203,7 +203,7 @@ function createWebhooks(platformFunctions: PlatformFunctions): WebhookObject {
         this.EXPECTED_SCHEME
       );
 
-      cryptoProvider = cryptoProvider || getNodeCryptoProvider();
+      cryptoProvider = cryptoProvider || getCryptoProvider();
 
       const expectedSignature = await cryptoProvider.computeHMACSignatureAsync(
         makeHMACContent(payload, details),
@@ -290,10 +290,7 @@ function createWebhooks(platformFunctions: PlatformFunctions): WebhookObject {
     tolerance: number
   ): boolean {
     const signatureFound = !!details.signatures.filter(
-      platformFunctions!.secureCompare.bind(
-        platformFunctions,
-        expectedSignature
-      )
+      platformFunctions.secureCompare.bind(platformFunctions, expectedSignature)
     ).length;
 
     if (!signatureFound) {
@@ -353,9 +350,9 @@ function createWebhooks(platformFunctions: PlatformFunctions): WebhookObject {
    * Lazily instantiate a CryptoProvider instance. This is a stateless object
    * so a singleton can be used here.
    */
-  function getNodeCryptoProvider(): StripeCryptoProvider {
+  function getCryptoProvider(): StripeCryptoProvider {
     if (!webhooksCryptoProviderInstance) {
-      webhooksCryptoProviderInstance = platformFunctions.createNodeCryptoProvider();
+      webhooksCryptoProviderInstance = platformFunctions.createCryptoProvider();
     }
     return webhooksCryptoProviderInstance!;
   }

src/crypto/SubtleCryptoProvider.ts

@@ -8,7 +8,7 @@ import CryptoProvider = require('./CryptoProvider');
 class SubtleCryptoProvider extends CryptoProvider {
   subtleCrypto: SubtleCrypto;
 
-  constructor(subtleCrypto: SubtleCrypto) {
+  constructor(subtleCrypto?: SubtleCrypto) {
     super();
 
     // If no subtle crypto is interface, default to the global namespace. This

src/platform/NodePlatformFunctions.ts

@@ -132,10 +132,21 @@ class NodePlatformFunctions extends PlatformFunctions {
     return new NodeHttpClient(agent);
   }
 
+  /** @override */
+  createHttpClient(agent?: http.Agent): typeof HttpClient {
+    // @ts-ignore
+    return new NodeHttpClient(agent);
+  }
+
   /** @override */
   createNodeCryptoProvider(): StripeCryptoProvider {
     return new NodeCryptoProvider();
   }
+
+  /** @override */
+  createCryptoProvider(): StripeCryptoProvider {
+    return this.createNodeCryptoProvider();
+  }
 }
 
 export = NodePlatformFunctions;

src/platform/PlatformFunctions.ts

@@ -12,6 +12,14 @@ import SubtleCryptoProvider = require('../crypto/SubtleCryptoProvider');
  * implementations depend on the platform / JS runtime.
  */
 class PlatformFunctions {
+  _fetchFn: any | null;
+  _agent: http.Agent | null;
+
+  constructor() {
+    this._fetchFn = null;
+    this._agent = null;
+  }
+
   /**
    * Gets uname with Node's built-in `exec` function, if available.
    */
@@ -67,7 +75,7 @@ class PlatformFunctions {
    * Creates an HTTP client which uses the Node `http` and `https` packages
    * to issue requests.
    */
-  createNodeHttpClient(agent: http.Agent): typeof HttpClient {
+  createNodeHttpClient(agent?: http.Agent | null): typeof HttpClient {
     throw new Error('createNodeHttpClient not implemented.');
   }
 
@@ -78,11 +86,18 @@ class PlatformFunctions {
    * A fetch function can optionally be passed in as a parameter. If none is
    * passed, will default to the default `fetch` function in the global scope.
    */
-  createFetchHttpClient(fetchFn: typeof fetch): typeof HttpClient {
+  createFetchHttpClient(fetchFn?: typeof fetch | null): typeof HttpClient {
     // @ts-ignore
     return new FetchHttpClient(fetchFn);
   }
 
+  /**
+   * Creates an HTTP client using runtime-specific APIs.
+   */
+  createHttpClient(agent?: http.Agent | null): typeof HttpClient {
+    throw new Error('createHttpClient not implemented.');
+  }
+
   /**
    * Creates a CryptoProvider which uses the Node `crypto` package for its computations.
    */
@@ -94,10 +109,14 @@ class PlatformFunctions {
    * Creates a CryptoProvider which uses the SubtleCrypto interface of the Web Crypto API.
    */
   createSubtleCryptoProvider(
-    subtleCrypto: typeof crypto.subtle
+    subtleCrypto?: typeof crypto.subtle
   ): StripeCryptoProvider {
     return new SubtleCryptoProvider(subtleCrypto);
   }
+
+  createCryptoProvider(): StripeCryptoProvider {
+    throw new Error('createCryptoProvider not implemented.');
+  }
 }
 
 export = PlatformFunctions;

src/platform/WebPlatformFunctions.ts

@@ -31,18 +31,28 @@ class WebPlatformFunctions extends PlatformFunctions {
   }
 
   /** @override */
-  createNodeHttpClient(agent: http.Agent): typeof HttpClient {
+  createNodeHttpClient(): typeof HttpClient {
     throw new Error(
       'Stripe: `createNodeHttpClient()` is not available in non-Node environments. Please use `createFetchHttpClient()` instead.'
     );
   }
 
+  /** @override */
+  createHttpClient(): typeof HttpClient {
+    return super.createFetchHttpClient();
+  }
+
   /** @override */
   createNodeCryptoProvider(): StripeCryptoProvider {
     throw new Error(
       'Stripe: `createNodeCryptoProvider()` is not available in non-Node environments. Please use `createSubtleCryptoProvider()` instead.'
     );
   }
+
+  /** @override */
+  createCryptoProvider(): StripeCryptoProvider {
+    return this.createSubtleCryptoProvider();
+  }
 }
 
 export = WebPlatformFunctions;

src/stripe.common.ts

@@ -39,7 +39,7 @@ import CryptoProvider = require('./crypto/CryptoProvider');
 import PlatformFunctions = require('./platform/PlatformFunctions');
 import createWebhooks = require('./Webhooks');
 
-function createStripe(platformFunctions: PlatformFunctions): any {
+function createStripe(platformFunctions: PlatformFunctions): typeof Stripe {
   Stripe.PACKAGE_VERSION = require('../package.json').version;
   Stripe.USER_AGENT = {
     bindings_version: Stripe.PACKAGE_VERSION,