Skip to content

Commit 06ea25a

Browse files
TorstenDittmannTorstenDittmann
authored
Merge pull request #703 from appwrite/fix-shadowed-parameters
Fix shadowed parameters
2 parents 8a3448d + f2b5cfd commit 06ea25a

File tree

32 files changed

+96
-96
lines changed

32 files changed

+96
-96
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class {{ service.name | caseUcfirst }} : Service {
5858
.replace("{{ '{' ~ parameter.name | caseCamel ~ '}' }}", {{ parameter.name | caseCamel }})
5959
{%~ endfor %}
6060

61-
val params = mutableMapOf<String, Any?>(
61+
val apiParams = mutableMapOf<String, Any?>(
6262
{%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
6363
"{{ parameter.name }}" to {{ parameter.name | caseCamel }},
6464
{%~ endfor %}
@@ -73,25 +73,25 @@ class {{ service.name | caseUcfirst }} : Service {
7373
{%~ endif %}
7474
)
7575
{%~ if method.type == 'webAuth' %}
76-
val query = mutableListOf<String>()
77-
params.forEach {
76+
val apiQuery = mutableListOf<String>()
77+
apiParams.forEach {
7878
when (it.value) {
7979
null -> {
8080
return@forEach
8181
}
8282
is List<*> -> {
83-
query.add("${it.key}[]=${it.value.toString()}")
83+
apiQuery.add("${it.key}[]=${it.value.toString()}")
8484
}
8585
else -> {
86-
query.add("${it.key}=${it.value.toString()}")
86+
apiQuery.add("${it.key}=${it.value.toString()}")
8787
}
8888
}
8989
}
9090

91-
val url = Uri.parse("${client.endPoint}${apiPath}?${query.joinToString("&")}")
91+
val apiUrl = Uri.parse("${client.endPoint}${apiPath}?${apiQuery.joinToString("&")}")
9292
val callbackUrlScheme = "{{ spec.title | caseLower }}-callback-${client.config["project"]}"
9393

94-
WebAuthComponent.authenticate(activity, url, callbackUrlScheme) {
94+
WebAuthComponent.authenticate(activity, apiUrl, callbackUrlScheme) {
9595
if (it.isFailure) {
9696
throw it.exceptionOrNull()!!
9797
}
@@ -119,11 +119,11 @@ class {{ service.name | caseUcfirst }} : Service {
119119
return client.call(
120120
"{{ method.method | caseUpper }}",
121121
apiPath,
122-
params = params,
122+
params = apiParams,
123123
responseType = {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}::class.java
124124
)
125125
{%~ else %}
126-
val headers = mutableMapOf(
126+
val apiHeaders = mutableMapOf(
127127
{%~ for key, header in method.headers %}
128128
"{{ key }}" to "{{ header }}",
129129
{%~ endfor %}
@@ -147,8 +147,8 @@ class {{ service.name | caseUcfirst }} : Service {
147147
{%~ endfor %}
148148
return client.chunkedUpload(
149149
apiPath,
150-
headers,
151-
params,
150+
apiHeaders,
151+
apiParams,
152152
responseType = {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}::class.java,
153153
{%~ if method.responseModel %}
154154
converter,
@@ -161,8 +161,8 @@ class {{ service.name | caseUcfirst }} : Service {
161161
return client.call(
162162
"{{ method.method | caseUpper }}",
163163
apiPath,
164-
headers,
165-
params,
164+
apiHeaders,
165+
apiParams,
166166
{%~ if method.responseModel | hasGenericType(spec) %}
167167
responseType = classOf(),
168168
{%~ else %}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
141141
let counter = 0;
142142
const totalCounters = Math.ceil(size / libClient.CHUNK_SIZE);
143143

144-
const headers = {
144+
const apiHeaders = {
145145
{% for parameter in method.parameters.header %}
146146
'{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
147147
{% endfor %}
@@ -154,7 +154,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
154154
{% if parameter.isUploadID %}
155155
if({{ parameter.name | caseCamel | escapeKeyword }} != 'unique()') {
156156
try {
157-
response = await client.call('get', apiPath + '/' + {{ parameter.name }}, headers);
157+
response = await client.call('get', apiPath + '/' + {{ parameter.name }}, apiHeaders);
158158
counter = response.chunksUploaded;
159159
} catch(e) {
160160
}
@@ -166,10 +166,10 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
166166
const start = (counter * libClient.CHUNK_SIZE);
167167
const end = Math.min((((counter * libClient.CHUNK_SIZE) + libClient.CHUNK_SIZE) - 1), size);
168168

169-
headers['content-range'] = 'bytes ' + start + '-' + end + '/' + size;
169+
apiHeaders['content-range'] = 'bytes ' + start + '-' + end + '/' + size;
170170

171171
if (id) {
172-
headers['x-appwrite-id'] = id;
172+
apiHeaders['x-appwrite-id'] = id;
173173
}
174174

175175
const stream = fs.createReadStream(streamFilePath, {
@@ -178,7 +178,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
178178
});
179179
payload['{{ parameter.name }}'] = stream;
180180

181-
response = await client.call('{{ method.method | caseLower }}', apiPath, headers, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %});
181+
response = await client.call('{{ method.method | caseLower }}', apiPath, apiHeaders, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %});
182182

183183
if (!id) {
184184
id = response['$id'];

‎templates/dart/base/requests/api.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% import 'dart/base/utils.twig' as utils %}
2-
final Map<String, dynamic> params = {
2+
final Map<String, dynamic> apiParams = {
33
{{ utils.map_parameter(method.parameters.query) }}
44
{{ utils.map_parameter(method.parameters.body) }}
55
};
@@ -8,6 +8,6 @@
88
{{ utils.map_headers(method.headers) }}
99
};
1010

11-
final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: apiPath, params: params, headers: apiHeaders);
11+
final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: apiPath, params: apiParams, headers: apiHeaders);
1212

1313
return {% if method.responseModel and method.responseModel != 'any' %}models.{{method.responseModel | caseUcfirst | overrideIdentifier}}.fromMap(res.data){% else %} res.data{% endif %};

‎templates/dart/base/requests/file.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% import 'dart/base/utils.twig' as utils %}
2-
final Map<String, dynamic> params = {
2+
final Map<String, dynamic> apiParams = {
33
{{ utils.map_parameter(method.parameters.query) }}
44
{{ utils.map_parameter(method.parameters.body) }}
55
};
@@ -20,7 +20,7 @@
2020
{% endfor %}
2121
final res = await client.chunkedUpload(
2222
path: apiPath,
23-
params: params,
23+
params: apiParams,
2424
paramName: paramName,
2525
idParamName: idParamName,
2626
headers: apiHeaders,

‎templates/deno/src/services/service.ts.twig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class {{ service.name | caseUcfirst }} extends Service {
9292

9393
const size = {{ parameter.name | caseCamel | escapeKeyword }}.size;
9494

95-
const headers: { [header: string]: string } = {
95+
const apiHeaders: { [header: string]: string } = {
9696
{% for parameter in method.parameters.header %}
9797
'{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
9898
{% endfor %}
@@ -110,7 +110,7 @@ export class {{ service.name | caseUcfirst }} extends Service {
110110
{% if parameter.isUploadID %}
111111
if({{ parameter.name | caseCamel | escapeKeyword }} != 'unique()') {
112112
try {
113-
response = await this.client.call('get', apiPath + '/' + {{ parameter.name }}, headers);
113+
response = await this.client.call('get', apiPath + '/' + {{ parameter.name }}, apiHeaders);
114114
chunksUploaded = response.chunksUploaded;
115115
} catch(e) {
116116
}
@@ -131,7 +131,7 @@ export class {{ service.name | caseUcfirst }} extends Service {
131131
const end = start + currentPosition;
132132

133133
if(!lastUpload || currentChunk !== 1) {
134-
headers['content-range'] = 'bytes ' + start + '-' + end + '/' + size;
134+
apiHeaders['content-range'] = 'bytes ' + start + '-' + end + '/' + size;
135135
}
136136

137137
let uploadableChunkTrimmed: Uint8Array;
@@ -146,12 +146,12 @@ export class {{ service.name | caseUcfirst }} extends Service {
146146
}
147147

148148
if (id) {
149-
headers['x-{{spec.title | caseLower }}-id'] = id;
149+
apiHeaders['x-{{spec.title | caseLower }}-id'] = id;
150150
}
151151

152152
payload['{{ parameter.name }}'] = { type: 'file', file: new File([uploadableChunkTrimmed], {{ parameter.name | caseCamel | escapeKeyword }}.filename), filename: {{ parameter.name | caseCamel | escapeKeyword }}.filename };
153153

154-
response = await this.client.call('{{ method.method | caseLower }}', apiPath, headers, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %});
154+
response = await this.client.call('{{ method.method | caseLower }}', apiPath, apiHeaders, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %});
155155

156156
if (!id) {
157157
id = response['$id'];

‎templates/dotnet/base/params.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
{%~ endfor %}
66

7-
var parameters = new Dictionary<string, object?>()
7+
var apiParameters = new Dictionary<string, object?>()
88
{
99
{%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
1010
{ "{{ parameter.name }}", {{ utils.map_parameter(parameter) }} }{% if not loop.last %},{% endif %}

‎templates/dotnet/base/requests/api.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
path: apiPath,
55
headers: apiHeaders,
66
{%~ if not method.responseModel %}
7-
parameters: parameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!);
7+
parameters: apiParameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!);
88
{%~ else %}
9-
parameters: parameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!,
9+
parameters: apiParameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!,
1010
convert: Convert);
1111
{%~ endif %}

‎templates/dotnet/base/requests/location.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
method: "{{ method.method | caseUpper }}",
33
path: apiPath,
44
headers: apiHeaders,
5-
parameters: parameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!);
5+
parameters: apiParameters.Where(it => it.Value != null).ToDictionary(it => it.Key, it => it.Value)!);

‎templates/flutter/base/requests/api.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% import 'flutter/base/utils.twig' as utils %}
2-
final Map<String, dynamic> params = {
2+
final Map<String, dynamic> apiParams = {
33
{{- utils.map_parameter(method.parameters.query) -}}
44
{{~ utils.map_parameter(method.parameters.body) }}
55
};
@@ -8,6 +8,6 @@
88
{{~ utils.map_headers(method.headers) }}
99
};
1010

11-
final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: apiPath, params: params, headers: apiHeaders);
11+
final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: apiPath, params: apiParams, headers: apiHeaders);
1212

1313
return {% if method.responseModel and method.responseModel != 'any' %}models.{{method.responseModel | caseUcfirst | overrideIdentifier}}.fromMap(res.data){% else %} res.data{% endif %};

‎templates/flutter/base/requests/file.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% import 'flutter/base/utils.twig' as utils %}
2-
final Map<String, dynamic> params = {
2+
final Map<String, dynamic> apiParams = {
33
{{~ utils.map_parameter(method.parameters.query) }}
44
{{~ utils.map_parameter(method.parameters.body) }}
55
};
@@ -20,7 +20,7 @@
2020
{% endfor %}
2121
final res = await client.chunkedUpload(
2222
path: apiPath,
23-
params: params,
23+
params: apiParams,
2424
paramName: paramName,
2525
idParamName: idParamName,
2626
headers: apiHeaders,

0 commit comments

Comments
 (0)