Merge pull request #645 from appwrite/feat-appwrite-1.3.x

Author: lohanidamodar

src/Spec/Swagger2.php

@@ -207,6 +207,7 @@ public function getMethods($service)
                             'class' => $parameter['x-class'] ?? null,
                             'description' => $parameter['description'] ?? '',
                             'required' => $parameter['required'] ?? false,
+                            'nullable' => $parameter['x-nullable'] ?? false,
                             'default' => $parameter['default'] ?? null,
                             'example' => $parameter['x-example'] ?? null,
                             'isUploadID' => $parameter['x-upload-id'] ?? false,
@@ -245,6 +246,7 @@ public function getMethods($service)
                                     $param['required'] = (in_array($key, $bodyRequired));
                                     $param['example'] = $value['x-example'] ?? null;
                                     $param['isUploadID'] = $value['x-upload-id'] ?? false;
+                                    $param['nullable'] = $value['x-nullable'] ?? false;
                                     $param['array'] = [
                                         'type' => $value['items']['type'] ?? '',
                                     ];

templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig

@@ -44,7 +44,7 @@ class {{ service.name | caseUcfirst }} : Service {
         activity: ComponentActivity,
         {%~ endif %}
         {%~ for parameter in method.parameters.all %}
-        {{ parameter.name | caseCamel }}: {{ parameter | typeName }}{%~ if not parameter.required %}? = null{% endif %},
+        {{ parameter.name | caseCamel }}: {{ parameter | typeName }}{%~ if not parameter.required or parameter.nullable %}? = null{% endif %},
         {%~ endfor %}
         {%~ if method.responseModel | hasGenericType(spec) %}
         nestedType: Class<T>,
@@ -198,7 +198,7 @@ class {{ service.name | caseUcfirst }} : Service {
         activity: ComponentActivity,
         {%~ endif %}
         {%~ for parameter in method.parameters.all %}
-        {{ parameter.name | caseCamel }}: {{ parameter | typeName }}{%~ if not parameter.required %}? = null{% endif %},
+        {{ parameter.name | caseCamel }}: {{ parameter | typeName }}{%~ if not parameter.required or parameter.nullable %}? = null{% endif %},
         {%~ endfor %}
         {%~ if 'multipart/form-data' in method.consumes %}
         onProgress: ((UploadProgress) -> Unit)? = null

templates/cli/lib/client.js.twig

@@ -1,4 +1,5 @@
 const os = require('os');
+const https = require("https");
 const axios = require("axios");
 const JSONbig = require("json-bigint")({ storeAsString: false });
 const FormData = require("form-data");
@@ -100,11 +101,6 @@ class Client {
     params = {},
     responseType = "json"
   ) {
-    if (this.selfSigned == true) {
-      // Allow self signed requests
-      process.env["NODE_TLS_REJECT_UNAUTHORIZED"] = 0;
-    }
-
     headers = Object.assign({}, this.headers, headers);
 
     let contentType = headers["content-type"].toLowerCase();
@@ -140,6 +136,10 @@ class Client {
       transformResponse: [ (data) =>  data ? JSONbig.parse(data) : data ],
       responseType: responseType,
     };
+    if (this.selfSigned == true) {
+      // Allow self signed requests
+      options.httpsAgent = new https.Agent({ rejectUnauthorized: false });
+    }
     try {
       let response = await axios(options);
       if (response.headers["set-cookie"]) {

templates/cli/lib/commands/command.js.twig

@@ -228,7 +228,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
 {% autoescape false %}
     .description(`{{ method.description | replace({'`':'\''}) | replace({'\n':' '}) | replace({'\n \n':' '}) }}`)
 {% for parameter in method.parameters.all %}
-    .{% if parameter.required %}requiredOption{% else %}option{% endif %}(`--{{ parameter.name | escapeKeyword }} {% if parameter.array.type|length > 0 %}[{% else %}<{% endif %}{{ parameter.name | escapeKeyword }}{% if parameter.array.type|length > 0 %}...{% endif %}{% if parameter.array.type|length > 0 %}]{% else %}>{% endif %}`, `{{ parameter.description | replace({'`':'\''}) | replace({'\n':' '}) | replace({'\n \n':' '}) }}`{% if parameter | typeName == 'boolean' %}, parseBool{% elseif parameter | typeName == 'number' %}, parseInteger{% endif %})
+    .{% if parameter.required and not parameter.nullable %}requiredOption{% else %}option{% endif %}(`--{{ parameter.name | escapeKeyword }} {% if parameter.array.type|length > 0 %}[{% else %}<{% endif %}{{ parameter.name | escapeKeyword }}{% if parameter.array.type|length > 0 %}...{% endif %}{% if parameter.array.type|length > 0 %}]{% else %}>{% endif %}`, `{{ parameter.description | replace({'`':'\''}) | replace({'\n':' '}) | replace({'\n \n':' '}) }}`{% if parameter | typeName == 'boolean' %}, parseBool{% elseif parameter | typeName == 'number' %}, parseInteger{% endif %})
 {% endfor %}
 {% if method.type == 'location' %}
     .requiredOption(`--destination <path>`, `output file path.`)