use one token for all SDKs

nash-md · Mar 10, 2020 · d9cb5c8 · d9cb5c8
1 parent 10630fe
commit d9cb5c8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 36 deletions.
diff --git a/controllers/agents.js b/controllers/agents.js
@@ -8,7 +8,6 @@ const client = twilio(
 )
 
 const taskrouterHelper = require('./helpers/taskrouter-helper.js')
-const clientHelper = require('./helpers/client-helper.js')
 
 module.exports.login = function (req, res) {
 	const friendlyName = req.body.worker.friendlyName
@@ -56,11 +55,6 @@ var createWorkerTokens = function (configuration, worker, endpoint) {
 		worker.sid
 	)
 
-	/* create a token for Twilio TaskRouter */
-	const clientAccessToken = clientHelper.createAccessToken(
-		worker.friendlyName, configuration.twilio.applicationSid, lifetime
-	)
-
 	const accessToken = new AccessToken(
 		process.env.TWILIO_ACCOUNT_SID,
 		process.env.TWILIO_API_KEY_SID,
@@ -79,13 +73,19 @@ var createWorkerTokens = function (configuration, worker, endpoint) {
 	/* grant the access token Twilio Video capabilities */
 	const videoGrant = new AccessToken.VideoGrant()
 
+	/* grant the token Twilio Client capabilities */
+	const clientGrant = new AccessToken.VoiceGrant({
+		incomingAllow: true,
+		outgoingApplicationSid: configuration.twilio.applicationSid
+	})
+
 	accessToken.addGrant(chatGrant)
 	accessToken.addGrant(videoGrant)
+	accessToken.addGrant(clientGrant)
 
 	return {
 		worker: workerCapability.toJwt(),
-		access: accessToken.toJwt(),
-		voice: clientAccessToken.toJwt()
+		access: accessToken.toJwt()
 	}
 }
 

diff --git a/controllers/helpers/client-helper.js b/controllers/helpers/client-helper.js
diff --git a/public/administration/AdministrationController.js b/public/administration/AdministrationController.js
@@ -98,7 +98,7 @@ function AdministrationController ($scope, $http, $log, $q) {
 
 		/* create attributes which are used for TaskRouter routing */
 		let attributes = {
-			contact_uri: 'client:' + $scope.agent.friendlyName.toLowerCase(),
+			contact_uri: 'client:' + $scope.agent.friendlyName,
 			channels: $scope.agent.channels,
 			team: $scope.agent.team
 		};

diff --git a/public/callcenter/WorkflowController.js b/public/callcenter/WorkflowController.js
@@ -38,7 +38,7 @@ app.controller('WorkflowController', function ($scope, $rootScope, $http, $inter
 				$scope.initWorker(response.data.tokens.worker);
 
 				/* initialize Twilio client with token received from the backend */
-				$scope.$broadcast('InitializePhone', { token: response.data.tokens.voice });
+				$scope.$broadcast('InitializePhone', { token: response.data.tokens.access });
 
 				/* initialize Twilio Chat client with token received from the backend */
 				$scope.$broadcast('InitializeChat', { token: response.data.tokens.access, identity: response.data.worker.friendlyName });