Skip to content

Commit e70c649

Browse files
po5ipo5i
authored
Merge branch 'master' into python-mqtt-quickstart-fix
2 parents 26fcd27 + db84088 commit e70c649

File tree

1,807 files changed

+4776
-2685
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,807 files changed

+4776
-2685
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ node_modules
4646
nbactions.xml
4747
*.class
4848
*.sw[op]
49+
.vscode
4950

5051
# Testing
5152
/.env
@@ -55,6 +56,7 @@ testable_snippets/
5556
/composer.json
5657
/composer.lock
5758
/tools/dependencies/
59+
migrate.ps1
5860

5961
# Custom Ruby Gems
6062
Gemfile*

‎README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
In the case of phone numbers, the following should be used:
2020

2121
```
22-
Destination Phone Number: +15558675309
23-
From/Twilio Number: +15017250604
22+
Destination Phone Number: +15558675310
23+
From/Twilio Number: +15017122661
2424
```
2525

2626
For auth_token:
@@ -60,14 +60,14 @@
6060
```
6161
rest/
6262
|-- resource-example/
63-
|-- snippet-example-1/
63+
└── snippet-example-1/
6464
|-- output/
65-
| |-- snippet-example-1.json
65+
| └── snippet-example-1.json
6666
|-- snippet-example-1.7.x.java
6767
|-- snippet-example-1.<sdk-version>.x.<language>
6868
|-- snippet-example-1.json.curl
6969
|-- snippet-example-1.xml.curl
70-
|-- meta.json
70+
└── meta.json
7171
```
7272

7373
Client version is important, as that is how the test harness knows which
@@ -175,13 +175,13 @@ Make sure you have the following dependencies installed on your system.
175175

176176
1. Install Python and PIP.
177177

178-
On Linux:
178+
- On Linux:
179179
```bash
180180
sudo apt-get install python-pip python2.7-dev build-essential \
181181
sudo pip install --upgrade pip
182182
```
183183

184-
On OSX:
184+
- On OSX:
185185

186186
```bash
187187
brew install python
@@ -205,15 +205,15 @@ Make sure you have the following dependencies installed on your system.
205205

206206
1. Install PHP 5 with CURL.
207207

208-
On Linux:
208+
- On Linux:
209209

210210
```bash
211211
sudo add-apt-repository ppa:ondrej/php -y
212212
sudo apt-get update
213213
sudo apt-get install -y --force-yes php5.6
214214
```
215215

216-
On OSX:
216+
- On OSX:
217217

218218
```bash
219219
brew install php56
@@ -235,15 +235,15 @@ Make sure you have the following dependencies installed on your system.
235235

236236
1. Install MonoDevelop.
237237

238-
On Linux (http://www.mono-project.com/docs/getting-started/install/linux/#usage):
238+
- On Linux (http://www.mono-project.com/docs/getting-started/install/linux/#usage):
239239
```bash
240240
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
241241
echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list \
242242
sudo apt-get update \
243243
sudo apt-get install mono-complete -y
244244
```
245245

246-
On OSX:
246+
- On OSX:
247247
```bash
248248
brew install mono
249249
```
@@ -294,14 +294,14 @@ the wrong user.
294294

295295
1. Make your system trust the fake server's self signed certificate.
296296

297-
On Linux:
297+
- On Linux:
298298
```bash
299299
sudo apt-get install ca-certificates \
300300
sudo cp twilio-api-faker/keystore/twilio_fake.pem /usr/local/share/ca-certificates/twilio_fake.crt \
301301
sudo update-ca-certificates
302302
```
303303

304-
On OSX:
304+
- On OSX:
305305
Use the system's keychain to trust the provided certificate in the `keystore`
306306
directory of the fake-api repo. Go [here](https://support.apple.com/kb/PH18677?locale=en_US)
307307
for more information.

‎add-ons/lookups/payfone-tcpa-compliance/payfone-tcpa-compliance.7.x.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static void main(String[] args) {
2222
}};
2323

2424
PhoneNumber number = PhoneNumber
25-
.fetcher(new com.twilio.type.PhoneNumber("+15108675309"))
25+
.fetcher(new com.twilio.type.PhoneNumber("+15108675310"))
2626
.setAddOns(addOns)
2727
.setAddOnsData(addOnsData)
2828
.fetch();

‎client/capability-token-expires/capability-token-expires.6.x.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
from twilio import capability
1+
from twilio.jwt.client import ClientCapabilityToken
22

3-
token = capability.generate(expires=600)
3+
account_sid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
4+
auth_token = 'your_auth_token'
5+
token = ClientCapabilityToken(account_sid, auth_token).to_jwt(ttl=600)

‎client/capability-token-incoming/capability-token.2.x.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ app.get('/token', (req, res) => {
1010
const authToken = 'your_auth_token';
1111

1212
const capability = new twilio.Capability(accountSid, authToken);
13-
capability.allowClientIncoming('jenny');
13+
capability.allowClientIncoming('joey');
1414
const token = capability.generate();
1515

1616
res.set('Content-Type', 'application/jwt');

‎client/capability-token-incoming/capability-token.3.x.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ app.get('/token', (req, res) => {
1313
accountSid: accountSid,
1414
authToken: authToken,
1515
});
16-
capability.addScope(new ClientCapability.IncomingClientScope('jenny'));
16+
capability.addScope(new ClientCapability.IncomingClientScope('joey'));
1717
const token = capability.toJwt();
1818

1919
res.set('Content-Type', 'application/jwt');

‎client/capability-token-incoming/capability-token.4.x.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public ActionResult Index()
1414
string authToken = "your_auth_token";
1515

1616
var capability = new TwilioCapability(accountSid, authToken);
17-
capability.AllowClientIncoming("jenny");
17+
capability.AllowClientIncoming("joey");
1818
string token = capability.GenerateToken();
1919

2020
return Content(token, "application/jwt");

‎client/capability-token-incoming/capability-token.4.x.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
$authToken = 'your_auth_token';
77

88
$capability = new Services_Twilio_Capability($accountSid, $authToken);
9-
$capability->allowClientIncoming("jenny");
9+
$capability->allowClientIncoming("joey");
1010
$token = $capability->generateToken();
1111

1212
echo $token;

‎client/capability-token-incoming/capability-token.4.x.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
account_sid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
66
auth_token = 'your_auth_token'
77
capability = Twilio::Util::Capability.new account_sid, auth_token
8-
capability.allow_client_incoming 'jenny'
8+
capability.allow_client_incoming 'joey'
99
token = capability.generate
1010

1111
content_type 'application/jwt'

‎client/capability-token-incoming/capability-token.5.x.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public ActionResult Index()
1717

1818
var scopes = new HashSet<IScope>
1919
{
20-
new IncomingClientScope("jenny")
20+
new IncomingClientScope("joey")
2121
};
2222
var capability = new ClientCapability(accountSid, authToken, scopes: scopes);
2323

‎client/capability-token-incoming/capability-token.5.x.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
$authToken = 'your_auth_token';
99

1010
$capability = new ClientToken($accountSid, $authToken);
11-
$capability->allowClientIncoming("jenny");
11+
$capability->allowClientIncoming("joey");
1212
$token = $capability->generateToken();
1313

1414
echo $token;

‎client/capability-token-incoming/capability-token.5.x.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def get_capability_token():
1414

1515
capability = TwilioCapability(account_sid, auth_token)
1616

17-
capability.allow_client_incoming("jenny")
17+
capability.allow_client_incoming("joey")
1818
token = capability.generate()
1919

2020
return Response(token, mimetype='application/jwt')

‎client/capability-token-incoming/capability-token.5.x.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
auth_token = 'your_auth_token'
77
capability = Twilio::JWT::Capability.new(account_sid, auth_token)
88

9-
capability.allow_client_incoming('jenny')
9+
capability.allow_client_incoming('joey')
1010
token = capability.generate
1111

1212
content_type 'application/jwt'

‎client/capability-token-incoming/capability-token.6.x.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class TwilioServlet extends HttpServlet {
1414
public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
1515

1616
TwilioCapability capability = new TwilioCapability(ACCOUNT_SID, AUTH_TOKEN);
17-
capability.allowClientIncoming("jenny");
17+
capability.allowClientIncoming("joey");
1818

1919
String token = capability.generateToken();
2020

‎client/capability-token-incoming/capability-token.6.x.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ def get_capability_token():
1414

1515
capability = ClientCapabilityToken(account_sid, auth_token)
1616

17-
capability.allow_client_incoming("jenny")
18-
token = capability.generate()
17+
capability.allow_client_incoming("joey")
18+
token = capability.to_jwt()
1919

2020
return Response(token, mimetype='application/jwt')
2121

‎client/capability-token-incoming/capability-token.7.x.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class TwilioServlet extends HttpServlet {
1616
public static final String AUTH_TOKEN = "your_auth_token";
1717

1818
public void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
19-
List<Scope> scopes = Lists.newArrayList(new IncomingClientScope("jenny"));
19+
List<Scope> scopes = Lists.newArrayList(new IncomingClientScope("joey"));
2020

2121
ClientCapability capability = new ClientCapability.Builder(ACCOUNT_SID, AUTH_TOKEN)
2222
.scopes(scopes)

‎client/capability-token/capability-token.2.x.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ app.get('/token', (req, res) => {
1414

1515
const capability = new twilio.Capability(accountSid, authToken);
1616
capability.allowClientOutgoing(appSid);
17-
capability.allowClientIncoming('jenny');
17+
capability.allowClientIncoming('joey');
1818
const token = capability.generate();
1919

2020
res.set('Content-Type', 'application/jwt');

‎client/capability-token/capability-token.3.x.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ app.get('/token', (req, res) => {
1919
capability.addScope(
2020
new ClientCapability.OutgoingClientScope({ applicationSid: appSid })
2121
);
22-
capability.addScope(new ClientCapability.IncomingClientScope('jenny'));
22+
capability.addScope(new ClientCapability.IncomingClientScope('joey'));
2323
const token = capability.toJwt();
2424

2525
res.set('Content-Type', 'application/jwt');

‎client/capability-token/capability-token.4.x.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public ActionResult Index()
1818

1919
var capability = new TwilioCapability(accountSid, authToken);
2020
capability.AllowClientOutgoing(appSid);
21-
capability.AllowClientIncoming("jenny");
21+
capability.AllowClientIncoming("joey");
2222
string token = capability.GenerateToken();
2323

2424
return Content(token, "application/jwt");

‎client/capability-token/capability-token.4.x.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
$capability = new Services_Twilio_Capability($accountSid, $authToken);
1010
$capability->allowClientOutgoing($appSid);
11-
$capability->allowClientIncoming('jenny');
11+
$capability->allowClientIncoming('joey');
1212
$token = $capability->generateToken();
1313

1414
echo $token;

‎client/capability-token/capability-token.4.x.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# Create an application sid at
99
# twilio.com/console/phone-numbers/dev-tools/twiml-apps and use it here
1010
capability.allow_client_outgoing 'APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
11-
capability.allow_client_incoming 'jenny'
11+
capability.allow_client_incoming 'joey'
1212
token = capability.generate
1313

1414
content_type 'application/jwt'

‎client/capability-token/capability-token.5.x.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public ActionResult Index()
2020
var scopes = new HashSet<IScope>
2121
{
2222
new OutgoingClientScope(appSid),
23-
new IncomingClientScope("jenny")
23+
new IncomingClientScope("joey")
2424
};
2525
var capability = new ClientCapability(accountSid, authToken, scopes: scopes);
2626

‎client/capability-token/capability-token.5.x.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
$capability = new ClientToken($accountSid, $authToken);
1212
$capability->allowClientOutgoing($appSid);
13-
$capability->allowClientIncoming('jenny');
13+
$capability->allowClientIncoming('joey');
1414
$token = $capability->generateToken();
1515

1616
echo $token;

‎client/capability-token/capability-token.5.x.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def get_capability_token():
1717
# Twilio Application Sid
1818
application_sid = 'APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
1919
capability.allow_client_outgoing(application_sid)
20-
capability.allow_client_incoming('jenny')
20+
capability.allow_client_incoming('joey')
2121
token = capability.generate()
2222

2323
return Response(token, mimetype='application/jwt')

‎client/capability-token/capability-token.5.x.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Create an application sid at
1010
# twilio.com/console/phone-numbers/dev-tools/twiml-apps and use it here
1111
capability.allow_client_outgoing('APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX')
12-
capability.allow_client_incoming('jenny')
12+
capability.allow_client_incoming('joey')
1313
token = capability.generate
1414

1515
content_type 'application/jwt'

‎client/capability-token/capability-token.6.x.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void service(HttpServletRequest request, HttpServletResponse response) th
1717
String applicationSid = "APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
1818
TwilioCapability capability = new TwilioCapability(ACCOUNT_SID, AUTH_TOKEN);
1919
capability.allowClientOutgoing(applicationSid);
20-
capability.allowClientIncoming("jenny");
20+
capability.allowClientIncoming("joey");
2121

2222
String token = capability.generateToken();
2323

‎client/capability-token/capability-token.6.x.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def get_capability_token():
1717
# Twilio Application Sid
1818
application_sid = 'APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
1919
capability.allow_client_outgoing(application_sid)
20-
capability.allow_client_incoming('jenny')
20+
capability.allow_client_incoming('joey')
2121
token = capability.generate()
2222

2323
return Response(token, mimetype='application/jwt')

‎client/capability-token/capability-token.7.x.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void service(HttpServletRequest request, HttpServletResponse response) th
2121
String applicationSid = "APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
2222

2323
OutgoingClientScope outgoingScope = new OutgoingClientScope.Builder(applicationSid).build();
24-
IncomingClientScope incomingScope = new IncomingClientScope("jenny");
24+
IncomingClientScope incomingScope = new IncomingClientScope("joey");
2525

2626
List<Scope> scopes = Lists.newArrayList(outgoingScope, incomingScope);
2727

‎client/connect-call-2/connect-call-2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Connect a call when button clicked
22
document.getElementById('button-call').onclick = function() {
33
// get the phone number to connect the call to
4-
const params = { To: '15558675309' };
4+
const params = { To: '15558675310' };
55

66
console.log('Calling ' + params.To + '...');
77
Twilio.Device.connect(params);

‎client/connect-call-3/connect-call-3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Connect a call when button clicked
22
document.getElementById('button-call').onclick = function() {
33
// get the phone number to connect the call to
4-
const params = { To: 'jenny' };
4+
const params = { To: 'joey' };
55

66
console.log('Calling ' + params.To + '...');
77
Twilio.Device.connect(params);

‎client/response-twiml-client/output/response-twiml-client.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Response>
3-
<Dial callerId="+15017250604">
4-
<Client>jenny</Client>
3+
<Dial callerId="+15017122661">
4+
<Client>joey</Client>
55
</Dial>
6-
</Response>
6+
</Response>

‎client/response-twiml-client/response-twiml-client.2.x.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ app.post('/voice', (req, res) => {
1111
const twiml = new twilio.TwimlResponse();
1212

1313
if (req.body.To) {
14-
twiml.dial({ callerId: '+15017250604' }, function() {
14+
twiml.dial({ callerId: '+15017122661' }, function() {
1515
// wrap the phone number or client name in the appropriate TwiML verb
1616
// by checking if the number given has only digits and format symbols
1717
if (/^[\d\+\-\(\) ]+$/.test(req.body.To)) {

‎client/response-twiml-client/response-twiml-client.3.x.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ app.post('/voice', (req, res) => {
1111
const twiml = new VoiceResponse();
1212

1313
if (req.body.To) {
14-
const dial = twiml.dial({ callerId: '+15017250604' });
14+
const dial = twiml.dial({ callerId: '+15017122661' });
1515
// wrap the phone number or client name in the appropriate TwiML verb
1616
// by checking if the number given has only digits and format symbols
1717
if (/^[\d\+\-\(\) ]+$/.test(req.body.To)) {

0 commit comments

Comments
 (0)