Merge pull request #1057 from appwrite/pla-2706

chore: update setting of realtime endpoint

Author: christyjacob4

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

@@ -25,6 +25,7 @@ import java.io.BufferedReader
 import java.io.File
 import java.io.RandomAccessFile
 import java.io.IOException
+import java.lang.IllegalArgumentException
 import java.net.CookieManager
 import java.net.CookiePolicy
 import java.security.SecureRandom
@@ -176,24 +177,31 @@ class Client @JvmOverloads constructor(
      *
      * @return this
      */
+    @Throws(IllegalArgumentException::class)
     fun setEndpoint(endpoint: String): Client {
-        this.endpoint = endpoint
-
-        if (this.endpointRealtime == null && endpoint.startsWith("http")) {
-            this.endpointRealtime = endpoint.replaceFirst("http", "ws")
+        require(endpoint.startsWith("http://") || endpoint.startsWith("https://")) {
+            "Invalid endpoint URL: $endpoint"
         }
 
+        this.endpoint = endpoint
+        this.endpointRealtime = endpoint.replaceFirst("http", "ws")
+
         return this
     }
 
     /**
-    * Set realtime endpoint
-    *
-    * @param endpoint
-    *
-    * @return this
-    */
+     * Set realtime endpoint
+     *
+     * @param endpoint
+     *
+     * @return this
+     */
+    @Throws(IllegalArgumentException::class)
     fun setEndpointRealtime(endpoint: String): Client {
+        require(endpoint.startsWith("ws://") || endpoint.startsWith("wss://")) {
+            "Invalid realtime endpoint URL: $endpoint"
+        }
+
         this.endpointRealtime = endpoint
         return this
     }

templates/apple/Sources/Client.swift.twig

@@ -135,14 +135,15 @@ open class Client {
     /// @return Client
     ///
     open func setEndpoint(_ endPoint: String) -> Client {
-        self.endPoint = endPoint
-
-        if (self.endPointRealtime == nil && endPoint.starts(with: "http")) {
-            self.endPointRealtime = endPoint
-                .replacingOccurrences(of: "http://", with: "ws://")
-                .replacingOccurrences(of: "https://", with: "wss://")
+        if !endPoint.hasPrefix("http://") && !endPoint.hasPrefix("https://") {
+            fatalError("Invalid endpoint URL: \(endPoint)")
         }
 
+        self.endPoint = endPoint
+        self.endPointRealtime = endPoint
+            .replacingOccurrences(of: "http://", with: "ws://")
+            .replacingOccurrences(of: "https://", with: "wss://")
+
         return self
     }
 
@@ -154,8 +155,11 @@ open class Client {
     /// @return Client
     ///
     open func setEndpointRealtime(_ endPoint: String) -> Client {
-        self.endPointRealtime = endPoint
+        if !endPoint.hasPrefix("ws://") && !endPoint.hasPrefix("wss://") {
+            fatalError("Invalid realtime endpoint URL: \(endPoint)")
+        }
 
+        self.endPointRealtime = endPoint
         return self
     }
 

templates/cli/lib/client.js.twig

@@ -79,8 +79,11 @@ class Client {
    * @return this
    */
   setEndpoint(endpoint) {
-    this.endpoint = endpoint;
+    if (!endpoint.startsWith('http://') && !endpoint.startsWith('https://')) {
+      throw new {{spec.title | caseUcfirst}}Exception('Invalid endpoint URL: ' + endpoint);
+    }
 
+    this.endpoint = endpoint;
     return this;
   }
 

templates/dart/lib/src/client_browser.dart.twig

@@ -67,6 +67,10 @@ class ClientBrowser extends ClientBase with ClientMixin {
 
   @override
   ClientBrowser setEndpoint(String endPoint) {
+    if (!endPoint.startsWith('http://') && !endPoint.startsWith('https://')) {
+      throw {{spec.title | caseUcfirst}}Exception('Invalid endpoint URL: $endPoint');
+    }
+
     _endPoint = endPoint;
     return this;
   }

templates/dart/lib/src/client_io.dart.twig

@@ -79,6 +79,10 @@ class ClientIO extends ClientBase with ClientMixin {
 
   @override
   ClientIO setEndpoint(String endPoint) {
+    if (!endPoint.startsWith('http://') && !endPoint.startsWith('https://')) {
+      throw {{spec.title | caseUcfirst}}Exception('Invalid endpoint URL: $endPoint');
+    }
+
     _endPoint = endPoint;
     return this;
   }

templates/deno/src/client.ts.twig

@@ -46,8 +46,11 @@ export class Client {
      * @return this
      */
     setEndpoint(endpoint: string): this {
-        this.endpoint = endpoint;
+        if (!endpoint.startsWith('http://') && !endpoint.startsWith('https://')) {
+            throw new {{spec.title | caseUcfirst}}Exception('Invalid endpoint URL: ' + endpoint);
+        }
 
+        this.endpoint = endpoint;
         return this;
     }
 

templates/dotnet/Package/Client.cs.twig

@@ -106,8 +106,11 @@ namespace {{ spec.title | caseUcfirst }}
 
         public Client SetEndpoint(string endpoint)
         {
-            _endpoint = endpoint;
+            if (!endpoint.StartsWith("http://") && !endpoint.StartsWith("https://")) {
+                throw new {{spec.title | caseUcfirst}}Exception("Invalid endpoint URL: " + endpoint);
+            }
 
+            _endpoint = endpoint;
             return this;
         }
 

templates/flutter/lib/src/client_browser.dart.twig

@@ -78,15 +78,24 @@ class ClientBrowser extends ClientBase with ClientMixin {
 
   @override
   ClientBrowser setEndpoint(String endPoint) {
+    if (!endPoint.startsWith('http://') && !endPoint.startsWith('https://')) {
+      throw {{spec.title | caseUcfirst}}Exception('Invalid endpoint URL: $endPoint');
+    }
+
     _endPoint = endPoint;
     _endPointRealtime = endPoint
         .replaceFirst('https://', 'wss://')
         .replaceFirst('http://', 'ws://');
+
     return this;
   }
 
   @override
   ClientBrowser setEndPointRealtime(String endPoint) {
+    if (!endPoint.startsWith('ws://') && !endPoint.startsWith('wss://')) {
+      throw {{spec.title | caseUcfirst}}Exception('Invalid realtime endpoint URL: $endPoint');
+    }
+
     _endPointRealtime = endPoint;
     return this;
   }

templates/flutter/lib/src/client_io.dart.twig

@@ -110,15 +110,24 @@ class ClientIO extends ClientBase with ClientMixin {
 
   @override
   ClientIO setEndpoint(String endPoint) {
+    if (!endPoint.startsWith('http://') && !endPoint.startsWith('https://')) {
+      throw {{spec.title | caseUcfirst}}Exception('Invalid endpoint URL: $endPoint');
+    }
+
     _endPoint = endPoint;
     _endPointRealtime = endPoint
         .replaceFirst('https://', 'wss://')
         .replaceFirst('http://', 'ws://');
+
     return this;
   }
 
   @override
   ClientIO setEndPointRealtime(String endPoint) {
+    if (!endPoint.startsWith('ws://') && !endPoint.startsWith('wss://')) {
+      throw {{spec.title | caseUcfirst}}Exception('Invalid realtime endpoint URL: $endPoint');
+    }
+
     _endPointRealtime = endPoint;
     return this;
   }

templates/kotlin/src/main/kotlin/io/appwrite/Client.kt.twig

@@ -21,6 +21,7 @@ import java.io.BufferedReader
 import java.io.File
 import java.io.RandomAccessFile
 import java.io.IOException
+import java.lang.IllegalArgumentException
 import java.security.SecureRandom
 import java.security.cert.X509Certificate
 import javax.net.ssl.HostnameVerifier
@@ -152,7 +153,12 @@ class Client @JvmOverloads constructor(
     *
     * @return this
     */
+    @Throws(IllegalArgumentException::class)
     fun setEndpoint(endPoint: String): Client {
+        require(endPoint.startsWith("http://") || endPoint.startsWith("https://")) {
+            "Invalid endpoint URL: $endPoint"
+        }
+
         this.endPoint = endPoint
         return this
     }