Merge pull request #5125 from appwrite/1.2.x

Update master with 1.2.1

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "app/console"]
 	path = app/console
 	url = https://github.com/appwrite/console
-	branch = 2.1.1
+	branch = 2.2.0

CHANGES.md

@@ -1,12 +1,17 @@
 # Version 1.2.1
-## Features
-
 ## Changes
+- Upgrade Console to [2.2.0](https://github.com/appwrite/console/releases/tag/2.2.0)
+- Update DBIP Database [#5049](https://github.com/appwrite/appwrite/pull/5049)
 
 ## Bugs
 - Fix a few null safety warnings [#4654](https://github.com/appwrite/appwrite/pull/4654)
 - Fix timestamp format in Realtime response [#4515](https://github.com/appwrite/appwrite/pull/4515)
 - Add flutter-web as a platform type [#4992](https://github.com/appwrite/appwrite/pull/4992)
+- Fix typo in Model/Locale.php [#4669](https://github.com/appwrite/appwrite/pull/4669)
+- Fix deletes worker not deleting project database tables [#4984](https://github.com/appwrite/appwrite/pull/4984)
+- Fix deletes worker not deleting database collections [#4983](https://github.com/appwrite/appwrite/pull/4983)
+- Fix restart policy for worker-messaging container [#4994](https://github.com/appwrite/appwrite/pull/4994)
+- Fix validating origin for apple platforms [#5089](https://github.com/appwrite/appwrite/pull/5089)
 
 # Version 1.2.0
 ## Features

README-CN.md

@@ -64,7 +64,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.2.0
+    appwrite/appwrite:1.2.1
 ```
 
 ### Windows
@@ -76,7 +76,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.2.0
+    appwrite/appwrite:1.2.1
 ```
 
 #### PowerShell
@@ -86,7 +86,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.2.0
+    appwrite/appwrite:1.2.1
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。

README.md

@@ -75,7 +75,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.2.0
+    appwrite/appwrite:1.2.1
 ```
 
 ### Windows
@@ -87,7 +87,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.2.0
+    appwrite/appwrite:1.2.1
 ```
 
 #### PowerShell
@@ -97,7 +97,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.2.0
+    appwrite/appwrite:1.2.1
 ```
 
 Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.

SECURITY.md

@@ -2,13 +2,13 @@
 
 ## Supported Versions
 
-| Version | Supported          |
-| ------- | ------------------ |
-| <= 0.14 | :x:                |
-| 1.15.x  | :white_check_mark: |
-| 1.0.x   | :white_check_mark: |
-| 1.1.x   | :white_check_mark: |
-| 1.2.x   | :white_check_mark: |
+| Version   | Supported          |
+| --------- | ------------------ |
+| <= 0.14.x | :x:                |
+| 0.15.x    | :white_check_mark: |
+| 1.0.x     | :white_check_mark: |
+| 1.1.x     | :white_check_mark: |
+| 1.2.x     | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

app/console

@@ -1 +1 @@
-Subproject commit 5e2a40c1e397bd341a432698c9d76a3f96315841
+Subproject commit 2456d8f21c6e2554056d1a37eab3602024cbb739

app/init.php

@@ -100,7 +100,7 @@ const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return
 const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
 const APP_CACHE_BUSTER = 501;
-const APP_VERSION_STABLE = '1.2.0';
+const APP_VERSION_STABLE = '1.2.1';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';

composer.lock

@@ -5590,5 +5590,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

src/Appwrite/Migration/Migration.php

@@ -49,6 +49,7 @@ abstract class Migration
         '1.1.1' => 'V16',
         '1.1.2' => 'V16',
         '1.2.0' => 'V17',
+        '1.2.1' => 'V17',
     ];
 
     /**

src/Appwrite/Network/Validator/Origin.php

@@ -26,8 +26,10 @@ class Origin extends Validator
     public const SCHEME_TYPE_HTTP = 'http';
     public const SCHEME_TYPE_HTTPS = 'https';
     public const SCHEME_TYPE_IOS = 'appwrite-ios';
-    public const SCHEME_TYPE_ANDROID = 'appwrite-android';
     public const SCHEME_TYPE_MACOS = 'appwrite-macos';
+    public const SCHEME_TYPE_WATCHOS = 'appwrite-watchos';
+    public const SCHEME_TYPE_TVOS = 'appwrite-tvos';
+    public const SCHEME_TYPE_ANDROID = 'appwrite-android';
     public const SCHEME_TYPE_WINDOWS = 'appwrite-windows';
     public const SCHEME_TYPE_LINUX = 'appwrite-linux';
 
@@ -38,8 +40,10 @@ class Origin extends Validator
         self::SCHEME_TYPE_HTTP => 'Web',
         self::SCHEME_TYPE_HTTPS => 'Web',
         self::SCHEME_TYPE_IOS => 'iOS',
-        self::SCHEME_TYPE_ANDROID => 'Android',
         self::SCHEME_TYPE_MACOS => 'macOS',
+        self::SCHEME_TYPE_WATCHOS => 'watchOS',
+        self::SCHEME_TYPE_TVOS => 'tvOS',
+        self::SCHEME_TYPE_ANDROID => 'Android',
         self::SCHEME_TYPE_WINDOWS => 'Windows',
         self::SCHEME_TYPE_LINUX => 'Linux',
     ];
@@ -81,6 +85,9 @@ class Origin extends Validator
                 case self::CLIENT_TYPE_FLUTTER_LINUX:
                 case self::CLIENT_TYPE_ANDROID:
                 case self::CLIENT_TYPE_APPLE_IOS:
+                case self::CLIENT_TYPE_APPLE_MACOS:
+                case self::CLIENT_TYPE_APPLE_WATCHOS:
+                case self::CLIENT_TYPE_APPLE_TVOS:
                     $this->clients[] = (isset($platform['key'])) ? $platform['key'] : '';
                     break;