File tree Expand file tree Collapse file tree 2 files changed +5
-18
lines changed
Expand file tree Collapse file tree 2 files changed +5
-18
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,8 @@ const { TwilioCliError } = require('@twilio/cli-core').services.error;
33const Twilio = require ( 'twilio' ) ;
44const createToken = require ( '../../helpers/accessToken.js' ) ;
55const globalFlags = require ( '../../helpers/globalFlags.js' ) ;
6- const { taskrouterFlags, validateWorkerSid, validateWorkspaceSid } = require ( '../../helpers/taskrouterGlobals.js' ) ;
6+ const { taskrouterFlags } = require ( '../../helpers/taskrouterGlobals.js' ) ;
7+ const { validateSid } = require ( '../../helpers/validation-helpers.js' ) ;
78
89class FlexTokenGenerator extends TwilioClientCommand {
910 constructor ( argv , config ) {
@@ -19,14 +20,14 @@ class FlexTokenGenerator extends TwilioClientCommand {
1920 const workspaceSid = await this . flags [ 'workspace-sid' ] ;
2021 const accessToken = createToken . call ( this ) ;
2122
22- if ( ! validateWorkerSid ( workerSid ) ) {
23+ if ( ! validateSid ( 'WK' , workerSid ) ) {
2324 this . logger . error (
2425 'Invalid Worker SID, must look like WKxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
2526 ) ;
2627 process . exit ( 1 ) ;
2728 }
2829
29- if ( ! validateWorkspaceSid ( workspaceSid ) ) {
30+ if ( ! validateSid ( 'WS' , workspaceSid ) ) {
3031 this . logger . error (
3132 'Invalid Workspace SID, must look like WSxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
3233 ) ;
Original file line number Diff line number Diff line change @@ -11,18 +11,4 @@ const taskrouterFlags = {
1111 } )
1212}
1313
14- const validateWorkerSid = function ( sid ) {
15- return (
16- sid . startsWith ( 'WK' ) &&
17- sid . length === 34
18- ) ;
19- }
20-
21- const validateWorkspaceSid = function ( sid ) {
22- return (
23- sid . startsWith ( 'WS' ) &&
24- sid . length === 34
25- ) ;
26- }
27-
28- module . exports = { taskrouterFlags, validateWorkerSid, validateWorkspaceSid } ;
14+ module . exports = { taskrouterFlags } ;
You can’t perform that action at this time.
0 commit comments