diff --git a/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig b/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig index e1afc8526..a461b5f91 100644 --- a/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig +++ b/templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig @@ -58,7 +58,7 @@ class {{ service.name | caseUcfirst }} : Service { .replace("{{ '{' ~ parameter.name | caseCamel ~ '}' }}", {{ parameter.name | caseCamel }}) {%~ endfor %} - val params = mutableMapOf( + val apiParams = mutableMapOf( {%~ for parameter in method.parameters.query | merge(method.parameters.body) %} "{{ parameter.name }}" to {{ parameter.name | caseCamel }}, {%~ endfor %} @@ -73,25 +73,25 @@ class {{ service.name | caseUcfirst }} : Service { {%~ endif %} ) {%~ if method.type == 'webAuth' %} - val query = mutableListOf() - params.forEach { + val apiQuery = mutableListOf() + apiParams.forEach { when (it.value) { null -> { return@forEach } is List<*> -> { - query.add("${it.key}[]=${it.value.toString()}") + apiQuery.add("${it.key}[]=${it.value.toString()}") } else -> { - query.add("${it.key}=${it.value.toString()}") + apiQuery.add("${it.key}=${it.value.toString()}") } } } - val url = Uri.parse("${client.endPoint}${apiPath}?${query.joinToString("&")}") + val apiUrl = Uri.parse("${client.endPoint}${apiPath}?${apiQuery.joinToString("&")}") val callbackUrlScheme = "{{ spec.title | caseLower }}-callback-${client.config["project"]}" - WebAuthComponent.authenticate(activity, url, callbackUrlScheme) { + WebAuthComponent.authenticate(activity, apiUrl, callbackUrlScheme) { if (it.isFailure) { throw it.exceptionOrNull()!! } @@ -119,11 +119,11 @@ class {{ service.name | caseUcfirst }} : Service { return client.call( "{{ method.method | caseUpper }}", apiPath, - params = params, + params = apiParams, responseType = {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}::class.java ) {%~ else %} - val headers = mutableMapOf( + val apiHeaders = mutableMapOf( {%~ for key, header in method.headers %} "{{ key }}" to "{{ header }}", {%~ endfor %} @@ -147,8 +147,8 @@ class {{ service.name | caseUcfirst }} : Service { {%~ endfor %} return client.chunkedUpload( apiPath, - headers, - params, + apiHeaders, + apiParams, responseType = {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}::class.java, {%~ if method.responseModel %} converter, @@ -161,8 +161,8 @@ class {{ service.name | caseUcfirst }} : Service { return client.call( "{{ method.method | caseUpper }}", apiPath, - headers, - params, + apiHeaders, + apiParams, {%~ if method.responseModel | hasGenericType(spec) %} responseType = classOf(), {%~ else %} diff --git a/templates/cli/lib/commands/command.js.twig b/templates/cli/lib/commands/command.js.twig index 3a747afde..726fd3539 100644 --- a/templates/cli/lib/commands/command.js.twig +++ b/templates/cli/lib/commands/command.js.twig @@ -141,7 +141,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ { let counter = 0; const totalCounters = Math.ceil(size / libClient.CHUNK_SIZE); - const headers = { + const apiHeaders = { {% for parameter in method.parameters.header %} '{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }}, {% endfor %} @@ -154,7 +154,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ { {% if parameter.isUploadID %} if({{ parameter.name | caseCamel | escapeKeyword }} != 'unique()') { try { - response = await client.call('get', apiPath + '/' + {{ parameter.name }}, headers); + response = await client.call('get', apiPath + '/' + {{ parameter.name }}, apiHeaders); counter = response.chunksUploaded; } catch(e) { } @@ -166,10 +166,10 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ { const start = (counter * libClient.CHUNK_SIZE); const end = Math.min((((counter * libClient.CHUNK_SIZE) + libClient.CHUNK_SIZE) - 1), size); - headers['content-range'] = 'bytes ' + start + '-' + end + '/' + size; + apiHeaders['content-range'] = 'bytes ' + start + '-' + end + '/' + size; if (id) { - headers['x-appwrite-id'] = id; + apiHeaders['x-appwrite-id'] = id; } const stream = fs.createReadStream(streamFilePath, { @@ -178,7 +178,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ { }); payload['{{ parameter.name }}'] = stream; - response = await client.call('{{ method.method | caseLower }}', apiPath, headers, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %}); + response = await client.call('{{ method.method | caseLower }}', apiPath, apiHeaders, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %}); if (!id) { id = response['$id']; diff --git a/templates/dart/base/requests/api.twig b/templates/dart/base/requests/api.twig index d049b3617..43683fd6c 100644 --- a/templates/dart/base/requests/api.twig +++ b/templates/dart/base/requests/api.twig @@ -1,5 +1,5 @@ {% import 'dart/base/utils.twig' as utils %} - final Map params = { + final Map apiParams = { {{ utils.map_parameter(method.parameters.query) }} {{ utils.map_parameter(method.parameters.body) }} }; @@ -8,6 +8,6 @@ {{ utils.map_headers(method.headers) }} }; - final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: apiPath, params: params, headers: apiHeaders); + final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: apiPath, params: apiParams, headers: apiHeaders); return {% if method.responseModel and method.responseModel != 'any' %}models.{{method.responseModel | caseUcfirst | overrideIdentifier}}.fromMap(res.data){% else %} res.data{% endif %}; diff --git a/templates/dart/base/requests/file.twig b/templates/dart/base/requests/file.twig index 756d1c00d..28c31c0a2 100644 --- a/templates/dart/base/requests/file.twig +++ b/templates/dart/base/requests/file.twig @@ -1,5 +1,5 @@ {% import 'dart/base/utils.twig' as utils %} - final Map params = { + final Map apiParams = { {{ utils.map_parameter(method.parameters.query) }} {{ utils.map_parameter(method.parameters.body) }} }; @@ -20,7 +20,7 @@ {% endfor %} final res = await client.chunkedUpload( path: apiPath, - params: params, + params: apiParams, paramName: paramName, idParamName: idParamName, headers: apiHeaders, diff --git a/templates/deno/src/services/service.ts.twig b/templates/deno/src/services/service.ts.twig index 9723d85ae..dbaecfca6 100644 --- a/templates/deno/src/services/service.ts.twig +++ b/templates/deno/src/services/service.ts.twig @@ -92,7 +92,7 @@ export class {{ service.name | caseUcfirst }} extends Service { const size = {{ parameter.name | caseCamel | escapeKeyword }}.size; - const headers: { [header: string]: string } = { + const apiHeaders: { [header: string]: string } = { {% for parameter in method.parameters.header %} '{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }}, {% endfor %} @@ -110,7 +110,7 @@ export class {{ service.name | caseUcfirst }} extends Service { {% if parameter.isUploadID %} if({{ parameter.name | caseCamel | escapeKeyword }} != 'unique()') { try { - response = await this.client.call('get', apiPath + '/' + {{ parameter.name }}, headers); + response = await this.client.call('get', apiPath + '/' + {{ parameter.name }}, apiHeaders); chunksUploaded = response.chunksUploaded; } catch(e) { } @@ -131,7 +131,7 @@ export class {{ service.name | caseUcfirst }} extends Service { const end = start + currentPosition; if(!lastUpload || currentChunk !== 1) { - headers['content-range'] = 'bytes ' + start + '-' + end + '/' + size; + apiHeaders['content-range'] = 'bytes ' + start + '-' + end + '/' + size; } let uploadableChunkTrimmed: Uint8Array; @@ -146,12 +146,12 @@ export class {{ service.name | caseUcfirst }} extends Service { } if (id) { - headers['x-{{spec.title | caseLower }}-id'] = id; + apiHeaders['x-{{spec.title | caseLower }}-id'] = id; } payload['{{ parameter.name }}'] = { type: 'file', file: new File([uploadableChunkTrimmed], {{ parameter.name | caseCamel | escapeKeyword }}.filename), filename: {{ parameter.name | caseCamel | escapeKeyword }}.filename }; - response = await this.client.call('{{ method.method | caseLower }}', apiPath, headers, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %}); + response = await this.client.call('{{ method.method | caseLower }}', apiPath, apiHeaders, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %}); if (!id) { id = response['$id']; diff --git a/templates/dotnet/base/params.twig b/templates/dotnet/base/params.twig index a979ffa36..0918c9d65 100644 --- a/templates/dotnet/base/params.twig +++ b/templates/dotnet/base/params.twig @@ -4,7 +4,7 @@ {%~ endfor %} - var parameters = new Dictionary() + var apiParameters = new Dictionary() { {%~ for parameter in method.parameters.query | merge(method.parameters.body) %} { "{{ parameter.name }}", {{ utils.map_parameter(parameter) }} }{% if not loop.last %},{% endif %} diff --git a/templates/dotnet/base/requests/api.twig b/templates/dotnet/base/requests/api.twig index f19e34989..0b10b627d 100644 --- a/templates/dotnet/base/requests/api.twig +++ b/templates/dotnet/base/requests/api.twig @@ -4,8 +4,8 @@ path: apiPath, headers: apiHeaders, {%~ if not method.responseModel %} - parameters: parameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!); + parameters: apiParameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!); {%~ else %} - parameters: parameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!, + parameters: apiParameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!, convert: Convert); {%~ endif %} \ No newline at end of file diff --git a/templates/dotnet/base/requests/location.twig b/templates/dotnet/base/requests/location.twig index 6ac039120..d9f25ea1c 100644 --- a/templates/dotnet/base/requests/location.twig +++ b/templates/dotnet/base/requests/location.twig @@ -2,4 +2,4 @@ method: "{{ method.method | caseUpper }}", path: apiPath, headers: apiHeaders, - parameters: parameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!); \ No newline at end of file + parameters: apiParameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!); diff --git a/templates/flutter/base/requests/api.twig b/templates/flutter/base/requests/api.twig index 9c354c817..512372d45 100644 --- a/templates/flutter/base/requests/api.twig +++ b/templates/flutter/base/requests/api.twig @@ -1,5 +1,5 @@ {% import 'flutter/base/utils.twig' as utils %} - final Map params = { + final Map apiParams = { {{- utils.map_parameter(method.parameters.query) -}} {{~ utils.map_parameter(method.parameters.body) }} }; @@ -8,6 +8,6 @@ {{~ utils.map_headers(method.headers) }} }; - final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: apiPath, params: params, headers: apiHeaders); + final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: apiPath, params: apiParams, headers: apiHeaders); return {% if method.responseModel and method.responseModel != 'any' %}models.{{method.responseModel | caseUcfirst | overrideIdentifier}}.fromMap(res.data){% else %} res.data{% endif %}; diff --git a/templates/flutter/base/requests/file.twig b/templates/flutter/base/requests/file.twig index df416dde7..3030fb494 100644 --- a/templates/flutter/base/requests/file.twig +++ b/templates/flutter/base/requests/file.twig @@ -1,5 +1,5 @@ {% import 'flutter/base/utils.twig' as utils %} - final Map params = { + final Map apiParams = { {{~ utils.map_parameter(method.parameters.query) }} {{~ utils.map_parameter(method.parameters.body) }} }; @@ -20,7 +20,7 @@ {% endfor %} final res = await client.chunkedUpload( path: apiPath, - params: params, + params: apiParams, paramName: paramName, idParamName: idParamName, headers: apiHeaders, diff --git a/templates/go/base/params.twig b/templates/go/base/params.twig index cc62c584b..34cbd8b51 100644 --- a/templates/go/base/params.twig +++ b/templates/go/base/params.twig @@ -1,4 +1,4 @@ - params := map[string]interface{}{ + apiParams := map[string]interface{}{ {% for parameter in method.parameters.query %} "{{ parameter.name }}": {{ parameter.name | caseUcfirst }}, {% endfor %} @@ -7,7 +7,7 @@ {% endfor %} } - headers := map[string]interface{}{ + apiHeaders := map[string]interface{}{ {% for key, header in method.headers %} "{{ key }}": "{{ header }}", {% endfor %} diff --git a/templates/go/base/requests/api.twig b/templates/go/base/requests/api.twig index 33e19d6b7..2b0ec67bb 100644 --- a/templates/go/base/requests/api.twig +++ b/templates/go/base/requests/api.twig @@ -1 +1 @@ - return srv.client.Call("{{ method.method | caseUpper }}", apiPath, headers, params) \ No newline at end of file + return srv.client.Call("{{ method.method | caseUpper }}", apiPath, apiHeaders, apiParams) \ No newline at end of file diff --git a/templates/kotlin/base/requests/api.twig b/templates/kotlin/base/requests/api.twig index 9d23ffd43..2b00f48a9 100644 --- a/templates/kotlin/base/requests/api.twig +++ b/templates/kotlin/base/requests/api.twig @@ -1,8 +1,8 @@ return client.call( "{{ method.method | caseUpper }}", apiPath, - headers, - params, + apiHeaders, + apiParams, {%~ if method.responseModel | hasGenericType(spec) %} responseType = classOf(), {%~ else %} diff --git a/templates/kotlin/base/requests/file.twig b/templates/kotlin/base/requests/file.twig index 49bd80635..a1b7c0f85 100644 --- a/templates/kotlin/base/requests/file.twig +++ b/templates/kotlin/base/requests/file.twig @@ -7,8 +7,8 @@ {%~ endfor %} return client.chunkedUpload( apiPath, - headers, - params, + apiHeaders, + apiParams, responseType = {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}::class.java, {%~ if method.responseModel %} converter, diff --git a/templates/kotlin/base/requests/location.twig b/templates/kotlin/base/requests/location.twig index 73589b764..e8d5de57f 100644 --- a/templates/kotlin/base/requests/location.twig +++ b/templates/kotlin/base/requests/location.twig @@ -1,6 +1,6 @@ return client.call( "{{ method.method | caseUpper }}", apiPath, - params = params, + params = apiParams, responseType = {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}::class.java ) \ No newline at end of file diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig index e84ec6f01..5fb0f8069 100644 --- a/templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig +++ b/templates/kotlin/src/main/kotlin/io/appwrite/services/ServiceTemplate.kt.twig @@ -54,7 +54,7 @@ class {{ service.name | caseUcfirst }} : Service { .replace("{{ '{' ~ parameter.name | caseCamel ~ '}' }}", {{ parameter.name | caseCamel }}) {%~ endfor %} - val params = mutableMapOf( + val apiParams = mutableMapOf( {%~ for parameter in method.parameters.query | merge(method.parameters.body) %} "{{ parameter.name }}" to {{ parameter.name | caseCamel }}, {%~ endfor %} @@ -62,7 +62,7 @@ class {{ service.name | caseUcfirst }} : Service { {%~ if method.type == 'location' %} {{~ include('kotlin/base/requests/location.twig') }} {%~ else %} - val headers = mutableMapOf( + val apiHeaders = mutableMapOf( {%~ for key, header in method.headers %} "{{ key }}" to "{{ header }}", {%~ endfor %} diff --git a/templates/node/base/requests/file.twig b/templates/node/base/requests/file.twig index 44b1c2183..51f60c4d8 100644 --- a/templates/node/base/requests/file.twig +++ b/templates/node/base/requests/file.twig @@ -2,7 +2,7 @@ {% if parameter.type == 'file' %} const size = {{ parameter.name | caseCamel | escapeKeyword }}.size; - const headers = { + const apiHeaders = { {% for parameter in method.parameters.header %} '{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }}, {% endfor %} @@ -20,7 +20,7 @@ {% if parameter.isUploadID %} if({{ parameter.name | caseCamel | escapeKeyword }} != 'unique()') { try { - response = await this.client.call('get', apiPath + '/' + {{ parameter.name }}, headers); + response = await this.client.call('get', apiPath + '/' + {{ parameter.name }}, apiHeaders); chunksUploaded = response.chunksUploaded; } catch(e) { } @@ -43,17 +43,17 @@ const end = Math.min(((start + client.CHUNK_SIZE) - 1), size); if(!lastUpload || currentChunkStart !== 0) { - headers['content-range'] = 'bytes ' + start + '-' + end + '/' + size; + apiHeaders['content-range'] = 'bytes ' + start + '-' + end + '/' + size; } if (id) { - headers['x-{{spec.title | caseLower }}-id'] = id; + apiHeaders['x-{{spec.title | caseLower }}-id'] = id; } const stream = Stream.Readable.from(currentChunk); payload['{{ parameter.name }}'] = { type: 'file', file: stream, filename: {{ parameter.name }}.filename }; - response = await selfClient.call('{{ method.method | caseLower }}', apiPath, headers, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %}); + response = await selfClient.call('{{ method.method | caseLower }}', apiPath, apiHeaders, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %}); if (!id) { id = response['$id']; diff --git a/templates/php/base/params.twig b/templates/php/base/params.twig index 3e0b08733..8557222a4 100644 --- a/templates/php/base/params.twig +++ b/templates/php/base/params.twig @@ -1,4 +1,4 @@ - $params = []; + $apiParams = []; {% if method.parameters.all | length %} {% for parameter in method.parameters.all %} {% if parameter.required and not parameter.nullable %} @@ -9,19 +9,19 @@ {% endfor %} {% for parameter in method.parameters.query %} if (!is_null(${{ parameter.name | caseCamel | escapeKeyword }})) { - $params['{{ parameter.name }}'] = ${{ parameter.name | caseCamel | escapeKeyword }}; + $apiParams['{{ parameter.name }}'] = ${{ parameter.name | caseCamel | escapeKeyword }}; } {% endfor %} {% for parameter in method.parameters.body %} if (!is_null(${{ parameter.name | caseCamel | escapeKeyword }})) { - $params['{{ parameter.name }}'] = ${{ parameter.name | caseCamel | escapeKeyword }}; + $apiParams['{{ parameter.name }}'] = ${{ parameter.name | caseCamel | escapeKeyword }}; } {% endfor %} {% for parameter in method.parameters.formData %} if (!is_null(${{ parameter.name | caseCamel | escapeKeyword }})) { - $params['{{ parameter.name }}'] = ${{ parameter.name | caseCamel | escapeKeyword }}; + $apiParams['{{ parameter.name }}'] = ${{ parameter.name | caseCamel | escapeKeyword }}; } {% endfor %} {% endif %} \ No newline at end of file diff --git a/templates/php/base/requests/api.twig b/templates/php/base/requests/api.twig index 6ba37e385..b22cf8ca8 100644 --- a/templates/php/base/requests/api.twig +++ b/templates/php/base/requests/api.twig @@ -5,4 +5,4 @@ {% for key, header in method.headers %} '{{ key }}' => '{{ header }}', {% endfor %} - ], $params); \ No newline at end of file + ], $apiParams); \ No newline at end of file diff --git a/templates/php/base/requests/file.twig b/templates/php/base/requests/file.twig index f2cb8e77a..834f0d59b 100644 --- a/templates/php/base/requests/file.twig +++ b/templates/php/base/requests/file.twig @@ -8,7 +8,7 @@ $mimeType = ${{ parameter.name | caseCamel }}->getMimeType(); $postedName = ${{ parameter.name | caseCamel }}->getFilename(); if ($size <= Client::CHUNK_SIZE) { - $params['{{ parameter.name | caseCamel }}'] = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode(${{ parameter.name | caseCamel }}->getData()), $mimeType, $postedName); + $apiParams['{{ parameter.name | caseCamel }}'] = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode(${{ parameter.name | caseCamel }}->getData()), $mimeType, $postedName); return $this->client->call(Client::METHOD_POST, $apiPath, [ {% for param in method.parameters.header %} '{{ param.name }}' => ${{ param.name | caseCamel }}, @@ -16,7 +16,7 @@ {% for key, header in method.headers %} '{{ key }}' => '{{ header }}', {% endfor %} - ], $params); + ], $apiParams); } } else { $size = filesize(${{ parameter.name | caseCamel }}->getPath()); @@ -24,7 +24,7 @@ $postedName = ${{ parameter.name | caseCamel }}->getFilename() ?? basename(${{ parameter.name | caseCamel }}->getPath()); //send single file if size is less than or equal to 5MB if ($size <= Client::CHUNK_SIZE) { - $params['{{ parameter.name }}'] = new \CURLFile(${{ parameter.name | caseCamel }}->getPath(), $mimeType, $postedName); + $apiParams['{{ parameter.name }}'] = new \CURLFile(${{ parameter.name | caseCamel }}->getPath(), $mimeType, $postedName); return $this->client->call(Client::METHOD_{{ method.method | caseUpper }}, $apiPath, [ {% for param in method.parameters.header %} '{{ param.name }}' => ${{ param.name | caseCamel }}, @@ -32,7 +32,7 @@ {% for key, header in method.headers %} '{{ key }}' => '{{ header }}', {% endfor %} - ], $params); + ], $apiParams); } } @@ -51,7 +51,7 @@ {% endif %} {% endfor %} - $headers = ['content-type' => 'multipart/form-data']; + $apiHeaders = ['content-type' => 'multipart/form-data']; $handle = null; if(!empty(${{parameter.name}}->getPath())) { @@ -67,12 +67,12 @@ } else { $chunk = substr($file->getData(), $start, Client::CHUNK_SIZE); } - $params['{{ parameter.name }}'] = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode($chunk), $mimeType, $postedName); - $headers['content-range'] = 'bytes ' . ($counter * Client::CHUNK_SIZE) . '-' . min(((($counter * Client::CHUNK_SIZE) + Client::CHUNK_SIZE) - 1), $size) . '/' . $size; + $apiParams['{{ parameter.name }}'] = new \CURLFile('data://' . $mimeType . ';base64,' . base64_encode($chunk), $mimeType, $postedName); + $apiHeaders['content-range'] = 'bytes ' . ($counter * Client::CHUNK_SIZE) . '-' . min(((($counter * Client::CHUNK_SIZE) + Client::CHUNK_SIZE) - 1), $size) . '/' . $size; if(!empty($id)) { - $headers['x-{{spec.title | caseLower }}-id'] = $id; + $apiHeaders['x-{{spec.title | caseLower }}-id'] = $id; } - $response = $this->client->call(Client::METHOD_POST, $apiPath, $headers, $params); + $response = $this->client->call(Client::METHOD_POST, $apiPath, $apiHeaders, $apiParams); $counter++; $start += Client::CHUNK_SIZE; if(empty($id)) { diff --git a/templates/python/base/params.twig b/templates/python/base/params.twig index 1e7373295..b3cdc4e82 100644 --- a/templates/python/base/params.twig +++ b/templates/python/base/params.twig @@ -1,4 +1,4 @@ - params = {} + api_params = {} {% if method.parameters.all | length %} {% for parameter in method.parameters.all %} {% if parameter.required and not parameter.nullable %} @@ -12,20 +12,20 @@ {% endfor %} {% for parameter in method.parameters.query %} - params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }} + api_params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }} {% endfor %} {% for parameter in method.parameters.body %} {% if method.consumes[0] == "multipart/form-data" and ( parameter.type != "string" and parameter.type != "array" ) %} - params['{{ parameter.name }}'] = str({{ parameter.name | escapeKeyword | caseSnake }}).lower() if type({{ parameter.name | escapeKeyword | caseSnake }}) is bool else {{ parameter.name | escapeKeyword | caseSnake }} + api_params['{{ parameter.name }}'] = str({{ parameter.name | escapeKeyword | caseSnake }}).lower() if type({{ parameter.name | escapeKeyword | caseSnake }}) is bool else {{ parameter.name | escapeKeyword | caseSnake }} {% else %} - params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }} + api_params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }} {% endif %} {% endfor %} {% for parameter in method.parameters.formData %} {% if method.consumes[0] == "multipart/form-data" and ( parameter.type != "string" and parameter.type != "array" ) %} - params['{{ parameter.name }}'] = str({{ parameter.name | escapeKeyword | caseSnake }}).lower() if type({{ parameter.name | escapeKeyword | caseSnake }}) is bool else {{ parameter.name | escapeKeyword | caseSnake }} + api_params['{{ parameter.name }}'] = str({{ parameter.name | escapeKeyword | caseSnake }}).lower() if type({{ parameter.name | escapeKeyword | caseSnake }}) is bool else {{ parameter.name | escapeKeyword | caseSnake }} {% else %} - params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }} + api_params['{{ parameter.name }}'] = {{ parameter.name | escapeKeyword | caseSnake }} {% endif %} {% endfor %} {% endif %} \ No newline at end of file diff --git a/templates/python/base/requests/api.twig b/templates/python/base/requests/api.twig index 674b2bdb5..e305a8d9b 100644 --- a/templates/python/base/requests/api.twig +++ b/templates/python/base/requests/api.twig @@ -5,4 +5,4 @@ {% for key, header in method.headers %} '{{ key }}': '{{ header }}', {% endfor %} - }, params) \ No newline at end of file + }, api_params) \ No newline at end of file diff --git a/templates/python/base/requests/file.twig b/templates/python/base/requests/file.twig index 69a804c88..52b3cc691 100644 --- a/templates/python/base/requests/file.twig +++ b/templates/python/base/requests/file.twig @@ -19,4 +19,4 @@ {% for key, header in method.headers %} '{{ key }}': '{{ header }}', {% endfor %} - }, params, param_name, on_progress, upload_id) \ No newline at end of file + }, api_params, param_name, on_progress, upload_id) \ No newline at end of file diff --git a/templates/ruby/base/params.twig b/templates/ruby/base/params.twig index 041c4593a..8276ff6d4 100644 --- a/templates/ruby/base/params.twig +++ b/templates/ruby/base/params.twig @@ -11,13 +11,13 @@ {% endif %} {% endfor %} - params = { + api_params = { {% for parameter in method.parameters.query | merge(method.parameters.body) %} {{ parameter.name }}: {{ parameter.name | caseSnake | escapeKeyword }}, {% endfor %} } - headers = { + api_headers = { {% for parameter in method.parameters.header %} "{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}, {% endfor %} diff --git a/templates/ruby/base/requests/api.twig b/templates/ruby/base/requests/api.twig index fdadb6fc9..312e078e8 100644 --- a/templates/ruby/base/requests/api.twig +++ b/templates/ruby/base/requests/api.twig @@ -1,8 +1,8 @@ @client.call( method: '{{ method.method | caseUpper }}', path: api_path, - headers: headers, - params: params, + headers: api_headers, + params: api_params, {% if method.responseModel and method.responseModel != 'any' %} response_type: Models::{{method.responseModel | caseUcfirst}} {% endif %} diff --git a/templates/ruby/base/requests/file.twig b/templates/ruby/base/requests/file.twig index 3aab37999..fda9ca23c 100644 --- a/templates/ruby/base/requests/file.twig +++ b/templates/ruby/base/requests/file.twig @@ -8,8 +8,8 @@ {% endfor %} @client.chunked_upload( path: api_path, - headers: headers, - params: params, + headers: api_headers, + params: api_params, param_name: param_name, id_param_name: id_param_name, on_progress: on_progress, diff --git a/templates/swift/Sources/Services/Service.swift.twig b/templates/swift/Sources/Services/Service.swift.twig index 7c581f5db..8ec922d6f 100644 --- a/templates/swift/Sources/Services/Service.swift.twig +++ b/templates/swift/Sources/Services/Service.swift.twig @@ -43,11 +43,11 @@ open class {{ service.name | caseUcfirst }}: Service { {{~ include('swift/base/requests/location.twig')}} {%~ else %} {%~ if method.headers | length <= 0 %} - let headers: [String: String] = [:] + let apiHeaders: [String: String] = [:] {%~ else %} {% if 'multipart/form-data' in method.consumes -%} var {%- else -%} let - {%- endif %} headers: [String: String] = [ + {%- endif %} apiHeaders: [String: String] = [ {%~ for key, header in method.headers %} "{{ key }}": "{{ header }}"{% if not loop.last %},{% endif %} diff --git a/templates/swift/base/params.twig b/templates/swift/base/params.twig index 463500468..518090ea8 100644 --- a/templates/swift/base/params.twig +++ b/templates/swift/base/params.twig @@ -1,14 +1,14 @@ - let api_path: String = "{{ method.path }}" + let apiPath: String = "{{ method.path }}" {%~ for parameter in method.parameters.path %} .replacingOccurrences(of: "{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}", with: {{ parameter.name | caseCamel | escapeKeyword }}) {%~ endfor %} {%~ if method.parameters.query | merge(method.parameters.body) | length <= 0 %} - let params: [String: Any] = [:] + let apiParams: [String: Any] = [:] {%~ else %} {% if 'multipart/form-data' in method.consumes -%} var {%- else -%} let - {%- endif %} params: [String: Any?] = [ + {%- endif %} apiParams: [String: Any?] = [ {%~ for parameter in method.parameters.query | merge(method.parameters.body) %} "{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or (method.type == 'location' or method.type == 'webAuth' and method.auth | length > 0) %},{% endif %} diff --git a/templates/swift/base/requests/api.twig b/templates/swift/base/requests/api.twig index 1a85bb28c..e93264245 100644 --- a/templates/swift/base/requests/api.twig +++ b/templates/swift/base/requests/api.twig @@ -1,8 +1,8 @@ return try await client.call( method: "{{ method.method | caseUpper }}", - path: api_path, - headers: headers, - params: params{% if method.responseModel %}, + path: apiPath, + headers: apiHeaders, + params: apiParams{% if method.responseModel %}, converter: converter {% endif %} ) \ No newline at end of file diff --git a/templates/swift/base/requests/file.twig b/templates/swift/base/requests/file.twig index e1f7568ee..2167704ec 100644 --- a/templates/swift/base/requests/file.twig +++ b/templates/swift/base/requests/file.twig @@ -6,9 +6,9 @@ {% endif %} {% endfor %} return try await client.chunkedUpload( - path: api_path, - headers: &headers, - params: ¶ms, + path: apiPath, + headers: &apiHeaders, + params: &apiParams, paramName: paramName, idParamName: idParamName, {% if method.responseModel %} diff --git a/templates/swift/base/requests/location.twig b/templates/swift/base/requests/location.twig index bd0f78b47..78d4b1d1a 100644 --- a/templates/swift/base/requests/location.twig +++ b/templates/swift/base/requests/location.twig @@ -1,5 +1,5 @@ return try await client.call( method: "{{ method.method | caseUpper }}", - path: api_path, - params: params + path: apiPath, + params: apiParams ) \ No newline at end of file diff --git a/templates/web/src/services/template.ts.twig b/templates/web/src/services/template.ts.twig index f68e1b577..9f2388b82 100644 --- a/templates/web/src/services/template.ts.twig +++ b/templates/web/src/services/template.ts.twig @@ -97,7 +97,7 @@ export class {{ service.name | caseUcfirst }} extends Service { let id = undefined; let response = undefined; - const headers: { [header: string]: string } = { + const apiHeaders: { [header: string]: string } = { {% for parameter in method.parameters.header %} '{{ parameter.name | caseCamel | escapeKeyword }}': this.client.${{ parameter.name | caseCamel | escapeKeyword }}, {% endfor %} @@ -112,7 +112,7 @@ export class {{ service.name | caseUcfirst }} extends Service { {% if parameter.isUploadID %} if({{ parameter.name | caseCamel | escapeKeyword }} != 'unique()') { try { - response = await this.client.call('GET', new URL(this.client.config.endpoint + apiPath + '/' + {{ parameter.name }}), headers); + response = await this.client.call('GET', new URL(this.client.config.endpoint + apiPath + '/' + {{ parameter.name }}), apiHeaders); counter = response.chunksUploaded; } catch(e) { } @@ -124,16 +124,16 @@ export class {{ service.name | caseUcfirst }} extends Service { const start = (counter * Service.CHUNK_SIZE); const end = Math.min((((counter * Service.CHUNK_SIZE) + Service.CHUNK_SIZE) - 1), size); - headers['content-range'] = 'bytes ' + start + '-' + end + '/' + size + apiHeaders['content-range'] = 'bytes ' + start + '-' + end + '/' + size if (id) { - headers['x-{{spec.title | caseLower }}-id'] = id; + apiHeaders['x-{{spec.title | caseLower }}-id'] = id; } const stream = {{ parameter.name | caseCamel | escapeKeyword }}.slice(start, end + 1); payload['{{ parameter.name }}'] = new File([stream], {{ parameter.name | caseCamel | escapeKeyword }}.name); - response = await this.client.call('{{ method.method | caseLower }}', uri, headers, payload); + response = await this.client.call('{{ method.method | caseLower }}', uri, apiHeaders, payload); if (!id) { id = response['$id'];