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

6046 commits

Author SHA1 Message Date
Torsten Dittmann 239a0b4dde
Merge pull request #8081 from appwrite/fix-dont-kick-after-enabling-mfa
Don't kick user and require verification after enabling MFA
2024-05-07 17:49:18 +02:00
Jake Barnby 921eb2b900
App::getEnv -> System::getEnv 2024-05-07 22:08:00 +12:00
Matej Bačo 08bf5aace4 Mark email verified after email OTP 2024-05-07 09:01:57 +00:00
Jake Barnby e9bac08de0
Fix header test 2024-05-07 17:59:24 +12:00
Jake Barnby 356d155df2
Add shared tables enabled flag for quick toggle 2024-05-07 17:29:12 +12:00
Jake Barnby 74a147f3b2
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables
# Conflicts:
#	tests/e2e/Services/Projects/ProjectsCustomServerTest.php
2024-05-07 15:53:58 +12:00
Jake Barnby 0e9838d290
Remove logging and test files 2024-05-07 15:48:20 +12:00
Jake Barnby 912e3b01dc
Add clarifying comments 2024-05-07 14:07:04 +12:00
Steven Nguyen 5b5505cf97
fix(auth): ensure session factors don't contain duplicates 2024-05-06 17:48:44 -07:00
Steven Nguyen 7e07f6b958
feat(auth): ensure user isn't kicked out after enabling MFA
User's were kicked out and forced to verify their session after enabling
MFA if they already had factors enabled. This change ensures that they
are not kicked out of their current session after MFA is enabled by
adding all relevant factors to the session.
2024-05-06 17:48:08 -07:00
Steven Nguyen 98d18ecc47
refactor(auth): remove auth duration from Auth::sessionVerify() calls
The paramter was removed from the method so we don't need to pass it
in anymore.
2024-05-06 17:16:56 -07:00
Jake Barnby 52c52fa519
Add scheme to DSN on fail 2024-05-06 18:13:41 +12:00
Jake Barnby db94070162
Use DSN for project database 2024-05-06 17:33:36 +12:00
shimon 8e291f3700 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into fix-file-size-limit
 Conflicts:
	app/controllers/api/storage.php
	composer.lock
2024-05-05 11:52:49 +03:00
Eldad A. Fux b2c57e2d8b
Merge pull request #7934 from appwrite/fix-custom-domain
Prevent functions domain to be used as custom domain
2024-05-05 06:53:29 +01:00
Damodar Lohani 74264582cc
Update proxy.php 2024-05-05 11:07:59 +05:45
Damodar Lohani 1094238820 add test 2024-05-05 04:56:49 +00:00
Damodar Lohani 9b0bacb1a2 Merge remote-tracking branch 'origin/refactor-usage-sn' into pea-699 2024-05-05 04:06:25 +00:00
loks0n c746fb40f8 chore: better name 2024-05-03 12:03:01 +01:00
loks0n 1295128b10 fix: use APP_VERSION_STABLE 2024-05-03 11:56:54 +01:00
Jake Barnby c4deb0ba93
Allow shared tables namespace override 2024-05-03 21:30:38 +12:00
Jake Barnby 99d05b3d8c
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables 2024-05-03 14:24:57 +12:00
Khushboo Verma ce5dd899a5 Remove unnecessary code 2024-05-02 20:48:36 +05:30
Khushboo Verma abcd74d224 Remove logger code from avatars.php 2024-05-02 19:49:55 +05:30
loks0n 644bbe1f5b fix: version 2024-05-02 14:25:41 +01:00
loks0n 3ab9875ca7 feat: use x-appwrite-response-format 2024-05-02 14:16:35 +01:00
loks0n 2ed38271a0 feat: add version header 2024-05-02 13:51:19 +01:00
Jake Barnby b2e956a14d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes
# Conflicts:
#	.gitignore
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/GetMigrationStats.php
#	src/Appwrite/Platform/Workers/Databases.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Hamster.php
#	tests/e2e/General/HTTPTest.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-04-30 19:40:47 +12:00
Jake Barnby 7140d8e6a5
Merge pull request #8036 from appwrite/feat-upgrade-db
Update database
2024-04-30 11:55:47 +12:00
Steven Nguyen bfb51328fe
fix: version in error response
The APP_VERSION_STABLE constant should be used for the version
in API errors so that developers see a version that makes more
sense (such as 1.5.5).
2024-04-29 22:50:20 +00:00
ItzNotABug 02ece2637f fix: use resourceInternalId. 2024-04-29 15:54:22 +05:30
Jake Barnby aeea5e8328
Merge pull request #7341 from appwrite/collection-not-found
databases.php collection not found
2024-04-29 21:04:31 +12:00
Jake Barnby bcca318494
Merge remote-tracking branch 'origin/refactor-usage-sn-invalid-relationship' into feat-upgrade-db
# Conflicts:
#	composer.lock
2024-04-29 20:54:44 +12:00
Jake Barnby ecff8f5b7e
Update app/controllers/general.php 2024-04-29 20:16:09 +12:00
Jake Barnby 9a7c424e85
Update app/controllers/general.php 2024-04-29 16:52:46 +12:00
Matej Bačo c768adacdc Re-enable experiment 4xx logging 2024-04-26 17:05:24 +02:00
Matej Bačo 0a85809532 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-26 13:14:00 +02:00
Matej Bačo 9616de7576 Merge branch 'main' into refactor-usage-sn-1.5.x 2024-04-26 13:11:21 +02: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
Christy Jacob 92c41954af Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn-1.5.x 2024-04-26 09:19:09 +00:00
Damodar Lohani fbdaf7616c
Fix response code label 2024-04-25 07:19:02 +05:45
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
shimon 4e639526d6 pull changes 2024-04-24 12:25:49 +03:00
Matej Bačo a99d9f3015 Disable experimental 4XX logging 2024-04-24 10:53:09 +02: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
Steven Nguyen 3a2e9b6f4a
Merge pull request #7984 from appwrite/fix-mfa-admin-mode-condition
fix: mfa with admin mode
2024-04-23 15:21:02 -07: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
Steven Nguyen f88887abad
fix(mfa): fix delete authenticator response model 2024-04-22 22:24:20 +00:00
Vincent (Wen Yu) Ge c57fa3546f Ran formatter 2024-04-18 17:22:41 -04:00
Vincent (Wen Yu) Ge 404de48cc3 Update user create error message for console to be console specific 2024-04-18 17:08:47 -04:00
fogelito 6a2b40db50 Remove redundent AppwriteException 2024-04-18 11:37:20 +03:00
fogelito 9d14fc75f1 Remove redundent AppwriteException 2024-04-18 11:36:27 +03:00
fogelito 0e8bc6b4b4 Fix bad copy 2024-04-18 11:25:03 +03:00
Shmuel Fogel 2fcbc4867b
Update app/controllers/general.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-18 11:08:15 +03:00
Shmuel Fogel 4d1698eab5
Update app/controllers/general.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-18 11:08:09 +03:00
fogelito b224aee2fe GENERAL_ACCESS_FORBIDDEN 2024-04-18 09:58:51 +03:00
fogelito a7318fdf8b Chnage message 2024-04-18 09:26:11 +03:00
Matej Bačo 2551cf6fb1 Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x 2024-04-17 17:56:31 +02:00
fogelito cd9a274f79 Message x-appwrite-project 2024-04-17 16:17:44 +03:00
Torsten Dittmann 9150ceadc7 fix: mfa with admin mode 2024-04-17 11:10:33 +02:00
Steven Nguyen 2f7aff3a44
fix(auth): fix challenge type check
The factor parameter is case insensitive so we need to make sure
comparing the parameter to the constant is case insensitive too.
2024-04-16 23:44:46 -07:00
Damodar Lohani 083c220e37
fix auth mode check 2024-04-17 06:45:15 +05:45
Matej Bačo 487d93bf04 Revert breaking changes 2024-04-16 09:59:02 +02:00
Eldad A. Fux 05dd17bd55
Merge pull request #7949 from appwrite/fix-factors-recovery-code
Add recovery code to List factors
2024-04-15 10:48:16 +02:00
Eldad A. Fux 8dd9b58513
Merge pull request #7950 from appwrite/fix-recovery-code-removal
Fix: recovery code removal
2024-04-11 17:28:15 +02:00
Matej Bačo 65115f876c Improve logic for recovery code factor 2024-04-11 07:52:54 +00:00
fogelito bec10c0052 Add previous Error 2024-04-11 10:49:45 +03:00
fogelito 00ebf5c10f Remove var_dumps 2024-04-11 10:46:18 +03:00
fogelito c7281af6e2 Move App::init to general.php 2024-04-11 10:28:16 +03:00
Jake Barnby ff8ebb4f7e
Match memberships on internal ID 2024-04-11 19:09:04 +12:00
fogelito ab3b1ac51a Add groups 2024-04-11 10:06:07 +03:00
Torsten Dittmann 11fdefa2b8 chore: run formatter 2024-04-10 19:49:16 +02:00
Torsten Dittmann 8cad8f5533 fix: admin mode on console 2024-04-10 19:46:31 +02:00
Matej Bačo 860d292df9 Fix recovery code removal 2024-04-10 14:01:25 +00:00
Matej Bačo b5b8aa5302 Add recovery code as factor 2024-04-10 13:57:36 +00:00
Matej Bačo c87a7053b4 Fix bug in MFA protected group 2024-04-10 11:42:20 +00:00
fogelito 84ffc95773 Revert 2024-04-09 18:25:49 +03:00
fogelito f73f8c9ae1 Move test tp base 2024-04-09 18:24:01 +03:00
fogelito 6edd0ea90d Merge branch 'main' of https://github.com/appwrite/appwrite into collection-not-found
 Conflicts:
	composer.lock
2024-04-09 17:56:52 +03:00
fogelito a465c625e9 mode 2024-04-09 17:52:30 +03:00
fogelito 2bbff0e0b6 Disable console project 2024-04-09 17:45:16 +03:00
fogelito 12434fd846 RELATIONSHIP_VALUE_INVALID 2024-04-09 15:38:55 +03:00
fogelito 65ab721c3d InvalidRelationshipValue 2024-04-09 15:32:23 +03:00
Damodar Lohani 99cb38c674 fix linter issues 2024-04-08 03:57:08 +00:00
Damodar Lohani d3bbcce302
Prevent functions domain to be used as custom domain 2024-04-08 09:31:15 +05:45
Damodar Lohani 4612636144 fix test 2024-04-08 03:45:02 +00:00
Damodar Lohani 82e6db903a prevent functions domain and subdomain to be added as custom domain 2024-04-08 03:29:35 +00:00
Steven Nguyen f53dd03b93
feat(messaging): Add attachments param to update email endpoint
The param is added to the end to reduce the impact on param order
in SDKs.
2024-04-04 08:06:33 -07:00
Jake Barnby 1f79d953d7
Merge pull request #7906 from appwrite/fix-7832-missing-event-param
Fix delete message event not firing
2024-04-04 14:53:31 +13:00
Steven Nguyen 4a2056890d
fix(storage): add missing chunkId param to create file abuse key
A previous PR added chunkId as an abuse key param to fix a problem where uploading multiple chunks of a file would trigger the `general_rate_limit_exceeded` error. For some reason, the parameter disappeared from the abuse key causing a regression. This PR adds the param back to fix the regression.

Reference:
* https://github.com/appwrite/appwrite/issues/7879
* https://github.com/appwrite/appwrite/pull/7154
2024-04-03 13:28:41 -07:00
Jake Barnby fb408636a4
Set token secrets as sensitive event params 2024-04-03 16:36:53 +13:00
Jake Barnby e224ca440b
Allow setting event parameters as sensitive 2024-04-03 16:36:21 +13:00
Matej Bačo aaa1465e21 Fix code bugs 2024-04-02 16:58:45 +00:00
Matej Bačo 1234770dc8 CI/CD fixes 2024-04-02 18:48:12 +02:00