1
0
Fork 0
mirror of synced 2024-10-01 17:58:02 +13:00

Merge pull request #5304 from appwrite/feat-db-pools-master-sync-2

Feat db pools master sync
This commit is contained in:
Christy Jacob 2023-04-03 15:39:10 +05:30 committed by GitHub
commit 5d625f3e8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
235 changed files with 407 additions and 262 deletions

4
.env
View file

@ -74,5 +74,5 @@ _APP_GRAPHQL_MAX_BATCH_SIZE=10
_APP_GRAPHQL_MAX_COMPLEXITY=250
_APP_GRAPHQL_MAX_DEPTH=3
_APP_REGION=default
DOCKERHUB_PULL_USERNAME
DOCKERHUB_PULL_PASSWORD
_APP_DOCKER_HUB_USERNAME=
_APP_DOCKER_HUB_PASSWORD=

View file

@ -1,5 +1,9 @@
name: "CodeQL"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
on:
push:
branches: [master]

View file

@ -1,5 +1,9 @@
name: "Linter"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
on: [pull_request]
jobs:
lint:

View file

@ -1,5 +1,9 @@
name: "Tests"
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
on: [pull_request]
jobs:
tests:
@ -21,16 +25,26 @@ jobs:
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}
# This is a separate action that sets up buildx runner
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build Appwrite
# Upstream bug causes buildkit pulls to fail so prefetch base images
# https://github.com/moby/moby/issues/41864
uses: docker/build-push-action@v3
with:
context: .
push: false
tags: appwrite-dev
load: true
cache-from: type=gha
cache-to: type=gha,mode=max
build-args: |
DEBUG=false
TESTING=true
VERSION=dev
- name: Start Appwrite
run: |
export COMPOSE_INTERACTIVE_NO_CLI
export DOCKER_BUILDKIT=1
export COMPOSE_DOCKER_CLI_BUILD=1
export BUILDKIT_PROGRESS=plain
docker pull composer:2.0
docker compose build appwrite
docker compose up -d
sleep 30
@ -41,4 +55,4 @@ jobs:
run: docker compose exec -T appwrite vars
- name: Run Tests
run: docker compose exec -T appwrite test --debug
run: docker compose exec -T appwrite test --debug

View file

@ -1,10 +1,12 @@
# TBD
# Version TBD
- Replace Appwrite executor with OpenRuntimes Executor [#4650](https://github.com/appwrite/appwrite/pull/4650)
- Add `_APP_CONNECTIONS_MAX` env var [#4673](https://github.com/appwrite/appwrite/pull/4673)
- Increase Traefik TCP + file limits [#4673](https://github.com/appwrite/appwrite/pull/4673)
- Fix invited account verified status [#4776](https://github.com/appwrite/appwrite/pull/4776)
- Get default region from environment on project create [#4780](https://github.com/appwrite/appwrite/pull/4780)
- Store build output file size [#4844](https://github.com/appwrite/appwrite/pull/4844)
- Fix expire to formatTz in create account session [#4985](https://github.com/appwrite/appwrite/pull/4985)
- Fix not storing function's response on response codes 5xx [#4610](https://github.com/appwrite/appwrite/pull/4610)
# Version 1.2.1
## Changes

View file

@ -29,7 +29,7 @@ ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT
RUN npm ci
RUN npm run build
FROM appwrite/base:0.1.0 as final
FROM appwrite/base:0.2.0 as final
LABEL maintainer="team@appwrite.io"

View file

@ -1,3 +1,6 @@
> 准备好迎接狂风暴'云'了吗? 🌩 ☂️
> Appwrite Cloud即将到来!你能够通过https://appwrite.io/cloud了解更多的资讯, 注册即可领取试用额度哦
<br />
<p align="center">
<a href="https://appwrite.io" target="_blank"><img width="260" height="39" src="https://appwrite.io/images/appwrite.svg" alt="Appwrite Logo"></a>
@ -9,7 +12,7 @@
</p>
<!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->
[![We're Hiring](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
[![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=friendly&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
[![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
[![Build Status](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
@ -23,7 +26,7 @@
[**我们发布了 Appwrite Console 2.0 版本,点击这里了解更多!**](https://medium.com/appwrite-io/announcing-console-2-0-2e0e96891cb0?source=friends_link&sk=7a82b4069778e3adc165dc026e960fe1)
Appwrite是一个基于Docker的端到端开发者平台其容器化的微服务库可应用于网页端移动端以及后端。Appwrite 通过视觉化界面简了从零编写 API 的繁琐过程,在保证软件安全的前提下为开发者创造了一个高效的开发环境。
Appwrite是一个基于Docker的端到端开发者平台其容器化的微服务库可应用于网页端移动端以及后端。Appwrite 通过视觉化界面简了从零开始编写 API 的繁琐过程,在保证软件安全的前提下为开发者创造了一个高效的开发环境。
Appwrite 可以提供给开发者用户验证,外部授权,用户数据读写检索,文件储存,图像处理,云函数计算,[等多种服务](https://appwrite.io/docs).
@ -55,7 +58,7 @@ Appwrite 可以提供给开发者用户验证,外部授权,用户数据读
Appwrite 的容器化服务器只需要一行指令就可以运行。您可以使用 docker-compose 在本地主机上运行 Appwrite也可以在任何其他容器化工具如 Kubernetes、Docker Swarm 或 Rancher上运行 Appwrite。
开始运行 Appwrite 服务器的最简单方法是运行我们的 docker-compose 文件。在运行安装命令之前,请确保您的机器上安装了 [Docker](https://dockerdocs.cn/get-docker/index.html)
启动 Appwrite 服务器的最简单方法是运行我们的 docker-compose 文件。在运行安装命令之前,请确保您的机器上安装了 [Docker](https://dockerdocs.cn/get-docker/index.html)
### Unix
@ -159,7 +162,7 @@ Appwrite API 界面层利用后台缓存和任务委派来提供极速的响应
## 贡献代码
所有代码贡献 - 包括来自具有直接提交更改权限的贡献者 - 都必须提交PR请求并在合并分支之前得到核心开发人员的批准。这是为了确保正确审查所有代码。
为了确保正确审查,所有代码贡献 - 包括来自具有直接提交更改权限的贡献者 - 都必须提交PR请求并在合并分支之前得到核心开发人员的批准。
我们欢迎所有人提交PR如果您愿意提供帮助可以在 [贡献指南](CONTRIBUTING.md) 中了解有关如何为项目做出贡献的更多信息。

View file

@ -14,6 +14,7 @@
<!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->
[![We're Hiring](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
[![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=ready&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
[![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
[![Build Status](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)

View file

@ -559,6 +559,11 @@ return [
'description' => 'Domain verification for the requested domain has failed.',
'code' => 401,
],
Exception::DOMAIN_TARGET_INVALID => [
'name' => Exception::DOMAIN_TARGET_INVALID,
'description' => 'Your Appwrite instance is not publicly accessible. Please check the _APP_DOMAIN_TARGET environment variable of your Appwrite server.',
'code' => 501,
],
Exception::GRAPHQL_NO_QUERY => [
'name' => Exception::GRAPHQL_NO_QUERY,
'description' => 'Param "query" is not optional.',

View file

@ -11,7 +11,7 @@ return [
'description' => 'Client libraries for integrating with Appwrite to build client-based applications and websites. Read the [getting started for web](/docs/getting-started-for-web) or [getting started for Flutter](/docs/getting-started-for-flutter) tutorials to start building your first application.',
'enabled' => true,
'beta' => false,
'languages' => [ // TODO change key to 'sdks'
'sdks' => [
[
'key' => 'web',
'name' => 'Web',
@ -181,11 +181,11 @@ return [
'name' => 'Console',
'enabled' => false,
'beta' => false,
'languages' => [
'sdks' => [
[
'key' => 'web',
'name' => 'Console',
'version' => '7.2.0',
'version' => '0.0.1',
'url' => 'https://github.com/appwrite/sdk-for-console',
'package' => '',
'enabled' => true,
@ -193,10 +193,10 @@ return [
'dev' => false,
'hidden' => true,
'family' => APP_PLATFORM_CONSOLE,
'prism' => 'console',
'prism' => 'javascript',
'source' => \realpath(__DIR__ . '/../sdks/console-web'),
'gitUrl' => '',
'gitBranch' => '',
'gitUrl' => 'git@github.com:appwrite/sdk-for-console.git',
'gitBranch' => 'main',
'gitRepoName' => 'sdk-for-console',
'gitUserName' => 'appwrite',
],
@ -227,7 +227,7 @@ return [
'description' => 'Libraries for integrating with Appwrite to build server side integrations. Read the [getting started for server](/docs/getting-started-for-server) tutorial to start building your first server integration.',
'enabled' => true,
'beta' => false,
'languages' => [
'sdks' => [
[
'key' => 'nodejs',
'name' => 'Node.js',

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 39727607a036534a323101fea876cbe68b05f4f0
Subproject commit d64fc2c3f981a6213cf28812364fcf92ac3f61af

View file

@ -280,7 +280,7 @@ App::post('/v1/account/sessions/email')
$detector = new Detector($request->getUserAgent('UNKNOWN'));
$record = $geodb->get($request->getIP());
$expire = DateTime::addSeconds(new \DateTime(), $duration);
$expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
$secret = Auth::tokenGenerator();
$session = new Document(array_merge(
[
@ -373,6 +373,12 @@ App::get('/v1/account/sessions/oauth2/:provider')
$protocol = $request->getProtocol();
$callback = $protocol . '://' . $request->getHostname() . '/v1/account/sessions/oauth2/callback/' . $provider . '/' . $project->getId();
$providerEnabled = $project->getAttribute('authProviders', [])[$provider . 'Enabled'] ?? false;
if (!$providerEnabled) {
throw new Exception(Exception::PROJECT_PROVIDER_DISABLED, 'This provider is disabled. Please enable the provider from your ' . APP_NAME . ' console to continue.');
}
$appId = $project->getAttribute('authProviders', [])[$provider . 'Appid'] ?? '';
$appSecret = $project->getAttribute('authProviders', [])[$provider . 'Secret'] ?? '{}';
@ -464,6 +470,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
->label('scope', 'public')
->label('audits.event', 'session.create')
->label('audits.resource', 'user/{user.$id}')
->label('audits.userId', '{user.$id}')
->label('abuse-limit', 50)
->label('abuse-key', 'ip:{ip}')
->label('docs', false)
@ -485,6 +492,11 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
$validateURL = new URL();
$appId = $project->getAttribute('authProviders', [])[$provider . 'Appid'] ?? '';
$appSecret = $project->getAttribute('authProviders', [])[$provider . 'Secret'] ?? '{}';
$providerEnabled = $project->getAttribute('authProviders', [])[$provider . 'Enabled'] ?? false;
if (!$providerEnabled) {
throw new Exception(Exception::PROJECT_PROVIDER_DISABLED, 'This provider is disabled. Please enable the provider from your ' . APP_NAME . ' console to continue.');
}
if (!empty($appSecret) && isset($appSecret['version'])) {
$key = App::getEnv('_APP_OPENSSL_KEY_V' . $appSecret['version']);
@ -1393,6 +1405,8 @@ App::get('/v1/account')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_ACCOUNT)
->label('sdk.offline.model', '/account')
->label('sdk.offline.key', 'current')
->inject('response')
->inject('user')
->action(function (Response $response, Document $user) {
@ -1411,6 +1425,8 @@ App::get('/v1/account/prefs')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_PREFERENCES)
->label('sdk.offline.model', '/account/prefs')
->label('sdk.offline.key', 'current')
->inject('response')
->inject('user')
->action(function (Response $response, Document $user) {
@ -1431,6 +1447,7 @@ App::get('/v1/account/sessions')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_SESSION_LIST)
->label('sdk.offline.model', '/account/sessions')
->inject('response')
->inject('user')
->inject('locale')
@ -1527,6 +1544,8 @@ App::get('/v1/account/sessions/:sessionId')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_SESSION)
->label('sdk.offline.model', '/account/sessions')
->label('sdk.offline.key', '{sessionId}')
->param('sessionId', '', new UID(), 'Session ID. Use the string \'current\' to get the current device session.')
->inject('response')
->inject('user')
@ -1572,6 +1591,8 @@ App::patch('/v1/account/name')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_ACCOUNT)
->label('sdk.offline.model', '/account')
->label('sdk.offline.key', 'current')
->param('name', '', new Text(128), 'User name. Max length: 128 chars.')
->inject('response')
->inject('user')
@ -1603,6 +1624,8 @@ App::patch('/v1/account/password')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_ACCOUNT)
->label('sdk.offline.model', '/account')
->label('sdk.offline.key', 'current')
->param('password', '', new Password(), 'New user password. Must be at least 8 chars.')
->param('oldPassword', '', new Password(), 'Current user password. Must be at least 8 chars.', true)
->inject('response')
@ -1641,6 +1664,8 @@ App::patch('/v1/account/email')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_ACCOUNT)
->label('sdk.offline.model', '/account')
->label('sdk.offline.key', 'current')
->param('email', '', new Email(), 'User email.')
->param('password', '', new Password(), 'User password. Must be at least 8 chars.')
->inject('response')
@ -1692,6 +1717,8 @@ App::patch('/v1/account/phone')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_ACCOUNT)
->label('sdk.offline.model', '/account')
->label('sdk.offline.key', 'current')
->param('phone', '', new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.')
->param('password', '', new Password(), 'User password. Must be at least 8 chars.')
->inject('response')
@ -1739,6 +1766,8 @@ App::patch('/v1/account/prefs')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_ACCOUNT)
->label('sdk.offline.model', '/account/prefs')
->label('sdk.offline.key', 'current')
->param('prefs', [], new Assoc(), 'Prefs key-value JSON object.')
->inject('response')
->inject('user')

View file

@ -1799,6 +1799,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
->label('sdk.response.code', Response::STATUS_CODE_CREATED)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_DOCUMENT)
->label('sdk.offline.model', '/databases/{databaseId}/collections/{collectionId}/documents')
->label('sdk.offline.key', '{documentId}')
->param('databaseId', '', new UID(), 'Database ID.')
->param('documentId', '', new CustomId(), 'Document ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection). Make sure to define attributes before creating documents.')
@ -1919,6 +1921,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_DOCUMENT_LIST)
->label('sdk.offline.model', '/databases/{databaseId}/collections/{collectionId}/documents')
->param('databaseId', '', new UID(), 'Database ID.')
->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
->param('queries', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long.', true)
@ -2014,6 +2017,8 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_DOCUMENT)
->label('sdk.offline.model', '/databases/{databaseId}/collections/{collectionId}/documents')
->label('sdk.offline.key', '{documentId}')
->param('databaseId', '', new UID(), 'Database ID.')
->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
->param('documentId', '', new UID(), 'Document ID.')
@ -2179,6 +2184,8 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_DOCUMENT)
->label('sdk.offline.model', '/databases/{databaseId}/collections/{collectionId}/documents')
->label('sdk.offline.key', '{documentId}')
->param('databaseId', '', new UID(), 'Database ID.')
->param('collectionId', '', new UID(), 'Collection ID.')
->param('documentId', '', new UID(), 'Document ID.')
@ -2310,6 +2317,8 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
->label('sdk.description', '/docs/references/databases/delete-document.md')
->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
->label('sdk.response.model', Response::MODEL_NONE)
->label('sdk.offline.model', '/databases/{databaseId}/collections/{collectionId}/documents')
->label('sdk.offline.key', '{documentId}')
->param('databaseId', '', new UID(), 'Database ID.')
->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
->param('documentId', '', new UID(), 'Document ID.')

View file

@ -19,6 +19,8 @@ App::get('/v1/locale')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_LOCALE)
->label('sdk.offline.model', '/locale')
->label('sdk.offline.key', 'current')
->inject('request')
->inject('response')
->inject('locale')
@ -77,6 +79,8 @@ App::get('/v1/locale/countries')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
->label('sdk.offline.model', '/locale/countries')
->label('sdk.offline.response.key', 'code')
->inject('response')
->inject('locale')
->action(function (Response $response, Locale $locale) {
@ -108,6 +112,8 @@ App::get('/v1/locale/countries/eu')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
->label('sdk.offline.model', '/locale/countries/eu')
->label('sdk.offline.response.key', 'code')
->inject('response')
->inject('locale')
->action(function (Response $response, Locale $locale) {
@ -141,6 +147,8 @@ App::get('/v1/locale/countries/phones')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_PHONE_LIST)
->label('sdk.offline.model', '/locale/countries/phones')
->label('sdk.offline.response.key', 'countryCode')
->inject('response')
->inject('locale')
->action(function (Response $response, Locale $locale) {
@ -173,6 +181,8 @@ App::get('/v1/locale/continents')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_CONTINENT_LIST)
->label('sdk.offline.model', '/locale/continents')
->label('sdk.offline.response.key', 'code')
->inject('response')
->inject('locale')
->action(function (Response $response, Locale $locale) {
@ -203,6 +213,8 @@ App::get('/v1/locale/currencies')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_CURRENCY_LIST)
->label('sdk.offline.model', '/locale/currencies')
->label('sdk.offline.response.key', 'code')
->inject('response')
->action(function (Response $response) {
$list = Config::getParam('locale-currencies');
@ -224,6 +236,8 @@ App::get('/v1/locale/languages')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_LANGUAGE_LIST)
->label('sdk.offline.model', '/locale/languages')
->label('sdk.offline.response.key', 'code')
->inject('response')
->action(function (Response $response) {
$list = Config::getParam('locale-languages');

View file

@ -1233,7 +1233,7 @@ App::post('/v1/projects/:projectId/domains')
$target = new Domain(App::getEnv('_APP_DOMAIN_TARGET', ''));
if (!$target->isKnown() || $target->isTest()) {
throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Unreachable CNAME target (' . $target->get() . '), please use a domain with a public suffix.');
throw new Exception(Exception::DOMAIN_TARGET_INVALID, 'Unreachable CNAME target (' . $target->get() . '). Please check the _APP_DOMAIN_TARGET environment variable of your Appwrite server.');
}
$domain = new Domain($domain);

View file

@ -130,6 +130,7 @@ App::get('/v1/teams')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_TEAM_LIST)
->label('sdk.offline.model', '/teams')
->param('queries', [], new Teams(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Teams::ALLOWED_ATTRIBUTES), true)
->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
->inject('response')
@ -179,6 +180,8 @@ App::get('/v1/teams/:teamId')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_TEAM)
->label('sdk.offline.model', '/teams')
->label('sdk.offline.key', '{teamId}')
->param('teamId', '', new UID(), 'Team ID.')
->inject('response')
->inject('dbForProject')
@ -207,6 +210,8 @@ App::put('/v1/teams/:teamId')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_TEAM)
->label('sdk.offline.model', '/teams')
->label('sdk.offline.key', '{teamId}')
->param('teamId', '', new UID(), 'Team ID.')
->param('name', null, new Text(128), 'New team name. Max length: 128 chars.')
->inject('response')
@ -493,6 +498,7 @@ App::get('/v1/teams/:teamId/memberships')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_MEMBERSHIP_LIST)
->label('sdk.offline.model', '/teams/{teamId}/memberships')
->param('teamId', '', new UID(), 'Team ID.')
->param('queries', [], new Memberships(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Memberships::ALLOWED_ATTRIBUTES), true)
->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
@ -574,6 +580,8 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
->label('sdk.offline.model', '/teams/{teamId}/memberships')
->label('sdk.offline.key', '{membershipId}')
->param('teamId', '', new UID(), 'Team ID.')
->param('membershipId', '', new UID(), 'Membership ID.')
->inject('response')

View file

@ -134,6 +134,8 @@ App::post('/v1/mock/tests/bar')
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_MOCK)
->label('sdk.offline.model', '/mock/tests/bar')
->label('sdk.offline.key', '{required}')
->label('sdk.mock', true)
->param('required', '', new Text(100), 'Sample string param')
->param('default', '', new Integer(true), 'Sample numeric param')

View file

@ -17,7 +17,7 @@ App::get('/versions')
];
foreach ($platforms as $platform) {
$languages = $platform['languages'] ?? [];
$languages = $platform['sdks'] ?? [];
foreach ($languages as $key => $language) {
if (isset($language['dev']) && $language['dev']) {

View file

@ -1195,7 +1195,7 @@ App::setResource('servers', function () {
$languages = array_map(function ($language) {
return strtolower($language['name']);
}, $server['languages']);
}, $server['sdks']);
return $languages;
});

View file

@ -63,7 +63,7 @@
"utopia-php/logger": "0.3.*",
"utopia-php/messaging": "0.1.*",
"utopia-php/registry": "0.5.*",
"utopia-php/storage": "0.13.*",
"utopia-php/storage": "0.14.*",
"utopia-php/swoole": "0.5.*",
"utopia-php/websocket": "0.1.*",
"resque/php-resque": "1.3.6",

36
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "1614e987617e0a710448662d1d9cc7ef",
"content-hash": "70121ad826cd1782e80ebe8f91defa13",
"packages": [
{
"name": "adhocore/jwt",
@ -2212,26 +2212,30 @@
},
{
"name": "utopia-php/storage",
"version": "0.13.2",
"version": "0.14.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/storage.git",
"reference": "ad1c00f24ca56e73888acc2af3deee4919b1194b"
"reference": "eda6651ac16884dc2a79ecb984ea591ba1ed498c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/utopia-php/storage/zipball/ad1c00f24ca56e73888acc2af3deee4919b1194b",
"reference": "ad1c00f24ca56e73888acc2af3deee4919b1194b",
"url": "https://api.github.com/repos/utopia-php/storage/zipball/eda6651ac16884dc2a79ecb984ea591ba1ed498c",
"reference": "eda6651ac16884dc2a79ecb984ea591ba1ed498c",
"shasum": ""
},
"require": {
"ext-brotli": "*",
"ext-fileinfo": "*",
"ext-lz4": "*",
"ext-snappy": "*",
"ext-zlib": "*",
"ext-zstd": "*",
"php": ">=8.0",
"utopia-php/framework": "0.*.*"
},
"require-dev": {
"laravel/pint": "1.2.*",
"phpunit/phpunit": "^9.3",
"vimeo/psalm": "4.0.1"
},
@ -2245,12 +2249,6 @@
"license": [
"MIT"
],
"authors": [
{
"name": "Eldad Fux",
"email": "eldad@appwrite.io"
}
],
"description": "A simple Storage library to manage application storage",
"keywords": [
"framework",
@ -2261,9 +2259,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/storage/issues",
"source": "https://github.com/utopia-php/storage/tree/0.13.2"
"source": "https://github.com/utopia-php/storage/tree/0.14.0"
},
"time": "2022-12-20T11:11:35+00:00"
"time": "2023-03-15T00:16:34+00:00"
},
{
"name": "utopia-php/swoole",
@ -3183,16 +3181,16 @@
},
{
"name": "phpdocumentor/type-resolver",
"version": "1.7.0",
"version": "1.7.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
"reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5"
"reference": "dfc078e8af9c99210337325ff5aa152872c98714"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5",
"reference": "1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5",
"url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/dfc078e8af9c99210337325ff5aa152872c98714",
"reference": "dfc078e8af9c99210337325ff5aa152872c98714",
"shasum": ""
},
"require": {
@ -3235,9 +3233,9 @@
"description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
"support": {
"issues": "https://github.com/phpDocumentor/TypeResolver/issues",
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.0"
"source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.1"
},
"time": "2023-03-12T10:13:29+00:00"
"time": "2023-03-27T19:02:04+00:00"
},
{
"name": "phpspec/prophecy",

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Account } from "appwrite";
import { Client, Account } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Avatars } from "appwrite";
import { Client, Avatars } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Avatars } from "appwrite";
import { Client, Avatars } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Avatars } from "appwrite";
import { Client, Avatars } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Avatars } from "appwrite";
import { Client, Avatars } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Avatars } from "appwrite";
import { Client, Avatars } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Avatars } from "appwrite";
import { Client, Avatars } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Avatars } from "appwrite";
import { Client, Avatars } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

View file

@ -1,4 +1,4 @@
import { Client, Databases } from "appwrite";
import { Client, Databases } from "@appwrite.io/console";
const client = new Client();

Some files were not shown because too many files have changed in this diff Show more