Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-04-30 01:47:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
13590 commits 1155 branches 492 tags 501 MiB
Commit graph

199 commits

Author SHA1 Message Date
Jake Barnby
9ccffe9af2 Inherit permissions after role checks to ensure users can update document permissions created by server with other users roles 2022-08-25 23:46:56 +12:00
Jake Barnby
e6e126dff4 Catch AuthorzationExceptions from database to throw 401 instead of 500 2022-08-25 23:30:26 +12:00
Matej Bačo
bc73b7bbf0 Fix bugs after merge 2022-08-25 10:28:13 +00:00
Matej Bačo
c85363f355 Fix bugs after merge 2022-08-25 09:59:28 +00:00
Matej Baco
fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Jake Barnby
7159f9c187 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix 
# Conflicts:
#	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
#	src/Appwrite/Usage/Calculators/Database.php
 2022-08-25 20:53:52 +12:00
Matej Baco
c6e614d896 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-25 10:38:43 +02:00
fogelito
064d538023 Merge remote-tracking branch 'origin/origin/datetime-attributes' into origin/datetime-attributes 2022-08-25 11:14:48 +03:00
fogelito
c30189f903 Vincent Changes Apply 2022-08-25 11:14:27 +03:00
Shmuel Fogel
c04734048f
Update app/controllers/api/databases.php 
Co-authored-by: Vincent (Wen Yu) Ge <wenyu1999@hotmail.com>
 2022-08-25 11:05:01 +03:00
Jake Barnby
e7298b13b0 Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes 
# Conflicts:
#	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/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
 2022-08-25 18:26:30 +12:00
Jake Barnby
625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix 
# Conflicts:
#	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/databases.php
#	app/controllers/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
 2022-08-25 18:21:15 +12:00
Jake Barnby
3149a298a7 Aggregate before role checks 2022-08-25 15:51:21 +12:00
Jake Barnby
b434dfb6b8 Fix missing check for existing validity on listDocuments 2022-08-25 13:04:47 +12:00
Steven
fc38771d69 Merge branch 'refactor-permissions-inc-console-fix' into feat-list-users-queries 2022-08-24 18:52:39 +00:00
Jake Barnby
0d3c1cba9a Better database permission checks 2022-08-25 01:24:19 +12:00
Matej Bačo
bd7395cb44 Bug fixing, upgrade tests to new syntax 2022-08-24 09:22:13 +00:00
Jake Barnby
dabaa49f8d Remove redundant extra permissions checks for document read/update/delete 2022-08-24 20:50:05 +12:00
Matej Bačo
01a57d91ad Fix listDocument queries validation 2022-08-23 16:33:08 +00:00
Matej Bačo
7fb74027d4 Upgrade listDocuments queries 2022-08-23 15:18:59 +00:00
Matej Bačo
2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo
36903d6358 Upgrade document&collection&database logs queries 2022-08-23 13:03:38 +00:00
Matej Bačo
e068bcdbc1 Upgrade listCollections queries 2022-08-23 12:30:28 +00:00
Matej Bačo
94acd32d69 Upgrade listDatabases queries 2022-08-23 09:40:17 +00:00
Matej Bačo
e780c90dd6 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-23 08:10:13 +00:00
Jake Barnby
00441885d2 Remove fallback setting for missing permissions 2022-08-23 13:42:53 +12:00
Jake Barnby
e989735e89 Remove permissions processor 2022-08-23 13:42:25 +12:00
Steven
66ff297103 Refactor Queries Validation 2022-08-22 19:16:20 +00:00
Jake Barnby
8841f8fe76 Merge remote-tracking branch 'origin/master' into feat-graphql-support 
# Conflicts:
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
 2022-08-22 21:13:29 +12:00
Jake Barnby
eb1476b28b Apply validator updates to OpenAPI3 2022-08-22 14:27:17 +12:00
Damodar Lohani
77958b465e update database usage params label 2022-08-21 02:10:21 +00:00
Damodar Lohani
2205ecd9c6 null safety checks 2022-08-20 11:20:31 +00:00
Steven
e70eb61717 Fix bug with list documents and new queries 2022-08-20 00:47:10 +00:00
Steven
2bde7aa02b Fix databases tests 2022-08-20 00:15:18 +00:00
Matej Bačo
926d1c6459 Fix incorrect endpoint information 2022-08-19 14:14:39 +00:00
Jake Barnby
e4392bdbfb Merge fixes 
(cherry picked from commit 24875e352d)
 2022-08-19 17:12:20 +12:00
Jake Barnby
24875e352d Merge fixes 2022-08-19 17:05:39 +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
7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes 
# Conflicts:
#	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/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
 2022-08-19 16:20:19 +12:00
Jake Barnby
9819088563 Lint 2022-08-19 16:05:00 +12:00
Jake Barnby
66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
Damodar Lohani
80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
Christy Jacob
4b0c707fd3 Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-16 20:37:05 +00:00
Jake Barnby
e3ec275a51 Cleaner permission checks 2022-08-16 23:26:38 +12:00
Jake Barnby
1aa36b6b2c Simplify permission checks 2022-08-16 21:08:14 +12:00
Jake Barnby
326220762e Exception fixes 2022-08-16 21:07:30 +12:00
Jake Barnby
5d84d6d43f Lint 2022-08-16 20:33:06 +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
Jake Barnby
fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge 
# Conflicts:
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/functions.php
#	app/controllers/api/projects.php
#	app/controllers/api/storage.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
 2022-08-16 19:20:26 +12:00
Jake Barnby
f672269a8c Handle aggregates per resource type at the controller level 2022-08-16 17:54:44 +12:00
shimon
590c1467bc Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
 2022-08-15 18:19:59 +03:00
Jake Barnby
bf2fa212aa Fix setting defaults 2022-08-16 01:16:20 +12:00
Jake Barnby
28e7934aeb Update document/file validator allowed permissions 2022-08-16 01:02:02 +12:00
Jake Barnby
b53f185ec6 Remove permissions processor 2022-08-16 00:56:19 +12:00
Jake Barnby
77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +12:00
Jake Barnby
33970276b2 Self review 2022-08-15 19:20:10 +12:00
Damodar Lohani
c0d05132df fix usage metric typo in database 2022-08-15 05:50:36 +00:00
Jake Barnby
cb4a256d5f Merge remote-tracking branch 'origin/feat-ui-datetime' into refactor-permissions-inc-queries-update-datetime-fixes 
# Conflicts:
#	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
#	composer.lock
#	public/dist/scripts/app-all.js
#	public/dist/scripts/app-dep.js
#	public/dist/scripts/app.js
#	public/dist/styles/default-ltr.css
#	public/dist/styles/default-rtl.css
#	public/scripts/dependencies/appwrite.js
 2022-08-15 12:05:52 +12:00
Jake Barnby
613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
Eldad A. Fux
d641fbb635
Merge pull request #3588 from appwrite/feat-simplify-exceptions 
Simplify Exception Creation
 2022-08-14 15:27:52 +03:00
Jake Barnby
9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes 
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
 2022-08-14 23:46:34 +12:00
Jake Barnby
6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes 
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
 2022-08-14 23:11:05 +12:00
Jake Barnby
b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Christy Jacob
8e24dbe22f feat: update exception class 2022-08-14 13:35:11 +05:30
Christy Jacob
cfab9221f2 feat: exceptions on more files 2022-08-14 12:32:41 +05:30
Christy Jacob
a5bc0a61ca feat: exceptions on more files 2022-08-14 12:26:12 +05:30
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Jake Barnby
a8698b6065 Lint 2022-08-14 17:24:50 +12:00
Jake Barnby
b2e659bd3f Review fixes 2022-08-14 17:21:33 +12:00
Jake Barnby
bdc8202422 Bad request for create permission on document/file 2022-08-14 02:24:28 +12:00
Jake Barnby
68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
Jake Barnby
737ebe408c Don't add create permission to documents/files if missing 2022-08-13 18:34:04 +12:00
Damodar Lohani
560bd97fcd organize metrics 2022-08-13 05:02:18 +00:00
Damodar Lohani
be00b64b7e Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-13 03:14:28 +00:00
Christy Jacob
9693c6e941 Merge branch 'master' of github.com:appwrite/appwrite into 0.16.x 2022-08-12 21:44:36 +05:30
shimon
1af95fcdaa Tidy up 2022-08-12 16:21:32 +03:00
Jake Barnby
d2b9102f84 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix 
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
 2022-08-13 00:54:27 +12:00
shimon
90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
Damodar Lohani
73f675aebe Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-11 01:15:29 +00:00
shimon
5a15d29a22 sync with 0.16.x 2022-08-10 12:22:55 +03:00
shimon
d31c23d25a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 
 Conflicts:
	app/controllers/api/databases.php
 2022-08-10 12:18:05 +03:00
Damodar Lohani
8aa7486e71 database usage stats working via labels 2022-08-10 02:33:46 +00:00
Damodar Lohani
ebf3d813cb refactor database usage to labels 2022-08-10 02:18:18 +00:00
Damodar Lohani
16fe9e241a Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-10 01:49:27 +00:00
shimon
d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
Torsten Dittmann
5db5f7217f Merge branch 'origin/datetime-attributes' of https://github.com/appwrite/appwrite into feat-ui-datetime 2022-08-09 14:49:08 +02:00
fogelito
db5d737235 Merge branch '0.16.x' of github.com:appwrite/appwrite into origin/datetime-api 
 Conflicts:
	tests/e2e/Services/Databases/DatabasesBase.php
 2022-08-09 14:37:21 +03:00
Christy Jacob
6a6c7d4b90
Merge pull request #3547 from appwrite/fix-update-status-codes 
Use 202 when resources are created asyncronously
 2022-08-09 14:42:40 +05:30
Damodar Lohani
bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
Jake Barnby
216486a4c6 Fix DB tests 2022-08-09 18:03:41 +12:00
shimon
6e0b7cc650 leftovers 2022-08-08 18:44:11 +03:00
shimon
62ef532801 leftovers 2022-08-08 17:32:54 +03:00
Bradley Schofield
43660d9c8f Merge branch 'master' into feat-simplify-exceptions 2022-08-08 15:03:01 +01:00
shimon
89f164bdd7 resource namespace 2022-08-08 15:19:41 +03:00
Jake Barnby
20f621d05c Databases permission check fixes 2022-08-08 22:58:28 +12:00
shimon
a6a9ad8cc0 databases controller 2022-08-08 11:14:27 +03:00
Jake Barnby
5e4a422495 Use helpers to process permissions 2022-08-05 18:01:25 +12:00
Jake Barnby
54b07a9446 Handle document/file level security in collections layer 2022-08-04 16:20:11 +12:00
Jake Barnby
d9f0ece812 Remove new properties from DB level 2022-08-04 12:08:16 +12:00
Jake Barnby
1ab86c9331 Role reference updates 2022-08-03 16:17:49 +12:00