starred/stf-DeviceFarmer-1
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-18 16:23:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge from master: fixing conflicts

Browse Source
This commit is contained in:
Denis barbaron
2019-08-27 15:04:33 +02:00
parent 7f5dc4c152
commit 91d828dfdb
5 changed files with 217 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/units/api/index.js
View File

@@ -7,7 +7,8 @@ var path = require('path')
var events = require('events')
var express = require('express')
var SwaggerExpress = require('swagger-express-mw')
var swaggerExpress = require('swagger-express-mw')
var swaggerUi = require('swagger-tools/middleware/swagger-ui')
var cookieSession = require('cookie-session')
var Promise = require('bluebird')
var _ = require('lodash')
@@ -106,10 +107,11 @@ module.exports = function(options) {
, swaggerFile: path.resolve(__dirname, 'swagger', 'api_v1.yaml')
}
SwaggerExpress.create(config, function(err, swaggerExpress) {
swaggerExpress.create(config, function(err, swaggerExpress) {
if (err) {
throw err
}
app.use(swaggerUi(swaggerExpress.runner.swagger))
swaggerExpress.register(app)
})