Commit graph

301 commits

Author SHA1 Message Date
prateek banga
6c260223ba Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 15:00:22 +05:30
prateek banga
161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
prateek banga
db9e7b0199 review changes 2023-10-20 13:28:23 +05:30
Jake Barnby
389d367fca
Set hard timeouts for API dbs 2023-10-19 15:32:45 +13:00
Prateek Banga
feac25f401 adds already sent exception in update message 2023-10-13 18:35:49 +05:30
Bradley Schofield
9cb1cf418c Improve Error Handling and Add more Validation 2023-10-06 17:02:01 +01:00
Yatharth Verma
f07f246f8d fix conflicts 2023-09-22 22:53:41 +05:30
Prateek Banga
e00b273577 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-21 22:19:30 +05:30
Prateek Banga
3ebcfe548d Adds get message endpoint 2023-09-21 16:26:53 +05:30
prateek banga
82e165c4c3 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-31 18:33:02 +05:30
prateek banga
1762c81b8d Merge branch 'feat-messages-event-config' into feat-mailgun-provider 2023-08-31 18:32:26 +05:30
prateek banga
24eabf29d0 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-29 22:30:02 +05:30
prateek banga
112c7a5133 adds default attribute for providers 2023-08-29 22:29:48 +05:30
prateek banga
264f0bd5dd adds subscriber controllers 2023-08-28 20:41:05 +05:30
Matej Bačo
89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Matej Bačo
596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
prateek banga
52f6b72f23 adds topic controllers 2023-08-25 01:45:17 +05:30
prateek banga
5ca8dc0a73 merge cl-1.4.x 2023-08-24 14:10:26 +05:30
prateek banga
ac33d7828f Revert "Pint linter ran"
This reverts commit bf5f0a8419.
2023-08-24 01:53:52 +05:30
wess
bf5f0a8419 Pint linter ran 2023-08-23 13:12:43 -04:00
Jake Barnby
2edbb1269f
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-22 16:02:29 -04:00
Jake Barnby
6a9588c4be
Update src/Appwrite/Extend/Exception.php 2023-08-22 13:38:43 -04:00
Jake Barnby
c929fe113e
Fix colliding ID overrides 2023-08-22 13:11:32 -04:00
prateek banga
78385a59c6 adds remaining provider controllers 2023-08-22 22:15:31 +05:30
prateek banga
5e3065c30a merge resolve conflicts 2023-08-21 14:07:18 +05:30
Matej Bačo
7bdbd51255 PR review changes 2023-08-20 14:14:05 +02:00
Jake Barnby
3c3326260a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	composer.lock
2023-08-17 17:39:26 -04:00
Khushboo Verma
4285d99f08 Added exception for repo creation + small fixes 2023-08-17 19:24:57 +05:30
prateek banga
07b7a9db0f adds controller for creating a user target 2023-08-17 17:24:45 +05:30
prateek banga
c7dec3762b Adds getTarget and list targets controller to user and account 2023-08-16 20:13:38 +05:30
Jake Barnby
4ddb0ce6a7
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param 2023-08-14 19:37:37 -04:00
Bishwajeet Parhi
d0755a587f Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-10 22:31:53 +05:30
Matej Bačo
899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +02:00
Bradley Schofield
fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-09 18:08:40 +01:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-09 09:01:29 -07:00
Christy Jacob
7d60e4272d Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations 2023-08-09 13:59:44 +00:00
Matej Bačo
93735ac4a7 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-09 12:30:45 +02:00
Jake Barnby
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04:00
Christy Jacob
c009a12a25 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-08-08 20:51:31 +00:00
Christy Jacob
82a206d808 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-08-08 16:48:59 +00:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-08 08:34:01 -07:00
Bishwajeet Parhi
b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration 2023-08-07 14:46:00 -07:00
Bradley Schofield
91c82f0d7d Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-07 16:09:28 +01:00
Matej Bačo
906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Eldad A. Fux
a56f91b054
Merge branch 'master' into feat-5542-validate-x-appwrite-id-header-for-CreateFile 2023-08-05 06:36:21 +03:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen
27e212553d
Separate OAuth2 info from Sessions into Identities
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-04 15:07:36 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Bradley Schofield
8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01:00
Steven Nguyen
a235024268
Separate OAuth2 info from Sessions into Identities
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-02 15:36:06 -07:00
Matej Bačo
ac2ca267d7 Address more PR reviews 2023-07-31 08:47:47 +02:00
Matej Bačo
6fb72db7c4 Rename exception 2023-07-29 18:03:13 +02:00
Matej Bačo
37c0cc122a More PR review changes 2023-07-28 10:27:16 +02:00
Matej Bačo
ce98b04348 Address PR reviews 2023-07-28 09:56:07 +02:00
Steven Nguyen
3499a7028c
Create OAuth2 exception class 2023-07-27 17:19:49 -07:00
Christy Jacob
c26194e189 Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 17:19:18 +04:00
Eldad A. Fux
66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp
[FEAT] Custom SMTP and Template support
2023-07-20 07:09:11 +03:00
Christy Jacob
e493551f8a Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 01:44:25 +04:00
Damodar Lohani
4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Damodar Lohani
8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00
jaivix
4db919b42d linting and wording updates based on stnguyen90 feedback 2023-07-13 00:33:38 +05:30
Christy Jacob
e0aa3db21e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-07-11 19:36:37 +00:00
Damodar Lohani
f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
jaivix
a6671a5caa fixed team creation response if teamId already exists 2023-07-09 16:50:09 +05:30
Matej Bačo
c6e491f2ed Support for external contributors 2023-06-28 10:48:10 +02:00
Torsten Dittmann
1f46d03e8c feat: initial mfa implementation 2023-06-22 15:35:49 +02:00
Jake Barnby
0363993f13
Fix errors 2023-06-15 17:28:35 +12:00
Matej Bačo
5e221e285f Update naming convention, add new VCS endpoints, support silent mode and rootDirectory 2023-06-07 17:50:32 +02:00
Jake Barnby
b7f4f57521
Add new error message to differentiate between missing data and missing data + permissions for document updates 2023-06-07 13:51:24 +12:00
Christy Jacob
f0df316b4f fix: throw correct exception when project custom ID already exists 2023-05-23 14:38:33 +00:00
Damodar Lohani
5a9f83c43d validate smtp configuration 2023-05-23 05:09:17 +00:00
Matej Bačo
6e515e3cc4 Copy Khushboo's integration from feat-peach-q1-kh 2023-05-22 12:58:13 +02:00
Christy Jacob
d630d8772b
Merge pull request #5460 from appwrite/fix-create-project-error
fix: throw correct exception when project ID already exists
2023-05-19 22:48:02 +05:30
Suven-p
582698bd03
Validate value of x-appwrite-id header 2023-05-18 00:41:07 +05:45
Christy Jacob
12afc294bd feat: add checks for domain 2023-05-13 23:35:05 +05:30
Damodar Lohani
f70712865e refactor 2023-05-11 06:52:27 +00:00
Christy Jacob
60f51580a7
Merge pull request #5246 from singhbhaskar/fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled
Fix: Updated error when _APP_USAGE_STATS is disabled
2023-05-04 20:47:50 +05:30
Christy Jacob
ac004acbc8 fix: throw correct exception when project custom ID already exists 2023-04-29 12:41:17 +05:30
Damodar Lohani
ac9f434c85 more fixes and reset endpoints 2023-04-19 08:44:22 +00:00
Christy Jacob
0fb34433b9 feat: personal data filters to enhance password protection 2023-04-14 00:20:03 +04:00
Jake Barnby
f00bd7dac7
Merge remote-tracking branch 'origin/1.3.x' into feat-relations-2
# Conflicts:
#	composer.lock
2023-04-11 17:25:26 +12:00
Jake Barnby
7f8f34793e
Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships
# Conflicts:
#	composer.lock
2023-04-11 15:57:35 +12:00
Jake Barnby
b252fe847f
Add custom delete restricted error 2023-04-06 00:54:44 +12:00
Damodar Lohani
41d22fb50b Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2 2023-03-30 08:02:31 +00:00
Bhaskar Singh
700f4f33ed
Merge branch 'appwrite:master' into fix-4960-Database-usage-screen-shows-500-error-when_APP_USAGE_STATS-is-disabled 2023-03-24 21:33:42 +05:30
Bhaskar Singh
8b5e0e1f1a Updating the exception variable name for easy
readability
2023-03-21 20:33:42 +05:30
Bhaskar Singh
ac2085ffa8 Updated error when _APP_USAGE_STATS is disabled
for usage
2023-03-18 22:12:36 +05:30
Matej Bačo
75f935601e Add function entrypoint 2023-03-16 11:07:15 +01:00
Matej Bačo
d10c7c7775 Merge branch 'feat-db-pools-master' into feat-executor-v3-sync 2023-03-15 08:59:42 +01:00
Matej Bačo
c01fcb130c Merge branch 'feat-db-pools-master' into feat-db-pools-sync 2023-03-14 12:58:54 +01:00
Torsten Dittmann
2178bfc126 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-database-update-attribute 2023-03-10 18:39:11 +05:30
Matej Bačo
83370c21f7 Improve error logs 2023-03-08 20:50:51 +01:00
Matej Bačo
59f5978fa3 Implement rules 2023-03-08 19:30:01 +01:00
Bhaskar Singh
7f3000439a Updated ENV_VARIABLE_INCORRECT_SETUP to DOMAIN_VARIABLE_INCORRECT 2023-03-08 17:15:55 +05:30
Steven Nguyen
85a2d623a6
Update APIs to check X-Appwrite-Timestamp header
Appwrite will refer to the X-Appwrite-Timestamp header for when the
request was originally sent and reject the request if the Timestamp
is older than the updatedAt timestamp of the document.
2023-03-07 10:54:52 -08:00
Bhaskar Singh
eaf31fdb78 Updated the error to 501 error code for custom
domain when _APP_DOMAIN and _APP_DOMAIN_TARGET is setup incorrectly
2023-03-05 14:35:47 +05:30
Torsten Dittmann
ec7e28b3e7 fix: databases update attributes events 2023-02-26 21:14:22 +05:30
Torsten Dittmann
8ae974e6dd feat: database update attribute endpoints 2023-02-26 18:03:18 +05:30
Matej Bačo
068acef0f6 Add unique url generator 2023-02-22 16:07:34 +01:00
Matej Bačo
eea635fe4b Basic implementation for Open Runtimes V2 2023-02-09 15:27:11 +01:00
Christy Jacob
4142ffdb70 feat: update account codes 2023-01-19 17:26:41 +05:30
Damodar Lohani
fe472e5b36 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-password-history 2023-01-16 05:04:13 +00:00
Damodar Lohani
f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
Christy Jacob
e3a2135515 feat: linter fixes 2023-01-10 20:18:45 +05:30
Damodar Lohani
8e7b89ec03 feat: check password history 2022-12-16 10:22:39 +00:00
Jake Barnby
444c68e07e
Remove redundant error 2022-10-14 13:23:21 +13:00
Jake Barnby
575b882b30
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	.github/workflows/tests.yml
#	composer.lock
2022-10-10 18:41:40 +13:00
Krishna Agarwal
0ddd2f6c77
fixed typo on line 15 2022-09-21 22:53:36 +05:30
Jake Barnby
e9f75d32a1
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	Dockerfile
#	app/config/errors.php
#	app/config/roles.php
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	app/controllers/api/graphql.php
#	app/controllers/shared/api.php
#	app/init.php
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Migration/Migration.php
2022-09-20 15:43:09 +12:00
Matej Bačo
3fc2e70007 updateVariable 'key' param marked as required 2022-08-31 07:33:43 +00:00
Bradley Schofield
0d81918685 Merge remote-tracking branch 'origin/refactor-permissions-inc-console-fix' into feat-variables-api 2022-08-19 11:25:39 +01:00
Jake Barnby
c1c3a7c7ae Remove redundant exception 2022-08-19 20:31:19 +12:00
Jake Barnby
bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Christy Jacob
fb81627b83 feat: update exception class 2022-08-14 12:49:19 +05:30
Christy Jacob
a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Christy Jacob
c2f7cd6d19 feat: remove logger as an entity 2022-08-14 11:06:04 +05:30
Christy Jacob
c6f0b14e92 feat: address issues on init.php 2022-08-14 11:05:25 +05:30
Christy Jacob
8b23dcd69e fix: update constructor, remove account entity, add missing ID error 2022-08-13 20:14:04 +05:30
Jake Barnby
bdc8202422 Bad request for create permission on document/file 2022-08-14 02:24:28 +12:00
Bradley Schofield
e3a3ca4c0d Translate more errors
+ Fixed an issue where some errors that should use 401 uses 400 error codes

+ Updated error messages and tests for multiple exceptions
2022-07-27 14:47:35 +01:00
Bradley Schofield
3c808ca895 Fix problem with Exception class 2022-07-26 15:56:59 +01:00
Bradley Schofield
96c6c0ff00 Migrate all exceptions to new signature 2022-07-26 15:24:32 +01:00
Bradley Schofield
4da9273b28 Move default message and code handling into exception 2022-07-25 23:54:08 +01:00
Bradley Schofield
40022decb4 Start working on simplifying exceptions 2022-07-22 15:38:06 +01:00
Matej Bačo
183a18f618 Implement functions CRUD operations 2022-07-20 07:18:49 +00:00
Jake Barnby
4f5c7ddada Add invalid query exception 2022-07-14 15:57:51 +12:00
Jake Barnby
10a5c24a63 Format and lint 2022-07-12 09:52:00 +12:00
Jake Barnby
9d134a949f Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/general.php
#	app/init.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
2022-07-01 00:05:44 +12:00
Christy Jacob
43f834c0bd feat: add new errors for phone auth 2022-06-24 12:49:00 +02:00
Damodar Lohani
8f14f5aa21
Database layer (#3338)
* database response model

* database collection config

* new database scopes

* database service update

* database execption codes

* remove read write permission from database model

* updating tests and fixing some bugs

* server side tests are now passing

* databases api

* tests for database endpoint

* composer update

* fix error

* formatting

* formatting fixes

* get database test

* more updates to events and usage

* more usage updates

* fix delete type

* fix test

* delete database

* more fixes

* databaseId in attributes and indexes

* more fixes

* fix issues

* fix index subquery

* fix console scope and index query

* updating tests as required

* fix phpcs errors and warnings

* updates to review suggestions

* UI progress

* ui updates and cleaning up

* fix type

* rework database events

* update tests

* update types

* event generation fixed

* events config updated

* updating context to support multiple

* realtime updates

* fix ids

* update context

* validator updates

* fix naming conflict

* fix tests

* fix lint errors

* fix wprler and realtime tests

* fix webhooks test

* fix event validator and other tests

* formatting fixes

* removing leftover var_dumps

* remove leftover comment

* update usage params

* usage metrics updates

* update database usage

* fix usage

* specs update

* updates to usage

* fix UI and usage

* fix lints

* internal id fixes

* fixes for internal Id

* renaming services and related files

* rename tests

* rename doc link

* rename readme

* fix test name

* tests: fixes for 0.15.x sync

Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2022-06-22 12:51:49 +02:00
Jake Barnby
e865f77a6b Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	CONTRIBUTING.md
#	app/config/errors.php
#	app/controllers/api/account.php
#	app/controllers/api/graphql.php
#	app/init.php
#	composer.json
#	composer.lock
2022-06-20 11:15:22 +12:00
Torsten Dittmann
372939c727 Merge branch 'master' of https://github.com/appwrite/appwrite into 0.15.x 2022-06-03 11:09:14 +02:00
Everly Precia Suresh
d41aff1861 fix linting issues 2022-06-02 13:03:37 +00:00
shimon
d39e6a842c Merge branch 'master' of github.com:appwrite/appwrite into feat-expire-key
 Conflicts:
	app/controllers/general.php
2022-06-01 09:34:34 +03:00
shimon
8bca5cd13e api keys 2022-05-31 18:41:12 +03:00
Everly Precia Suresh
19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00:00
Matej Bačo
1a96105d92 Merge remote-tracking branch 'origin/0.14.x' into feat-https-redirect-exception 2022-04-26 09:59:57 +00:00
Christy Jacob
66d68a786b
Update src/Appwrite/Extend/Exception.php 2022-04-26 12:22:01 +03:00
Jake Barnby
dbb49ac7bf
Async resolution fixes 2022-04-26 19:49:36 +12:00
Matej Bačo
4c82810d61 PR review changes 2022-04-25 09:12:43 +00:00
Damodar Lohani
f6d4526217 customId console, reserved project 2022-04-17 10:18:00 +00:00
Matej Bačo
4110709874 PR review changes 2022-04-05 16:57:22 +00:00
Matej Bačo
45e9040fa5 Disallow HTTP communication if required 2022-03-21 14:23:56 +00:00
Christy Jacob
f8a445294c feat: add missing error codes 2022-02-27 15:57:41 +04:00
Christy Jacob
ca2bee015a feat: add new error codes for storage 2022-02-17 02:55:54 +04:00
Christy Jacob
da7512e050 Merge branch '0.13.x' of github.com:appwrite/appwrite into feat-add-error-codes 2022-02-17 02:25:29 +04:00
Christy Jacob
ca2cf23a74 feat: support mock endpoints 2022-02-16 19:28:37 +04:00
Christy Jacob
5fee7378ad feat: add test for error message 2022-02-13 13:12:16 +04:00
Christy Jacob
cb922827a4 feat: update cursor errors 2022-02-09 03:08:23 +04:00