Merge pull request #11 from twilio-labs/remove-join-conference-controller

Removed joinConference controller

Author: cweems

src/@types/types.ts

@@ -32,12 +32,6 @@ export interface ConversationParticipant {
   'messagingBinding.proxyAddress': string;
 }
 
-export interface JoinConferenceParams extends Request {
-  params: {
-    conferenceName: string
-  }
-}
-
 export interface ParticipantToDial {
   address: string,
   proxyAddress: string

src/controllers/index.ts

@@ -1,4 +1,3 @@
 export * as conversationsPostEvent from './conversationsPostEvent'
 export * as inboundCall from './inboundCall'
 export * as session from './session'
-export * as joinConference from './joinConference'

src/controllers/joinConference.ts

@@ -12,7 +12,6 @@ const router = Router()
 router.post('/conversations-post-event', twilio.webhook(webhookConfig), controllers.conversationsPostEvent.post)
 
 router.post('/inbound-call', twilio.webhook(webhookConfig), controllers.inboundCall.post)
-router.post('/join-conference', twilio.webhook(webhookConfig), controllers.joinConference.get)
 
 router.post('/sessions', basicAuth({
   users: { [AUTH_USERNAME]: AUTH_PASSWORD }

src/routes/index.ts

@@ -8,6 +8,14 @@ import {
   generateConferenceName
 } from '../utils/'
 
+export function joinConferenceTwiml (conferenceName: string) : VoiceResponse {
+  const response = new VoiceResponse()
+  const dial = response.dial()
+  dial.conference(`${decodeURIComponent(conferenceName)}`)
+
+  return response
+}
+
 export const generateTwiml = async (from: string, to: string) => {
   const response = new VoiceResponse()
 
@@ -35,9 +43,9 @@ export const generateTwiml = async (from: string, to: string) => {
         console.log(`Dialing ${pa.address} from ${pa.proxyAddress}...`)
 
         return client.calls.create({
-          url: `https://${process.env.DOMAIN}/join-conference?conferenceName=${encodeURIComponent(conferenceName)}`,
           to: pa.address,
-          from: pa.proxyAddress
+          from: pa.proxyAddress,
+          twiml: joinConferenceTwiml(conferenceName).toString()
         })
       })
 

src/services/inboundCall.service.ts

@@ -1,3 +1,3 @@
 export const generateConferenceName = (phoneNumber: string) : string => {
-  return encodeURIComponent(`${phoneNumber}_at_${Date.now()}`)
+  return `${phoneNumber}_at_${Date.now()}`
 }

src/utils/generateConferenceName.util.ts

@@ -7,7 +7,7 @@ import { Mock } from 'moq.ts'
 import { app } from '../../src/app/app'
 
 describe('sessions controller', () => {
-  jest.setTimeout(3600000)
+  jest.setTimeout(60000)
 
   // Test parameters
   const requestedPhoneNumbers = ['+1001', '+1002']

tests/controllers/session.test.ts

@@ -80,15 +80,15 @@ describe('inbound call service', () => {
       expect.objectContaining({
         to: '+1112223333',
         from: '+2223334444',
-        url: 'https://testdomain.com/join-conference?conferenceName=test_conference'
+        twiml: '<?xml version="1.0" encoding="UTF-8"?><Response><Dial><Conference>test_conference</Conference></Dial></Response>'
       })
     )
 
     expect(createSpy).toHaveBeenNthCalledWith(2,
       expect.objectContaining({
         to: '+3334445555',
         from: '+4445556666',
-        url: 'https://testdomain.com/join-conference?conferenceName=test_conference'
+        twiml: '<?xml version="1.0" encoding="UTF-8"?><Response><Dial><Conference>test_conference</Conference></Dial></Response>'
       })
     )
   })

tests/services/inboundCall.test.ts

@@ -5,6 +5,6 @@ describe('generateConferenceName', () => {
     Date.now = jest.fn(() => 1234567890)
 
     const result = generateConferenceName('+1234567890')
-    expect(result).toBe('%2B1234567890_at_1234567890')
+    expect(result).toBe('+1234567890_at_1234567890')
   })
 })