Code Exchange upgrade

.dockerignore

@@ -0,0 +1,5 @@
+bin/
+build/
+*.db
+*.sqlite
+.env

.env.example

@@ -1,4 +1,16 @@
-export TWILIO_ACCOUNT_SID=
-export TWILIO_AUTH_TOKEN=
-export TWILIO_TWIML_APP_SID=
-export TWILIO_CALLER_ID=
+export TWILIO_ACCOUNT_SID=ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+export TWILIO_CALLER_ID=+1XXXYYYZZZZ
+
+# SID of your TwiML Application
+# https://www.twilio.com/console/voice/twiml/apps
+# OR
+# twilio api:core:applications:create --friendly-name=voice-client-javascript
+export TWILIO_TWIML_APP_SID=APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+# Your REST API Key information
+# https://www.twilio.com/console/project/api-keys
+# OR
+# twilio api:core:keys:create --friendly-name=voice-client-javascript -o json
+# NOTE: Make sure to copy the secret, it'll will only be displayed once
+export API_KEY=SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+export API_SECRET=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

.env.example.ps1

@@ -1,16 +1,18 @@
 $Env:TWILIO_ACCOUNT_SID = "ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-$Env:TWILIO_AUTH_TOKEN = "your_auth_token"
 $Env:TWILIO_TWIML_APP_SID = "APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
 $Env:TWILIO_CALLER_ID = "+1XXXYYYZZZZ"
+$Env:API_KEY = "SKXXXXXXXXXXXX"
+$Env:API_SECRET = "XXXXXXXXXXXXXXXX"
 
 # Uncomment the following if you'd like the environment variables
 # to be permanently set on your user account for this machine.
 
 <#
 
 [Environment]::SetEnvironmentVariable("TWILIO_ACCOUNT_SID", $Env:TWILIO_ACCOUNT_SID, "User")
-[Environment]::SetEnvironmentVariable("TWILIO_AUTH_TOKEN", $Env:TWILIO_AUTH_TOKEN, "User")
 [Environment]::SetEnvironmentVariable("TWILIO_TWIML_APP_SID", $Env:TWILIO_TWIML_APP_SID, "User")
 [Environment]::SetEnvironmentVariable("TWILIO_CALLER_ID", $Env:TWILIO_CALLER_ID, "User")
+[Environment]::SetEnvironmentVariable("API_KEY", $Env:API_KEY, "User")
+[Environment]::SetEnvironmentVariable("API_SECRET", $Env:API_SECRET, "User")
 
 #>

.github/workflows/maven.yml

@@ -0,0 +1,36 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java
+
+on:
+  push:
+    branches: [ master, next ]
+  pull_request:
+    branches: [ master, next ]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.platform }}
+    strategy:
+      max-parallel: 3
+      matrix:
+        platform: [windows-latest, macos-latest, ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11.0
+    - name: Build with Maven
+      run: mvn compile
+    - name: Test
+      run: mvn clean test
+      env:
+        TWILIO_ACCOUNT_SID: ACXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        TWILIO_CALLER_ID: +1XXXYYYZZZZ
+        TWILIO_TWIML_APP_SID: APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        API_KEY: SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        API_SECRET: XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

.gitignore

@@ -12,6 +12,7 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
+.vscode
 
 *.pydevproject
 .metadata

.java-version

@@ -0,0 +1 @@
+11.0

.mergify.yml

@@ -0,0 +1,10 @@
+pull_request_rules:
+  - name: automatic merge for Dependabot pull requests
+    conditions:
+      - author=dependabot-preview[bot]
+      - status-success=build (macos-latest)
+      - status-success=build (windows-latest)
+      - status-success=build (ubuntu-latest)
+    actions:
+      merge:
+        method: squash

CODE_OF_CONDUCT.md

@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at open-source@twilio.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -0,0 +1,3 @@
+# Contributing to Twilio
+
+All third party contributors acknowledge that any contributions they provide will be made under the same open source license that the open source project is provided under.

Dockerfile

@@ -0,0 +1,23 @@
+FROM maven:3-openjdk-11
+
+WORKDIR /usr/app/
+
+RUN apt-get update && \
+  apt-get upgrade -y && \
+  apt-get install -y build-essential
+
+COPY . .
+
+# No need to update these values, only at docker-compose.yml
+# If the application can't read those values, you can try update them here as well
+ENV TWILIO_ACCOUNT_SID=your_account_sid
+ENV TWILIO_CALLER_ID=+1XXXYYYZZZZ
+ENV TWILIO_TWIML_APP_SID=APXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ENV API_KEY=SKXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+ENV API_SECRET=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+
+RUN make install
+
+EXPOSE 8080
+
+CMD ["make", "serve"]

LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2015 Twilio Inc.
+MIT License
+
+Copyright (c) 2020 Twilio Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -7,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -0,0 +1,5 @@
+install:
+	mvn package
+
+serve:
+	java -jar target/client-quickstart-1.0-SNAPSHOT.jar