Merge remote-tracking branch 'origin/5.0.0-rc' into 5.0.0-rc

# Conflicts:
#	UPGRADE.md

.github/workflows/test-and-deploy.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        node: [ 14, 16, 18, lts/* ]
+        node: [ 14, 16, 18 ]
     steps:
       - name: Checkout twilio-node
         uses: actions/checkout@v3
@@ -49,7 +49,7 @@ jobs:
           npm run test
 
       - name: SonarCloud Scan
-        if: ${{ (github.event_name == 'pull_request' || github.ref_type == 'branch') && matrix.node == 'lts/*' && !github.event.pull_request.head.repo.fork }}
+        if: ${{ (github.event_name == 'pull_request' || github.ref_type == 'branch') && matrix.node == '18' && !github.event.pull_request.head.repo.fork }}
         uses: SonarSource/sonarcloud-github-action@master
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
@@ -69,7 +69,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v3
         with:
-          node-version: lts/*
+          node-version: 18
 
       - run: npm install
 

CHANGES.md

@@ -1,6 +1,10 @@
 twilio-node changelog
 =====================
 
+[2023-11-07] Version 5.0.0-rc.0
+---------------------------
+- Release Candidate preparation
+
 [2023-11-06] Version 4.19.1
 ---------------------------
 **Flex**

CONTRIBUTING.md

@@ -22,7 +22,7 @@ it can be.
 
 If you have questions about how to use `twilio-node`, please see our
 [docs](./README.md), and if you don't find the answer there, please contact
-[[email protected]](mailto:help@twilio.com) with any issues you have.
+[Twilio Support](https://www.twilio.com/help/contact) with any issues you have.
 
 ## <a name="issue"></a> Found an Issue?
 

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2023, Twilio, Inc. <help@twilio.com>
+Copyright (C) 2023, Twilio, Inc. <https://www.twilio.com/help/contact>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package.json

@@ -1,7 +1,7 @@
 {
   "name": "twilio",
   "description": "A Twilio helper library",
-  "version": "4.19.1",
+  "version": "5.0.0-rc.0",
   "author": "API Team <[email protected]>",
   "contributors": [
     {
@@ -20,7 +20,7 @@
     "url": "https://github.com/twilio/twilio-node.git"
   },
   "dependencies": {
-    "axios": "^0.26.1",
+    "axios": "^1.6.0",
     "dayjs": "^1.11.9",
     "https-proxy-agent": "^5.0.0",
     "jsonwebtoken": "^9.0.0",

src/base/RequestClient.ts

@@ -57,7 +57,7 @@ function getExponentialBackoffResponseHandler(
       );
       const delay = Math.floor(baseDelay * Math.random()); // Full jitter backoff
 
-      return new Promise((resolve) => {
+      return new Promise((resolve: (value: Promise<AxiosResponse>) => void) => {
         setTimeout(() => resolve(axios(config)), delay);
       });
     }
@@ -190,8 +190,14 @@ class RequestClient {
       validateStatus: (status) => status >= 100 && status < 600,
     };
 
-    if (opts.data) {
+    if (opts.data && options.headers) {
+      if (
+        options.headers["Content-Type"] === "application/x-www-form-urlencoded"
+      ) {
       options.data = qs.stringify(opts.data, { arrayFormat: "repeat" });
+      } else if (options.headers["Content-Type"] === "application/json") {
+        options.data = opts.data;
+      }
     }
 
     if (opts.params) {

src/rest/PreviewMessaging.ts

@@ -0,0 +1,13 @@
+import PreviewMessagingBase from "./PreviewMessagingBase";
+import { MessageListInstance } from "./previewMessaging/v1/message";
+
+class PreviewMessaging extends PreviewMessagingBase {
+    /**
+     * @deprecated - Use v1.messages; instead
+     */
+    get messages(): MessageListInstance {
+        console.warn("messages is deprecated. Use v1.messages; instead.");
+        return this.v1.messages;
+    }
+}
+export = PreviewMessaging;

src/rest/OauthBase.ts → src/rest/PreviewMessagingBase.ts

@@ -10,24 +10,24 @@
  */
 
 import Domain from "../base/Domain";
-import V1 from "./oauth/V1";
+import V1 from "./previewMessaging/V1";
 
-class OauthBase extends Domain {
-  _v1?: V1;
+class PreviewMessagingBase extends Domain {
+    _v1?: V1;
 
-  /**
-   * Initialize oauth domain
-   *
-   * @param twilio - The twilio client
-   */
-  constructor(twilio: any) {
-    super(twilio, "https://oauth.twilio.com");
-  }
+    /**
+     * Initialize accounts domain
+     *
+     * @param twilio - The twilio client
+     */
+    constructor(twilio: any) {
+        super(twilio, "https://preview.messaging.twilio.com");
+    }
 
-  get v1(): V1 {
-    this._v1 = this._v1 || new V1(this);
-    return this._v1;
-  }
+    get v1(): V1 {
+        this._v1 = this._v1 || new V1(this);
+        return this._v1;
+    }
 }
 
-export = OauthBase;
+export = PreviewMessagingBase;

src/rest/Twilio.ts

@@ -30,7 +30,6 @@ import Microvisor from "./Microvisor";
 import Monitor from "./Monitor";
 import Notify from "./Notify";
 import Numbers from "./Numbers";
-import Oauth from "./Oauth";
 import Preview from "./Preview";
 import Pricing from "./Pricing";
 import Proxy from "./Proxy";
@@ -118,8 +117,6 @@ class Twilio extends Client {
   _notify?: Notify;
   /** (Twilio.Numbers) - numbers domain */
   _numbers?: Numbers;
-  /** (Twilio.Oauth) - oauth domain */
-  _oauth?: Oauth;
   /** (Twilio.Preview) - preview domain */
   _preview?: Preview;
   /** (Twilio.Pricing) - pricing domain */
@@ -188,7 +185,6 @@ class Twilio extends Client {
       this.monitor;
       this.notify;
       this.numbers;
-      this.oauth;
       this.preview;
       this.pricing;
       this.proxy;
@@ -314,10 +310,6 @@ class Twilio extends Client {
   get numbers(): Numbers {
     return this._numbers ?? (this._numbers = new (require("./Numbers"))(this));
   }
-  /** Getter for (Twilio.Oauth) domain */
-  get oauth(): Oauth {
-    return this._oauth ?? (this._oauth = new (require("./Oauth"))(this));
-  }
   /** Getter for (Twilio.Preview) domain */
   get preview(): Preview {
     return this._preview ?? (this._preview = new (require("./Preview"))(this));