Merge pull request #54 from apiaddicts/develop

Up version to 2.2.0

Author: marcosanz-apiquality

index.js

@@ -227,14 +227,13 @@ _.forEach(environments, function (element) {
 			}
 		}
 	}
-	if(global.definition.components.securitySchemes){
-		console.log('securitySchemes');
+	if ( element.custom_authorizations_file ) {
+		require('./src/parser/authorizationRequests.js')(endpointsStage,element.custom_authorizations_file)
+	} else if(global.definition.components.securitySchemes){
 		let securityDefinition = require('./src/parser/openapiAuthorizationDefinition.js')(global.definition.components.securitySchemes)
 		if(securityDefinition){
-			require('./src/parser/authorizationRequests.js')(endpointsStage,securityDefinition)
-		} else {
-			exclude.auth = true
-		}
+			require('./src/parser/authorizationRequests.js')(endpointsStage,null,securityDefinition)
+		} 
 	} else {
 		// Elimina la cabecera Authorization de las peticiones en Postman
 		exclude.auth = true

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi2postman",
-  "version": "2.1.0",
+  "version": "2.2.1",
   "description": "openapi2postman",
   "bin": {
     "o2p": "index.js"

package.json

@@ -34,7 +34,7 @@ module.exports = function() {
 			"	// Guardar variables en environment",
 			"	// pm.environment.set('nombreVariable', json.data.variable);",
 			"} catch (e) {",
-			"	pm.test(\"Se esperaba una respuesta JSON\", function() {",
+			"	pm.test(\"A JSON response was expected\", function() {",
 			"		pm.expect(json, \"responseBody no es un JSON\").not.to.be.null;",
 			"	});",
 			"}",

src/generator/testBody.js

@@ -10,7 +10,15 @@ const path = require('path')
 
 module.exports = function() {
 
-  return function get(endpoints,definition){
+  return function get(endpoints,file, definition){
+		if(!definition){
+			
+			try {
+				definition = JSON.parse(fs.readFileSync(file, 'utf8'));
+			} catch (e) {
+					require('../utils/error.js')('error reading auth file ');
+			}
+		}
 	for (let i in definition.item){
 		definition.item[i].authType = true
 		// Comprobar que viene un status dentro del objeto aux para cada endpoint de autorización

src/parser/authorizationRequests.js

@@ -8,10 +8,12 @@ const _ = require('lodash');
 module.exports = function() {
 
   return function get(oAuthDefinition){
-    // console.log('oAuthDefinition');
-    // console.log(oAuthDefinition.oAuth2ClientCredentials.flows);
-
-   const data =  parseUrl(oAuthDefinition.oAuth2ClientCredentials.flows.clientCredentials.tokenUrl)
+    let definition
+    for (const i in oAuthDefinition) {
+			definition = oAuthDefinition[i];
+			
+    }
+   const data =  parseUrl(definition.flows)
    return generateDefinition(data) 
   }
 
@@ -85,13 +87,17 @@ module.exports = function() {
     return postmanCollection;
   }
 
-  function parseUrl(url) {
-    const urlObject = new URL(url);
+  function parseUrl(flows) {
+		let getTokenUrl
+		for (const i in flows) {
+			getTokenUrl = flows[i];
+    }
+    const urlObject = new URL(getTokenUrl.tokenUrl);
     const host = `${urlObject.protocol}//${urlObject.host}`;
     const path = urlObject.pathname.split('/').filter(segment => segment);
 
     return {
-        raw: url,
+        raw: getTokenUrl.tokenUrl,
         host: host,
         path: path
     };