Merge branch 'master' into python-mqtt-quickstart-fix

Author: po5i

.gitignore

@@ -46,6 +46,7 @@ node_modules
 nbactions.xml
 *.class
 *.sw[op]
+.vscode
 
 # Testing
 /.env
@@ -55,6 +56,7 @@ testable_snippets/
 /composer.json
 /composer.lock
 /tools/dependencies/
+migrate.ps1
 
 # Custom Ruby Gems
 Gemfile*

README.md

@@ -19,8 +19,8 @@
    In the case of phone numbers, the following should be used:
 
    ```
-   Destination Phone Number: +15558675309
-   From/Twilio Number: +15017250604
+   Destination Phone Number: +15558675310
+   From/Twilio Number: +15017122661
    ```
 
    For auth_token:
@@ -60,14 +60,14 @@
    ```
    rest/
    |-- resource-example/
-       |-- snippet-example-1/
+       └── snippet-example-1/
            |-- output/
-           |   |-- snippet-example-1.json
+           |   └── snippet-example-1.json
            |-- snippet-example-1.7.x.java
            |-- snippet-example-1.<sdk-version>.x.<language>
            |-- snippet-example-1.json.curl
            |-- snippet-example-1.xml.curl
-           |-- meta.json
+           └── meta.json
    ```
 
    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.
 
 1. Install Python and PIP.
 
-   On Linux:
+   - On Linux:
    ```bash
    sudo apt-get install python-pip python2.7-dev build-essential \
    sudo pip install --upgrade pip
    ```
 
-   On OSX:
+   - On OSX:
 
    ```bash
    brew install python
@@ -205,15 +205,15 @@ Make sure you have the following dependencies installed on your system.
 
 1. Install PHP 5 with CURL.
 
-   On Linux:
+   - On Linux:
 
    ```bash
    sudo add-apt-repository ppa:ondrej/php -y
    sudo apt-get update
    sudo apt-get install -y --force-yes php5.6
    ```
 
-   On OSX:
+   - On OSX:
 
    ```bash
    brew install php56
@@ -235,15 +235,15 @@ Make sure you have the following dependencies installed on your system.
 
 1. Install MonoDevelop.
 
-   On Linux (http://www.mono-project.com/docs/getting-started/install/linux/#usage):
+   - On Linux (http://www.mono-project.com/docs/getting-started/install/linux/#usage):
    ```bash
    sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
    echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list \
    sudo apt-get update \
    sudo apt-get install mono-complete -y
    ```
 
-   On OSX:
+   - On OSX:
    ```bash
    brew install mono
    ```
@@ -294,14 +294,14 @@ the wrong user.
 
 1. Make your system trust the fake server's self signed certificate.
 
-   On Linux:
+   - On Linux:
    ```bash
    sudo apt-get install ca-certificates \
    sudo cp twilio-api-faker/keystore/twilio_fake.pem /usr/local/share/ca-certificates/twilio_fake.crt \
    sudo update-ca-certificates
    ```
 
-   On OSX:
+   - On OSX:
    Use the system's keychain to trust the provided certificate in the `keystore`
    directory of the fake-api repo. Go [here](https://support.apple.com/kb/PH18677?locale=en_US)
    for more information.

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

@@ -22,7 +22,7 @@ public static void main(String[] args) {
         }};
 
         PhoneNumber number = PhoneNumber
-                .fetcher(new com.twilio.type.PhoneNumber("+15108675309"))
+                .fetcher(new com.twilio.type.PhoneNumber("+15108675310"))
                 .setAddOns(addOns)
                 .setAddOnsData(addOnsData)
                 .fetch();

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

@@ -1,3 +1,5 @@
-from twilio import capability
+from twilio.jwt.client import ClientCapabilityToken
 
-token = capability.generate(expires=600)
+account_sid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
+auth_token = 'your_auth_token'
+token = ClientCapabilityToken(account_sid, auth_token).to_jwt(ttl=600)

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

@@ -10,7 +10,7 @@ app.get('/token', (req, res) => {
   const authToken = 'your_auth_token';
 
   const capability = new twilio.Capability(accountSid, authToken);
-  capability.allowClientIncoming('jenny');
+  capability.allowClientIncoming('joey');
   const token = capability.generate();
 
   res.set('Content-Type', 'application/jwt');

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

@@ -13,7 +13,7 @@ app.get('/token', (req, res) => {
     accountSid: accountSid,
     authToken: authToken,
   });
-  capability.addScope(new ClientCapability.IncomingClientScope('jenny'));
+  capability.addScope(new ClientCapability.IncomingClientScope('joey'));
   const token = capability.toJwt();
 
   res.set('Content-Type', 'application/jwt');

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

@@ -14,7 +14,7 @@ public ActionResult Index()
     string authToken = "your_auth_token";
 
     var capability = new TwilioCapability(accountSid, authToken);
-    capability.AllowClientIncoming("jenny");
+    capability.AllowClientIncoming("joey");
     string token = capability.GenerateToken();
 
     return Content(token, "application/jwt");

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

@@ -6,7 +6,7 @@
 $authToken  = 'your_auth_token';
 
 $capability = new Services_Twilio_Capability($accountSid, $authToken);
-$capability->allowClientIncoming("jenny");
+$capability->allowClientIncoming("joey");
 $token = $capability->generateToken();
 
 echo $token;

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

@@ -5,7 +5,7 @@
   account_sid = 'ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
   auth_token = 'your_auth_token'
   capability = Twilio::Util::Capability.new account_sid, auth_token
-  capability.allow_client_incoming 'jenny'
+  capability.allow_client_incoming 'joey'
   token = capability.generate
 
   content_type 'application/jwt'

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

@@ -17,7 +17,7 @@ public ActionResult Index()
 
         var scopes = new HashSet<IScope>
         {
-            new IncomingClientScope("jenny")
+            new IncomingClientScope("joey")
         };
         var capability = new ClientCapability(accountSid, authToken, scopes: scopes);