Updated

Author: bytesleo

README.md

@@ -39,6 +39,8 @@
 
 **url:** <http://localhost:8000/docs> 
 
+**OpenAPI Spec compatibility:** 2.0, 3.0
+
 <img src="https://i.imgur.com/lnOKBF4.png">
 
 ### Horizontal scalability

package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodetomic-api-swagger",
-    "version": "3.4.2",
+    "version": "3.4.4",
     "description": "RESTful API Nodejs designed for horizontal scalability with support for cluster, based on Swagger, Redis, JWT, Passport, Socket.io, Express, MongoDB.",
     "main": "src/app.js",
     "repository": {
@@ -39,6 +39,7 @@
         "scaling",
         "socket.io",
         "cluster-socket",
+        "open-api",
         "nodejs",
         "es6",
         "es7",
@@ -54,9 +55,9 @@
         "scalability"
     ],
     "dependencies": {
-        "bcrypt": "^1.0.3",
+        "bcrypt": "^2.0.1",
         "body-parser": "^1.18.2",
-        "chalk": "^2.3.2",
+        "chalk": "^2.4.1",
         "compression": "^1.7.2",
         "cookie-parser": "^1.4.3",
         "cors": "^2.8.4",
@@ -65,16 +66,15 @@
         "express-session": "^1.15.6",
         "helmet": "^3.12.0",
         "method-override": "^2.3.10",
-        "mongoose": "5.0.13",
+        "mongoose": "5.0.17",
         "mongoose-paginate": "^5.0.3",
         "passport": "^0.4.0",
-        "passport-bitbucket": "^2.0.0",
         "passport-facebook": "^2.1.1",
         "passport-github": "^1.1.0",
         "passport-google-oauth": "^1.0.0",
         "passport-local": "^1.0.0",
         "passport-twitter": "^1.0.4",
-        "pm2": "^2.10.2",
+        "pm2": "^2.10.3",
         "redis-jwt": "^1.4.0",
         "role-calc": "^1.1.6",
         "serve-favicon": "^2.5.0",
@@ -85,8 +85,8 @@
     },
     "devDependencies": {
         "babel-cli": "^6.26.0",
-        "babel-core": "^6.26.0",
-        "babel-eslint": "^8.2.2",
+        "babel-core": "^6.26.3",
+        "babel-eslint": "^8.2.3",
         "babel-plugin-transform-flow-comments": "^6.22.0",
         "babel-plugin-transform-runtime": "^6.23.0",
         "babel-preset-env": "^1.6.1",
@@ -103,7 +103,7 @@
         "gulp-minifier": "^1.2.2",
         "gulp-rename": "^1.2.2",
         "gulp-rimraf": "^0.2.2",
-        "mocha": "^5.0.5",
+        "mocha": "^5.1.1",
         "morgan": "^1.9.0",
         "nodemon": "^1.17.3",
         "npm-delay": "^1.0.4",

src/auth/controllers/bitbucket.controller.js

@@ -1,20 +1,7 @@
 import config from '../../config';
 
-//Passport's
-if ("local" in config.oAuth && config.oAuth.local.enabled)
-  require('../passports/local.passport');
-
-if ("github" in config.oAuth && config.oAuth.github.enabled)
-  require('../passports/github.passport');
-
-if ("twitter" in config.oAuth && config.oAuth.twitter.enabled)
-  require('../passports/twitter.passport');
-
-if ("facebook" in config.oAuth && config.oAuth.facebook.enabled)
-  require('../passports/facebook.passport');
-
-if ("google" in config.oAuth && config.oAuth.google.enabled)
-  require('../passports/google.passport');
-
-if ("bitbucket" in config.oAuth && config.oAuth.bitbucket.enabled)
-  require('../passports/bitbucket.passport');
+// Load Passport's
+Object.keys(config.oAuth).forEach((key) => {
+  if (config.oAuth[key].enabled)
+    require(`../passports/${key}.passport`);
+});

src/auth/passports/bitbucket.passport.js

@@ -1,5 +1,5 @@
 /auth/facebook:
-  x-swagger-router-controller: facebook
+  x-swagger-router-controller: facebook.controller
 # index
   get:
     operationId: index
@@ -17,7 +17,7 @@
         $ref: '#/responses/auth-500'
 
 /auth/facebook/callback:
-  x-swagger-router-controller: facebook
+  x-swagger-router-controller: facebook.controller
 # callback
   get:
     operationId: callback

src/auth/services/router.service.js

@@ -1,5 +1,5 @@
 /auth/github:
-  x-swagger-router-controller: github
+  x-swagger-router-controller: github.controller
 # index
   get:
     operationId: index
@@ -17,7 +17,7 @@
         $ref: '#/responses/auth-500'
 
 /auth/github/callback:
-  x-swagger-router-controller: github
+  x-swagger-router-controller: github.controller
 # callback
   get:
     operationId: callback

src/auth/swagger/bitbucket.swagger.yaml

@@ -1,5 +1,5 @@
 /auth/google:
-  x-swagger-router-controller: google
+  x-swagger-router-controller: google.controller
 # index
   get:
     operationId: index
@@ -17,7 +17,7 @@
         $ref: '#/responses/auth-500'
 
 /auth/google/callback:
-  x-swagger-router-controller: google
+  x-swagger-router-controller: google.controller
 # callback
   get:
     operationId: callback

src/auth/swagger/facebook.swagger.yaml

@@ -1,5 +1,5 @@
 /auth/twitter:
-  x-swagger-router-controller: twitter
+  x-swagger-router-controller: twitter.controller
 # index
   get:
     operationId: index
@@ -17,7 +17,7 @@
         $ref: '#/responses/auth-500'
 
 /auth/twitter/callback:
-  x-swagger-router-controller: twitter
+  x-swagger-router-controller: twitter.controller
 # callback
   get:
     operationId: callback