Remove more deprecated items (#1600)

Remove remaining deprecated items
stripe · Nov 4, 2022 · 651324b · 651324b
1 parent 58e625c
commit 651324b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 238 deletions.
diff --git a/lib/StripeMethod.basic.js b/lib/StripeMethod.basic.js
diff --git a/lib/StripeResource.js b/lib/StripeResource.js
diff --git a/lib/utils.js b/lib/utils.js
diff --git a/src/StripeMethod.basic.js b/src/StripeMethod.basic.js
diff --git a/src/StripeResource.ts b/src/StripeResource.ts
@@ -25,9 +25,8 @@ type Options = {
 // Provide extension mechanism for Stripe Resource Sub-Classes
 StripeResource.extend = utils.protoExtend;
 
-// Expose method-creator & prepared (basic) methods
+// Expose method-creator
 StripeResource.method = require('./StripeMethod');
-StripeResource.BASIC_METHODS = require('./StripeMethod.basic');
 
 StripeResource.MAX_BUFFERED_REQUEST_METRICS = 100;
 const MAX_RETRY_AFTER_WAIT = 60;
@@ -49,14 +48,6 @@ function StripeResource(stripe, deprecatedUrlData) {
   this.resourcePath = this.path;
   this.path = utils.makeURLInterpolator(this.path);
 
-  // DEPRECATED: This was kept for backwards compatibility in case users were
-  // using this, but basic methods are now explicitly defined on a resource.
-  if (this.includeBasic) {
-    this.includeBasic.forEach(function(methodName) {
-      this[methodName] = StripeResource.BASIC_METHODS[methodName];
-    }, this);
-  }
-
   this.initialize(...arguments);
 }
 
@@ -117,9 +108,6 @@ StripeResource.prototype = {
     return parts.join('/').replace(/\/{2,}/g, '/');
   },
 
-  // DEPRECATED: Here for backcompat in case users relied on this.
-  wrapTimeout: utils.callbackifyPromiseWithTimeout,
-
   _timeoutHandler(timeout, req, callback) {
     return () => {
       const timeoutErr = new TypeError('ETIMEDOUT');

diff --git a/src/utils.ts b/src/utils.ts
@@ -24,15 +24,6 @@ const OPTIONS_KEYS = [
   'host',
 ];
 
-const DEPRECATED_OPTIONS = {
-  api_key: 'apiKey',
-  idempotency_key: 'idempotencyKey',
-  stripe_account: 'stripeAccount',
-  stripe_version: 'apiVersion',
-  stripeVersion: 'apiVersion',
-};
-const DEPRECATED_OPTIONS_KEYS = Object.keys(DEPRECATED_OPTIONS);
-
 type Settings = {
   timeout?: number;
   maxNetworkRetries?: number;
@@ -51,12 +42,7 @@ const utils = {
     return (
       o &&
       typeof o === 'object' &&
-      (OPTIONS_KEYS.some((prop) =>
-        Object.prototype.hasOwnProperty.call(o, prop)
-      ) ||
-        DEPRECATED_OPTIONS_KEYS.some((prop) =>
-          Object.prototype.hasOwnProperty.call(o, prop)
-        ))
+      OPTIONS_KEYS.some((prop) => Object.prototype.hasOwnProperty.call(o, prop))
     );
   },
 
@@ -170,27 +156,9 @@ const utils = {
         );
 
         if (extraKeys.length) {
-          const nonDeprecated = extraKeys.filter((key) => {
-            if (!DEPRECATED_OPTIONS[key]) {
-              return true;
-            }
-            const newParam = DEPRECATED_OPTIONS[key];
-            if (params[newParam]) {
-              throw Error(
-                `Both '${newParam}' and '${key}' were provided; please remove '${key}', which is deprecated.`
-              );
-            }
-            /**
-             * TODO turn this into a hard error in a future major version (once we have fixed our docs).
-             */
-            emitWarning(`'${key}' is deprecated; use '${newParam}' instead.`);
-            params[newParam] = params[key];
-          });
-          if (nonDeprecated.length) {
-            emitWarning(
-              `Invalid options found (${extraKeys.join(', ')}); ignoring.`
-            );
-          }
+          emitWarning(
+            `Invalid options found (${extraKeys.join(', ')}); ignoring.`
+          );
         }
 
         if (params.apiKey) {

diff --git a/test/utils.spec.js b/test/utils.spec.js
@@ -309,91 +309,6 @@ describe('utils', () => {
       });
     });
 
-    it('parses snake case for backwards compatibility', () => {
-      return new Promise((resolve, reject) => {
-        const args = [
-          {
-            api_key: 'sk_test_iiiiiiiiiiiiiiiiiiiiiiii',
-            idempotency_key: 'key',
-            stripe_account: 'acct_123',
-            stripe_version: '2019-08-08',
-          },
-        ];
-        const desiredWarnings = [
-          "Stripe: 'api_key' is deprecated; use 'apiKey' instead.",
-          "Stripe: 'idempotency_key' is deprecated; use 'idempotencyKey' instead.",
-          "Stripe: 'stripe_account' is deprecated; use 'stripeAccount' instead.",
-          "Stripe: 'stripe_version' is deprecated; use 'apiVersion' instead.",
-        ];
-
-        const warnings = [];
-        const onWarn = (message) => {
-          warnings.push(message);
-          if (warnings.length === desiredWarnings.length) {
-            expect(warnings).to.deep.equal(desiredWarnings);
-            resolve();
-          }
-        };
-        handleWarnings(() => {
-          expect(utils.getOptionsFromArgs(args)).to.deep.equal({
-            auth: 'sk_test_iiiiiiiiiiiiiiiiiiiiiiii',
-            headers: {
-              'Idempotency-Key': 'key',
-              'Stripe-Version': '2019-08-08',
-              'Stripe-Account': 'acct_123',
-            },
-            settings: {},
-          });
-        }, onWarn);
-      });
-    });
-
-    it('parses stripeVersion for backwards compatibility', () => {
-      return new Promise((resolve, reject) => {
-        const args = [
-          {
-            apiKey: 'sk_test_iiiiiiiiiiiiiiiiiiiiiiii',
-            stripeVersion: '2019-08-08',
-          },
-        ];
-        const desiredWarnings = [
-          "Stripe: 'stripeVersion' is deprecated; use 'apiVersion' instead.",
-        ];
-
-        const warnings = [];
-        const onWarn = (message) => {
-          warnings.push(message);
-          if (warnings.length === desiredWarnings.length) {
-            expect(warnings).to.deep.equal(desiredWarnings);
-            resolve();
-          }
-        };
-        handleWarnings(() => {
-          expect(utils.getOptionsFromArgs(args)).to.deep.equal({
-            auth: 'sk_test_iiiiiiiiiiiiiiiiiiiiiiii',
-            headers: {
-              'Stripe-Version': '2019-08-08',
-            },
-            settings: {},
-          });
-        }, onWarn);
-      });
-    });
-
-    it('errors if you pass both a deprecated and non-deprecated version of the same param', () => {
-      const args = [
-        {
-          stripeVersion: 'bad',
-          apiVersion: 'good',
-        },
-      ];
-      expect(() => {
-        utils.getOptionsFromArgs(args);
-      }).to.throw(
-        "Both 'apiVersion' and 'stripeVersion' were provided; please remove 'stripeVersion', which is deprecated."
-      );
-    });
-
     it('warns if the hash contains something that does not belong', (done) => {
       const args = [
         {foo: 'bar'},