Merge pull request #1099 from appwrite/pla-3167

fix: request cannot have request body error

Author: abnegate

templates/swift/Sources/Models/Model.swift.twig

@@ -82,7 +82,7 @@ open class {{ definition | modelType(spec) | raw }}: Codable {
         return {{ definition.name | caseUcfirst }}(
             {%~ for property in definition.properties %}
             {%~ set isDocument = definition.name | lower == 'document' %}{# Temporary Fix until BE is fixed to return all attributes #}
-            {{ property.name | escapeSwiftKeyword | removeDollarSign }}: {% if property.sub_schema -%}
+            {{ property.name | removeDollarSign }}: {% if property.sub_schema -%}
                 {%- if property.type == 'array' -%}
                     (map["{{property.name }}"] as{% if isDocument %}?{% else %}{% if property.required %}!{% else %}?{% endif %}{% endif %} [[String: Any]]{% if isDocument %} ?? []{% elseif not property.required %} ?? []{% endif %}).map { {{property.sub_schema | caseUcfirst}}.from(map: $0) }
                 {%- else -%}

templates/swift/Sources/OAuth/WebAuthComponent.swift.twig

@@ -44,7 +44,7 @@ public class WebAuthComponent {
                 url: url,
                 callbackURLScheme: callbackScheme
             ) { callbackURL, error in
-                if let error = error {
+                if error != nil {
                     cleanUp()
                 } else if let callbackURL = callbackURL {
                     // handle cookies here itself!
@@ -161,7 +161,7 @@ class PresentationContextProvider: NSObject, ASWebAuthenticationPresentationCont
     static let shared = PresentationContextProvider()
 
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
-        if let mainWindow = OSApplication.shared.windows.first { $0.isKeyWindow } {
+        if let mainWindow = OSApplication.shared.windows.first(where: { $0.isKeyWindow }) {
             return mainWindow
         }
 

templates/swift/Sources/WebSockets/HTTPHandler.swift.twig

@@ -48,8 +48,6 @@ extension HTTPHandler : ChannelInboundHandler, RemovableChannelHandler {
         var headers = HTTPHeaders()
 
         headers.add(name: "Host", value: "\(client.host):\(client.port)")
-        headers.add(name: "Content-Type", value: "text/plain")
-        headers.add(name: "Content-Length", value: "\(1)")
         headers.add(contentsOf: self.headers)
         headers.addDomainCookies(for: client.host)
         let requestHead = HTTPRequestHead(
@@ -60,7 +58,6 @@ extension HTTPHandler : ChannelInboundHandler, RemovableChannelHandler {
         )
 
         context.write(wrapOutboundOut(.head(requestHead)), promise: nil)
-        context.write(wrapOutboundOut(.body(.byteBuffer(ByteBuffer(string: "\r\n")))), promise: nil)
         context.writeAndFlush(wrapOutboundOut(.end(nil)), promise: nil)
     }