Merge remote-tracking branch 'origin/master' into 1.5.x

# Conflicts:
#	templates/android/docs/java/example.md.twig
#	templates/android/docs/kotlin/example.md.twig
#	templates/dart/docs/example.md.twig
#	templates/deno/docs/example.md.twig
#	templates/dotnet/docs/example.md.twig
#	templates/flutter/docs/example.md.twig
#	templates/kotlin/docs/java/example.md.twig
#	templates/node/docs/example.md.twig
#	templates/php/docs/example.md.twig
#	templates/python/docs/example.md.twig
#	templates/ruby/docs/example.md.twig
#	templates/swift/docs/example.md.twig
#	templates/web/docs/example.md.twig

Author: abnegate

templates/android/docs/java/example.md.twig

@@ -43,17 +43,15 @@ Client client = new Client(context)
 }));{% endif %}
 
 {% for parameter in method.parameters.all %}
-    {%~ if parameter.required -%}
     {%~ if parameter.enumValues is not empty -%}
     {%~ if parameter.enumName is not empty -%}
     {%~ set name = parameter.enumName -%}
     {%~ else -%}
     {%~ set name = parameter.name -%}
     {%~ endif %}
-    {{ name }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }},
+    {{ name }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }}, // {{ parameter.name }} {% if not parameter.required %}(optional){% endif %}
     {%~ else %}
-    {{ parameter | paramExample }},
-    {%~ endif -%}
+    {{ parameter | paramExample }}, // {{ parameter.name }} {% if not parameter.required %}(optional){% endif %}
     {%~ endif -%}
     {%~ if loop.last %}
     new CoroutineCallback<>((result, error) -> {

templates/android/docs/kotlin/example.md.twig

@@ -36,21 +36,16 @@ val {{ service.name | caseCamel }} = {{ service.name | caseUcfirst }}(client)
 {% if method.type == 'webAuth' %}
 {% elseif method.type == 'location' %}
 val result = {%~ else %}val response = {% endif %}{{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% if method.parameters.all | length == 0 %}){% endif %}
-
-{% for parameter in method.parameters.all %}
-    {%~ if parameter.required -%}
+    {%~ for parameter in method.parameters.all %}
     {%~ if parameter.enumValues is not empty -%}
     {%~ if parameter.enumName is not empty -%}
     {%~ set name = parameter.enumName -%}
     {%~ else -%}
     {%~ set name = parameter.name -%}
     {%~ endif %}
-    {{ parameter.name }} = {{ name }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }},
+    {{ parameter.name }} = {{ name }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }},{% if not parameter.required %} // (optional){% endif %}
     {%~ else %}
-    {{ parameter.name }} = {{ parameter | paramExample }},
+    {{ parameter.name }} = {{ parameter | paramExample }}, {% if not parameter.required %}// (optional){% endif %}
     {%~ endif -%}
-    {%~ endif %}
-    {%~ if loop.last %}
 )
-{%- endif %}
 {% endfor %}

templates/cli/base/params.twig

@@ -34,6 +34,12 @@
             file: 'code.tar.gz'
         }, files);
 
+    let archivePath = fs.realpathSync('code.tar.gz')
+    if (typeof archivePath !== 'undefined') {
+        payload['{{ parameter.name }}'] = archivePath;
+       {{ parameter.name | caseCamel | escapeKeyword }} = archivePath;
+    }
+
 {% endif %}
     const filePath = fs.realpathSync({{ parameter.name | caseCamel | escapeKeyword }});
     const nodeStream = fs.createReadStream(filePath);
@@ -70,7 +76,6 @@
     }
 {% endif %}
 {% endfor %}
-
 {% if method.type == 'location' %}
     payload['project'] = localConfig.getProject().projectId
     payload['key'] = globalConfig.getKey();

templates/cli/base/requests/api.twig

@@ -1,5 +1,5 @@
     let response = undefined;
-    
+
     response = await client.call('{{ method.method | caseLower }}', apiPath, {
 {% for parameter in method.parameters.header %}
         '{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
@@ -11,8 +11,8 @@
 
 {% if method.type == 'location' %}
     fs.writeFileSync(destination, response);
+
 {% endif %}
-    
     if (parseOutput) {
         parse(response)
         success()

templates/cli/base/requests/file.twig

@@ -1,6 +1,5 @@
 {% for parameter in method.parameters.all %}
 {% if parameter.type == 'file' %}
-
     const size = {{ parameter.name | caseCamel | escapeKeyword }}.size;
 
     const apiHeaders = {

templates/cli/lib/client.js.twig

@@ -152,6 +152,11 @@ class Client {
       return data;
     }
 
+    let cookies = response.headers.getSetCookie();
+    if (cookies && cookies.length > 0) {
+      globalConfig.setCookie(cookies[0]);
+    }
+
     const text = await response.text();
     let json = undefined;
     try {

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

@@ -37,7 +37,7 @@ function convertReadStreamToReadableStream(readStream) {
 
 const {{ service.name | caseLower }} = new Command("{{ service.name | caseLower }}").description(commandDescriptions['{{ service.name | caseLower }}']).configureHelp({
     helpWidth: process.stdout.columns || 80
-  })
+})
 
 {% for method in service.methods %}
 /**
@@ -51,7 +51,7 @@ const {{ service.name | caseLower }} = new Command("{{ service.name | caseLower
  * @property {CallableFunction} onProgress
 {% endif %}
 {% if method.type == 'location' %}
-* @property {string} destination
+ * @property {string} destination
 {% endif %}
  */
 
@@ -60,18 +60,15 @@ const {{ service.name | caseLower }} = new Command("{{ service.name | caseLower
  */
 const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {% for parameter in method.parameters.all %}{{ parameter.name | caseCamel | escapeKeyword }}, {% endfor %}parseOutput = true, sdk = undefined{% if 'multipart/form-data' in method.consumes %}, onProgress = () => {}{% endif %}{% if method.type == 'location' %}, destination{% endif %}}) => {
     let client = !sdk ? await {% if service.name == "projects" %}sdkForConsole(){% else %}sdkForProject(){% endif %} : sdk;
-    
     let apiPath = '{{ method.path }}'{% for parameter in method.parameters.path %}.replace('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | caseCamel | escapeKeyword }}){% endfor %};
 {{ include ('cli/base/params.twig') }}
 {% if 'multipart/form-data' in method.consumes %}
-{{ include ('cli/base/requests/file.twig') }}
-{% else %}
+{{ include ('cli/base/requests/file.twig') }}{% else %}
 {{ include('cli/base/requests/api.twig') }}
 {% endif %}
 }
 
 {% endfor %}
-
 {% for method in service.methods %}
 {{service.name | caseLower }}
     .command(`{{ method.name | caseCamel }}`)
@@ -87,11 +84,10 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
     .action(actionRunner({{ service.name | caseLower }}{{ method.name | caseUcfirst }}))
 
 {% endfor %}
-
 module.exports = {
     {{ service.name | caseLower }},
 {% for method in service.methods %}
     {{ service.name | caseLower }}{{ method.name | caseUcfirst }}{% if not loop.last %},{% endif %}
-    
+
 {% endfor %}
 };

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

@@ -120,7 +120,6 @@ const client = new Command("client")
         success()
     }));
 
-
 module.exports = {
 {% if sdk.test != "true" %}
     login,

templates/dart/docs/example.md.twig

@@ -17,14 +17,11 @@ void main() { // Init SDK
 {% endfor %}  ;
 
 {% endif %}
-  Future result = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% for parameter in method.parameters.all %}
-{% if loop.first %}
-
-{% endif %}
-{% if parameter.required %}
-    {{ parameter.name | caseCamel | overrideIdentifier }}:{% if parameter.enumValues | length > 0 %} {{ parameter.enumName }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseCamel | replace({'-': ''}) }}{% else %}{{ parameter | paramExample | replace({'<field-name>': (parameter.name | caseCamel) }) | raw }} {% endif %},
-{% endif %}
-{% endfor %}{% if method.parameters.all | length > 0 %}  {% endif %});
+  Future result = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}(
+    {%~ for parameter in method.parameters.all %}
+    {{ parameter.name | caseCamel | overrideIdentifier }}:{% if parameter.enumValues | length > 0 %} {{ parameter.enumName }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseCamel | replace({'-': ''}) }}{% else %}{{ parameter | paramExample | replace({'<field-name>': (parameter.name | caseCamel) }) | raw }} {% endif %},{% if not parameter.required %} // optional{% endif %}
+    {%~ endfor %}
+  );
 
   result
     .then((response) {

templates/deno/docs/example.md.twig

@@ -16,10 +16,18 @@ client
     .set{{header}}('{{node[header]['x-appwrite']['demo']}}') // {{node[header].description}}
 {% endfor %}
 {% endfor %};
-
 {% endif %}
 
-let promise = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% for parameter in method.parameters.all %}{% if parameter.required %}{% if not loop.first %}, {% endif %}{% if parameter.enumValues | length > 0%}{{parameter.enumName}}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }}{% else%}{{ parameter | paramExample  }}{% endif %}{% endif %}{% endfor %});
+const promise = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}(
+    {%~ for parameter in method.parameters.all %}
+    {%~ if parameter.enumValues | length > 0%}
+    {{ parameter.enumName }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }}{% if not loop.last %}, {% endif %} // {{parameter.name}} {% if not parameter.required %}(optional){% endif %}
+    {%~ else %}
+    {{ parameter | paramExample  }}{% if not loop.last %}, {% endif %} // {{parameter.name}} {% if not parameter.required %}(optional){% endif %}
+    {%~ endif %}
+    {%~ endif %}
+    {%~ endfor %}
+);
 
 promise.then(function (response) {
     console.log(response);