Check for @odata.type and @type in authorization annotations (#67)

oasis-tcs · Feb 29, 2020 · c8f9767 · c8f9767
1 parent f0ec123
commit c8f9767
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/csdl2openapi.js b/lib/csdl2openapi.js
@@ -1929,7 +1929,8 @@ module.exports.csdl2openapi = function (
             const scheme = {};
             const flow = {};
             if (auth.Description) scheme.description = auth.Description;
-            const type = auth['@type'].substr(auth['@type'].lastIndexOf('.') + 1);
+            const qualifiedType = auth['@type'] || auth['@odata.type']
+            const type = qualifiedType.substr(qualifiedType.lastIndexOf('.') + 1);
             let unknown = false
             switch (type) {
                 case 'ApiKey':
@@ -1978,7 +1979,7 @@ module.exports.csdl2openapi = function (
                     break;
                 default:
                     unknown = true
-                    console.warn('Unknown Authorization type ' + auth['@type']);
+                    console.warn('Unknown Authorization type ' + qualifiedType);
             }
             if (!unknown) schemes[auth.Name] = scheme;
         });

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "odata-openapi",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Convert OData CSDL XML or CSDL JSON to OpenAPI",
   "homepage": "https://github.com/oasis-tcs/odata-openapi/blob/master/lib/README.md",
   "bugs": "https://github.com/oasis-tcs/odata-openapi/issues",