Merge remote-tracking branch 'origin/master' into feat-react-native-sdk

Author: lohanidamodar

.github/workflows/tests.yml

@@ -67,4 +67,4 @@ jobs:
         run: composer install
 
       - name: Lint
-        run: composer lint
+        run: composer lint

composer.lock

@@ -1,10 +1,34 @@
 package {{ sdk.namespace | caseDot }}
 
+import java.time.Instant
+import kotlin.math.floor
+import kotlin.random.Random
+
 class ID {
     companion object {
+        // Generate an hex ID based on timestamp
+        // Recreated from https://www.php.net/manual/en/function.uniqid.php
+        private fun hexTimestamp(): String {
+            val now = Instant.now()
+            val sec = now.epochSecond
+            val usec = (System.nanoTime() / 1000) % 1000
+
+            val hexTimestamp = "%08x%05x".format(sec, usec)
+
+            return hexTimestamp
+        }
+
         fun custom(id: String): String
             = id
-        fun unique(): String
-            = "unique()"
+
+        // Generate a unique ID with padding to have a longer ID
+        fun unique(padding: Int = 7): String {
+            val baseId = hexTimestamp()
+            val randomPadding = (1..padding)
+                .map { Random.nextInt(0, 16).toString(16) }
+                .joinToString("")
+
+            return baseId + randomPadding
+        }
     }
-}
+}

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

@@ -542,6 +542,8 @@ extension Client {
         return "tvos"
         #elseif os(macOS)
         return "macos"
+        #elseif os(visionOS)
+        return "visionos"
         #elseif os(Linux)
         return "linux"
         #elseif os(Windows)

templates/apple/Sources/Client.swift.twig

@@ -6,7 +6,7 @@ const { globalConfig, localConfig } = require("../config");
 const { actionRunner, success, parseBool, commandDescriptions, log, parse } = require("../parser");
 {% if sdk.test != "true" %}
 const { questionsLogin } = require("../questions");
-const { accountCreateEmailSession, accountDeleteSession } = require("./account");
+const { accountCreateEmailPasswordSession, accountDeleteSession } = require("./account");
 
 const login = new Command("login")
     .description(commandDescriptions['login'])
@@ -18,7 +18,7 @@ const login = new Command("login")
 
         let client = await sdkForConsole(false);
 
-        await accountCreateEmailSession({
+        await accountCreateEmailPasswordSession({
             email: answers.email,
             password: answers.password,
             parseOutput: false,

templates/cli/lib/commands/generic.js.twig

@@ -1,16 +1,37 @@
-part of {{ language.params.packageName }};
+part of '{{ language.params.packageName }}.dart';
 
 /// Helper class to generate ID strings for resources.
 class ID {
   ID._();
 
-  /// Have Appwrite generate a unique ID for you.
-  static String unique() {
-    return 'unique()';
+  // Generate an hex ID based on timestamp
+  // Recreated from https://www.php.net/manual/en/function.uniqid.php
+  static String _hexTimestamp() {
+    final now = DateTime.now();
+    final sec = (now.millisecondsSinceEpoch / 1000).floor();
+    final usec = now.microsecondsSinceEpoch - (sec * 1000000);
+    return sec.toRadixString(16) +
+        usec.toRadixString(16).padLeft(5, '0');
+  }
+
+  // Generate a unique ID with padding to have a longer ID
+  static String unique({int padding = 7}) {
+    String id = _hexTimestamp();
+
+    if (padding > 0) {
+      StringBuffer sb = StringBuffer();
+      for (var i = 0; i < padding; i++) {
+        sb.write(Random().nextInt(16).toRadixString(16));
+      }
+
+      id += sb.toString();
+    }
+
+    return id;
   }
 
   /// Uses [id] as the ID for the resource.
   static String custom(String id) {
     return id;
   }
-}
+}

templates/dart/lib/id.dart.twig

@@ -6,6 +6,7 @@
 library {{ language.params.packageName }};
 
 import 'dart:async';
+import 'dart:math';
 import 'dart:typed_data';
 import 'dart:convert';
 

templates/dart/lib/package.dart.twig

@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }};
+part of '{{ language.params.packageName }}.dart';
 
 /// Helper class to generate permission strings for resources.
 class Permission {

templates/dart/lib/permission.dart.twig

@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }};
+part of '{{ language.params.packageName }}.dart';
 
 
 /// Helper class to generate query strings.

templates/dart/lib/query.dart.twig

@@ -1,4 +1,4 @@
-part of {{ language.params.packageName }};
+part of '{{ language.params.packageName }}.dart';
 
 /// Helper class to generate role strings for [Permission].
 class Role {