Skip to content

Commit ca483a7

Browse files
abnegateabnegate
committed
Merge remote-tracking branch 'origin/master' into 1.4.x
2 parents c4ef17e + 81538d1 commit ca483a7

File tree

47 files changed

+72
-68
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+72
-68
lines changed

‎src/SDK/Language/DotNet.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ public function getKeywords(): array
129129
'when',
130130
'where',
131131
'while',
132-
'yield'
132+
'yield',
133+
'path'
133134
];
134135
}
135136

‎src/SDK/Language/JS.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ public function getKeywords(): array
105105
'while',
106106
'with',
107107
'yield',
108+
'path'
108109
];
109110
}
110111

‎src/SDK/Language/Kotlin.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ public function getKeywords(): array
8686
"vararg",
8787
"when",
8888
"where",
89-
"while"
89+
"while",
90+
"path"
9091
];
9192
}
9293

‎src/SDK/Language/PHP.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ public function getKeywords(): array
117117
'use',
118118
'var',
119119
'while',
120-
'xor'
120+
'xor',
121+
'path'
121122
];
122123
}
123124

‎src/SDK/Language/Ruby.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public function getKeywords(): array
7474
'until',
7575
'when',
7676
'while',
77+
'path'
7778
];
7879
}
7980

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class {{ service.name | caseUcfirst }} : Service {
5353
onProgress: ((UploadProgress) -> Unit)? = null
5454
{%~ endif %}
5555
){% if method.type != "webAuth" %}: {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}{% endif %} {
56-
val path = "{{ method.path }}"
56+
val apiPath = "{{ method.path }}"
5757
{%~ for parameter in method.parameters.path %}
5858
.replace("{{ '{' ~ parameter.name | caseCamel ~ '}' }}", {{ parameter.name | caseCamel }})
5959
{%~ endfor %}
@@ -88,7 +88,7 @@ class {{ service.name | caseUcfirst }} : Service {
8888
}
8989
}
9090

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

9494
WebAuthComponent.authenticate(activity, url, callbackUrlScheme) {
@@ -118,7 +118,7 @@ class {{ service.name | caseUcfirst }} : Service {
118118
{%~ elseif method.type == 'location' %}
119119
return client.call(
120120
"{{ method.method | caseUpper }}",
121-
path,
121+
apiPath,
122122
params = params,
123123
responseType = {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}::class.java
124124
)
@@ -146,7 +146,7 @@ class {{ service.name | caseUcfirst }} : Service {
146146
{%~ endif %}
147147
{%~ endfor %}
148148
return client.chunkedUpload(
149-
path,
149+
apiPath,
150150
headers,
151151
params,
152152
responseType = {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}::class.java,
@@ -160,7 +160,7 @@ class {{ service.name | caseUcfirst }} : Service {
160160
{%~ else %}
161161
return client.call(
162162
"{{ method.method | caseUpper }}",
163-
path,
163+
apiPath,
164164
headers,
165165
params,
166166
{%~ if method.responseModel | hasGenericType(spec) %}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
2121
{% endfor %}
2222

2323
let client = !sdk ? await {% if service.name == "projects" %}sdkForConsole(){% else %}sdkForProject(){% endif %} : sdk;
24-
let path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replace('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | caseCamel | escapeKeyword }}){% endfor %};
24+
let apiPath = '{{ method.path }}'{% for parameter in method.parameters.path %}.replace('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | caseCamel | escapeKeyword }}){% endfor %};
2525
let payload = {};
2626
{% if method.parameters.query|length > 0 %}
2727

@@ -95,9 +95,9 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
9595
payload['project'] = localConfig.getProject().projectId
9696
payload['key'] = globalConfig.getKey();
9797
const queryParams = new URLSearchParams(payload);
98-
path = `${globalConfig.getEndpoint()}${path}?${queryParams.toString()}`;
98+
apiPath = `${globalConfig.getEndpoint()}${apiPath}?${queryParams.toString()}`;
9999

100-
const response = await client.call('{{ method.method | caseLower }}', path, {
100+
const response = await client.call('{{ method.method | caseLower }}', apiPath, {
101101
{% for parameter in method.parameters.header %}
102102
'{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
103103
{% endfor %}
@@ -122,7 +122,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
122122
if (size <= libClient.CHUNK_SIZE) {
123123
payload['{{ parameter.name }}'] = fs.createReadStream(payload['{{ parameter.name }}']);
124124

125-
response = await client.call('{{ method.method | caseLower }}', path, {
125+
response = await client.call('{{ method.method | caseLower }}', apiPath, {
126126
{% for parameter in method.parameters.header %}
127127
'{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
128128
{% 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', path + '/' + {{ parameter.name }}, headers);
157+
response = await client.call('get', apiPath + '/' + {{ parameter.name }}, headers);
158158
counter = response.chunksUploaded;
159159
} catch(e) {
160160
}
@@ -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 }}', path, headers, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %});
181+
response = await client.call('{{ method.method | caseLower }}', apiPath, headers, payload{% if method.type == 'location' %}, 'arraybuffer'{% endif %});
182182

183183
if (!id) {
184184
id = response['$id'];
@@ -198,7 +198,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
198198
{% endif %}
199199
{% endfor %}
200200
{% else %}
201-
response = await client.call('{{ method.method | caseLower }}', path, {
201+
response = await client.call('{{ method.method | caseLower }}', apiPath, {
202202
{% for parameter in method.parameters.header %}
203203
'{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
204204
{% endfor %}

‎templates/cli/lib/config.js.twig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class Config {
1515
const file = fs.readFileSync(this.path).toString();
1616
this.data = JSONbig.parse(file);
1717
} catch (e) {
18-
// console.log(`${this.path} not found. Empty data`);
1918
this.data = {};
2019
}
2120
}
@@ -25,7 +24,7 @@ class Config {
2524
if (!fs.existsSync(dir)) {
2625
fs.mkdirSync(dir, { recursive: true });
2726
}
28-
fs.writeFileSync(this.path, JSONbig.stringify(this.data, null, 4));
27+
fs.writeFileSync(this.path, JSONbig.stringify(this.data, null, 4), { mode: 0o600 });
2928
}
3029

3130
get(key) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
{{ utils.map_headers(method.headers) }}
99
};
1010

11-
final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: path, params: params, headers: headers);
11+
final res = await client.call(HttpMethod.{{ method.method | caseLower }}, path: apiPath, params: params, headers: headers);
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{% endif %}
2020
{% endfor %}
2121
final res = await client.chunkedUpload(
22-
path: path,
22+
path: apiPath,
2323
params: params,
2424
paramName: paramName,
2525
idParamName: idParamName,

0 commit comments

Comments
 (0)