Merge remote-tracking branch 'origin/0.16.x' into fix-write-permission-not-allowed

# Conflicts:
#	composer.lock

CHANGES.md

@@ -1,3 +1,35 @@
+# Version 1.0.0-RC1
+
+# DO NOT INSTALL THIS VERSION ON ANY EXISTING INSTANCES OF APPWRITE, THIS IS A TEST RELEASE AND DOES NOT HAVE BACKWARDS COMPATIBILITY!!
+
+## BREAKING CHANGES
+- All Date values are now stored as ISO-8601 instead of UNIX timestamps [#3516](https://github.com/appwrite/appwrite/pull/3516)
+- Permission levels and syntax have been reworked. See the Permissions V2 section in the document for more information [#3700](https://github.com/appwrite/appwrite/pull/3700)
+- Function Variables are now stored in a seperate collection with their own API endpoints [#3634](https://github.com/appwrite/appwrite/pull/3634)
+- Resources that are computed asynchronously, such as function deployments, will now return a `202 Accepted` status code instead of `200 OK` [#3547](https://github.com/appwrite/appwrite/pull/3547)
+- Queries have been improved to allow even more flexibility, and introduced to new endpoints. See the Queries V2 section in the document for more information [#3702](https://github.com/appwrite/appwrite/pull/3702)
+- Compound indexes are now more flexible [#151](https://github.com/utopia-php/database/pull/151)
+
+## Features
+- Added the UI to see the Parent ID of all resources within the UI. [#3653](https://github.com/appwrite/appwrite/pull/3653)
+- Added automatic cache cleaning for internal Appwrite services [#3491](https://github.com/appwrite/appwrite/pull/3491)
+- Added the ability for Appwrite to handle importing hashed passwords, this can be leveraged to import existing user data from other systems. More information can be found in the document linked above. [#2747](https://github.com/appwrite/appwrite/pull/2747)
+- `Users` has now been renamed to `Authentication` within the Appwrite console [#3664](https://github.com/appwrite/appwrite/pull/3664)
+- More endpoints were made public (for guests) with proper rate limits [#3741](https://github.com/appwrite/appwrite/pull/3741)
+- Added Disqus, Podio, and Etsy OAuth providers [#3526](https://github.com/appwrite/appwrite/pull/3526), [#3488](https://github.com/appwrite/appwrite/pull/3488), [#3522](https://github.com/appwrite/appwrite/pull/3522)
+- Function logs now capture stdout [#3656](https://github.com/appwrite/appwrite/pull/3656)
+- Added the ability to grant guests write permissions for documents, files and executions [#3727](https://github.com/appwrite/appwrite/pull/3727)
+
+## Bugs
+- Fixed an issue where after resetting your password in the Appwrite console, you would not be redirected to the login page. [#3654](https://github.com/appwrite/appwrite/pull/3654)
+- Fixed an issue where invalid data could be loaded into the Appwrite console. [#3660](https://github.com/appwrite/appwrite/pull/3660)
+- Fixed an issue where users using the MySQL adapter for Appwrite would run into an issue with full text indexes [#154](https://github.com/utopia-php/database/pull/154)
+- Fix teams being created with no owners [#3558](https://github.com/appwrite/appwrite/pull/3558)
+- Fixed a bug where you could not search users by phone [#3619](https://github.com/appwrite/appwrite/pull/3619)
+- Fixed a bug where unaccepted invitations would grant access to projects [#3738](https://github.com/appwrite/appwrite/pull/3738)
+
+For more information on the changes, please see our [1.0-RC1 Documentation](https://warm-tray-285.notion.site/Appwrite-1-0-0-RC1-a5eab87e115d454db0259f707fc88535).
+
 # Version 0.15.3
 ## Features
 - Added hint during Installation for DNS Configuration by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/2450

app/config/platforms.php

@@ -15,7 +15,7 @@ return [
             [
                 'key' => 'web',
                 'name' => 'Web',
-                'version' => '9.1.0-RC1',
+                'version' => '10.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-web',
                 'package' => 'https://www.npmjs.com/package/appwrite',
                 'enabled' => true,
@@ -81,7 +81,7 @@ return [
             [
                 'key' => 'apple',
                 'name' => 'Apple',
-                'version' => '0.7.0-RC1',
+                'version' => '1.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-apple',
                 'package' => 'https://github.com/appwrite/sdk-for-apple',
                 'enabled' => true,
@@ -116,7 +116,7 @@ return [
             [
                 'key' => 'android',
                 'name' => 'Android',
-                'version' => '0.8.0-SNAPSHOT',
+                'version' => '1.0.0-SNAPSHOT',
                 'url' => 'https://github.com/appwrite/sdk-for-android',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                 'enabled' => true,
@@ -162,7 +162,7 @@ return [
             [
                 'key' => 'web',
                 'name' => 'Console',
-                'version' => '6.1.0-RC1',
+                'version' => '7.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-console',
                 'package' => '',
                 'enabled' => true,
@@ -180,7 +180,7 @@ return [
             [
                 'key' => 'cli',
                 'name' => 'Command Line',
-                'version' => '0.19.0-RC1',
+                'version' => '1.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://www.npmjs.com/package/appwrite-cli',
                 'enabled' => true,
@@ -208,7 +208,7 @@ return [
             [
                 'key' => 'nodejs',
                 'name' => 'Node.js',
-                'version' => '7.1.0-RC1',
+                'version' => '8.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-node',
                 'package' => 'https://www.npmjs.com/package/node-appwrite',
                 'enabled' => true,
@@ -226,7 +226,7 @@ return [
             [
                 'key' => 'deno',
                 'name' => 'Deno',
-                'version' => '5.1.0-RC1',
+                'version' => '6.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-deno',
                 'package' => 'https://deno.land/x/appwrite',
                 'enabled' => true,
@@ -244,7 +244,7 @@ return [
             [
                 'key' => 'php',
                 'name' => 'PHP',
-                'version' => '6.1.0-RC1',
+                'version' => '7.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-php',
                 'package' => 'https://packagist.org/packages/appwrite/appwrite',
                 'enabled' => true,
@@ -262,7 +262,7 @@ return [
             [
                 'key' => 'python',
                 'name' => 'Python',
-                'version' => '0.11.0-RC1',
+                'version' => '1.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-python',
                 'package' => 'https://pypi.org/project/appwrite/',
                 'enabled' => true,
@@ -280,7 +280,7 @@ return [
             [
                 'key' => 'ruby',
                 'name' => 'Ruby',
-                'version' => '6.1.0-RC1',
+                'version' => '7.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-ruby',
                 'package' => 'https://rubygems.org/gems/appwrite',
                 'enabled' => true,
@@ -298,7 +298,7 @@ return [
             [
                 'key' => 'go',
                 'name' => 'Go',
-                'version' => '0.2.0-RC1',
+                'version' => '1.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-go',
                 'package' => '',
                 'enabled' => false,
@@ -316,7 +316,7 @@ return [
             [
                 'key' => 'java',
                 'name' => 'Java',
-                'version' => '0.0.3-SNAPSHOT',
+                'version' => '1.0.0-SNAPSHOT',
                 'url' => 'https://github.com/appwrite/sdk-for-java',
                 'package' => '',
                 'enabled' => false,
@@ -334,7 +334,7 @@ return [
             [
                 'key' => 'dotnet',
                 'name' => '.NET',
-                'version' => '0.5.0-RC1',
+                'version' => '1.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                 'package' => 'https://www.nuget.org/packages/Appwrite',
                 'enabled' => false,
@@ -370,7 +370,7 @@ return [
             [
                 'key' => 'kotlin',
                 'name' => 'Kotlin',
-                'version' => '0.7.0-SNAPSHOT',
+                'version' => '1.0.0-SNAPSHOT',
                 'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                 'enabled' => true,
@@ -392,7 +392,7 @@ return [
             [
                 'key' => 'swift',
                 'name' => 'Swift',
-                'version' => '0.7.0-RC1',
+                'version' => '1.0.0-RC1',
                 'url' => 'https://github.com/appwrite/sdk-for-swift',
                 'package' => 'https://github.com/appwrite/sdk-for-swift',
                 'enabled' => true,

app/controllers/api/avatars.php

@@ -354,27 +354,20 @@ App::get('/v1/avatars/initials')
     ->param('name', '', new Text(128), 'Full Name. When empty, current user name or email will be used. Max length: 128 chars.', true)
     ->param('width', 500, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
     ->param('height', 500, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
-    ->param('color', '', new HexColor(), 'Changes text color. By default a random color will be picked and stay will persistent to the given name.', true)
     ->param('background', '', new HexColor(), 'Changes background color. By default a random color will be picked and stay will persistent to the given name.', true)
     ->inject('response')
     ->inject('user')
-    ->action(function (string $name, int $width, int $height, string $color, string $background, Response $response, Document $user) {
+    ->action(function (string $name, int $width, int $height, string $background, Response $response, Document $user) {
 
         $themes = [
-            ['color' => '#27005e', 'background' => '#e1d2f6'], // VIOLET
-            ['color' => '#5e2700', 'background' => '#f3d9c6'], // ORANGE
-            ['color' => '#006128', 'background' => '#c9f3c6'], // GREEN
-            ['color' => '#580061', 'background' => '#f2d1f5'], // FUSCHIA
-            ['color' => '#00365d', 'background' => '#c6e1f3'], // BLUE
-            ['color' => '#00075c', 'background' => '#d2d5f6'], // INDIGO
-            ['color' => '#610038', 'background' => '#f5d1e6'], // PINK
-            ['color' => '#386100', 'background' => '#dcf1bd'], // LIME
-            ['color' => '#615800', 'background' => '#f1ecba'], // YELLOW
-            ['color' => '#610008', 'background' => '#f6d2d5'], // RED
+            ['background' => '#F2F2F8'], // Default
+            ['background' => '#FDC584'], // Orange
+            ['background' => '#94DBD1'], // Green
+            ['background' => '#A1C4FF'], // Blue
+            ['background' => '#FFA1CE'], // Pink
+            ['background' => '#CBB1FC'] // Purple
         ];
 
-        $rand = \rand(0, \count($themes) - 1);
-
         $name = (!empty($name)) ? $name : $user->getAttribute('name', $user->getAttribute('email', ''));
         $words = \explode(' ', \strtoupper($name));
         // if there is no space, try to split by `_` underscore
@@ -393,25 +386,34 @@ App::get('/v1/avatars/initials')
         }
 
         $rand = \substr($code, -1);
+
+        // Wrap rand value to avoid out of range
+        $rand = ($rand > \count($themes) - 1) ? $rand % \count($themes) : $rand;
+
         $background = (!empty($background)) ? '#' . $background : $themes[$rand]['background'];
-        $color = (!empty($color)) ? '#' . $color : $themes[$rand]['color'];
 
         $image = new \Imagick();
+        $punch = new \Imagick();
         $draw = new \ImagickDraw();
         $fontSize = \min($width, $height) / 2;
 
+        $punch->newImage($width, $height, 'transparent');
+
         $draw->setFont(__DIR__ . "/../../../public/fonts/poppins-v9-latin-500.ttf");
         $image->setFont(__DIR__ . "/../../../public/fonts/poppins-v9-latin-500.ttf");
 
-        $draw->setFillColor(new \ImagickPixel($color));
+        $draw->setFillColor(new ImagickPixel('black'));
         $draw->setFontSize($fontSize);
 
         $draw->setTextAlignment(\Imagick::ALIGN_CENTER);
         $draw->annotation($width / 1.97, ($height / 2) + ($fontSize / 3), $initials);
 
+        $punch->drawImage($draw);
+        $punch->negateImage(true, Imagick::CHANNEL_ALPHA);
+
         $image->newImage($width, $height, $background);
         $image->setImageFormat("png");
-        $image->drawImage($draw);
+        $image->compositeImage($punch, Imagick::COMPOSITE_COPYOPACITY, 0, 0);
 
         //$image->setImageCompressionQuality(9 - round(($quality / 100) * 9));
 

app/controllers/api/functions.php

@@ -1108,6 +1108,7 @@ App::post('/v1/functions/:functionId/executions')
         $roles = Authorization::getRoles();
         $isPrivilegedUser = Auth::isPrivilegedUser($roles);
         $isAppUser = Auth::isAppUser($roles);
+
         if (!$isPrivilegedUser && !$isAppUser) {
             $execution->setAttribute('stdout', '');
             $execution->setAttribute('stderr', '');

app/controllers/general.php

@@ -223,7 +223,7 @@ App::init()
             ->addHeader('Server', 'Appwrite')
             ->addHeader('X-Content-Type-Options', 'nosniff')
             ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma')
             ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
             ->addHeader('Access-Control-Allow-Origin', $refDomain)
             ->addHeader('Access-Control-Allow-Credentials', 'true')
@@ -374,7 +374,7 @@ App::options()
         $response
             ->addHeader('Server', 'Appwrite')
             ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
             ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
             ->addHeader('Access-Control-Allow-Origin', $origin)
             ->addHeader('Access-Control-Allow-Credentials', 'true')

app/views/console/databases/document.phtml

@@ -413,7 +413,7 @@ $permissions = $this->getParam('permissions', null);
                     </div>
                 </li>
                 <?php if(!$new): ?>
-                    <li data-state="/console/databases/document/activity?id={{router.params.id}}&collection={{router.params.collection}}&project={{router.params.project}}">
+                    <li data-state="/console/databases/document/activity?id={{router.params.id}}&collection={{router.params.collection}}&project={{router.params.project}}&databaseId={{router.params.databaseId}}">
                         <h2>Activity</h2>
 
                         <?php echo $logs->render(); ?>

app/views/console/functions/function.phtml

@@ -596,7 +596,7 @@ sort($patterns);
                         </form>
 
                         <div>
-                            <span class="text-one-liner" data-ls-bind="{{variable.key}}"></span>
+                            <span data-ls-bind="{{variable.key}}"></span>
                         </div>
 
                         <div data-ui-modal class="modal box close" data-button-text="Show Value" data-button-class="link pull-start margin-end-small margin-top-tiny">

composer.json

@@ -77,7 +77,7 @@
         }
     ],
     "require-dev": {
-        "appwrite/sdk-generator": "0.23.0",
+        "appwrite/sdk-generator": "0.24.0",
         "ext-fileinfo": "*",
         "phpunit/phpunit": "9.5.20",
         "squizlabs/php_codesniffer": "^3.6",

tests/e2e/General/HTTPTest.php

@@ -26,7 +26,7 @@ class HTTPTest extends Scope
         $this->assertEquals(204, $response['headers']['status-code']);
         $this->assertEquals('Appwrite', $response['headers']['server']);
         $this->assertEquals('GET, POST, PUT, PATCH, DELETE', $response['headers']['access-control-allow-methods']);
-        $this->assertEquals('Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies', $response['headers']['access-control-allow-headers']);
+        $this->assertEquals('Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies', $response['headers']['access-control-allow-headers']);
         $this->assertEquals('X-Fallback-Cookies', $response['headers']['access-control-expose-headers']);
         $this->assertEquals('http://localhost', $response['headers']['access-control-allow-origin']);
         $this->assertEquals('true', $response['headers']['access-control-allow-credentials']);

tests/e2e/Services/Avatars/AvatarsBase.php

@@ -491,7 +491,6 @@ trait AvatarsBase
             'name' => 'W W',
             'width' => 200,
             'height' => 200,
-            'color' => 'ffffff',
             'background' => '000000',
         ]);
 
@@ -508,34 +507,33 @@ trait AvatarsBase
             'name' => 'W W',
             'width' => 200000,
             'height' => 200,
-            'color' => 'ffffff',
             'background' => '000000',
         ]);
 
         $this->assertEquals(400, $response['headers']['status-code']);
-
-        $response = $this->client->call(Client::METHOD_GET, '/avatars/initials', [
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], [
-            'name' => 'W W',
-            'width' => 200,
-            'height' => 200,
-            'color' => 'white',
-            'background' => '000000',
-        ]);
-
-        $this->assertEquals(400, $response['headers']['status-code']);
-
-        $response = $this->client->call(Client::METHOD_GET, '/avatars/initials', [
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], [
-            'name' => 'W W',
-            'width' => 200,
-            'height' => 200,
-            'color' => 'ffffff',
-            'background' => 'black',
-        ]);
-
-        $this->assertEquals(400, $response['headers']['status-code']);
+    }
+
+    public function testInitialImage()
+    {
+        $response = $this->client->call(Client::METHOD_GET, '/avatars/initials', [
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], [
+            'name' => 'W W',
+            'width' => 200,
+            'height' => 200,
+        ]);
+
+        $this->assertEquals(200, $response['headers']['status-code']);
+        $this->assertEquals('image/png', $response['headers']['content-type']);
+        $this->assertNotEmpty($response['body']);
+
+        $image = new \Imagick();
+        $image->readImageBlob($response['body']);
+        $original = new \Imagick(__DIR__ . '/../../../resources/initials.png');
+
+        $this->assertEquals($image->getImageWidth(), $original->getImageWidth());
+        $this->assertEquals($image->getImageHeight(), $original->getImageHeight());
+        $this->assertEquals('PNG', $image->getImageFormat());
+        $this->assertEquals(strlen(\file_get_contents(__DIR__ . '/../../../resources/initials.png')), strlen($response['body']));
     }
 }