Update remaining tokens

Author: micaswyers-work

src/commands/token/capability/client.js

@@ -1,7 +1,8 @@
 const { TwilioClientCommand } = require('@twilio/cli-core').baseCommands;
 const ClientCapability = require('twilio').jwt.ClientCapability;
 const globalFlags = require('../../../helpers/globalFlags.js');
-const { voiceFlags, validateTwimlAppSid } = require('../../../helpers/voiceGlobals.js');
+const { voiceFlags } = require('../../../helpers/voiceGlobals.js');
+const { validateSid } = require('../../../helpers/validation-helpers.js');
 
 class ClientCapabilityTokenGenerator extends TwilioClientCommand {
   constructor(argv, config) {
@@ -13,27 +14,29 @@ class ClientCapabilityTokenGenerator extends TwilioClientCommand {
   async run() {
     await super.run();
 
-    let ttl = this.flags['ttl'];
+    const voiceAppSid = await this.flags['voice-app-sid'];
+    const ttl = await this.flags['ttl'];
+    const incomingAllow = await this.flags['allow-incoming'];
+    const identity = await this.flags['identity'];
     const capability = new ClientCapability({
       accountSid: this.twilioClient.accountSid,
       authToken: this.twilioClient.password,
       ttl
     });
 
-    if (!validateTwimlAppSid(this.flags['voice-app-sid'])) {
+    if (!validateSid('AP', voiceAppSid)) {
       this.logger.error(
         'Invalid TwiML Application SID, must look like APxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
       );
       process.exit(1);
     }
 
     capability.addScope(new ClientCapability.OutgoingClientScope({
-      applicationSid: this.flags['voice-app-sid']
+      applicationSid: voiceAppSid
     }));
 
-    let incomingAllow = (this.flags['allow-incoming'] == 'true');
     if (incomingAllow) {
-      capability.addScope(new ClientCapability.IncomingClientScope(this.flags['identity']))
+      capability.addScope(new ClientCapability.IncomingClientScope(identity))
     }
 
     this.logger.info('Copy/paste this voice token into your test application:');

src/commands/token/capability/worker.js

@@ -1,6 +1,7 @@
 const { TwilioClientCommand } = require('@twilio/cli-core').baseCommands;
 const globalFlags = require('../../../helpers/globalFlags.js');
-const { taskrouterFlags, validateWorkerSid, validateWorkspaceSid } = require('../../../helpers/taskrouterGlobals.js');
+const { taskrouterFlags } = require('../../../helpers/taskrouterGlobals.js');
+const { validateSid } = require('../../../helpers/validation-helpers.js');
 const taskrouter = require('twilio').jwt.taskrouter;
 const util = taskrouter.util;
 const TaskRouterCapability = taskrouter.TaskRouterCapability;
@@ -16,17 +17,20 @@ class WorkerCapabilityTokenGenerator extends TwilioClientCommand {
   async run() {
     await super.run();
 
+    const workerSid = await this.flags['worker-sid'];
+    const workspaceSid = await this.flags['workspace-sid'];
+    let ttl = await this.flags['ttl'];
     const TASKROUTER_BASE_URL = 'https://taskrouter.twilio.com';
     const version = 'v1';
 
-    if (!validateWorkerSid(this.flags['worker-sid'])) {
+    if (!validateSid('WK', workerSid)) {
       this.logger.error(
         'Invalid Worker SID, must look like WKxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
       );
       process.exit(1);
     }
 
-    if (!validateWorkspaceSid(this.flags['workspace-sid'])) {
+    if (!validateWorkspaceSid('WS', workspaceSid)) {
       this.logger.error(
         'Invalid Workspace SID, must look like WSxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
       );
@@ -35,10 +39,7 @@ class WorkerCapabilityTokenGenerator extends TwilioClientCommand {
 
     const accountSid = this.twilioClient.accountSid;
     const authToken = this.twilioClient.password;
-    const workspaceSid = this.flags['workspace-sid'];
-    const workerSid = this.flags['worker-sid'];
 
-    let ttl = this.flags['ttl'];
     const capability = new TaskRouterCapability({
       accountSid,
       authToken,