Merge remote-tracking branch 'origin/master' into feat-dotnet-response-models

abnegate · abnegate · commit 0cec05e8523e · 2023-05-11T18:59:49.000+12:00
# Conflicts:
#	templates/dotnet/docs/example.md.twig
diff --git a/src/SDK/Language/PHP.php b/src/SDK/Language/PHP.php
@@ -384,7 +384,10 @@ public function getFilters(): array
         return [
             new TwigFilter('getReturn', function ($value) {
                 return $this->getReturn($value);
-            })
+            }),
+            new TwigFilter('deviceInfo', function ($value) {
+                return php_uname('s') . '; ' . php_uname('v') . '; ' . php_uname('m');
+            }),
         ];
     }
 }
diff --git a/templates/android/docs/java/example.md.twig b/templates/android/docs/java/example.md.twig
@@ -7,7 +7,7 @@ import {{ sdk.namespace | caseDot }}.services.{{ service.name | caseUcfirst }};
 
 Client client = new Client(context)
 {% if method.auth|length > 0 %}
-    .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header | caseUcfirst}}("{{node[header]['x-appwrite']['demo']}}"){% if loop.last %};{% endif %} // {{node[header].description}}
diff --git a/templates/android/docs/kotlin/example.md.twig b/templates/android/docs/kotlin/example.md.twig
@@ -6,7 +6,7 @@ import {{ sdk.namespace | caseDot }}.services.{{ service.name | caseUcfirst }}
 
 val client = Client(context)
 {% if method.auth|length > 0 %}
-    .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header | caseUcfirst}}("{{node[header]['x-appwrite']['demo']}}") // {{node[header].description}}
diff --git a/templates/dart/docs/example.md.twig b/templates/dart/docs/example.md.twig
@@ -9,7 +9,7 @@ void main() { // Init SDK
 
 {% if method.auth|length > 0 %}
   client
-    .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header}}('{{node[header]['x-appwrite']['demo']}}') // {{node[header].description}}
diff --git a/templates/dart/lib/src/client_io.dart.twig b/templates/dart/lib/src/client_io.dart.twig
@@ -43,6 +43,7 @@ class ClientIO extends ClientBase with ClientMixin {
       'x-sdk-platform': '{{ sdk.platform }}',
       'x-sdk-language': '{{ language.name | caseLower }}',
       'x-sdk-version': '{{ sdk.version }}',
+      'user-agent' : '{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} ({{Platform.operatingSystem}}; {{Platform.operatingSystemVersion}})',
 {% for key,header in spec.global.defaultHeaders %}
       '{{key}}' : '{{header}}',
 {% endfor %}
diff --git a/templates/deno/docs/example.md.twig b/templates/deno/docs/example.md.twig
@@ -10,7 +10,7 @@ let {{ service.name | caseCamel }} = new sdk.{{service.name | caseUcfirst}}(clie
 
 {% if method.auth|length > 0 %}
 client
-    .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header}}('{{node[header]['x-appwrite']['demo']}}') // {{node[header].description}}
diff --git a/templates/deno/src/client.ts.twig b/templates/deno/src/client.ts.twig
@@ -11,6 +11,7 @@ export class Client {
     endpoint: string = '{{spec.endpoint}}';
     headers: Payload = {
         'content-type': '',
+        'user-agent' : `{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} (${Deno.build.os}; ${Deno.build.arch})`,
         'x-sdk-name': '{{ sdk.name }}',
         'x-sdk-platform': '{{ sdk.platform }}',
         'x-sdk-language': '{{ language.name | caseLower }}',
diff --git a/templates/dotnet/docs/example.md.twig b/templates/dotnet/docs/example.md.twig
@@ -3,7 +3,7 @@ using {{ spec.title | caseUcfirst }}.Models;
 
 Client client = new Client()
 {% if method.auth|length > 0 %}
-    .SetEndPoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+    .SetEndPoint("https://cloud.appwrite.io/v1") // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .Set{{header | caseUcfirst}}("{{node[header]['x-appwrite']['demo']}}"){% if loop.last %};{% endif %} // {{node[header].description}}
diff --git a/templates/dotnet/src/Appwrite/Client.cs.twig b/templates/dotnet/src/Appwrite/Client.cs.twig
@@ -58,6 +58,7 @@ namespace {{ spec.title | caseUcfirst }}
             _headers = new Dictionary<string, string>()
             {
                 { "content-type", "application/json" },
+                { "user-agent" , "{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} (${Environment.OSVersion.Platform}; ${Environment.OSVersion.VersionString})"},
                 { "x-sdk-name", "{{ sdk.name }}" },
                 { "x-sdk-platform", "{{ sdk.platform }}" },
                 { "x-sdk-language", "{{ language.name | caseLower }}" },
diff --git a/templates/flutter/docs/example.md.twig b/templates/flutter/docs/example.md.twig
@@ -9,7 +9,7 @@ void main() { // Init SDK
 
 {% if method.auth|length > 0 %}
   client
-    .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header}}('{{node[header]['x-appwrite']['demo']}}') // {{node[header].description}}
diff --git a/templates/go/client.go.twig b/templates/go/client.go.twig
@@ -18,6 +18,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+	"runtime"
 )
 
 const (
@@ -65,6 +66,7 @@ func NewClient() Client {
 	headers := map[string]string{
 {% for key,header in spec.global.defaultHeaders %}
 		"{{key}}" : "{{header}}",
+		"user-agent" : fmt.Sprintf("{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} (%s; %s)", runtime.GOOS, runtime.GOARCH),
 		"x-sdk-name": "{{ sdk.name }}",
 		"x-sdk-platform": "{{ sdk.platform }}",
 		"x-sdk-language": "{{ language.name | caseLower }}",
@@ -387,4 +389,4 @@ func toString(arg interface{}) string {
 	default:
 		return fmt.Sprintf("%s", v)
 	}
-}
+}
diff --git a/templates/go/docs/example.md.twig b/templates/go/docs/example.md.twig
@@ -10,7 +10,7 @@ func main() {
     client := {{ spec.title | caseLower }}.NewClient()
 
 {% if method.auth|length > 0 %}
-    client.SetEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+    client.SetEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     client.Set{{header}}("{{node[header]['x-{{ spec.title | caseLower }}']['demo']}}") // {{node[header].description}}
diff --git a/templates/kotlin/docs/java/example.md.twig b/templates/kotlin/docs/java/example.md.twig
@@ -7,7 +7,7 @@ import {{ sdk.namespace | caseDot }}.services.{{ service.name | caseUcfirst }};
 
 Client client = new Client()
 {% if method.auth|length > 0 %}
-    .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header | caseUcfirst}}("{{node[header]['x-appwrite']['demo']}}"){% if loop.last %};{% endif %} // {{node[header].description}}
diff --git a/templates/kotlin/docs/kotlin/example.md.twig b/templates/kotlin/docs/kotlin/example.md.twig
@@ -6,7 +6,7 @@ import {{ sdk.namespace | caseDot }}.services.{{ service.name | caseUcfirst }}
 
 val client = Client(context)
 {% if method.auth|length > 0 %}
-    .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header | caseUcfirst}}("{{node[header]['x-appwrite']['demo']}}") // {{node[header].description}}
diff --git a/templates/kotlin/src/main/kotlin/io/appwrite/Client.kt.twig b/templates/kotlin/src/main/kotlin/io/appwrite/Client.kt.twig
@@ -62,11 +62,11 @@ class Client @JvmOverloads constructor(
     init {
         headers = mutableMapOf(
             "content-type" to "application/json",
+            "user-agent" to "{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} ${System.getProperty("http.agent")}",
             "x-sdk-name" to "{{ sdk.name }}",
             "x-sdk-platform" to "{{ sdk.platform }}",
             "x-sdk-language" to "{{ language.name | caseLower }}",
             "x-sdk-version" to "{{ sdk.version }}"{% if spec.global.defaultHeaders | length > 0 %},{% endif %}
-            
 {% for key,header in spec.global.defaultHeaders %}
             "{{ key | caseLower }}" to "{{ header }}"{% if not loop.last %},{% endif %}
 {% endfor %}
diff --git a/templates/node/docs/example.md.twig b/templates/node/docs/example.md.twig
@@ -10,7 +10,7 @@ const {{ service.name | caseCamel }} = new sdk.{{service.name | caseUcfirst}}(cl
 
 {% if method.auth|length > 0 %}
 client
-    .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header}}('{{node[header]['x-appwrite']['demo']}}') // {{node[header].description}}
diff --git a/templates/node/lib/client.js.twig b/templates/node/lib/client.js.twig
@@ -1,3 +1,4 @@
+const os = require('os');
 const URL = require('url').URL;
 const axios = require('axios');
 const FormData = require('form-data');
@@ -11,6 +12,7 @@ class Client {
         this.headers = {
             'accept-encoding': '*',
             'content-type': '',
+            'user-agent' : `{{spec.title | caseUcfirst}}{{language.name | caseUcfirst}}SDK/{{ sdk.version }} (${os.type()}; ${os.version()}; ${os.arch()})`,
             'x-sdk-name': '{{ sdk.name }}',
             'x-sdk-platform': '{{ sdk.platform }}',
             'x-sdk-language': '{{ language.name | caseLower }}',
diff --git a/templates/php/docs/example.md.twig b/templates/php/docs/example.md.twig
@@ -10,7 +10,7 @@ $client = new Client();
 
 {% if method.auth|length > 0 %}
 $client
-    ->setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
+    ->setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     ->set{{header}}('{{node[header]['x-appwrite']['demo']}}') // {{node[header].description}}
diff --git a/templates/php/src/Client.php.twig b/templates/php/src/Client.php.twig
@@ -37,6 +37,7 @@ class Client
      */
     protected $headers = [
         'content-type' => '',
+        'user-agent' => '{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} ({{deviceInfo}})',
         'x-sdk-name'=> '{{ sdk.name }}',
         'x-sdk-platform'=> '{{ sdk.platform }}',
         'x-sdk-language'=> '{{ language.name | caseLower }}',
diff --git a/templates/python/docs/example.md.twig b/templates/python/docs/example.md.twig
@@ -8,7 +8,7 @@ client = Client()
 
 {% if method.auth|length > 0 %}
 (client
-  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
+  .set_endpoint('https://cloud.appwrite.io/v1') # Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
   .set_{{header | caseSnake}}('{{node[header]['x-appwrite']['demo']}}') # {{node[header].description}}
diff --git a/templates/python/package/client.py.twig b/templates/python/package/client.py.twig
@@ -11,6 +11,7 @@ class Client:
         self._endpoint = '{{spec.endpoint}}'
         self._global_headers = {
             'content-type': '',
+            'user-agent' : '{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} (${os.uname().sysname}; ${os.uname().version}; ${os.uname().machine})',
             'x-sdk-name': '{{ sdk.name }}',
             'x-sdk-platform': '{{ sdk.platform }}',
             'x-sdk-language': '{{ language.name | caseLower }}',
diff --git a/templates/ruby/docs/example.md.twig b/templates/ruby/docs/example.md.twig
@@ -3,7 +3,7 @@ require '{{ spec.title }}'
 include {{ spec.title | caseUcfirst }}
 
 client = Client.new
-    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
+    .set_endpoint('https://cloud.appwrite.io/v1') # Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set_{{header|caseSnake}}('{{node[header]['x-appwrite']['demo']}}') # {{node[header].description}}
diff --git a/templates/swift/docs/example.md.twig b/templates/swift/docs/example.md.twig
@@ -2,7 +2,7 @@ import Appwrite
 
 let client = Client()
 {% if method.auth|length > 0 %}
-    .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header | caseUcfirst}}("{{node[header]['x-appwrite']['demo']}}") // {{node[header].description}}
diff --git a/templates/web/docs/example.md.twig b/templates/web/docs/example.md.twig
@@ -6,7 +6,7 @@ const {{ service.name | caseCamel }} = new {{service.name | caseUcfirst}}(client
 
 {% if method.auth|length > 0 %}
 client
-    .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
+    .setEndpoint('https://cloud.appwrite.io/v1') // Your API Endpoint
 {% for node in method.auth %}
 {% for key,header in node|keys %}
     .set{{header}}('{{node[header]['x-appwrite']['demo']}}') // {{node[header].description}}
diff --git a/templates/web/package.json.twig b/templates/web/package.json.twig
@@ -8,7 +8,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/sdk.js",
-      "require": "./dist/cjs/sdk.js"
+      "require": "./dist/cjs/sdk.js",
+      "types": "./types/index.d.ts"
     },
     "./package.json": "./package.json"
   },

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,10 @@ public function getFilters(): array`
`384`	`384`	`return [`
`385`	`385`	`new TwigFilter('getReturn', function ($value) {`
`386`	`386`	`return $this->getReturn($value);`
`387`		`- })`
	`387`	`+ }),`
	`388`	`+ new TwigFilter('deviceInfo', function ($value) {`
	`389`	`+ return php_uname('s') . '; ' . php_uname('v') . '; ' . php_uname('m');`
	`390`	`+ }),`
`388`	`391`	`];`
`389`	`392`	`}`
`390`	`393`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ namespace {{ spec.title \| caseUcfirst }}`
`58`	`58`	`_headers = new Dictionary<string, string>()`
`59`	`59`	`{`
`60`	`60`	`{ "content-type", "application/json" },`
	`61`	`+ { "user-agent" , "{{spec.title \| caseUcfirst}}{{ language.name \| caseUcfirst }}SDK/{{ sdk.version }} (${Environment.OSVersion.Platform}; ${Environment.OSVersion.VersionString})"},`
`61`	`62`	`{ "x-sdk-name", "{{ sdk.name }}" },`
`62`	`63`	`{ "x-sdk-platform", "{{ sdk.platform }}" },`
`63`	`64`	`{ "x-sdk-language", "{{ language.name \| caseLower }}" },`