Browse Source

UI-3269-fix: Remove unused device data on user creation and handle device creation error (#114)

* Remove this

* Don't store device data inside user data, on user creation

* user creationg, prevent device error

* Revert "Remove this"

This reverts commit 7102cf9b4a.
4.3
Ricardo Merino 7 years ago
committed by Joris Tirado
parent
commit
a59bf13e9e
1 changed files with 27 additions and 8 deletions
  1. +27
    -8
      submodules/users/users.js

+ 27
- 8
submodules/users/users.js View File

@ -3914,7 +3914,10 @@ define(function(require) {
}, },
usersCreate: function(data, success, error) { usersCreate: function(data, success, error) {
var self = this;
var self = this,
deviceData = _.get(data, 'user.device');
delete data.user.device;
monster.waterfall([ monster.waterfall([
function(callback) { function(callback) {
@ -3977,15 +3980,26 @@ define(function(require) {
}); });
}, },
function(_dataUser, callback) { function(_dataUser, callback) {
if (!data.user.device) {
if (!deviceData) {
callback(null); callback(null);
return; return;
} }
var deviceData = data.user.device;
deviceData.owner_id = _dataUser.id; deviceData.owner_id = _dataUser.id;
self.usersAddUserDevice(deviceData, function(_device) {
callback(null);
self.usersAddUserDevice({
data: deviceData,
success: function(_device) {
callback(null);
},
error: function(parsedError) {
if (parsedError.error === '402') {
error();
return;
}
callback(true);
}
}); });
} }
], ],
@ -4195,8 +4209,10 @@ define(function(require) {
}); });
}, },
usersAddUserDevice: function(dataDevice, callback) {
var self = this;
usersAddUserDevice: function(args) {
var self = this,
dataDevice = args.data;
self.callApi({ self.callApi({
resource: 'device.create', resource: 'device.create',
data: { data: {
@ -4204,7 +4220,10 @@ define(function(require) {
data: dataDevice data: dataDevice
}, },
success: function(device) { success: function(device) {
callback && callback(device);
args.hasOwnProperty('success') && args.success(device);
},
error: function(error) {
args.hasOwnProperty('error') && args.error(error);
} }
}); });
}, },


Loading…
Cancel
Save