fixed some bugs with p2o and fix + update dojah submodule SHA

98labs · Jul 28, 2023 · daf0e05 · daf0e05
1 parent c7143f8
commit daf0e05
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 5 deletions.
diff --git a/customers/dojah/dojah-sdks b/customers/dojah/dojah-sdks
diff --git a/generator/konfig-dash/packages/konfig-cli/src/util/fix-adv-security-schemes-defined.ts b/generator/konfig-dash/packages/konfig-cli/src/util/fix-adv-security-schemes-defined.ts
@@ -4,6 +4,7 @@ import {
   getOperations,
   Operation,
   OperationParameter,
+  resolveRef,
   Spec,
 } from 'konfig-lib'
 import {
@@ -71,6 +72,44 @@ export async function fixAdvSecuritySchemesDefined({
           continue
         }
       }
+
+      const existingSecurity =
+      spec.spec.components?.securitySchemes !== undefined
+        ? Object.entries(spec.spec.components.securitySchemes).find(
+            ([securityName, s]) => {
+              const resolved = resolveRef({ refOrObject: s, $ref: spec.$ref })
+              if (resolved.type !== 'apiKey') return
+              return (
+                resolved.name.toLowerCase() === parameter.name.toLowerCase()
+              )
+            }
+          )
+        : undefined
+    if (existingSecurity !== undefined) {
+      const securitySchemeObject = resolveRef({
+        refOrObject: existingSecurity[1],
+        $ref: spec.$ref,
+      })
+      if (securitySchemeObject.type !== 'apiKey')
+        throw Error(
+          'unexpected security scheme type when replacing case in-sensitive parameter'
+        )
+      const securityScheme: SecuritySchemeObject = {
+        in: securitySchemeObject.in as any,
+        name: securitySchemeObject.name,
+        type: 'apiKey',
+        securityName: existingSecurity[0],
+      }
+      await removeParameterForSecurityRequirement({
+        spec,
+        name: parameter.name,
+        parameterIn: parameter.in,
+        securityScheme,
+        operation,
+      })
+      continue;
+    }
+
       const { securityName, isSecurity } = await inquirer.prompt<{
         securityName: string
         isSecurity: boolean

diff --git a/generator/konfig-dash/packages/konfig-lib/src/util/disallowed-header-names-request.ts b/generator/konfig-dash/packages/konfig-lib/src/util/disallowed-header-names-request.ts
@@ -1,7 +1,7 @@
 import type { IFunctionResult, RulesetFunction } from '@stoplight/spectral-core'
 import type { ParameterObject } from '../parseSpec'
 
-export const disallowedHeadersRegex = /^(Content-Type|Authorization|Accept)$/
+export const disallowedHeadersRegex = /^(Content-Type|Accept)$/
 
 export async function isParameterDisallowed({
   parameter,

diff --git a/generator/konfig-dash/packages/konfig-postman-to-openapi/lib/index.js b/generator/konfig-dash/packages/konfig-postman-to-openapi/lib/index.js
@@ -459,15 +459,15 @@ function generateSecurityScheme(auth) {
   const name = auth.apikey.find((obj) => obj.key === 'key')?.value
   return {
     type: 'apiKey',
-    in: where === undefined ? 'Header' : where,
+    in: where === undefined ? 'header' : where,
     name,
   }
 }
 
 /* Parse a postman auth definition */
 function parsePostmanAuth(postmanAuth = {}, securitySchemes) {
   const { type } = postmanAuth
-  if (type != null) {
+  if (type != null && type !== "noauth") {
     securitySchemes[`${type}Auth`] = generateSecurityScheme(postmanAuth)
     return {
       components: { securitySchemes },
@@ -483,7 +483,7 @@ function parsePostmanAuth(postmanAuth = {}, securitySchemes) {
 
 /* Parse Auth at operation/request level */
 function parseOperationAuth(auth, securitySchemes, optsAuth) {
-  if (auth == null || optsAuth != null) {
+  if (auth == null || optsAuth != null || auth.type === "noauth") {
     // In case of config auth operation auth is disabled
     return {}
   } else {