Skip to content

[swift6] Don't encode Data as base64 in multipart request #22456

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+42 −42
Draft

[swift6] Don't encode Data as base64 in multipart request #22456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions modules/openapi-generator/src/main/resources/swift6/APIHelper.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ import Vapor{{/useVapor}}
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions modules/openapi-generator/src/main/resources/swift6/Extensions.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...nt/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...t/petstore/swift6/alamofireLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions .../petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...petstore/swift6/apiNonStaticMethod/Sources/PetstoreClient/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...t/petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions .../petstore/swift6/asyncAwaitLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...ft6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...t6/combineDeferredLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...ient/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...ent/petstore/swift6/combineLibrary/Sources/CombineLibrary/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions samples/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...les/client/petstore/swift6/default/Sources/PetstoreClient/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...ient/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...ent/petstore/swift6/objcCompatible/Sources/PetstoreClient/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...ient/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...ent/petstore/swift6/oneOf/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...e/swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions .../swift6/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...store/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ internal struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...tore/swift6/resultLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...tore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...ore/swift6/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...t/petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions .../petstore/swift6/urlsessionLibrary/Sources/PetstoreClient/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
2 changes: 2 additions & 0 deletions ...petstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ public struct APIHelper {
guard let value = value else { return nil }
if let value = value as? any RawRepresentable {
return "\(value.rawValue)"
} else if let data = value as? Data {
return data.base64EncodedString(options: Data.Base64EncodingOptions())
} else {
return "\(value)"
}
Expand Down
4 changes: 1 addition & 3 deletions ...etstore/swift6/validation/PetstoreClient/Classes/OpenAPIs/Infrastructure/Extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,7 @@ extension Dictionary where Key: Sendable, Value: Sendable {
}

extension Data: ParameterConvertible {
func asParameter(codableHelper: CodableHelper) -> any Sendable {
return self.base64EncodedString(options: Data.Base64EncodingOptions())
}
func asParameter(codableHelper: CodableHelper) -> any Sendable { self }
}

extension Date: ParameterConvertible {
Expand Down
Loading