Merge pull request #694 from appwrite/1.4.x

Related to Appwrite 1.4.x release

Author: christyjacob4

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

@@ -374,7 +374,7 @@ class Client @JvmOverloads constructor(
                 responseType = Map::class.java,
             )
             val chunksUploaded = current["chunksUploaded"] as Long
-            offset = (chunksUploaded * CHUNK_SIZE).coerceAtMost(size)
+            offset = chunksUploaded * CHUNK_SIZE
         }
 
         while (offset < size) {
@@ -385,7 +385,7 @@ class Client @JvmOverloads constructor(
                 }
                 "bytes" -> {
                     val end = if (offset + CHUNK_SIZE < size) {
-                        offset + CHUNK_SIZE
+                        offset + CHUNK_SIZE - 1
                     } else {
                         size - 1
                     }
@@ -405,7 +405,7 @@ class Client @JvmOverloads constructor(
             )
 
             headers["Content-Range"] =
-                "bytes $offset-${((offset + CHUNK_SIZE) - 1).coerceAtMost(size)}/$size"
+                "bytes $offset-${((offset + CHUNK_SIZE) - 1).coerceAtMost(size - 1)}/$size"
 
             result = call(
                 method = "POST",

templates/android/library/src/main/java/io/appwrite/Role.kt.twig

@@ -1,29 +1,72 @@
 package {{ sdk.namespace | caseDot }}
 
+/**
+ * Helper class to generate role strings for [Permission].
+ */
 class Role {
     companion object {
+
+        /**
+         * Grants access to anyone.
+         *
+         * This includes authenticated and unauthenticated users.
+         */
         fun any(): String = "any"
 
+        /**
+         * Grants access to a specific user by user ID.
+         *
+         * You can optionally pass verified or unverified for
+         * [status] to target specific types of users.
+         */
         fun user(id: String, status: String = ""): String = if(status.isEmpty()) {
             "user:$id"
         } else {
             "user:$id/$status"
         }
 
+        /**
+         * Grants access to any authenticated or anonymous user.
+         *
+         * You can optionally pass verified or unverified for
+         * [status] to target specific types of users.
+         */
         fun users(status: String = ""): String = if(status.isEmpty()) {
             "users"
         } else {
             "users/$status"
         }
 
+        /**
+         * Grants access to any guest user without a session.
+         *
+         * Authenticated users don't have access to this role.
+         */
         fun guests(): String = "guests"
 
+        /**
+         * Grants access to a team by team ID.
+         *
+         * You can optionally pass a role for [role] to target
+         * team members with the specified role.
+         */
         fun team(id: String, role: String = ""): String = if(role.isEmpty()) {
             "team:$id"
         } else {
             "team:$id/$role"
         }
 
+        /**
+         * Grants access to a specific member of a team.
+         *
+         * When the member is removed from the team, they will
+         * no longer have access.
+         */
         fun member(id: String): String = "member:$id"
+
+        /**
+         * Grants access to a user with the specified label.
+         */
+        fun label(name: String): String = "label:$name"
     }
 }

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

@@ -164,7 +164,7 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
 
         for (counter; counter < totalCounters; counter++) {
             const start = (counter * libClient.CHUNK_SIZE);
-            const end = Math.min((((counter * libClient.CHUNK_SIZE) + libClient.CHUNK_SIZE) - 1), size);
+            const end = Math.min((((counter * libClient.CHUNK_SIZE) + libClient.CHUNK_SIZE) - 1), size - 1);
 
             apiHeaders['content-range'] = 'bytes ' + start + '-' + end + '/' + size;
 

templates/dart/lib/role.dart.twig

@@ -58,4 +58,9 @@ class Role {
     static String member(String id) {
         return 'member:$id';
     }
+
+    /// Grants access to a user with the specified label.
+    static String label(String name) {
+        return 'label:$name';
+    }
 }

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

@@ -114,18 +114,18 @@ class ClientBrowser extends ClientBase with ClientMixin {
           headers: headers,
         );
         final int chunksUploaded = res.data['chunksUploaded'] as int;
-        offset = min(size, chunksUploaded * CHUNK_SIZE);
+        offset = chunksUploaded * CHUNK_SIZE;
       } on {{spec.title | caseUcfirst}}Exception catch (_) {}
     }
 
     while (offset < size) {
-      List<int> chunk;
-      final end = min(offset + CHUNK_SIZE, size);
+      var chunk;
+      final end = min(offset + CHUNK_SIZE - 1, size - 1);
       chunk = file.bytes!.getRange(offset, end).toList();
       params[paramName] =
           http.MultipartFile.fromBytes(paramName, chunk, filename: file.filename);
       headers['content-range'] =
-          'bytes $offset-${min<int>(((offset + CHUNK_SIZE) - 1), size)}/$size';
+          'bytes $offset-${min<int>((offset + CHUNK_SIZE - 1), size - 1)}/$size';
       res = await call(HttpMethod.post,
           path: path, headers: headers, params: params);
       offset += CHUNK_SIZE;
@@ -134,8 +134,8 @@ class ClientBrowser extends ClientBase with ClientMixin {
       }
       final progress = UploadProgress(
         $id: res.data['\$id'] ?? '',
-        progress: min(offset - 1, size) / size * 100,
-        sizeUploaded: min(offset - 1, size),
+        progress: min(offset, size) / size * 100,
+        sizeUploaded: min(offset, size),
         chunksTotal: res.data['chunksTotal'] ?? 0,
         chunksUploaded: res.data['chunksUploaded'] ?? 0,
       );

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

@@ -143,7 +143,7 @@ class ClientIO extends ClientBase with ClientMixin {
           headers: headers,
         );
         final int chunksUploaded = res.data['chunksUploaded'] as int;
-        offset = min(size, chunksUploaded * CHUNK_SIZE);
+        offset = chunksUploaded * CHUNK_SIZE;
       } on {{spec.title | caseUcfirst}}Exception catch (_) {}
     }
 
@@ -156,7 +156,7 @@ class ClientIO extends ClientBase with ClientMixin {
     while (offset < size) {
       List<int> chunk = [];
       if (file.bytes != null) {
-        final end = min(offset + CHUNK_SIZE-1, size-1);
+        final end = min(offset + CHUNK_SIZE - 1, size - 1);
         chunk = file.bytes!.getRange(offset, end).toList();
       } else {
         raf!.setPositionSync(offset);
@@ -165,7 +165,7 @@ class ClientIO extends ClientBase with ClientMixin {
       params[paramName] =
           http.MultipartFile.fromBytes(paramName, chunk, filename: file.filename);
       headers['content-range'] =
-          'bytes $offset-${min<int>(((offset + CHUNK_SIZE) - 1), size)}/$size';
+          'bytes $offset-${min<int>((offset + CHUNK_SIZE - 1), size - 1)}/$size';
       res = await call(HttpMethod.post,
           path: path, headers: headers, params: params);
       offset += CHUNK_SIZE;
@@ -174,8 +174,8 @@ class ClientIO extends ClientBase with ClientMixin {
       }
       final progress = UploadProgress(
         $id: res.data['\$id'] ?? '',
-        progress: min(offset - 1, size) / size * 100,
-        sizeUploaded: min(offset - 1, size),
+        progress: min(offset, size) / size * 100,
+        sizeUploaded: min(offset, size),
         chunksTotal: res.data['chunksTotal'] ?? 0,
         chunksUploaded: res.data['chunksUploaded'] ?? 0,
       );

templates/dart/test/role_test.dart.twig

@@ -53,4 +53,10 @@ void main() {
       expect(Role.member('custom'), 'member:custom');
     });
   });
+
+  group('label()', () {
+    test('returns label', () {
+      expect(Role.label('admin'), 'label:admin');
+    });
+  });
 }

templates/deno/src/role.ts.twig

@@ -1,34 +1,100 @@
+/**
+ * Helper class to generate role strings for `Permission`.
+ */
 export class Role {
+
+    /**
+     * Grants access to anyone.
+     * 
+     * This includes authenticated and unauthenticated users.
+     * 
+     * @returns {string}
+     */
     public static any(): string {
         return 'any'
     }
 
+    /**
+     * Grants access to a specific user by user ID.
+     * 
+     * You can optionally pass verified or unverified for
+     * `status` to target specific types of users.
+     *
+     * @param {string} id 
+     * @param {string} status 
+     * @returns {string}
+     */
     public static user(id: string, status: string = ''): string {
-        if(status === '') {
+        if (status === '') {
             return `user:${id}`
         }
         return `user:${id}/${status}`
     }
-    
+
+    /**
+     * Grants access to any authenticated or anonymous user.
+     * 
+     * You can optionally pass verified or unverified for
+     * `status` to target specific types of users.
+     * 
+     * @param {string} status 
+     * @returns {string}
+     */
     public static users(status: string = ''): string {
-        if(status === '') {
+        if (status === '') {
             return 'users'
         }
         return `users/${status}`
     }
-    
+
+    /**
+     * Grants access to any guest user without a session.
+     * 
+     * Authenticated users don't have access to this role.
+     * 
+     * @returns {string}
+     */
     public static guests(): string {
         return 'guests'
     }
-    
+
+    /**
+     * Grants access to a team by team ID.
+     * 
+     * You can optionally pass a role for `role` to target
+     * team members with the specified role.
+     * 
+     * @param {string} id 
+     * @param {string} role 
+     * @returns {string}
+     */
     public static team(id: string, role: string = ''): string {
-        if(role === '') {
+        if (role === '') {
             return `team:${id}`
         }
         return `team:${id}/${role}`
     }
 
+    /**
+     * Grants access to a specific member of a team.
+     * 
+     * When the member is removed from the team, they will
+     * no longer have access.
+     * 
+     * @param {string} id 
+     * @returns {string}
+     */
     public static member(id: string): string {
         return `member:${id}`
     }
+
+    /**
+     * Grants access to a user with the specified label.
+     * 
+     * @param {string} name 
+     * @returns  {string}
+     */
+    public static label(name: string): string {
+        return `label:${name}`
+    }
 }

templates/dotnet/base/requests/file.twig

@@ -9,7 +9,7 @@
             return _client.ChunkedUpload(
                 apiPath,
                 apiHeaders,
-                parameters,
+                apiParameters,
                 {%~ if method.responseModel %}
                 Convert,
                 {%~ endif %}

templates/dotnet/src/Appwrite/Client.cs.twig

@@ -354,7 +354,7 @@ namespace {{ spec.title | caseUcfirst }}
                 parameters[paramName] = content;
 
                 headers["Content-Range"] =
-                    $"bytes {offset}-{Math.Min(offset + ChunkSize - 1, size)}/{size}";
+                    $"bytes {offset}-{Math.Min(offset + ChunkSize - 1, size - 1)}/{size}";
 
                 result = await Call<Dictionary<string, object?>>(
                     method: "POST",