yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00
Code Issues Releases Wiki Activity

Fix express warning for deprecated res.json(stat) message

Browse source
This commit is contained in:
Vishal Banthia 2015-12-07 23:03:38 +09:00
parent 96494247bb
commit 25cee263b2
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/units/api/controllers/device.js
View file

@ -31,7 +31,7 @@ function getDevices(req, res) {
}) })
.catch(function(err) { .catch(function(err) {
log.error('Failed to load device list: ', err.stack) log.error('Failed to load device list: ', err.stack)
res.json(500, { res.status(500).json({
success: false success: false
}) })
}) })
@ -56,14 +56,14 @@ function getDeviceBySerial(req, res) {
}) })
} }
else { else {
res.json(404, { res.status(404).json({
success: false success: false
}) })
} }
}) })
.catch(function(err) { .catch(function(err) {
log.error('Failed to load device "%s": ', req.params.serial, err.stack) log.error('Failed to load device "%s": ', req.params.serial, err.stack)
res.json(500, { res.status(500).json({
success: false success: false
}) })
}) })

2
lib/units/api/controllers/token.js
View file

@ -26,7 +26,7 @@ function getAccessTokens(req, res) {
}) })
.catch(function(err) { .catch(function(err) {
log.error('Failed to load tokens: ', err.stack) log.error('Failed to load tokens: ', err.stack)
res.json(500, { res.status(500).json({
success: false success: false
}) })
}) })

36
lib/units/api/controllers/user.js
View file

@ -41,7 +41,7 @@ function getCurrentUserDevices(req, res) {
}) })
.catch(function(err) { .catch(function(err) {
log.error('Failed to load group: ', err.stack) log.error('Failed to load group: ', err.stack)
res.json(500, { res.status(500).json({
success: false success: false
}) })
}) })
@ -79,19 +79,19 @@ function addDeviceToUser(req, res) {
) )
]) ])
res.json(202, { res.status(202).json({
success: true success: true
, description: 'Device Add request is accepted' , description: 'Device Add request is accepted'
}) })
} else { } else {
res.json(500, { res.status(500).json({
success: false success: false
, description: 'Device is being used or not available' , description: 'Device is being used or not available'
}) })
} }
} else { } else {
res.json(500, { res.status(500).json({
success: false success: false
, description: 'Bad device serial' , description: 'Bad device serial'
}) })
@ -124,19 +124,19 @@ function deleteDeviceFromUser(req, res) {
) )
]) ])
res.json(202, { res.status(202).json({
success: true success: true
, description: 'Device Release request is accepted' , description: 'Device Release request is accepted'
}) })
} else { } else {
res.json(500, { res.status(500).json({
success: false success: false
, description: 'You cannot kick this device' , description: 'You cannot kick this device'
}) })
} }
} else { } else {
res.json(500, { res.status(500).json({
success: false success: false
, description: 'Bad device serial' , description: 'Bad device serial'
}) })
@ -164,21 +164,21 @@ function getUserDeviceBySerial(req, res) {
}) })
} }
else { else {
res.json(404, { res.status(404).json({
success: false success: false
, description: 'device is not owned by you' , description: 'device is not owned by you'
}) })
} }
} }
else { else {
res.json(404, { res.status(404).json({
success: false success: false
}) })
} }
}) })
.catch(function(err) { .catch(function(err) {
log.error('Failed to load device "%s": ', req.params.serial, err.stack) log.error('Failed to load device "%s": ', req.params.serial, err.stack)
res.json(500, { res.status(500).json({
success: false success: false
}) })
}) })
@ -200,20 +200,20 @@ function connectDeviceBySerial(req, res) {
) )
]) ])
res.json(202, { res.status(202).json({
success: true success: true
, description: 'Device Connect request is accepted' , description: 'Device Connect request is accepted'
}) })
} }
else { else {
res.json(500, { res.status(500).json({
success: false success: false
, description: 'Device is not owned by you or is not available' , description: 'Device is not owned by you or is not available'
}) })
} }
} }
else { else {
res.json(404, { res.status(404).json({
success: false success: false
, description: 'Bad device serial' , description: 'Bad device serial'
}) })
@ -221,7 +221,7 @@ function connectDeviceBySerial(req, res) {
}) })
.catch(function(err) { .catch(function(err) {
log.error('Failed to load device "%s": ', req.params.serial, err.stack) log.error('Failed to load device "%s": ', req.params.serial, err.stack)
res.json(500, { res.status(500).json({
success: false success: false
}) })
}) })
@ -243,20 +243,20 @@ function disconnectDeviceBySerial(req, res) {
) )
]) ])
res.json(202, { res.status(202).json({
success: true success: true
, description: 'Device Disonnect request is accepted' , description: 'Device Disonnect request is accepted'
}) })
} }
else { else {
res.json(500, { res.status(500).json({
success: false success: false
, description: 'Device is not owned by you or is not available' , description: 'Device is not owned by you or is not available'
}) })
} }
} }
else { else {
res.json(404, { res.status(404).json({
success: false success: false
, description: 'Bad device serial' , description: 'Bad device serial'
}) })
@ -264,7 +264,7 @@ function disconnectDeviceBySerial(req, res) {
}) })
.catch(function(err) { .catch(function(err) {
log.error('Failed to load device "%s": ', req.params.serial, err.stack) log.error('Failed to load device "%s": ', req.params.serial, err.stack)
res.json(500, { res.status(500).json({
success: false success: false
}) })
}) })