Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[swift6] add credentials by default #19885

Merged
merged 2 commits into from
Oct 16, 2024
Merged

[swift6] add credentials by default #19885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2bae23
[swift6] add credentials by default
4brunu Oct 16, 2024
dc191de
Merge branch 'master' into feature/swift-add-credentials-by-default
4brunu Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/swift6/APIs.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ import Alamofire{{/useAlamofire}}
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addHeaders(_ aHeaders: [String: String]) {
Expand Down Expand Up @@ -161,9 +162,8 @@ import Alamofire{{/useAlamofire}}
return self
}

{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() -> Self {
{{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions .../client/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand All @@ -103,9 +104,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...lient/petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand Down Expand Up @@ -138,9 +139,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...client/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand Down Expand Up @@ -124,9 +125,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...e/swift6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand All @@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...es/client/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand All @@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand Down Expand Up @@ -124,9 +125,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...es/client/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand All @@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...es/client/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand All @@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...tstore/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand All @@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...t/petstore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ internal class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

internal func addHeaders(_ aHeaders: [String: String]) {
Expand All @@ -89,9 +90,8 @@ internal class RequestBuilder<T>: @unchecked Sendable {
return self
}

internal func addCredential() -> Self {
internal func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions .../petstore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand All @@ -89,9 +90,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...client/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand All @@ -91,9 +92,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
4 changes: 2 additions & 2 deletions ...ient/petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ open class RequestBuilder<T>: @unchecked Sendable {
self.openAPIClient = openAPIClient

addHeaders(openAPIClient.customHeaders)
addCredential()
}

open func addHeaders(_ aHeaders: [String: String]) {
Expand Down Expand Up @@ -124,9 +125,8 @@ open class RequestBuilder<T>: @unchecked Sendable {
return self
}

open func addCredential() -> Self {
open func addCredential() {
credential = openAPIClient.credential
return self
}
}

Expand Down
Loading