1
0
Fork 0
mirror of synced 2024-07-08 16:06:02 +12:00
Commit graph

309 commits

Author SHA1 Message Date
Matej Bačo 43b1c196e0 Merge branch 'feat-git-integration' into feat-git-integration-copy 2023-08-23 10:16:23 +02:00
Vincent (Wen Yu) Ge 31b8c77b5c Fix typos, improve a few errors 2023-08-22 20:30:00 +00:00
Jake Barnby 87b72e4d0d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4-request-response-filters 2023-08-22 16:01:19 -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
Matej Bačo eea43e17bd Fix function request filter 2023-08-22 15:16:07 +02:00
Vincent (Wen Yu) Ge 1ffd660334 Improve error copy 2023-08-22 04:15:15 +00:00
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
Matej Bačo 897d299ae6 PR review changes, fixes from QA 2023-08-11 15:34:57 +02: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 c6302014f5
Run Linter 2023-08-09 23:51:36 +01: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 43ee8e1ed4 fix: update tests 2023-07-20 02:17:16 +04: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
Jake Barnby ed2c1139a7
Update messages 2023-06-09 13:03:19 +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 075ed65a2f
Merge pull request #5572 from appwrite/feat-update-project-creation
Feat update project creation
2023-05-25 22:50:24 +05:30
Steven Nguyen f774721701
Update the error message for blocked users
Remove the "You can unblock the user from the Appwrite console." part
as it is not relevant for the person receiving the error.
2023-05-23 10:40:05 -07:00
Christy Jacob 0839822a66 Apply suggestions from code review 2023-05-23 14:39:26 +00: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
Eldad A. Fux b86ce2d233
Merge pull request #5561 from appwrite/fix-delete-account
Update the Update Account Status API to clear the cookie
2023-05-22 23:06:02 +03:00
Steven Nguyen 09b4fbcc21
Update the error message for blocked users
Remove the "You can unblock the user from the Appwrite console." part
as it is not relevant for the person receiving the error.
2023-05-22 12:28:47 -07: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 0d12b13241 feat: update error message 2023-05-14 01:48:51 +05:30
Christy Jacob 12afc294bd feat: add checks for domain 2023-05-13 23:35:05 +05:30
Matej Bačo c63505078d Fix bugs with new versions of utopia 2023-05-13 12:08:02 +02:00
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 33d2e94d1d
Apply suggestions from code review 2023-04-30 01:54:45 +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 b1bbc9dfbd Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-28 07:11:17 +00:00
Torsten Dittmann 4ceae33a5a
Merge pull request #5163 from yatharth1706/fix-5147-fix-error-description-in-case-of-duplicate-user
fix error description for duplicate user
2023-04-25 15:45:59 +02:00
Damodar Lohani ac9f434c85 more fixes and reset endpoints 2023-04-19 08:44:22 +00:00
Christy Jacob 6f28047feb
Update app/config/errors.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2023-04-14 04:31:35 +05:30
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
Jake Barnby 578d4d1619
Disallow index creation on relationship attributes 2023-03-31 18:06:50 +13:00
Jake Barnby c7201cc417
Remove HTML from API error messages 2023-03-31 18:05:45 +13: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
Matej Baco ed610fcdd4 Address TODOs 2023-03-14 11:13:03 +00:00
Matej Bačo 541cb010a6 Changes after dev-mode QA 2023-03-10 20:36:39 +01:00
Matej Baco 2d25514dd8 Improve 409 rule error; update console 2023-03-10 13:36:31 +00:00
Matej Baco 4b0d6d9826 Bug fixes after proxy QA 2023-03-10 12:20:24 +00:00
Matej Baco 04c7db9f7b Bug fixes for proxy rule service 2023-03-10 07:42:52 +00:00
Bhaskar Singh 31a903d144 Updated the error message for target check fails
in custom domain creation
2023-03-10 00:24:33 +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 b16c789282 Fixing the bracket 2023-03-08 17:23:15 +05:30
Bhaskar Singh 7a4cea9f79 Removed ENV_VARIABLE_INCORRECT_SETUP 2023-03-08 17:21:37 +05:30
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
yatharth b5f02bd6c8 fix error description for duplicate user 2023-02-25 20:36:09 +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 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
Jake Barnby b6723b7c83
Merge remote-tracking branch 'origin/master' into feat-graphql-support
# Conflicts:
#	app/init.php
2022-12-06 20:38:09 +13:00
Vincent (Wen Yu) Ge 7f95ff31bd Updated the error descriptions for better SEO. 2022-11-21 15:37:34 +00:00
Jake Barnby 444c68e07e
Remove redundant error 2022-10-14 13:23:21 +13:00
Jake Barnby 44e4f1e05b
Make param errors consistent 2022-10-14 13:18:08 +13:00
Jake Barnby 8cd36b2721
Fix custom entity list 2022-09-22 22:48:22 +12:00
Jake Barnby 6aee9e0ddb
Update errors 2022-09-21 21:11:05 +12:00
Jake Barnby 144e723431
Update error handling 2022-09-21 18:36:43 +12:00
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
Matej Bačo cb6a186c5d PR review changes 2022-08-24 15:07:18 +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 cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +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
Eldad Fux 22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00
Eldad Fux 25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Christy Jacob a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Christy Jacob 662bfe0ab8 feat: address issues on projects.php 2022-08-14 11:39:46 +05:30
Christy Jacob c6f0b14e92 feat: address issues on init.php 2022-08-14 11:05:25 +05:30
Jake Barnby 89dd4be9f1
Update app/config/errors.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-08-14 17:06:48 +12:00
Christy Jacob 5296e61d35 feat: address issues on accounts controller 2022-08-13 20:45:19 +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 96c6c0ff00 Migrate all exceptions to new signature 2022-07-26 15:24:32 +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 4ee7f80433 Add too many queries exception 2022-07-14 15:57:34 +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
Jake Barnby 09c89ecd12 Test updates 2022-06-20 13:15:02 +12: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
Everly Precia Suresh 19300ccdd7 format files in app, src, tests 2022-05-23 14:54:50 +00: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
Matej Baco 6141080449 Fix code in exception 2022-04-20 10:10:39 +02: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 21ea0f0f0f
Update app/config/errors.php
Co-authored-by: Matej Bačo <matejbacocom@gmail.com>
2022-02-27 21:14:04 +04:00