Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' of https://github.com/appwrite/appwrite into chore-prepare-0-13-2

Browse source
This commit is contained in:
Torsten Dittmann 2022-03-07 16:11:36 +01:00
commit 26684ec0f9
6 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/bug.yaml vendored
View file

@ -37,6 +37,7 @@ body:
label: "🎲 Appwrite version" label: "🎲 Appwrite version"
description: "What version of Appwrite are you running?" description: "What version of Appwrite are you running?"
options: options:
- Version 0.13.x
- Version 0.12.x - Version 0.12.x
- Version 0.11.x - Version 0.11.x
- Version 0.10.x - Version 0.10.x

3
app/controllers/api/projects.php
View file

@ -4,6 +4,7 @@ use Appwrite\Auth\Auth;
use Appwrite\Auth\Validator\Password; use Appwrite\Auth\Validator\Password;
use Appwrite\Network\Validator\CNAME; use Appwrite\Network\Validator\CNAME;
use Appwrite\Network\Validator\Domain as DomainValidator; use Appwrite\Network\Validator\Domain as DomainValidator;
use Appwrite\Network\Validator\Origin;
use Appwrite\Network\Validator\URL; use Appwrite\Network\Validator\URL;
use Appwrite\Utopia\Database\Validator\CustomId; use Appwrite\Utopia\Database\Validator\CustomId;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
@ -1002,7 +1003,7 @@ App::post('/v1/projects/:projectId/platforms')
->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_PLATFORM) ->label('sdk.response.model', Response::MODEL_PLATFORM)
->param('projectId', null, new UID(), 'Project unique ID.') ->param('projectId', null, new UID(), 'Project unique ID.')
->param('type', null, new WhiteList(['web', 'flutter-ios', 'flutter-android', 'flutter-linux', 'flutter-macos', 'flutter-windows', 'apple-ios', 'apple-macos', 'apple-watchos', 'apple-tvos', 'android', 'unity'], true), 'Platform type.') ->param('type', null, new WhiteList([Origin::CLIENT_TYPE_WEB, Origin::CLIENT_TYPE_FLUTTER_IOS, Origin::CLIENT_TYPE_FLUTTER_ANDROID, Origin::CLIENT_TYPE_FLUTTER_LINUX, Origin::CLIENT_TYPE_FLUTTER_MACOS, Origin::CLIENT_TYPE_FLUTTER_WINDOWS, Origin::CLIENT_TYPE_APPLE_IOS, Origin::CLIENT_TYPE_APPLE_MACOS, Origin::CLIENT_TYPE_APPLE_WATCHOS, Origin::CLIENT_TYPE_APPLE_TVOS, Origin::CLIENT_TYPE_ANDROID, Origin::CLIENT_TYPE_UNITY], true), 'Platform type.')
->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.') ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.')
->param('key', '', new Text(256), 'Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.', true) ->param('key', '', new Text(256), 'Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.', true)
->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true) ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)

4
app/executor.php
View file

@ -500,8 +500,8 @@ App::post('/v1/execution')
$execution = [ $execution = [
'status' => $functionStatus, 'status' => $functionStatus,
'statusCode' => $statusCode, 'statusCode' => $statusCode,
'stdout' => \utf8_encode(\mb_substr($stdout, -8000)), 'stdout' => \utf8_encode(\mb_substr($stdout, -16384)),
'stderr' => \utf8_encode(\mb_substr($stderr, -8000)), 'stderr' => \utf8_encode(\mb_substr($stderr, -16384)),
'time' => $executionTime, 'time' => $executionTime,
]; ];

1
app/views/install/compose.phtml
View file

@ -344,6 +344,7 @@ services:
- _APP_STORAGE_DO_SPACES_BUCKET - _APP_STORAGE_DO_SPACES_BUCKET
- _APP_LOGGING_PROVIDER - _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG - _APP_LOGGING_CONFIG
- _APP_EXECUTOR_SECRET
appwrite-worker-certificates: appwrite-worker-certificates:
image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?> image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>

1
docker-compose.yml
View file

@ -280,6 +280,7 @@ services:
- _APP_STORAGE_DO_SPACES_BUCKET - _APP_STORAGE_DO_SPACES_BUCKET
- _APP_LOGGING_PROVIDER - _APP_LOGGING_PROVIDER
- _APP_LOGGING_CONFIG - _APP_LOGGING_CONFIG
- _APP_EXECUTOR_SECRET
appwrite-worker-database: appwrite-worker-database:
entrypoint: worker-database entrypoint: worker-database

8
src/Appwrite/Network/Validator/Origin.php
View file

@ -13,8 +13,12 @@ class Origin extends Validator
public const CLIENT_TYPE_FLUTTER_MACOS = 'flutter-macos'; public const CLIENT_TYPE_FLUTTER_MACOS = 'flutter-macos';
public const CLIENT_TYPE_FLUTTER_WINDOWS = 'flutter-windows'; public const CLIENT_TYPE_FLUTTER_WINDOWS = 'flutter-windows';
public const CLIENT_TYPE_FLUTTER_LINUX = 'flutter-linux'; public const CLIENT_TYPE_FLUTTER_LINUX = 'flutter-linux';
public const CLIENT_TYPE_APPLE_IOS = 'apple-ios';
public const CLIENT_TYPE_APPLE_MACOS = 'apple-macos';
public const CLIENT_TYPE_APPLE_WATCHOS = 'apple-watchos';
public const CLIENT_TYPE_APPLE_TVOS = 'apple-tvos';
public const CLIENT_TYPE_ANDROID = 'android'; public const CLIENT_TYPE_ANDROID = 'android';
public const CLIENT_TYPE_IOS = 'ios'; public const CLIENT_TYPE_UNITY = 'unity';
public const SCHEME_TYPE_HTTP = 'http'; public const SCHEME_TYPE_HTTP = 'http';
@ -73,7 +77,7 @@ class Origin extends Validator
case self::CLIENT_TYPE_FLUTTER_WINDOWS: case self::CLIENT_TYPE_FLUTTER_WINDOWS:
case self::CLIENT_TYPE_FLUTTER_LINUX: case self::CLIENT_TYPE_FLUTTER_LINUX:
case self::CLIENT_TYPE_ANDROID: case self::CLIENT_TYPE_ANDROID:
case self::CLIENT_TYPE_IOS: case self::CLIENT_TYPE_APPLE_IOS:
$this->clients[] = (isset($platform['key'])) ? $platform['key'] : ''; $this->clients[] = (isset($platform['key'])) ? $platform['key'] : '';
break; break;