fix swagger and upgrade to openapi3, reapply changes of issue nightsc…

…out#3345
PieterGit · Feb 16, 2018 · 7821b69 · 7821b69
1 parent 1cd83e9
commit 7821b69
Show file tree

Hide file tree

Showing 8 changed files with 4,264 additions and 883 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: node_js
 sudo: required
 dist: trusty
 node_js:
-  - "8.9.3"
+  - "8.9.4"
 before_install: if [[ `npm --version` != "5.6" ]]; then npm install -g npm@latest; npm --version; fi
 matrix:
   fast_finish: true

diff --git a/app.js b/app.js
@@ -101,9 +101,9 @@ function create(env, ctx) {
     // pebble data
     app.get('/pebble', ctx.pebble);
 
-    // expose swagger.yaml
-    app.get('/swagger.yaml', function(req, res) {
-        res.sendFile(__dirname + '/swagger.yaml');
+    // expose swagger.json
+    app.get('/swagger.json', function(req, res) {
+        res.sendFile(__dirname + '/swagger.json');
     });
 
 /*
@@ -141,6 +141,13 @@ function create(env, ctx) {
     // serve the static content
     app.use(staticFiles);
 
+    var swaggerFiles = express.static(env.swagger_files, {
+        maxAge: maxAge
+    });
+
+    // serve the static content
+    app.use('/swagger-ui-dist', swaggerFiles);
+
     var tmpFiles = express.static('tmp', {
         maxAge: maxAge
     });

diff --git a/env.js b/env.js
@@ -20,6 +20,7 @@ function config ( ) {
   env.HOSTNAME = readENV('HOSTNAME', null);
   env.IMPORT_CONFIG = readENV('IMPORT_CONFIG', null);
   env.static_files = readENV('NIGHTSCOUT_STATIC_FILES', __dirname + '/static/');
+  env.swagger_files = readENV('NIGHTSCOUT_SWAGGER_FILES',  __dirname + '/node_modules/swagger-ui-dist/');
   env.debug = {
     minify: readENVTruthy('DEBUG_MINIFY', true)
   };