Merge branch 'master' into feat-cli-changes-for-sites

Author: vermakhushboo

example.php

@@ -42,7 +42,7 @@ function getSSLPage($url) {
      $platform = 'console';
     // $platform = 'server';
 
-    $spec = getSSLPage("https://raw.githubusercontent.com/appwrite/appwrite/1.7.x/app/config/specs/swagger2-latest-{$platform}.json");
+    $spec = getSSLPage("https://raw.githubusercontent.com/appwrite/appwrite/1.6.x/app/config/specs/swagger2-latest-{$platform}.json");
 
     if(empty($spec)) {
         throw new Exception('Failed to fetch spec from Appwrite server');

mock-server/src/Utopia/Exception.php

@@ -69,7 +69,7 @@
     ],
     Exception::GENERAL_ROUTE_NOT_FOUND => [
         'name' => Exception::GENERAL_ROUTE_NOT_FOUND,
-        'description' => 'The requested route was not found. Please refer to the API docs and try again.',
+        'description' => 'Route not found. Please ensure the endpoint is configured correctly and that the API route is valid for this SDK version. Refer to the API docs for more details.',
         'code' => 404,
     ],
     Exception::GENERAL_CURSOR_NOT_FOUND => [

src/SDK/SDK.php

@@ -544,6 +544,7 @@ public function generate(string $target): void
                 'namespace' => $this->spec->getNamespace(),
                 'version' => $this->spec->getVersion(),
                 'endpoint' => $this->spec->getEndpoint(),
+                'endpointDocs' => $this->spec->getEndpointDocs(),
                 'host' => parse_url($this->spec->getEndpoint(), PHP_URL_HOST),
                 'basePath' => $this->spec->getAttribute('basePath', ''),
                 'licenseName' => $this->spec->getLicenseName(),

src/Spec/Spec.php

@@ -64,6 +64,11 @@ abstract public function getVersion();
      */
     abstract public function getEndpoint();
 
+    /**
+     * @return string
+     */
+    abstract public function getEndpointDocs();
+
     /**
      * @return string
      */

src/Spec/Swagger2.php

@@ -48,6 +48,16 @@ public function getEndpoint()
         $this->getAttribute('basePath', '');
     }
 
+    /**
+     * @return string
+     */
+    public function getEndpointDocs()
+    {
+        return $this->getAttribute('schemes.0', 'https') .
+        '://' . $this->getAttribute('x-host-docs', 'example.com') .
+        $this->getAttribute('basePath', '');
+    }
+
     /**
      * @return string
      */
@@ -298,6 +308,7 @@ public function getMethods($service)
                 foreach ($method['x-appwrite']['methods'] as $additionalMethod) {
                     $duplicatedMethod = $method;
                     $duplicatedMethod['x-appwrite']['method'] = $additionalMethod['name'];
+                    $duplicatedMethod['x-appwrite']['auth'] = $additionalMethod['auth'] ?? [];
 
                     // Update Response
                     $responses = $additionalMethod['responses'];

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

@@ -23,7 +23,7 @@ import {{ sdk.namespace | caseDot }}.enums.{{ name | caseUcfirst }};
 
 Client client = new Client(context)
     {%~ if method.auth|length > 0 %}
-    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setEndpoint("{{ spec.endpointDocs | raw }}") // Your API Endpoint
     {%~ for node in method.auth %}
     {%~ for key,header in node|keys %}
     .set{{header | caseUcfirst}}("{{node[header]['x-appwrite']['demo'] | raw }}"){% if loop.last %};{% endif %} // {{ node[header].description }}

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

@@ -23,7 +23,7 @@ import {{ sdk.namespace | caseDot }}.enums.{{ name | caseUcfirst }}
 
 val client = Client(context)
     {%~ if method.auth|length > 0 %}
-    .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+    .setEndpoint("{{ spec.endpointDocs | raw }}") // Your API Endpoint
     {%~ for node in method.auth %}
     {%~ for key,header in node|keys %}
     .set{{header | caseUcfirst}}("{{node[header]['x-appwrite']['demo'] | raw }}") // {{node[header].description}}

templates/android/example/src/main/java/io/package/android/utils/Client.kt.twig

@@ -8,7 +8,7 @@ object Client {
 
     fun create(context: Context) {
         client = Client(context)
-            .setEndpoint("http://192.168.4.24/v1")
+            .setEndpoint("{{ spec.endpointDocs | raw }}")
             .setProject("65a8e2b4632c04b1f5da")
             .setSelfSigned(true)
     }

templates/android/library/src/main/java/io/package/services/Service.kt.twig

@@ -127,7 +127,7 @@ class {{ service.name | caseUcfirst }}(client: Client) : Service(client) {
             responseType = {{ method | returnType(spec, sdk.namespace | caseDot) | raw }}::class.java
         )
         {%~ else %}
-        val apiHeaders = mutableMapOf(
+        val apiHeaders = mutableMapOf<String, String>(
         {%~ for key, header in method.headers %}
             "{{ key }}" to "{{ header }}",
         {%~ endfor %}

templates/apple/Sources/Client.swift.twig

@@ -215,7 +215,7 @@ open class Client {
 
        return output.addingPercentEncoding(
            withAllowedCharacters: .urlHostAllowed
-       ) ?? ""
+       )?.replacingOccurrences(of: "+", with: "%2B") ?? "" // since urlHostAllowed doesn't include +
    }
 
     ///