From c97b15325507b6eca319fca1fa38ab741be4e43a Mon Sep 17 00:00:00 2001
From: Matej Baco <matejbacocom@gmail.com>
Date: Thu, 23 Sep 2021 13:12:50 +0200
Subject: [PATCH] Implemented oneOf for non-array results with multiple types

---
 .../Specification/Format/OpenAPI3.php         | 19 ++++++++++++++-----
 .../Specification/Format/Swagger2.php         | 18 +++++++++++++-----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/Appwrite/Specification/Format/OpenAPI3.php b/src/Appwrite/Specification/Format/OpenAPI3.php
index 0c055fe709..7bcfdd00a2 100644
--- a/src/Appwrite/Specification/Format/OpenAPI3.php
+++ b/src/Appwrite/Specification/Format/OpenAPI3.php
@@ -6,6 +6,7 @@ use Appwrite\Specification\Format;
 use Appwrite\Template\Template;
 use stdClass;
 use Utopia\Validator;
+use function var_dump;
 
 class OpenAPI3 extends Format
 {
@@ -442,11 +443,19 @@ class OpenAPI3 extends Format
                         $rule['type'] = ($rule['type']) ? $rule['type'] : 'none';
 
                         if(\is_array($rule['type'])) {
-                            $items = [
-                                'anyOf' => \array_map(function($type) {
-                                    return ['$ref' => '#/components/schemas/'.$type];
-                                }, $rule['type'])
-                            ];
+                            if($rule['array']) {
+                                $items = [
+                                    'anyOf' => \array_map(function($type) {
+                                        return ['$ref' => '#/components/schemas/'.$type];
+                                    }, $rule['type'])
+                                ];
+                            } else {
+                                $items = [
+                                    'oneOf' => \array_map(function($type) {
+                                        return ['$ref' => '#/components/schemas/'.$type];
+                                    }, $rule['type'])
+                                ];
+                            }
                         } else {
                             $items = [
                                 '$ref' => '#/components/schemas/'.$rule['type'],
diff --git a/src/Appwrite/Specification/Format/Swagger2.php b/src/Appwrite/Specification/Format/Swagger2.php
index 88cec0b2a0..66324567bc 100644
--- a/src/Appwrite/Specification/Format/Swagger2.php
+++ b/src/Appwrite/Specification/Format/Swagger2.php
@@ -445,11 +445,19 @@ class Swagger2 extends Format
                         $rule['type'] = ($rule['type']) ? $rule['type'] : 'none';
 
                         if(\is_array($rule['type'])) {
-                            $items = [
-                                'anyOf' => \array_map(function($type) {
-                                    return ['$ref' => '#/definitions/'.$type];
-                                }, $rule['type'])
-                            ];
+                            if($rule['array']) {
+                                $items = [
+                                    'anyOf' => \array_map(function($type) {
+                                        return ['$ref' => '#/definitions/'.$type];
+                                    }, $rule['type'])
+                                ];
+                            } else {
+                                $items = [
+                                    'oneOf' => \array_map(function($type) {
+                                        return ['$ref' => '#/definitions/'.$type];
+                                    }, $rule['type'])
+                                ];
+                            }
                         } else {
                             $items = [
                                 'type' => $type,