require base path. match swagger json endpoints based on the full path which may include any parts from the basePath after the host.

Author: Johny Lam

lib/swagger-express/index.js

@@ -4,6 +4,7 @@ var fs = require('fs');
 var path = require('path');
 var yaml = require('js-yaml');
 var coffee = require('coffee-script');
+var url = require('url');
 
 var doctrine = require('doctrine');
 var express = require('express');
@@ -218,7 +219,11 @@ function generate(opt) {
     throw new Error('\'swaggerUI\' is required.');
   }
 
-  if(opt.basePath) descriptor.basePath = opt.basePath;
+  if (!opt.basePath) {
+     throw new Error('\'basePath\' is required.');
+  }
+
+  descriptor.basePath = opt.basePath;
   descriptor.apiVersion = (opt.apiVersion) ? opt.apiVersion : '1.0';
   descriptor.swaggerVersion = (opt.swaggerVersion) ? opt.swaggerVersion : '1.0';
   descriptor.swaggerURL = (opt.swaggerURL) ? opt.swaggerURL : '/swagger';
@@ -229,6 +234,7 @@ function generate(opt) {
   opt.swaggerVersion = descriptor.swaggerVersion;
   opt.swaggerURL = descriptor.swaggerURL;
   opt.swaggerJSON = descriptor.swaggerJSON;
+  opt.fullSwaggerJSONPath = url.parse(opt.basePath + opt.swaggerJSON).path;
 
   if (opt.apis) {
     opt.apis.forEach(function (api) {
@@ -273,7 +279,7 @@ exports.init = function (app, opt) {
 
   return function (req, res, next) {
     var match, resource, result;
-    var regex = new RegExp('^'+ opt.swaggerJSON +'(\/.*)?$');
+    var regex = new RegExp('^'+ opt.fullSwaggerJSONPath +'(\/.*)?$');
 
     match = regex.exec(req.path);