Merge pull request #8356 from appwrite/chore-16x-specs
Chores: Update specs
This commit is contained in:
commit
8bc3fb18e2
16 changed files with 37 additions and 36 deletions
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -1,4 +1,4 @@
|
||||||
[submodule "app/console"]
|
[submodule "app/console"]
|
||||||
path = app/console
|
path = app/console
|
||||||
url = https://github.com/appwrite/console
|
url = https://github.com/appwrite/console
|
||||||
branch = 4.3.5
|
branch = 1.6.x
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1 +1 @@
|
||||||
Subproject commit f483d9631d6f21e94aedb20b5c37c56fea06c23e
|
Subproject commit f978cecfafe55e85fcd20fe90fc020e78a7c7952
|
22
app/init.php
22
app/init.php
|
@ -62,6 +62,10 @@ use Utopia\Database\Validator\Structure;
|
||||||
use Utopia\Domains\Validator\PublicDomain;
|
use Utopia\Domains\Validator\PublicDomain;
|
||||||
use Utopia\DSN\DSN;
|
use Utopia\DSN\DSN;
|
||||||
use Utopia\Locale\Locale;
|
use Utopia\Locale\Locale;
|
||||||
|
use Utopia\Logger\Adapter\AppSignal;
|
||||||
|
use Utopia\Logger\Adapter\LogOwl;
|
||||||
|
use Utopia\Logger\Adapter\Raygun;
|
||||||
|
use Utopia\Logger\Adapter\Sentry;
|
||||||
use Utopia\Logger\Log;
|
use Utopia\Logger\Log;
|
||||||
use Utopia\Logger\Logger;
|
use Utopia\Logger\Logger;
|
||||||
use Utopia\Pools\Group;
|
use Utopia\Pools\Group;
|
||||||
|
@ -763,18 +767,14 @@ $register->set('logger', function () {
|
||||||
throw new Exception(Exception::GENERAL_SERVER_ERROR, "Logging provider not supported. Logging is disabled");
|
throw new Exception(Exception::GENERAL_SERVER_ERROR, "Logging provider not supported. Logging is disabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Old Sentry Format conversion. Fallback until the old syntax is completely deprecated.
|
$adapter = match ($providerName) {
|
||||||
if (str_contains($providerConfig, ';') && strtolower($providerName) == 'sentry') {
|
'sentry' => new Sentry($providerConfig['projectId'], $providerConfig['key'], $providerConfig['host']),
|
||||||
$configChunks = \explode(";", $providerConfig);
|
'logowl' => new LogOwl($providerConfig['ticket'], $providerConfig['host']),
|
||||||
|
'raygun' => new Raygun($providerConfig['key']),
|
||||||
|
'appsignal' => new AppSignal($providerConfig['key']),
|
||||||
|
default => throw new Exception('Provider "' . $providerName . '" not supported.')
|
||||||
|
};
|
||||||
|
|
||||||
$sentryKey = $configChunks[0];
|
|
||||||
$projectId = $configChunks[1];
|
|
||||||
|
|
||||||
$providerConfig = 'https://' . $sentryKey . '@sentry.io/' . $projectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
$classname = '\\Utopia\\Logger\\Adapter\\' . \ucfirst($providerName);
|
|
||||||
$adapter = new $classname($providerConfig);
|
|
||||||
return new Logger($adapter);
|
return new Logger($adapter);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
"ext-openssl": "*",
|
"ext-openssl": "*",
|
||||||
"ext-zlib": "*",
|
"ext-zlib": "*",
|
||||||
"ext-sockets": "*",
|
"ext-sockets": "*",
|
||||||
"appwrite/php-runtimes": "0.13.*",
|
"appwrite/php-runtimes": "0.14.*",
|
||||||
"appwrite/php-clamav": "2.0.*",
|
"appwrite/php-clamav": "2.0.*",
|
||||||
"utopia-php/abuse": "0.37.*",
|
"utopia-php/abuse": "0.37.*",
|
||||||
"utopia-php/analytics": "0.10.*",
|
"utopia-php/analytics": "0.10.*",
|
||||||
|
|
21
composer.lock
generated
21
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "90c87617f6a2639e3c6c3a1920e7d7de",
|
"content-hash": "06f391b62842a79736fe3fe77ec82adf",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "adhocore/jwt",
|
"name": "adhocore/jwt",
|
||||||
|
@ -156,16 +156,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "appwrite/php-runtimes",
|
"name": "appwrite/php-runtimes",
|
||||||
"version": "0.13.5",
|
"version": "0.14.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/appwrite/runtimes.git",
|
"url": "https://github.com/appwrite/runtimes.git",
|
||||||
"reference": "ba24c3a163f1a1da6cd355db92def508d05e59f7"
|
"reference": "9bae5bebe7c7cb3e4bf3a05a1d36c9d6ce3a2d3e"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/appwrite/runtimes/zipball/ba24c3a163f1a1da6cd355db92def508d05e59f7",
|
"url": "https://api.github.com/repos/appwrite/runtimes/zipball/9bae5bebe7c7cb3e4bf3a05a1d36c9d6ce3a2d3e",
|
||||||
"reference": "ba24c3a163f1a1da6cd355db92def508d05e59f7",
|
"reference": "9bae5bebe7c7cb3e4bf3a05a1d36c9d6ce3a2d3e",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -173,8 +173,9 @@
|
||||||
"utopia-php/system": "0.8.*"
|
"utopia-php/system": "0.8.*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^9.3",
|
"laravel/pint": "^1.15",
|
||||||
"vimeo/psalm": "4.0.1"
|
"phpstan/phpstan": "^1.10",
|
||||||
|
"phpunit/phpunit": "^9.3"
|
||||||
},
|
},
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
@ -204,9 +205,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/appwrite/runtimes/issues",
|
"issues": "https://github.com/appwrite/runtimes/issues",
|
||||||
"source": "https://github.com/appwrite/runtimes/tree/0.13.5"
|
"source": "https://github.com/appwrite/runtimes/tree/0.14.0"
|
||||||
},
|
},
|
||||||
"time": "2024-04-01T10:35:02+00:00"
|
"time": "2024-07-03T10:18:32+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "beberlei/assert",
|
"name": "beberlei/assert",
|
||||||
|
@ -5615,5 +5616,5 @@
|
||||||
"platform-overrides": {
|
"platform-overrides": {
|
||||||
"php": "8.3"
|
"php": "8.3"
|
||||||
},
|
},
|
||||||
"plugin-api-version": "2.3.0"
|
"plugin-api-version": "2.6.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -851,7 +851,7 @@ services:
|
||||||
hostname: exc1
|
hostname: exc1
|
||||||
<<: *x-logging
|
<<: *x-logging
|
||||||
stop_signal: SIGINT
|
stop_signal: SIGINT
|
||||||
image: openruntimes/executor:0.6.0
|
image: openruntimes/executor:0.6.1
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- appwrite
|
- appwrite
|
||||||
|
|
|
@ -76,6 +76,6 @@ class MockNumber extends Validator
|
||||||
*/
|
*/
|
||||||
public function getType(): string
|
public function getType(): string
|
||||||
{
|
{
|
||||||
return self::TYPE_STRING;
|
return self::TYPE_OBJECT;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ use Utopia\App;
|
||||||
use Utopia\CLI\Console;
|
use Utopia\CLI\Console;
|
||||||
use Utopia\Config\Config;
|
use Utopia\Config\Config;
|
||||||
use Utopia\Domains\Domain;
|
use Utopia\Domains\Domain;
|
||||||
|
use Utopia\DSN\DSN;
|
||||||
use Utopia\Logger\Logger;
|
use Utopia\Logger\Logger;
|
||||||
use Utopia\Platform\Action;
|
use Utopia\Platform\Action;
|
||||||
use Utopia\Registry\Registry;
|
use Utopia\Registry\Registry;
|
||||||
|
|
|
@ -271,7 +271,6 @@ class Response extends SwooleResponse
|
||||||
public const MODEL_KEY = 'key';
|
public const MODEL_KEY = 'key';
|
||||||
public const MODEL_KEY_LIST = 'keyList';
|
public const MODEL_KEY_LIST = 'keyList';
|
||||||
public const MODEL_MOCK_NUMBER = 'mockNumber';
|
public const MODEL_MOCK_NUMBER = 'mockNumber';
|
||||||
public const MODEL_MOCK_NUMBER_LIST = 'mockNumberList';
|
|
||||||
public const MODEL_AUTH_PROVIDER = 'authProvider';
|
public const MODEL_AUTH_PROVIDER = 'authProvider';
|
||||||
public const MODEL_AUTH_PROVIDER_LIST = 'authProviderList';
|
public const MODEL_AUTH_PROVIDER_LIST = 'authProviderList';
|
||||||
public const MODEL_PLATFORM = 'platform';
|
public const MODEL_PLATFORM = 'platform';
|
||||||
|
@ -351,7 +350,6 @@ class Response extends SwooleResponse
|
||||||
->setModel(new BaseList('Projects List', self::MODEL_PROJECT_LIST, 'projects', self::MODEL_PROJECT, true, false))
|
->setModel(new BaseList('Projects List', self::MODEL_PROJECT_LIST, 'projects', self::MODEL_PROJECT, true, false))
|
||||||
->setModel(new BaseList('Webhooks List', self::MODEL_WEBHOOK_LIST, 'webhooks', self::MODEL_WEBHOOK, true, false))
|
->setModel(new BaseList('Webhooks List', self::MODEL_WEBHOOK_LIST, 'webhooks', self::MODEL_WEBHOOK, true, false))
|
||||||
->setModel(new BaseList('API Keys List', self::MODEL_KEY_LIST, 'keys', self::MODEL_KEY, true, false))
|
->setModel(new BaseList('API Keys List', self::MODEL_KEY_LIST, 'keys', self::MODEL_KEY, true, false))
|
||||||
->setModel(new BaseList('Mock Numbers List', self::MODEL_MOCK_NUMBER_LIST, 'numbers', self::MODEL_MOCK_NUMBER, true, false))
|
|
||||||
->setModel(new BaseList('Auth Providers List', self::MODEL_AUTH_PROVIDER_LIST, 'platforms', self::MODEL_AUTH_PROVIDER, true, false))
|
->setModel(new BaseList('Auth Providers List', self::MODEL_AUTH_PROVIDER_LIST, 'platforms', self::MODEL_AUTH_PROVIDER, true, false))
|
||||||
->setModel(new BaseList('Platforms List', self::MODEL_PLATFORM_LIST, 'platforms', self::MODEL_PLATFORM, true, false))
|
->setModel(new BaseList('Platforms List', self::MODEL_PLATFORM_LIST, 'platforms', self::MODEL_PLATFORM, true, false))
|
||||||
->setModel(new BaseList('Countries List', self::MODEL_COUNTRY_LIST, 'countries', self::MODEL_COUNTRY))
|
->setModel(new BaseList('Countries List', self::MODEL_COUNTRY_LIST, 'countries', self::MODEL_COUNTRY))
|
||||||
|
|
|
@ -139,10 +139,11 @@ class Project extends Model
|
||||||
'example' => true,
|
'example' => true,
|
||||||
])
|
])
|
||||||
->addRule('authMockNumbers', [
|
->addRule('authMockNumbers', [
|
||||||
'type' => Response::MODEL_MOCK_NUMBER_LIST,
|
'type' => Response::MODEL_MOCK_NUMBER,
|
||||||
'description' => 'An array of mock numbers and their corresponding verification codes (OTPs).',
|
'description' => 'An array of mock numbers and their corresponding verification codes (OTPs).',
|
||||||
'default' => [],
|
'default' => [],
|
||||||
'example' => true,
|
'array' => true,
|
||||||
|
'example' => [new \stdClass()],
|
||||||
])
|
])
|
||||||
->addRule('authSessionAlerts', [
|
->addRule('authSessionAlerts', [
|
||||||
'type' => self::TYPE_BOOLEAN,
|
'type' => self::TYPE_BOOLEAN,
|
||||||
|
|
Loading…
Reference in a new issue