appwrite · abnegate · Aug 30, 2024 · Aug 30, 2024 · Aug 30, 2024 · Aug 30, 2024
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -42,7 +42,9 @@ jobs:
           Ruby30,
           Ruby31,
           AppleSwift56,
+          AppleSwift510,
           Swift56,
+          Swift510,
           WebChromium,
           WebNode
         ]

diff --git a/composer.lock b/composer.lock
diff --git a/mock-server/Dockerfile b/mock-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM composer:2.0 as composer
+FROM composer:2.0 AS composer
 
 LABEL maintainer="[email protected]"
 
@@ -14,7 +14,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist \
     `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
 
-FROM phpswoole/swoole:5.1.2-php8.3-alpine as final
+FROM phpswoole/swoole:5.1.2-php8.3-alpine AS final
 
 RUN apk add docker
 

diff --git a/mock-server/app/http.php b/mock-server/app/http.php
@@ -306,8 +306,9 @@
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'general')
     ->label('sdk.method', 'upload')
+    ->label('sdk.methodType', 'upload')
     ->label('sdk.description', 'Mock a file upload request.')
-    ->label('sdk.request.type', 'multipart/form-data')
+    ->label('sdk.request.type', Response::CONTENT_TYPE_MULTIPART)
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MOCK)
@@ -319,6 +320,7 @@
     ->inject('request')
     ->inject('response')
     ->action(function (string $x, int $y, array $z, mixed $file, Request $request, Response $response) {
+
         $file = $request->getFiles('file');
 
         $contentRange = $request->getHeader('content-range');

diff --git a/src/SDK/Language/Apple.php b/src/SDK/Language/Apple.php
@@ -47,13 +47,13 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Models/{{ spec.title | caseUcfirst}}Error.swift',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Models/{{ spec.title | caseUcfirst}}Error.swift',
                 'template'      => '/swift/Sources/Models/Error.swift.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Models/InputFile.swift',
-                'template'      => 'swift/Sources/Models/InputFile.swift.twig',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Models/Payload.swift',
+                'template'      => 'swift/Sources/Models/Payload.swift.twig',
             ],
             [
                 'scope'         => 'default',
@@ -77,29 +77,24 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Models/UploadProgress.swift',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Models/UploadProgress.swift',
                 'template'      => 'swift/Sources/Models/UploadProgress.swift.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/JSONCodable/Codable+JSON.swift',
-                'template'      => 'swift/Sources/JSONCodable/Codable+JSON.swift.twig',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Extensions/Codable+JSON.swift',
+                'template'      => 'swift/Sources/Extensions/Codable+JSON.swift.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/Cookie+Codable.swift',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Extensions/Cookie+Codable.swift',
                 'template'      => 'swift/Sources/Extensions/Cookie+Codable.swift.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/HTTPClientRequest+Cookies.swift',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Extensions/HTTPClientRequest+Cookies.swift',
                 'template'      => 'swift/Sources/Extensions/HTTPClientRequest+Cookies.swift.twig',
             ],
-            [
-                'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/String+MimeTypes.swift',
-                'template'      => 'swift/Sources/Extensions/String+MimeTypes.swift.twig',
-            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/StreamingDelegate.swift',
@@ -213,7 +208,7 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Models/RealtimeModels.swift',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Models/RealtimeModels.swift',
                 'template'      => '/swift/Sources/Models/RealtimeModels.swift.twig',
             ],
             [
@@ -486,11 +481,11 @@ public function getFiles(): array
         ];
     }
 
-    protected function getReturnType(array $method, array $spec, string $namespace, string $generic = 'T'): string
+    protected function getReturnType(array $method, array $spec, string $generic = 'T'): string
     {
         if ($method['type'] === 'webAuth') {
             return 'Bool';
         }
-        return parent::getReturnType($method, $spec, $namespace, $generic);
+        return parent::getReturnType($method, $spec, $generic);
     }
 }
diff --git a/src/SDK/Language/Swift.php b/src/SDK/Language/Swift.php
@@ -144,13 +144,13 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Models/{{ spec.title | caseUcfirst}}Error.swift',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Models/{{ spec.title | caseUcfirst}}Error.swift',
                 'template'      => '/swift/Sources/Models/Error.swift.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Models/InputFile.swift',
-                'template'      => 'swift/Sources/Models/InputFile.swift.twig',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Models/Payload.swift',
+                'template'      => 'swift/Sources/Models/Payload.swift.twig',
             ],
             [
                 'scope'         => 'default',
@@ -174,29 +174,24 @@ public function getFiles(): array
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Models/UploadProgress.swift',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Models/UploadProgress.swift',
                 'template'      => 'swift/Sources/Models/UploadProgress.swift.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/JSONCodable/Codable+JSON.swift',
-                'template'      => 'swift/Sources/JSONCodable/Codable+JSON.swift.twig',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Extensions/Codable+JSON.swift',
+                'template'      => 'swift/Sources/Extensions/Codable+JSON.swift.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/Cookie+Codable.swift',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Extensions/Cookie+Codable.swift',
                 'template'      => 'swift/Sources/Extensions/Cookie+Codable.swift.twig',
             ],
             [
                 'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/HTTPClientRequest+Cookies.swift',
+                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}Extensions/HTTPClientRequest+Cookies.swift',
                 'template'      => 'swift/Sources/Extensions/HTTPClientRequest+Cookies.swift.twig',
             ],
-            [
-                'scope'         => 'default',
-                'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/Extensions/String+MimeTypes.swift',
-                'template'      => 'swift/Sources/Extensions/String+MimeTypes.swift.twig',
-            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/Sources/{{ spec.title | caseUcfirst}}/StreamingDelegate.swift',
@@ -311,7 +306,8 @@ public function getTypeName(array $parameter, array $spec = []): string
             self::TYPE_INTEGER => 'Int',
             self::TYPE_NUMBER => 'Double',
             self::TYPE_STRING => 'String',
-            self::TYPE_FILE => 'InputFile',
+            self::TYPE_FILE,
+            self::TYPE_PAYLOAD => 'Payload',
             self::TYPE_BOOLEAN => 'Bool',
             self::TYPE_ARRAY => (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type']))
                 ? '[' . $this->getTypeName($parameter['array']) . ']'
@@ -397,7 +393,10 @@ public function getParamExample(array $param): string
         if (empty($example) && $example !== 0 && $example !== false) {
             switch ($type) {
                 case self::TYPE_FILE:
-                    $output .= 'InputFile.fromPath("file.png")';
+                    $output .= 'Payload.fromFile("/path/to/file.png")';
+                    break;
+                case self::TYPE_PAYLOAD:
+                    $output .= 'Payload.fromString("<BODY>")'; // TODO: Update to fromJson()
                     break;
                 case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:

diff --git a/templates/android/library/src/main/java/io/package/Client.kt.twig b/templates/android/library/src/main/java/io/package/Client.kt.twig
@@ -342,7 +342,7 @@ class Client @JvmOverloads constructor(
         if (size < CHUNK_SIZE) {
             val data = when(input.sourceType) {
                 "file", "path" -> File(input.path).asRequestBody()
-                "bytes" -> input.toBinary().toRequestBody(input.mimeType?.toMediaType())
+                "bytes" -> input.toBinary().toRequestBody()
                 else -> throw UnsupportedOperationException()
             }
             params[paramName] = MultipartBody.Part.createFormData(

diff --git a/templates/android/library/src/main/java/io/package/models/Payload.kt.twig b/templates/android/library/src/main/java/io/package/models/Payload.kt.twig
@@ -12,7 +12,6 @@ class Payload private constructor() {
     lateinit var filename: String
     lateinit var sourceType: String
     lateinit var data: Any
-    var mimeType: String? = null
 
     override fun toString(): String {
         if (sourceType != "bytes") {
@@ -62,9 +61,6 @@ class Payload private constructor() {
         fun fromFileObject(file: File, name: String = "") = Payload().apply {
             path = file.canonicalPath
             filename = if (name != "") name else file.name
-            mimeType = Files.probeContentType(Paths.get(file.canonicalPath))
-                ?: URLConnection.guessContentTypeFromName(filename)
-                        ?: ""
             sourceType = "file"
         }
     }

diff --git a/templates/apple/Package.swift.twig b/templates/apple/Package.swift.twig
@@ -16,35 +16,37 @@ let package = Package(
             targets: [
                 "{{spec.title | caseUcfirst}}",
                 "{{spec.title | caseUcfirst}}Enums",
-                "{{spec.title | caseUcfirst}}Models",
-                "JSONCodable"
+                "{{spec.title | caseUcfirst}}Extensions",
+                "{{spec.title | caseUcfirst}}Models"
             ]
         ),
     ],
     dependencies: [
         .package(url: "https://github.com/swift-server/async-http-client.git", from: "1.19.0"),
         .package(url: "https://github.com/apple/swift-nio.git", from: "2.58.0"),
+        .package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "4.0.0"),
     ],
     targets: [
         .target(
             name: "{{spec.title | caseUcfirst}}",
             dependencies: [
                 .product(name: "AsyncHTTPClient", package: "async-http-client"),
                 .product(name: "NIOWebSocket", package: "swift-nio"),
+                .product(name: "Crypto", package: "swift-crypto"),
                 {%~ if spec.definitions is not empty %}
                 "{{spec.title | caseUcfirst}}Models",
                 {%~ endif %}
                 {%~ if spec.enums is not empty %}
                 "{{spec.title | caseUcfirst}}Enums",
                 {%~ endif %}
-                "JSONCodable"
+                "{{spec.title | caseUcfirst}}Extensions"
             ]
         ),
         {%~ if spec.definitions is not empty %}
         .target(
             name: "{{spec.title | caseUcfirst}}Models",
             dependencies: [
-                "JSONCodable"
+                "{{spec.title | caseUcfirst}}Extensions",
             ]
         ),
         {%~ endif %}
@@ -54,7 +56,10 @@ let package = Package(
         ),
         {%~ endif %}
         .target(
-            name: "JSONCodable"
+            name: "{{spec.title | caseUcfirst}}Extensions",
+            dependencies: [
+                .product(name: "AsyncHTTPClient", package: "async-http-client"),
+            ]
         ),
         .testTarget(
             name: "{{spec.title | caseUcfirst}}Tests",