Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync with main #981

Merged
merged 4 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -69,7 +69,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v3
with:
node-version: lts/*
node-version: 18

- run: npm install

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
[help@twilio.com](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?

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/base/RequestClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
}
Expand Down
52 changes: 0 additions & 52 deletions src/rest/Oauth.ts

This file was deleted.

33 changes: 0 additions & 33 deletions src/rest/OauthBase.ts

This file was deleted.

8 changes: 0 additions & 8 deletions src/rest/Twilio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -188,7 +185,6 @@ class Twilio extends Client {
this.monitor;
this.notify;
this.numbers;
this.oauth;
this.preview;
this.pricing;
this.proxy;
Expand Down Expand Up @@ -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));
Expand Down
74 changes: 0 additions & 74 deletions src/rest/oauth/V1.ts

This file was deleted.

Loading