[swift5] fix generation of multiple security definitions (#13617)

* uses correct variable to check for security definitions * update samples
2022-10-07 17:01:35 +02:00
parent 038fe790dc
commit 6f3c0a8b5b
26 changed files with 50 additions and 13 deletions
--- a/modules/openapi-generator/src/main/resources/swift5/api.mustache
+++ b/modules/openapi-generator/src/main/resources/swift5/api.mustache
@@ -466,7 +466,7 @@ extension {{projectName}}API {

        let localVariableRequestBuilder: RequestBuilder<{{{returnType}}}{{#returnType}}{{#isResponseOptional}}?{{/isResponseOptional}}{{/returnType}}{{^returnType}}Void{{/returnType}}>.Type = {{projectName}}API.requestBuilderFactory.{{#returnType}}getBuilder(){{/returnType}}{{^returnType}}getNonDecodableBuilder(){{/returnType}}

-        return localVariableRequestBuilder.init(method: "{{httpMethod}}", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: {{#authMethods}}true{{/authMethods}}{{^authMethods}}false{{/authMethods}})
+        return localVariableRequestBuilder.init(method: "{{httpMethod}}", URLString: (localVariableUrlComponents?.string ?? localVariableURLString), parameters: localVariableParameters, headers: localVariableHeaderParameters, requiresAuthentication: {{#hasAuthMethods}}true{{/hasAuthMethods}}{{^hasAuthMethods}}false{{/hasAuthMethods}})
    }
 {{/useVapor}}
 {{/operation}}
--- a/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -45,6 +45,7 @@ paths:
        - petstore_auth:
            - 'write:pets'
            - 'read:pets'
+        - api_key_query: []
    put:
      tags:
        - pet
--- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -34,6 +34,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/alamofireLibrary/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/alamofireLibrary/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -46,6 +46,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/asyncAwaitLibrary/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/asyncAwaitLibrary/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -45,6 +45,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/combineLibrary/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/combineLibrary/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -34,6 +34,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/frozenEnums/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/frozenEnums/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -34,6 +34,9 @@ internal class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/nonPublicApi/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/nonPublicApi/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -34,6 +34,9 @@ import AnyCodable
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/objcCompatible/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/objcCompatible/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -35,6 +35,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/promisekitLibrary/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/promisekitLibrary/docs/PetAPI.md
@@ -51,7 +51,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -34,6 +34,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/readonlyProperties/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/readonlyProperties/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -34,6 +34,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/resultLibrary/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/resultLibrary/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -41,6 +41,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/rxswiftLibrary/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/rxswiftLibrary/docs/PetAPI.md
@@ -44,7 +44,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIs/PetAPI.swift
@@ -37,6 +37,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/urlsessionLibrary/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/urlsessionLibrary/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers

--- a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -34,6 +34,9 @@ open class PetAPI {
    /**
     Add a new pet to the store
     - POST /pet
+     - API Key:
+       - type: apiKey api_key_query (QUERY)
+       - name: api_key_query
     - OAuth:
       - type: oauth2
       - name: petstore_auth
--- a/samples/client/petstore/swift5/x-swift-hashable/docs/PetAPI.md
+++ b/samples/client/petstore/swift5/x-swift-hashable/docs/PetAPI.md
@@ -54,7 +54,7 @@ Void (empty response body)

 ### Authorization

-[petstore_auth](../README.md#petstore_auth)
+[api_key_query](../README.md#api_key_query), [petstore_auth](../README.md#petstore_auth)

 ### HTTP request headers