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

490 commits

Author SHA1 Message Date
Matej Bačo 49b2bcf462 Implement JWT dynamic keys test 2024-05-29 09:33:39 +00:00
Matej Bačo 2e1f67245d Fix bugs, add old api key test 2024-05-16 08:39:15 +00:00
Matej Bačo 37176e7865 Backwards compatible approach 2024-05-14 12:33:49 +00:00
Matej Bačo 4d249c5d36 Bug fix 2024-05-14 12:27:35 +00:00
Matej Bačo 54c953d559 Add prefix of api key types 2024-05-14 11:58:31 +00:00
Matej Bačo 9252b66493 Add scope tests 2024-05-06 11:27:28 +00:00
Matej Bačo 3a3d5b61a6 PR review changes 2024-05-06 09:55:59 +00:00
Matej Bačo 448b0a5607 Re-add api token auth 2024-05-06 08:35:27 +00:00
Christy Jacob c7bdcda593
Merge pull request #8028 from appwrite/1.5.x
Sync 1.5.x into main
2024-04-26 15:10:09 +04:00
Damodar Lohani c8bf5f4328 simplify check 2024-04-25 01:23:01 +00:00
Damodar Lohani 4e66f8a8e2 simplify test 2024-04-25 01:01:15 +00:00
Damodar Lohani 67cdde15f5
Update api.php 2024-04-24 09:03:08 +05:45
Damodar Lohani c163c84478
Merge branch 'main' into fix-usage-skip-main 2024-04-24 08:42:17 +05:45
Damodar Lohani ac95a7c5eb
Update api.php 2024-04-24 06:44:14 +05:45
Damodar Lohani dc3aa5e12f
revert 2024-04-24 06:30:32 +05:45
Steven Nguyen b75f5263a2
Merge branch 'main' into chore-sync-main-into-1.5.x 2024-04-23 23:43:53 +00:00
Bradley Schofield 089af4e137
Update app/controllers/shared/api.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-23 16:34:12 +09:00
Bradley Schofield 3d17b64eac Add Null check before we access factors 2024-04-23 16:24:05 +09:00
Torsten Dittmann 9150ceadc7 fix: mfa with admin mode 2024-04-17 11:10:33 +02:00
Damodar Lohani 083c220e37
fix auth mode check 2024-04-17 06:45:15 +05:45
Matej Bačo c87a7053b4 Fix bug in MFA protected group 2024-04-10 11:42:20 +00:00
Eldad Fux beda5293b4 Fix format 2024-04-01 13:08:46 +02:00
Eldad Fux 8ed1da4ea8 Updated getEnv to use system lib 2024-04-01 13:02:47 +02:00
Torsten Dittmann fc028b953e fix: formatter 2024-03-08 00:30:23 +01:00
Torsten Dittmann f51c39cd2b Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-03-08 00:30:02 +01:00
Khushboo Verma 8f1aaf69d4 Merge branch 'main' into feat-disable-api 2024-03-07 18:22:34 +01:00
Torsten Dittmann dfef0e732c sync: main -> 1.5.x 2024-03-07 17:16:39 +01:00
Torsten Dittmann 0a1d572c72 chore: run formatter 2024-03-06 18:34:21 +01:00
Torsten Dittmann a53e630536 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2 2024-03-05 10:31:51 +01:00
Khushboo Verma d3b0b00917 Allow users to disable APIs 2024-03-04 23:12:54 +01:00
Matej Bačo d4e4337c57 PR review changes 2024-03-04 08:50:50 +00:00
Matej Bačo 9137dc82f8 Re-implement mfa protection as hook 2024-03-03 14:18:09 +00:00
Torsten Dittmann 01e1a43106 fix: wrong namespace 2024-03-01 03:08:30 +01:00
Torsten Dittmann b7d3996960 feat: mfa collection restructure 2024-02-29 21:59:49 +01:00
Jake Barnby 6fb1e929cd
Use group hook to block recreating sessions 2024-02-27 22:08:39 +13:00
Christy Jacob 7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Luke B. Silver f285173f4e
Merge branch '1.5.x' into feat-ssr-dx 2024-02-22 13:22:41 +00:00
Christy Jacob a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
Jake Barnby 942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/collections.php
#	app/config/errors.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/account.php
#	app/controllers/api/teams.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/worker.php
#	composer.json
#	composer.lock
#	docker-compose.yml
#	src/Appwrite/Extend/Exception.php
#	src/Appwrite/Platform/Services/Tasks.php
#	src/Appwrite/Platform/Tasks/Maintenance.php
#	src/Appwrite/Platform/Workers/Certificates.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Messaging.php
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
#	src/Appwrite/Specification/Format/OpenAPI3.php
#	src/Appwrite/Specification/Format/Swagger2.php
#	tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby b265106af2
Fix tests 2024-02-21 02:20:09 +13:00
Jake Barnby bbce53cda5
Auto trigger messaging events 2024-02-21 01:06:35 +13:00
loks0n fa28496b32 feat: ssr dx changes 2024-02-20 11:45:11 +00:00
Jake Barnby 2f711c84ed
Remove callback resources from workers 2024-02-21 00:40:55 +13:00
Torsten Dittmann b500c085e1 revert: unnecessary style changes 2024-02-16 18:00:49 +00:00
Torsten Dittmann de0e83f703 fix: move user and project logic from general to api hook 2024-02-16 17:58:51 +00:00
Torsten Dittmann 5193a97ddb fix: move user logic from general to api hook 2024-02-16 16:26:50 +00:00
Jake Barnby 014464506e
Remove redundant hook 2024-02-13 17:45:03 +13:00
shimon 6b6f04d2d3 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Jake Barnby 8ed2b1f3a5
Fix tests 2024-02-12 18:35:05 +13:00
Jake Barnby 18f7168160
Merge main 2024-02-12 14:18:19 +13:00