fix: handle missing accountcode for external calls (#19)

Author: edospadoni

lib/plugins_command_13/confBridgeList.js

@@ -48,6 +48,15 @@ var IDLOG = '[confBridgeList]';
      */
     var list = {};
 
+    /**
+     * Asterisk phone code used to start a ConfBridge conference.
+     *
+     * @property CONFBRIDGE_CONF_CODE
+     * @type {string}
+     * @private
+     */
+    var CONFBRIDGE_CONF_CODE;
+
     /**
      * Command plugin to list ConfBridge users.
      *
@@ -73,10 +82,12 @@ var IDLOG = '[confBridgeList]';
        */
       execute: function (am, args, cb) {
         try {
+          CONFBRIDGE_CONF_CODE = args.confBridgeConfCode;
+
           // action for asterisk
           var act = {
             Action: 'ConfBridgeList',
-            Conference: args.confBridgeConfCode + args.confId
+            Conference: CONFBRIDGE_CONF_CODE + args.confId
           };
 
           // set the action identifier
@@ -105,6 +116,7 @@ var IDLOG = '[confBridgeList]';
         try {
           // store new member object
           if (data.event === 'ConfbridgeList') {
+            var extenOwner = data.conference.substring(CONFBRIDGE_CONF_CODE.length, data.conference.length);
             var obj = {
               conference: data.conference,
               userNumber: data.usernumber,
@@ -118,7 +130,7 @@ var IDLOG = '[confBridgeList]';
               muted: data.muted,
               talking: data.talking
             };
-            list[`${data.accountcode}-${data.calleridnum}`] = obj;
+            list[`${extenOwner}-${data.calleridnum}`] = obj;
 
           } else if (map[data.actionid] && data.event === 'ConfbridgeListComplete') {
             map[data.actionid](null, list);

lib/plugins_command_13/listConfBridgeConf.js

@@ -149,7 +149,6 @@ var IDLOG = '[listConfBridgeConf]';
           } else if (map[data.actionid] &&
             data.channel &&
             data.conference &&
-            data.accountcode &&
             data.calleridnum &&
             data.calleridname &&
             data.muted &&
@@ -170,7 +169,7 @@ var IDLOG = '[listConfBridgeConf]';
 
             var extenOwner = data.conference.substring(CONFBRIDGE_CONF_CODE.length, data.conference.length);
             var userObj = {
-              id: `${data.accountcode}-${data.calleridnum}`,
+              id: `${extenOwner}-${data.calleridnum}`,
               name: data.calleridname === '<no name>' ? undefined : data.calleridname,
               site: remoteSite,
               muted: data.muted.toLowerCase() === 'no' ? false : true,

lib/plugins_event_13/confbridgejoin.js

@@ -66,7 +66,7 @@ var astProxy;
             astProxy.proxyLogic.evtAddConfBridgeUserConf({
               name: data.calleridname,
               confId: extOwnerId,
-              userId: `${data.accountcode}-${data.calleridnum}`,
+              userId: `${extOwnerId}-${data.calleridnum}`,
               extenId: data.calleridnum
             });
 

lib/plugins_event_13/confbridgeleave.js

@@ -55,7 +55,6 @@ var astProxy;
       data: function (data) {
         try {
           if (data.conference &&
-            data.accountcode &&
             data.calleridnum &&
             data.calleridname &&
             data.event === 'ConfbridgeLeave') {
@@ -66,7 +65,7 @@ var astProxy;
             var extOwnerId = data.conference.substring(CONFBRIDGE_CONF_CODE.length, data.conference.length);
             astProxy.proxyLogic.evtRemoveConfBridgeUserConf({
               confId: extOwnerId,
-              userId: `${data.accountcode}-${data.calleridnum}`,
+              userId: `${extOwnerId}-${data.calleridnum}`,
               extenId: data.calleridnum
             });
 

lib/plugins_event_13/confbridgemute.js

@@ -56,7 +56,6 @@ var astProxy;
         try {
           if (data.status &&
             data.conference &&
-            data.accountcode &&
             data.event === 'ConfbridgeMute') {
 
             logger.info(IDLOG, 'received event ' + data.event);
@@ -66,7 +65,7 @@ var astProxy;
             astProxy.proxyLogic.evtConfBridgeUserMute({
               mute: data.status === 'on' ? true : false,
               confId: extOwnerId,
-              userId: `${data.accountcode}-${data.calleridnum}`
+              userId: `${extOwnerId}-${data.calleridnum}`
             });
 
           } else {