From 03f3b8f3b3a6df3fbcf7564f9c64238b69dd6745 Mon Sep 17 00:00:00 2001 From: Jean-Roch Maitre Date: Tue, 16 Dec 2014 16:57:42 -0800 Subject: [PATCH] UI-1021: SmartPBX now correctly use self.callApi --- app.js | 23 +- submodules/devices/devices.js | 91 ++----- submodules/myOffice/myOffice.js | 134 +++------- submodules/users/users.js | 418 +++++++++----------------------- views/devices-softphone.html | 6 + 5 files changed, 181 insertions(+), 491 deletions(-) diff --git a/app.js b/app.js index f28064a..42da013 100644 --- a/app.js +++ b/app.js @@ -13,27 +13,8 @@ define(function(require){ 'fr-FR': { customCss: false } }, - requests: { - 'voip.users.getUsers': { - url: 'accounts/{accountId}/users', - verb: 'GET' - }, - 'voip.groups.listGroups': { - url: 'accounts/{accountId}/groups', - verb: 'GET' - }, - 'common.numbers.list': { - url: 'accounts/{accountId}/phone_numbers', - verb: 'GET' - }, - 'voip.devices.listDevices': { - url: 'accounts/{accountId}/devices', - verb: 'GET' - }, - }, - - subscribe: { - }, + requests: {}, + subscribe: {}, subModules: ['devices', 'groups', 'numbers', 'strategy', 'callLogs', 'users', 'myOffice', 'featureCodes'], diff --git a/submodules/devices/devices.js b/submodules/devices/devices.js index d954caa..ff60b73 100644 --- a/submodules/devices/devices.js +++ b/submodules/devices/devices.js @@ -7,52 +7,7 @@ define(function(require){ var app = { - requests: { - /* Classifiers */ - 'voip.devices.listClassifiers': { - url: 'accounts/{accountId}/phone_numbers/classifiers', - verb: 'GET' - }, - /* Numbers */ - 'voip.devices.listNumbers': { - url: 'accounts/{accountId}/phone_numbers', - verb: 'GET' - }, - 'common.e911.getNumber': { - url: 'accounts/{accountId}/phone_numbers/{phoneNumber}', - verb: 'GET' - }, - /* Users */ - 'voip.devices.listUsers': { - url: 'accounts/{accountId}/users', - verb: 'GET' - }, - /* Devices */ - 'voip.devices.getStatus': { - url: 'accounts/{accountId}/devices/status', - verb: 'GET' - }, - 'voip.devices.listDevices': { - url: 'accounts/{accountId}/devices', - verb: 'GET' - }, - 'voip.devices.createDevice': { - url: 'accounts/{accountId}/devices', - verb: 'PUT' - }, - 'voip.devices.getDevice': { - url: 'accounts/{accountId}/devices/{deviceId}', - verb: 'GET' - }, - 'voip.devices.deleteDevice': { - url: 'accounts/{accountId}/devices/{deviceId}', - verb: 'DELETE' - }, - 'voip.devices.updateDevice': { - url: 'accounts/{accountId}/devices/{deviceId}', - verb: 'POST' - } - }, + requests: {}, subscribe: { 'voip.devices.render': 'devicesRender', @@ -210,8 +165,8 @@ define(function(require){ if(type === 'sip_device' && monster.config.api.provisioner) { monster.pub('common.chooseModel.render', { callback: function(dataModel) { - monster.request({ - resource: 'voip.devices.createDevice', + self.callApi({ + resource: 'device.create', data: { accountId: self.accountId, data: dataModel @@ -815,8 +770,8 @@ define(function(require){ devicesDeleteDevice: function(deviceId, callback) { var self = this; - monster.request({ - resource: 'voip.devices.deleteDevice', + self.callApi({ + resource: 'device.delete', data: { accountId: self.accountId, deviceId: deviceId, @@ -831,8 +786,8 @@ define(function(require){ devicesListClassifiers: function(callback) { var self = this; - monster.request({ - resource: 'voip.devices.listClassifiers', + self.callApi({ + resource: 'numbers.listClassifiers', data: { accountId: self.accountId }, @@ -845,8 +800,8 @@ define(function(require){ devicesGetE911Numbers: function(callback) { var self = this; - monster.request({ - resource: 'voip.devices.listNumbers', + self.callApi({ + resource: 'numbers.list', data: { accountId: self.accountId }, @@ -911,8 +866,8 @@ define(function(require){ devicesGetDevice: function(deviceId, callbackSuccess, callbackError) { var self = this; - monster.request({ - resource: 'voip.devices.getDevice', + self.callApi({ + resource: 'device.get', data: { accountId: self.accountId, deviceId: deviceId @@ -940,8 +895,8 @@ define(function(require){ devicesCreateDevice: function(deviceData, callback) { var self = this; - monster.request({ - resource: 'voip.devices.createDevice', + self.callApi({ + resource: 'device.create', data: { accountId: self.accountId, data: deviceData @@ -955,8 +910,8 @@ define(function(require){ devicesUpdateDevice: function(deviceData, callbackSuccess, callbackError) { var self = this; - monster.request({ - resource: 'voip.devices.updateDevice', + self.callApi({ + resource: 'device.update', data: { accountId: self.accountId, data: deviceData, @@ -976,8 +931,8 @@ define(function(require){ monster.parallel({ users: function(callback) { - monster.request({ - resource: 'voip.devices.listUsers', + self.callApi({ + resource: 'user.list', data: { accountId: self.accountId }, @@ -987,8 +942,8 @@ define(function(require){ }); }, status: function(callback) { - monster.request({ - resource: 'voip.devices.getStatus', + self.callApi({ + resource: 'device.getStatus', data: { accountId: self.accountId }, @@ -998,8 +953,8 @@ define(function(require){ }); }, devices: function(callback) { - monster.request({ - resource: 'voip.devices.listDevices', + self.callApi({ + resource: 'device.list', data: { accountId: self.accountId }, @@ -1018,8 +973,8 @@ define(function(require){ devicesGetE911NumberAddress: function(number, callback) { var self = this; - monster.request({ - resource: 'common.e911.getNumber', + self.callApi({ + resource: 'numbers.get', data: { accountId: self.accountId, phoneNumber: encodeURIComponent(number) diff --git a/submodules/myOffice/myOffice.js b/submodules/myOffice/myOffice.js index 4dc2dfe..4c282d7 100644 --- a/submodules/myOffice/myOffice.js +++ b/submodules/myOffice/myOffice.js @@ -5,69 +5,8 @@ define(function(require){ chart = require('chart'); var app = { - requests: { - 'voip.myOffice.getAccount': { - url: 'accounts/{accountId}', - verb: 'GET' - }, - 'voip.myOffice.updateAccount': { - url: 'accounts/{accountId}', - verb: 'POST' - }, - 'voip.myOffice.listUsers': { - url: 'accounts/{accountId}/users', - verb: 'GET' - }, - 'voip.myOffice.listDevices': { - url: 'accounts/{accountId}/devices', - verb: 'GET' - }, - 'voip.myOffice.getDevicesStatus': { - url: 'accounts/{accountId}/devices/status', - verb: 'GET' - }, - 'voip.myOffice.listNumbers': { - url: 'accounts/{accountId}/phone_numbers', - verb: 'GET' - }, - 'voip.myOffice.getNumber': { - url: 'accounts/{accountId}/phone_numbers/{phoneNumber}', - verb: 'GET' - }, - 'voip.myOffice.updateNumber': { - url: 'accounts/{accountId}/phone_numbers/{phoneNumber}', - verb: 'POST' - }, - 'voip.myOffice.listDirectories': { - url: 'accounts/{accountId}/directories', - verb: 'GET' - }, - 'voip.myOffice.listChannels': { - url: 'accounts/{accountId}/channels', - verb: 'GET' - }, - 'voip.myOffice.listTypedCallflows': { - url: 'accounts/{accountId}/callflows?has_value=type', - verb: 'GET' - }, - 'voip.myOffice.listMedia': { - url: 'accounts/{accountId}/media?key_missing=type', - verb: 'GET' - }, - 'voip.myOffice.createMedia': { - url: 'accounts/{accountId}/media', - verb: 'PUT' - }, - 'voip.myOffice.deleteMedia': { - url: 'accounts/{accountId}/media/{mediaId}', - verb: 'DELETE' - }, - 'voip.myOffice.uploadMedia': { - url: 'accounts/{accountId}/media/{mediaId}/raw', - verb: 'POST', - type: 'application/x-base64' - } - }, + + requests: {}, subscribe: { 'voip.myOffice.render': 'myOfficeRender' @@ -176,21 +115,22 @@ define(function(require){ myOfficeLoadData: function(callback) { var self = this; + monster.parallel({ account: function(parallelCallback) { - monster.request({ - resource: 'voip.myOffice.getAccount', + self.callApi({ + resource: 'account.get', data: { accountId: self.accountId }, - success: function(dataUsers) { - parallelCallback && parallelCallback(null, dataUsers.data); + success: function(dataAccount) { + parallelCallback && parallelCallback(null, dataAccount.data); } }); }, users: function(parallelCallback) { - monster.request({ - resource: 'voip.myOffice.listUsers', + self.callApi({ + resource: 'user.list', data: { accountId: self.accountId }, @@ -200,8 +140,8 @@ define(function(require){ }); }, devices: function(parallelCallback) { - monster.request({ - resource: 'voip.myOffice.listDevices', + self.callApi({ + resource: 'device.list', data: { accountId: self.accountId }, @@ -211,8 +151,8 @@ define(function(require){ }); }, devicesStatus: function(parallelCallback) { - monster.request({ - resource: 'voip.myOffice.getDevicesStatus', + self.callApi({ + resource: 'device.getStatus', data: { accountId: self.accountId }, @@ -222,8 +162,8 @@ define(function(require){ }); }, numbers: function(parallelCallback) { - monster.request({ - resource: 'voip.myOffice.listNumbers', + self.callApi({ + resource: 'numbers.list', data: { accountId: self.accountId }, @@ -238,8 +178,8 @@ define(function(require){ }); }, channels: function(parallelCallback) { - monster.request({ - resource: 'voip.myOffice.listChannels', + self.callApi({ + resource: 'channel.list', data: { accountId: self.accountId }, @@ -249,9 +189,12 @@ define(function(require){ }); }, callflows: function(parallelCallback) { - monster.request({ - resource: 'voip.myOffice.listTypedCallflows', + self.callApi({ + resource: 'callflow.list', data: { + filters: { + has_type: 'type', + }, accountId: self.accountId }, success: function(data) { @@ -546,7 +489,7 @@ define(function(require){ account = args.account, silenceMediaId = 'silence_stream://300000'; - self.groupsListMedias(function(medias) { + self.myOfficeListMedias(function(medias) { var templateData = { silenceMedia: silenceMediaId, mediaList: medias, @@ -606,8 +549,8 @@ define(function(require){ fileReader = new FileReader(); fileReader.onloadend = function(evt) { - monster.request({ - resource: 'voip.myOffice.createMedia', + self.callApi({ + resource: 'media.create', data: { accountId: self.accountId, data: { @@ -619,8 +562,8 @@ define(function(require){ }, success: function(data, status) { var media = data.data; - monster.request({ - resource: 'voip.myOffice.uploadMedia', + self.callApi({ + resource: 'media.upload', data: { accountId: self.accountId, mediaId: media.id, @@ -630,8 +573,8 @@ define(function(require){ closeUploadDiv(media); }, error: function(data, status) { - monster.request({ - resource: 'voip.myOffice.deleteMedia', + self.callApi({ + resource: 'media.delete', data: { accountId: self.accountId, mediaId: media.id, @@ -841,8 +784,8 @@ define(function(require){ myOfficeGetNumber: function(number, success, error) { var self = this; - monster.request({ - resource: 'voip.myOffice.getNumber', + self.callApi({ + resource: 'numbers.get', data: { accountId: self.accountId, phoneNumber: encodeURIComponent(number) @@ -859,8 +802,8 @@ define(function(require){ myOfficeUpdateNumber: function(numberData, success, error) { var self = this; - monster.request({ - resource: 'voip.myOffice.updateNumber', + self.callApi({ + resource: 'numbers.update', data: { accountId: self.accountId, phoneNumber: encodeURIComponent(numberData.id), @@ -878,10 +821,11 @@ define(function(require){ myOfficeListMedias: function(callback) { var self = this; - monster.request({ - resource: 'voip.myOffice.listMedia', + self.callApi({ + resource: 'media.list', data: { - accountId: self.accountId + accountId: self.accountId, + filters: { 'key_missing':'type' } }, success: function(medias) { callback && callback(medias.data); @@ -894,8 +838,8 @@ define(function(require){ delete account.extra; - monster.request({ - resource: 'voip.myOffice.updateAccount', + self.callApi({ + resource: 'account.update', data: { accountId: self.accountId, data: account diff --git a/submodules/users/users.js b/submodules/users/users.js index 4665426..4c65ff6 100644 --- a/submodules/users/users.js +++ b/submodules/users/users.js @@ -8,177 +8,7 @@ define(function(require){ var app = { - requests: { - /* Users */ - 'voip.users.getUsers': { - url: 'accounts/{accountId}/users', - verb: 'GET' - }, - 'voip.users.updateUser': { - url: 'accounts/{accountId}/users/{userId}', - verb: 'POST' - }, - 'voip.users.createUser': { - url: 'accounts/{accountId}/users', - verb: 'PUT' - }, - 'voip.users.getUser': { - url: 'accounts/{accountId}/users/{userId}', - verb: 'GET' - }, - 'voip.users.deleteUser': { - url: 'accounts/{accountId}/users/{userId}', - verb: 'DELETE' - }, - /* VMBoxes*/ - 'voip.users.listVMBoxes': { - url: 'accounts/{accountId}/vmboxes', - verb: 'GET' - }, - 'voip.users.createVMBox': { - url: 'accounts/{accountId}/vmboxes', - verb: 'PUT' - }, - 'voip.users.getVMBox': { - url: 'accounts/{accountId}/vmboxes/{vmboxId}', - verb: 'GET' - }, - 'voip.users.updateVMBox': { - url: 'accounts/{accountId}/vmboxes/{vmboxId}', - verb: 'POST' - }, - 'voip.users.deleteVMBox': { - url: 'accounts/{accountId}/vmboxes/{vmboxId}', - verb: 'DELETE' - }, - 'voip.users.listUserVMBoxes': { - url: 'accounts/{accountId}/vmboxes?filter_owner_id={userId}', - verb: 'GET' - }, - /* Callflows */ - 'voip.users.getCallflows': { - url: 'accounts/{accountId}/callflows', - verb: 'GET' - }, - 'voip.users.createCallflow': { - url: 'accounts/{accountId}/callflows', - verb: 'PUT' - }, - 'voip.users.listUserCallflows': { - url: 'accounts/{accountId}/callflows?filter_owner_id={userId}', - verb: 'GET' - }, - 'voip.users.getCallflow': { - url: 'accounts/{accountId}/callflows/{callflowId}', - verb: 'GET' - }, - 'voip.users.updateCallflow': { - url: 'accounts/{accountId}/callflows/{callflowId}', - verb: 'POST' - }, - 'voip.users.deleteCallflow': { - url: 'accounts/{accountId}/callflows/{callflowId}', - verb: 'DELETE' - }, - 'voip.users.listConfNumbers': { - url: 'accounts/{accountId}/callflows?filter_type=conference', - verb: 'GET' - }, - /* Devices */ - 'voip.users.listDevices': { - url: 'accounts/{accountId}/devices', - verb: 'GET' - }, - 'voip.users.listUserDevices': { - url: 'accounts/{accountId}/devices?filter_owner_id={userId}', - verb: 'GET' - }, - 'voip.users.getDevice': { - url: 'accounts/{accountId}/devices/{deviceId}', - verb: 'GET' - }, - 'voip.users.updateDevice': { - url: 'accounts/{accountId}/devices/{deviceId}', - verb: 'POST' - }, - 'voip.users.deleteDevice': { - url: 'accounts/{accountId}/devices/{deviceId}', - verb: 'DELETE' - }, - /* Directories */ - 'voip.users.listDirectories': { - url: 'accounts/{accountId}/directories', - verb: 'GET' - }, - 'voip.users.createDirectory': { - url: 'accounts/{accountId}/directories', - verb: 'PUT' - }, - /* Conferences */ - 'voip.users.createConference': { - url: 'accounts/{accountId}/conferences', - verb: 'PUT' - }, - 'voip.users.getConference': { - url: 'accounts/{accountId}/conferences/{conferenceId}', - verb: 'GET' - }, - 'voip.users.updateConference': { - url: 'accounts/{accountId}/conferences/{conferenceId}', - verb: 'POST' - }, - 'voip.users.deleteConference': { - url: 'accounts/{accountId}/conferences/{conferenceId}', - verb: 'DELETE' - }, - 'voip.users.listUserConferences': { - url: 'accounts/{accountId}/conferences?filter_owner_id={userId}', - verb: 'GET' - }, - /* Media */ - 'voip.users.listMedia': { - url: 'accounts/{accountId}/media?key_missing=type', - verb: 'GET' - }, - 'voip.users.createMedia': { - url: 'accounts/{accountId}/media', - verb: 'PUT' - }, - 'voip.users.deleteMedia': { - url: 'accounts/{accountId}/media/{mediaId}', - verb: 'DELETE' - }, - 'voip.users.uploadMedia': { - url: 'accounts/{accountId}/media/{mediaId}/raw', - verb: 'POST', - type: 'application/x-base64' - }, - /* Misc */ - 'voip.users.getNumbers': { - url: 'accounts/{accountId}/phone_numbers', - verb: 'GET' - }, - 'voip.users.resendInstructions': { - apiRoot: 'apps/voip/submodules/users/fixtures/', - url: 'resendInstructions.json', - verb: 'POST' - }, - 'voip.users.resetPassword': { - apiRoot: 'apps/voip/submodules/users/fixtures/', - url: 'resetPassword.json', - verb: 'POST' - } - /*, - 'voip.users.resendInstructions': { - url: 'accounts/{accountId}/users/{userId}/resend_instructions', - verb: 'POST' - }, - 'voip.users.resetPassword': { - url: 'accounts/{accountId}/users/{userId}/reset_password', - verb: 'POST' - }, - */ - }, + requests: {}, subscribe: { 'voip.users.render': 'usersRender' @@ -471,15 +301,8 @@ define(function(require){ renderFindMeFollowMeFeature = function(featureCallback) { monster.parallel({ userDevices: function(callback) { - monster.request({ - resource: 'voip.users.listUserDevices', - data: { - accountId: self.accountId, - userId: currentUser.id - }, - success: function(data) { - callback(null, data.data); - } + self.usersListDeviceUser(currentUser.id, function(devices) { + callback(null, devices); }); }, userCallflow: function(callback) { @@ -746,38 +569,6 @@ define(function(require){ $(this).parents('.item-row').remove(); }); - - /* Events for Users detail */ - template.on('click', '#resend_instructions', function() { - var userId = $(this).parents('.grid-row').data('id'); - - monster.request({ - resource: 'voip.users.resendInstructions', - data: { - accountId: self.accountId, - userId: userId - }, - success: function(data) { - toastr.success(monster.template(self, '!' + toastrMessages.instructionsSent, { email: currentUser.email })); - } - }); - }); - - template.on('click', '#reset_password', function() { - var userId = $(this).parents('.grid-row').data('id'); - - monster.request({ - resource: 'voip.users.resetPassword', - data: { - accountId: self.accountId, - userId: userId - }, - success: function(data) { - toastr.success(monster.template(self, '!' + toastrMessages.passwordReseted, { email: currentUser.email })); - } - }); - }); - template.on('click', '#delete_user', function() { var dataUser = $(this).parents('.grid-row').data(), deleteType = dataUser.priv_level === 'admin' ? 'confirmDeleteAdmin' : 'confirmDeleteUser'; @@ -2318,8 +2109,8 @@ define(function(require){ fileReader = new FileReader(); fileReader.onloadend = function(evt) { - monster.request({ - resource: 'voip.users.createMedia', + self.callApi({ + resource: 'media.create', data: { accountId: self.accountId, data: { @@ -2331,8 +2122,8 @@ define(function(require){ }, success: function(data, status) { var media = data.data; - monster.request({ - resource: 'voip.users.uploadMedia', + self.callApi({ + resource: 'media.upload', data: { accountId: self.accountId, mediaId: media.id, @@ -2342,15 +2133,14 @@ define(function(require){ closeUploadDiv(media); }, error: function(data, status) { - monster.request({ - resource: 'voip.users.deleteMedia', + self.callApi({ + resource: 'media.delete', data: { accountId: self.accountId, mediaId: media.id, data: {} }, success: function(data, status) { - } }); } @@ -2598,8 +2388,8 @@ define(function(require){ usersGetDevicesData: function(callback) { var self = this; - monster.request({ - resource: 'voip.users.listDevices', + self.callApi({ + resource: 'device.list', data: { accountId: self.accountId }, @@ -2631,8 +2421,8 @@ define(function(require){ }); if(callflowId) { - monster.request({ - resource: 'voip.users.getCallflow', + self.callApi({ + resource: 'callflow.get', data: { accountId: self.accountId, callflowId: callflowId @@ -2858,15 +2648,8 @@ define(function(require){ monster.parallel({ devices: function(callback) { - monster.request({ - resource: 'voip.users.listUserDevices', - data: { - accountId: self.accountId, - userId: userId - }, - success: function(data) { - callback(null, data.data); - } + self.usersListDeviceUser(userId, function(devices) { + callback(null, devices); }); }, vmbox: function(callback) { @@ -2921,8 +2704,8 @@ define(function(require){ usersDeleteUser: function(userId, callback) { var self = this; - monster.request({ - resource: 'voip.users.deleteUser', + self.callApi({ + resource: 'user.delete', data: { userId: userId, accountId: self.accountId, @@ -2933,13 +2716,14 @@ define(function(require){ } }); }, + usersDeleteVMBox: function(vmboxId, callback) { var self = this; - monster.request({ - resource: 'voip.users.deleteVMBox', + self.callApi({ + resource: 'voicemail.delete', data: { - vmboxId: vmboxId, + voicemailId: vmboxId, accountId: self.accountId, data: {} }, @@ -2964,8 +2748,8 @@ define(function(require){ usersDeleteDevice: function(deviceId, callback) { var self = this; - monster.request({ - resource: 'voip.users.deleteDevice', + self.callApi({ + resource: 'device.delete', data: { deviceId: deviceId, accountId: self.accountId, @@ -2979,8 +2763,8 @@ define(function(require){ usersDeleteCallflow: function(callflowId, callback) { var self = this; - monster.request({ - resource: 'voip.users.deleteCallflow', + self.callApi({ + resource: 'callflow.delete', data: { callflowId: callflowId, accountId: self.accountId, @@ -2995,8 +2779,8 @@ define(function(require){ usersCreate: function(data, callback) { var self = this; - monster.request({ - resource: 'voip.users.createUser', + self.callApi({ + resource: 'user.create', data: { accountId: self.accountId, data: data.user @@ -3151,8 +2935,8 @@ define(function(require){ usersListDirectories: function(callback) { var self = this; - monster.request({ - resource: 'voip.users.listDirectories', + self.callApi({ + resource: 'directory.list', data: { accountId: self.accountId }, @@ -3172,8 +2956,8 @@ define(function(require){ sort_by: 'last_name' }; - monster.request({ - resource: 'voip.users.createDirectory', + self.callApi({ + resource: 'directory.create', data: { accountId: self.accountId, data: dataDirectory @@ -3187,8 +2971,8 @@ define(function(require){ usersListCallflows: function(callback) { var self = this; - monster.request({ - resource: 'voip.users.getCallflows', + self.callApi({ + resource: 'callflow.list', data: { accountId: self.accountId }, @@ -3201,11 +2985,13 @@ define(function(require){ usersListCallflowsUser: function(userId, callback) { var self = this; - monster.request({ - resource: 'voip.users.listUserCallflows', + self.callApi({ + resource: 'callflow.list', data: { accountId: self.accountId, - userId: userId + filters: { + filter_owner_id: userId + } }, success: function(data) { callback(data.data); @@ -3216,8 +3002,8 @@ define(function(require){ usersListVMBoxes: function(callback) { var self = this; - monster.request({ - resource: 'voip.users.listVMBoxes', + self.callApi({ + resource: 'voicemail.list', data: { accountId: self.accountId }, @@ -3230,11 +3016,13 @@ define(function(require){ usersListVMBoxesUser: function(userId, callback) { var self = this; - monster.request({ - resource: 'voip.users.listUserVMBoxes', + self.callApi({ + resource: 'voicemail.list', data: { accountId: self.accountId, - userId: userId + filters: { + filter_owner_id: userId + } }, success: function(data) { callback(data.data); @@ -3245,11 +3033,11 @@ define(function(require){ usersGetVMBox: function(vmboxId, callback) { var self = this; - monster.request({ - resource: 'voip.users.getVMBox', + self.callApi({ + resource: 'voicemail.get', data: { accountId: self.accountId, - vmboxId: vmboxId + voicemailId: vmboxId }, success: function(data) { callback(data.data); @@ -3260,8 +3048,8 @@ define(function(require){ usersCreateVMBox: function(vmData, callback) { var self = this; - monster.request({ - resource: 'voip.users.createVMBox', + self.callApi({ + resource: 'voicemail.create', data: { accountId: self.accountId, data: vmData @@ -3275,12 +3063,12 @@ define(function(require){ usersUpdateVMBox: function(vmData, callback) { var self = this; - monster.request({ - resource: 'voip.users.updateVMBox', + self.callApi({ + resource: 'voicemail.update', data: { accountId: self.accountId, data: vmData, - vmboxId: vmData.id + voicemailId: vmData.id }, success: function(data) { callback(data.data); @@ -3291,8 +3079,8 @@ define(function(require){ usersGetUser: function(userId, callback) { var self = this; - monster.request({ - resource: 'voip.users.getUser', + self.callApi({ + resource: 'user.get', data: { accountId: self.accountId, userId: userId @@ -3308,8 +3096,8 @@ define(function(require){ userData = self.usersCleanUserData(userData); - monster.request({ - resource: 'voip.users.updateUser', + self.callApi({ + resource: 'user.update', data: { accountId: self.accountId, userId: userData.id, @@ -3359,10 +3147,13 @@ define(function(require){ usersListConfNumbers: function(callback) { var self = this; - monster.request({ - resource: 'voip.users.listConfNumbers', + self.callApi({ + resource: 'callflow.list', data: { - accountId: self.accountId + accountId: self.accountId, + filters: { + filter_type: 'conference' + } }, success: function(data) { var numbers = []; @@ -3383,11 +3174,13 @@ define(function(require){ usersListConferences: function(userId, callback) { var self = this; - monster.request({ - resource: 'voip.users.listUserConferences', + self.callApi({ + resource: 'conference.list', data: { accountId: self.accountId, - userId: userId + filters: { + filter_owner_id: userId + } }, success: function(data) { callback(data.data); @@ -3398,8 +3191,8 @@ define(function(require){ usersGetConference: function(conferenceId, callback) { var self = this; - monster.request({ - resource: 'voip.users.getConference', + self.callApi({ + resource: 'conference.get', data: { accountId: self.accountId, conferenceId: conferenceId @@ -3413,8 +3206,8 @@ define(function(require){ usersUpdateConference: function(conference, callback) { var self = this; - monster.request({ - resource: 'voip.users.updateConference', + self.callApi({ + resource: 'conference.update', data: { accountId: self.accountId, conferenceId: conference.id, @@ -3429,8 +3222,8 @@ define(function(require){ usersCreateConference: function(conference, callback) { var self = this; - monster.request({ - resource: 'voip.users.createConference', + self.callApi({ + resource: 'conference.create', data: { accountId: self.accountId, data: conference @@ -3444,8 +3237,8 @@ define(function(require){ usersDeleteConference: function(conferenceId, callback) { var self = this; - monster.request({ - resource: 'voip.users.deleteConference', + self.callApi({ + resource: 'conference.delete', data: { accountId: self.accountId, conferenceId: conferenceId, @@ -3460,8 +3253,8 @@ define(function(require){ usersGetDevice: function(deviceId, callback) { var self = this; - monster.request({ - resource: 'voip.users.getDevice', + self.callApi({ + resource: 'device.get', data: { accountId: self.accountId, deviceId: deviceId @@ -3475,8 +3268,8 @@ define(function(require){ usersUpdateDevice: function(data, callback) { var self = this; - monster.request({ - resource: 'voip.users.updateDevice', + self.callApi({ + resource: 'device.update', data: { accountId: self.accountId, data: data, @@ -3488,11 +3281,28 @@ define(function(require){ }); }, + usersListDeviceUser: function(userId, callback) { + var self = this; + + self.callApi({ + resource: 'device.list', + data: { + accountId: self.accountId, + filters: { + filter_owner_id: userId + } + }, + success: function(data) { + callback(data.data); + } + }); + }, + usersListMedias: function(callback) { var self = this; - monster.request({ - resource: 'voip.users.listMedia', + self.callApi({ + resource: 'media.list', data: { accountId: self.accountId }, @@ -3507,8 +3317,8 @@ define(function(require){ monster.parallel({ users: function(callback) { - monster.request({ - resource: 'voip.users.getUsers', + self.callApi({ + resource: 'user.list', data: { accountId: self.accountId }, @@ -3523,14 +3333,8 @@ define(function(require){ }); }, devices: function(callback) { - monster.request({ - resource: 'voip.users.listDevices', - data: { - accountId: self.accountId - }, - success: function(dataDevices) { - callback(null, dataDevices.data); - } + self.usersGetDevicesData(function(devices) { + callback(null, devices); }); } }, @@ -3614,8 +3418,8 @@ define(function(require){ if(numbers.length > 0) { if(callflowId) { - monster.request({ - resource: 'voip.users.getCallflow', + self.callApi({ + resource: 'callflow.get', data: { accountId: self.accountId, callflowId: callflowId @@ -3648,8 +3452,8 @@ define(function(require){ usersListNumbers: function(callback) { var self = this; - monster.request({ - resource: 'voip.users.getNumbers', + self.callApi({ + resource: 'numbers.list', data: { accountId: self.accountId }, @@ -3662,8 +3466,8 @@ define(function(require){ usersUpdateCallflow: function(callflow, callback) { var self = this; - monster.request({ - resource: 'voip.users.updateCallflow', + self.callApi({ + resource: 'callflow.update', data: { accountId: self.accountId, callflowId: callflow.id, @@ -3678,8 +3482,8 @@ define(function(require){ usersCreateCallflow: function(callflow, callback) { var self = this; - monster.request({ - resource: 'voip.users.createCallflow', + self.callApi({ + resource: 'callflow.create', data: { accountId: self.accountId, data: callflow diff --git a/views/devices-softphone.html b/views/devices-softphone.html index a4823a0..cdd00bb 100644 --- a/views/devices-softphone.html +++ b/views/devices-softphone.html @@ -182,6 +182,12 @@ +
+ +
+

+
+
{{else}}