mirror of
https://github.com/openstf/stf
synced 2025-10-04 10:19:30 +02:00
refactoring swagger
This commit is contained in:
Vishal Banthia
parent
26ad95a36e
commit
9de5ba5fae
5 changed files with 234 additions and 148 deletions
|
|
@ -1,31 +1,37 @@
|
|||
var Promise = require('bluebird')
|
||||
var _ = require('lodash')
|
||||
var Promise = require('bluebird')
|
||||
|
||||
var dbapi = require('../../../db/api')
|
||||
var logger = require('../../../util/logger')
|
||||
var datautil = require('../../../util/datautil')
|
||||
|
||||
var log = logger.createLogger('api:controllers:device')
|
||||
var log = logger.createLogger('api:controllers:devices')
|
||||
|
||||
module.exports = {
|
||||
getDevices: getDevices
|
||||
, getDeviceBySerial: getDeviceBySerial
|
||||
}
|
||||
|
||||
var log = logger.createLogger('api:contoller:device')
|
||||
|
||||
function getDevices(req, res) {
|
||||
var fields = req.swagger.params.fields.value
|
||||
|
||||
dbapi.loadDevices()
|
||||
.then(function(cursor) {
|
||||
return Promise.promisify(cursor.toArray, cursor)()
|
||||
.then(function(list) {
|
||||
var deviceList = []
|
||||
|
||||
list.forEach(function(device) {
|
||||
datautil.normalize(device, req.user)
|
||||
if (fields) {
|
||||
device = _.pick(device, fields.split(','))
|
||||
}
|
||||
deviceList.push(device)
|
||||
})
|
||||
|
||||
res.json({
|
||||
success: true
|
||||
, devices: list
|
||||
, devices: deviceList
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
@ -58,6 +64,7 @@ function getDeviceBySerial(req, res) {
|
|||
else {
|
||||
res.status(404).json({
|
||||
success: false
|
||||
, description: 'Device not found'
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
var Promise = require('bluebird')
|
||||
|
||||
var dbapi = require('../../../db/api')
|
||||
var logger = require('../../../util/logger')
|
||||
|
||||
var log = logger.createLogger('api:controllers:token')
|
||||
|
||||
module.exports = {
|
||||
getAccessTokens: getAccessTokens
|
||||
}
|
||||
|
||||
function getAccessTokens(req, res) {
|
||||
dbapi.loadAccessTokens(req.user.email)
|
||||
.then(function(cursor) {
|
||||
return Promise.promisify(cursor.toArray, cursor)()
|
||||
.then(function(list) {
|
||||
var titles = []
|
||||
list.forEach(function(token) {
|
||||
titles.push(token.title)
|
||||
})
|
||||
res.json({
|
||||
success: true
|
||||
, titles: titles
|
||||
})
|
||||
})
|
||||
})
|
||||
.catch(function(err) {
|
||||
log.error('Failed to load tokens: ', err.stack)
|
||||
res.status(500).json({
|
||||
success: false
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
var util = require('util')
|
||||
|
||||
var Promise = require('bluebird')
|
||||
var _ = require('lodash')
|
||||
|
||||
var dbapi = require('../../../db/api')
|
||||
var logger = require('../../../util/logger')
|
||||
|
|
@ -9,45 +12,96 @@ var wireutil = require('../../../wire/util')
|
|||
var log = logger.createLogger('api:controllers:user')
|
||||
|
||||
module.exports = {
|
||||
getCurrentUser: getCurrentUser
|
||||
, getCurrentUserDevices: getCurrentUserDevices
|
||||
, addDeviceToUser: addDeviceToUser
|
||||
, deleteDeviceFromUser: deleteDeviceFromUser
|
||||
getUser: getUser
|
||||
, getUserDevices: getUserDevices
|
||||
, addUserDevice: addUserDevice
|
||||
, getUserDeviceBySerial: getUserDeviceBySerial
|
||||
, connectDeviceBySerial: connectDeviceBySerial
|
||||
, disconnectDeviceBySerial: disconnectDeviceBySerial
|
||||
, deleteUserDeviceBySerial: deleteUserDeviceBySerial
|
||||
, remoteConnectUserDeviceBySerial: remoteConnectUserDeviceBySerial
|
||||
, remoteDisconnectUserDeviceBySerial: remoteDisconnectUserDeviceBySerial
|
||||
, getUserAccessTokens: getUserAccessTokens
|
||||
}
|
||||
|
||||
function getCurrentUser(req, res) {
|
||||
function getUser(req, res) {
|
||||
res.json({
|
||||
success: true
|
||||
, user: req.user
|
||||
})
|
||||
}
|
||||
|
||||
function getCurrentUserDevices(req, res) {
|
||||
function getUserDevices(req, res) {
|
||||
var fields = req.swagger.params.fields.value
|
||||
|
||||
dbapi.loadUserDevices(req.user.email)
|
||||
.then(function(cursor) {
|
||||
return Promise.promisify(cursor.toArray, cursor)()
|
||||
.then(function(list) {
|
||||
var deviceList = []
|
||||
|
||||
list.forEach(function(device) {
|
||||
datautil.normalize(device, req.user)
|
||||
if (fields) {
|
||||
device = _.pick(device, fields.split(','))
|
||||
}
|
||||
deviceList.push(device)
|
||||
})
|
||||
|
||||
res.json({
|
||||
success: true
|
||||
, devices: list
|
||||
, devices: deviceList
|
||||
})
|
||||
})
|
||||
})
|
||||
.catch(function(err) {
|
||||
log.error('Failed to load group: ', err.stack)
|
||||
log.error('Failed to load device list: ', err.stack)
|
||||
res.status(500).json({
|
||||
success: false
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function addDeviceToUser(req, res) {
|
||||
function getUserDeviceBySerial(req, res) {
|
||||
var serial = req.swagger.params.serial.value
|
||||
var fields = req.swagger.params.fields.value
|
||||
|
||||
dbapi.loadDevice(serial)
|
||||
.then(function(device) {
|
||||
if (device) {
|
||||
datautil.normalize(device, req.user)
|
||||
|
||||
if (device.owner && device.owner.email === req.user.email) {
|
||||
if(fields) {
|
||||
device = _.pick(device, fields.split(','))
|
||||
}
|
||||
|
||||
res.json({
|
||||
success: true
|
||||
, device: device
|
||||
})
|
||||
}
|
||||
else {
|
||||
res.status(401).json({
|
||||
success: false
|
||||
, description: 'Device is not owned by you'
|
||||
})
|
||||
}
|
||||
}
|
||||
else {
|
||||
res.status(404).json({
|
||||
success: false
|
||||
, description: 'Device not found'
|
||||
})
|
||||
}
|
||||
})
|
||||
.catch(function(err) {
|
||||
log.error('Failed to load device "%s": ', req.params.serial, err.stack)
|
||||
res.status(500).json({
|
||||
success: false
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function addUserDevice(req, res) {
|
||||
var serial = req.body.serial
|
||||
var timeout = req.body.timeout || null
|
||||
|
||||
|
|
@ -81,17 +135,23 @@ function addDeviceToUser(req, res) {
|
|||
|
||||
res.status(202).json({
|
||||
success: true
|
||||
, description: 'Device Add request is accepted'
|
||||
, description: 'Device Add request is accepted. Check if device is successfully added using pollingUrl'
|
||||
, pollingUrl: util.format('%s://%s%s/user/devices/%s'
|
||||
, req.protocol
|
||||
, req.get('host')
|
||||
, req.swagger.operation.api.basePath
|
||||
, serial
|
||||
)
|
||||
})
|
||||
|
||||
} else {
|
||||
res.status(500).json({
|
||||
res.status(401).json({
|
||||
success: false
|
||||
, description: 'Device is being used or not available'
|
||||
})
|
||||
}
|
||||
} else {
|
||||
res.status(500).json({
|
||||
res.status(404).json({
|
||||
success: false
|
||||
, description: 'Bad device serial'
|
||||
})
|
||||
|
|
@ -99,7 +159,7 @@ function addDeviceToUser(req, res) {
|
|||
})
|
||||
}
|
||||
|
||||
function deleteDeviceFromUser(req, res) {
|
||||
function deleteUserDeviceBySerial(req, res) {
|
||||
var serial = req.swagger.params.serial.value
|
||||
|
||||
dbapi.loadDevice(serial)
|
||||
|
|
@ -126,17 +186,23 @@ function deleteDeviceFromUser(req, res) {
|
|||
|
||||
res.status(202).json({
|
||||
success: true
|
||||
, description: 'Device Release request is accepted'
|
||||
, description: 'Device Release request is accepted. Check if device is successfully removed using pollingUrl'
|
||||
, pollingUrl: util.format('%s://%s%s/user/devices/%s'
|
||||
, req.protocol
|
||||
, req.get('host')
|
||||
, req.swagger.operation.api.basePath
|
||||
, serial
|
||||
)
|
||||
})
|
||||
|
||||
} else {
|
||||
res.status(500).json({
|
||||
res.status(401).json({
|
||||
success: false
|
||||
, description: 'You cannot kick this device'
|
||||
})
|
||||
}
|
||||
} else {
|
||||
res.status(500).json({
|
||||
res.status(404).json({
|
||||
success: false
|
||||
, description: 'Bad device serial'
|
||||
})
|
||||
|
|
@ -144,47 +210,7 @@ function deleteDeviceFromUser(req, res) {
|
|||
})
|
||||
}
|
||||
|
||||
function getUserDeviceBySerial(req, res) {
|
||||
var serial = req.swagger.params.serial.value
|
||||
var fields = req.swagger.params.fields.value
|
||||
|
||||
dbapi.loadDevice(serial)
|
||||
.then(function(device) {
|
||||
if (device) {
|
||||
datautil.normalize(device, req.user)
|
||||
|
||||
if (device.owner && device.owner === req.user.email) {
|
||||
if(fields) {
|
||||
device = _.pick(device, fields.split(','))
|
||||
}
|
||||
|
||||
res.json({
|
||||
success: true
|
||||
, device: device
|
||||
})
|
||||
}
|
||||
else {
|
||||
res.status(404).json({
|
||||
success: false
|
||||
, description: 'device is not owned by you'
|
||||
})
|
||||
}
|
||||
}
|
||||
else {
|
||||
res.status(404).json({
|
||||
success: false
|
||||
})
|
||||
}
|
||||
})
|
||||
.catch(function(err) {
|
||||
log.error('Failed to load device "%s": ', req.params.serial, err.stack)
|
||||
res.status(500).json({
|
||||
success: false
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
function connectDeviceBySerial(req, res) {
|
||||
function remoteConnectUserDeviceBySerial(req, res) {
|
||||
var serial = req.swagger.params.serial.value
|
||||
|
||||
dbapi.loadDevice(serial)
|
||||
|
|
@ -192,7 +218,7 @@ function connectDeviceBySerial(req, res) {
|
|||
if (device) {
|
||||
datautil.normalize(device, req.user)
|
||||
|
||||
if (device.present && device.ready && device.using && device.owner.email == req.user.email) {
|
||||
if (device.present && device.ready && device.using && device.owner.email === req.user.email) {
|
||||
req.options.push.send([
|
||||
device.channel
|
||||
, wireutil.envelope(
|
||||
|
|
@ -202,11 +228,17 @@ function connectDeviceBySerial(req, res) {
|
|||
|
||||
res.status(202).json({
|
||||
success: true
|
||||
, description: 'Device Connect request is accepted'
|
||||
, description: 'Device Connect request is accepted. Check if device is successfully connected using pollingUrl'
|
||||
, pollingUrl: util.format('%s://%s%s/user/devices/%s'
|
||||
, req.protocol
|
||||
, req.get('host')
|
||||
, req.swagger.operation.api.basePath
|
||||
, serial
|
||||
)
|
||||
})
|
||||
}
|
||||
else {
|
||||
res.status(500).json({
|
||||
res.status(401).json({
|
||||
success: false
|
||||
, description: 'Device is not owned by you or is not available'
|
||||
})
|
||||
|
|
@ -215,7 +247,7 @@ function connectDeviceBySerial(req, res) {
|
|||
else {
|
||||
res.status(404).json({
|
||||
success: false
|
||||
, description: 'Bad device serial'
|
||||
, description: 'Device not found'
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
@ -227,7 +259,7 @@ function connectDeviceBySerial(req, res) {
|
|||
})
|
||||
}
|
||||
|
||||
function disconnectDeviceBySerial(req, res) {
|
||||
function remoteDisconnectUserDeviceBySerial(req, res) {
|
||||
var serial = req.swagger.params.serial.value
|
||||
|
||||
dbapi.loadDevice(serial)
|
||||
|
|
@ -245,11 +277,17 @@ function disconnectDeviceBySerial(req, res) {
|
|||
|
||||
res.status(202).json({
|
||||
success: true
|
||||
, description: 'Device Disonnect request is accepted'
|
||||
, description: 'Device Disonnect request is accepted. Check if device is successfully disconnected using pollingUrl'
|
||||
, pollingUrl: util.format('%s://%s%s/user/devices/%s'
|
||||
, req.protocol
|
||||
, req.get('host')
|
||||
, req.swagger.operation.api.basePath
|
||||
, serial
|
||||
)
|
||||
})
|
||||
}
|
||||
else {
|
||||
res.status(500).json({
|
||||
res.status(401).json({
|
||||
success: false
|
||||
, description: 'Device is not owned by you or is not available'
|
||||
})
|
||||
|
|
@ -258,7 +296,7 @@ function disconnectDeviceBySerial(req, res) {
|
|||
else {
|
||||
res.status(404).json({
|
||||
success: false
|
||||
, description: 'Bad device serial'
|
||||
, description: 'Device not found'
|
||||
})
|
||||
}
|
||||
})
|
||||
|
|
@ -269,3 +307,26 @@ function disconnectDeviceBySerial(req, res) {
|
|||
})
|
||||
})
|
||||
}
|
||||
|
||||
function getUserAccessTokens(req, res) {
|
||||
dbapi.loadAccessTokens(req.user.email)
|
||||
.then(function(cursor) {
|
||||
return Promise.promisify(cursor.toArray, cursor)()
|
||||
.then(function(list) {
|
||||
var titles = []
|
||||
list.forEach(function(token) {
|
||||
titles.push(token.title)
|
||||
})
|
||||
res.json({
|
||||
success: true
|
||||
, titles: titles
|
||||
})
|
||||
})
|
||||
})
|
||||
.catch(function(err) {
|
||||
log.error('Failed to load tokens: ', err.stack)
|
||||
res.status(500).json({
|
||||
success: false
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue