1
0
Fork 0
mirror of synced 2024-07-05 22:51:24 +12:00
Commit graph

4721 commits

Author SHA1 Message Date
Damodar Lohani e462d73f65 prevent user with active team, from deletion 2024-02-11 09:31:09 +00:00
Christy Jacob e2baefe8c6
Merge pull request #7500 from appwrite/fix-account-delete
PEA-233-prevent console user deletion before deleting their team
2024-02-11 14:52:24 +05:30
Damodar Lohani 681688e252
fix rename 2024-02-11 14:52:54 +05:45
Damodar Lohani c8720805c7
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-02-11 14:41:19 +05:45
Christy Jacob 5abcb86fd7 fix: use atomic operations for updating team count 2024-02-09 23:18:18 +05:30
shimon 179a045399 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
 Conflicts:
	composer.lock
2024-02-09 16:29:26 +02:00
Souptik Datta e6a97bb36a
Merge branch 'master' into fix-7109-user-activity-log 2024-02-09 00:40:36 +05:30
Souptik Datta 8d7be399d3
fix: Fix project user activity log's missing fields and total count
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:15:48 +05:30
Souptik Datta f42a78ef9c
fix: Fix account activity logs total count
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
2024-02-09 00:14:37 +05:30
Christy Jacob ba4f708137
Apply suggestions from code review
Co-authored-by: Torsten Dittmann <torsten.dittmann@googlemail.com>
2024-02-08 23:26:43 +05:30
fogelito bcc6564e5b typo 2024-02-08 18:18:39 +02:00
fogelito 7176d7feab Remove comment 2024-02-08 18:12:43 +02:00
fogelito 103fec1664 parseQueries 2024-02-08 18:10:25 +02:00
fogelito 2c57f9a44a Merge branch '1.5.x' of github.com:appwrite/appwrite into create-array-index 2024-02-08 15:04:43 +02:00
fogelito 98a6b96af9 Hardcode size and orders 2024-02-08 15:01:20 +02:00
shimon 790cdc297b composer update 2024-02-08 10:26:45 +02:00
shimon 632f78140f Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc
 Conflicts:
	composer.json
	composer.lock
2024-02-08 09:29:12 +02:00
Christy Jacob 243ddd4b33
Merge pull request #7519 from appwrite/update-param-name
Update param name
2024-02-08 12:55:19 +05:30
Steven Nguyen 4ace8ed027
Replace catching \Exception with \Throwable
\Exception doesn't work as a catch-all because not everything extends
\Exception. For example, there was a problem where the messaging worker
didn't catch an exception here:

} catch (\Exception $e) {
    $deliveryErrors[] = 'Failed sending to targets ' . $batchIndex + 1 . '-' . \count($batch) . ' with error: ' . $e->getMessage();
} finally {

As such, $deliveryErrors stayed as an empty array. In this case, the
$adapter->send() threw a TypeError which extends Error which implements
Throwable. Updating the catch to catch \Throwable ensures the error is
caught and $deliveryErrors gets updated.
2024-02-08 01:17:54 +00:00
Jake Barnby 66a38898eb
Fix message status values and enums 2024-02-07 23:50:05 +13:00
Jake Barnby 7014b2c2cd
Fix user API mfa route auth 2024-02-07 18:08:51 +13:00
Bradley Schofield 559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Khushboo Verma fb127270ce Add test for empty domain 2024-02-06 16:04:58 +05:30
Khushboo Verma 11ceeff5ca Add health certificate validity endpoint 2024-02-06 15:15:03 +05:30
Jake Barnby 0a72b37b3e
Fix session response model 2024-02-06 02:17:04 +13:00
Matej Bačo 25f8702429 Fix formatting 2024-02-05 10:40:53 +00:00
Matej Bačo 7beb9080fa Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates 2024-02-05 10:38:48 +00:00
Khushboo Verma e8523e38f7 Merge branch '1.5.x' into feat-block-countries 2024-02-05 13:26:52 +05:30
Jake Barnby 15f433794f
Add missing enum cases 2024-02-05 20:25:34 +13:00
shimon 6a6c3445fa updates 2024-02-04 20:02:01 +02:00
shimon a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models
 Conflicts:
	.gitmodules
2024-02-04 09:27:08 +02:00
Jake Barnby bb9947bfd3
Remove invalid injection 2024-02-04 04:15:16 +13:00
Jake Barnby 68931c8672
Merge pull request #7538 from appwrite/fix-spec-generation
Fix spec generation
2024-02-03 04:04:00 +13:00
Jake Barnby f14c0cc0aa
Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation
# 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
2024-02-03 03:35:14 +13:00
Jake Barnby 3816870e19
Fix duplicate routes 2024-02-03 03:26:04 +13:00
Jake Barnby 874e483fb5
Trigger delete of targets associated with sessions when sessions are deleted 2024-02-03 03:06:36 +13:00
Khushboo Verma 7b4f334f31 Update error message 2024-02-02 19:30:54 +05:30
Torsten Dittmann b462eee183 chore: run formatter 2024-02-02 13:50:41 +01:00
Torsten Dittmann a77526cab1 fix: backup codes 2024-02-02 13:50:18 +01:00
Torsten Dittmann db321db0fb fix: code review 2024-02-02 13:42:15 +01:00
Torsten Dittmann 75fc59931a Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-02 13:30:11 +01:00
Jake Barnby 0e8e455903
Fix spec generation 2024-02-02 23:54:34 +13:00
Jake Barnby df3042dc55
Merge pull request #7536 from appwrite/fix-invalid-usage-labels
Remove redundant usage labels
2024-02-02 22:21:20 +13:00
Khushboo Verma d96d84201e Add auth group to create email token endpoint 2024-02-02 14:03:20 +05:30
Jake Barnby 499f0a53ea
Update to standard namespacing for enums 2024-02-02 17:53:19 +13:00
Jake Barnby d1bad7c3cd
Remove redundant usage labels 2024-02-02 17:16:31 +13:00
shimon a254bb7edb Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 2024-02-01 17:13:38 +02:00
Eldad A. Fux 321a998947
Merge pull request #7533 from appwrite/feat-rename-security-phrases
Feat: Rename security phrases
2024-02-01 15:45:15 +01:00
Matej Bačo ef3f7878dc PR review changes 2024-02-01 14:13:30 +00:00
Torsten Dittmann ceb868c9d7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-02-01 11:57:32 +01:00
loks0n 5e26f01ecd chore: fix account get ssr 2024-02-01 10:41:41 +00:00
Matej Bačo a47a4240ed Rename security phrases 2024-02-01 10:41:01 +00:00
shimon 350d72eb1f updates 2024-02-01 12:21:50 +02:00
loks0n d84cfab244 feat: remove users.createSession 2024-02-01 10:21:38 +00:00
Jake Barnby 21f0ce5b82
Set port, username and password to defaults if not provided 2024-02-01 17:45:41 +13:00
Jake Barnby a6b5734884
Fix encryption type options 2024-02-01 17:44:42 +13:00
Jake Barnby acc7131c95
Remove redundant key existence check 2024-02-01 17:42:19 +13:00
Jake Barnby 19fdc193b6
Fix credential enabled check 2024-02-01 17:41:24 +13:00
Jake Barnby d275d36a0b
Fix param order 2024-02-01 02:33:14 +13:00
Jake Barnby e4194c690f
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-provider
# Conflicts:
#	composer.lock
2024-02-01 01:50:36 +13:00
Jake Barnby 49a753509b
Merge pull request #7067 from appwrite/feat-php-8-1
Upgrade to PHP 8.2
2024-02-01 01:47:57 +13:00
Jake Barnby d9f53cacfa
Add SMTP provider 2024-02-01 01:30:09 +13:00
Jake Barnby 39312a83ef
Merge pull request #7518 from appwrite/feat-remove-description
Feat remove description
2024-02-01 00:33:49 +13:00
Jake Barnby 79c324527e
Merge pull request #7510 from appwrite/feat-delete-message
Add message delete route
2024-01-31 19:55:11 +13:00
Christy Jacob 8d7705a2e3 chore: update rate limits 2024-01-30 15:28:48 +00:00
Torsten Dittmann 3f688a2aa7 fix: remove some leftovers 2024-01-30 16:09:58 +01:00
shimon 5518ca165e remarks 2024-01-30 13:24:57 +02:00
Christy Jacob 3c7fae7843 chore: update param name 2024-01-30 08:10:13 +00:00
Jake Barnby ee4b50ce51
Merge pull request #7504 from appwrite/labels-limit
Labels limit
2024-01-30 19:43:32 +13:00
Jake Barnby ab0fae216d
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1
# Conflicts:
#	composer.lock
2024-01-30 18:44:16 +13:00
Jake Barnby d7c9f9df59
Merge remote-tracking branch 'origin/1.5.x' into feat-remove-description 2024-01-30 16:58:20 +13:00
Jake Barnby 14a279eb57
Merge remote-tracking branch 'origin/1.5.x' into feat-delete-message 2024-01-30 16:58:04 +13:00
Jake Barnby afb32b49d5
Throw if status still scheduled and scheduled time before now 2024-01-30 16:33:18 +13:00
Matej Bačo 738a696ca9 Add proejct ID abuse protection 2024-01-29 20:38:01 +00:00
Matej Bačo 7acdaa5978 PR review changes 2024-01-29 20:24:21 +00:00
Matej Bačo bc88197e0d Add more abuse keys 2024-01-29 20:11:44 +00:00
Matej Bačo 0a518cd47e Fix failing tests 2024-01-29 20:03:14 +00:00
Christy Jacob af21b44125 chore: revert abuse key 2024-01-29 17:25:56 +00:00
Christy Jacob 62246b5a2c chore: add auth label to phone endpoint 2024-01-29 17:24:10 +00:00
Christy Jacob d849aa1ed2 chore: add logs 2024-01-29 16:47:12 +00:00
Christy Jacob 94c423c429 chore: add project details to messaging worker 2024-01-29 13:27:03 +00:00
Christy Jacob 6c09d04038 fix: use atomic operations for count updates 2024-01-29 10:54:58 +00:00
fogelito 53efc930c0 Remove Database::INDEX_ARRAY 2024-01-29 08:58:11 +02:00
fogelito 9c8c017618 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1
 Conflicts:
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2024-01-29 08:50:53 +02:00
Jake Barnby 61dd4a123c
Remove descriptions 2024-01-29 19:29:58 +13:00
Jake Barnby d94962f086
Add message delete route 2024-01-29 17:20:45 +13:00
shimon 44ed6826a9 refactor usage poc 2024-01-28 15:33:04 +02:00
fogelito 974783f54a Increase labels max value 2024-01-28 12:51:05 +02:00
shimon 7a2ee683e3 refactor usage poc 2024-01-28 11:28:59 +02:00
Damodar Lohani 9b7a5f55b7 fix linter 2024-01-28 03:01:34 +00:00
Damodar Lohani e5dfed0aa3 fix, check only for confirmed membership 2024-01-28 02:47:23 +00:00
Damodar Lohani 215a139e87 prevent console user deletion before deleting their team 2024-01-28 02:10:14 +00:00
Christy Jacob 91e625cfc2 chore: linter 2024-01-26 18:04:06 +00:00
Bradley Schofield 126c3a38de Add threshold 2024-01-26 15:55:55 +00:00
Christy Jacob 7e444b037d
Merge pull request #7482 from appwrite/feat-improve-cname-logging
Feat: CNAME validation logs
2024-01-26 19:08:26 +04:00
Bradley Schofield 772d42cef8 Update health.php 2024-01-26 09:52:41 +00:00
Bradley Schofield e2c05fea8c Update health.php 2024-01-26 09:42:21 +00:00
Bradley Schofield 73b1837d66 Remove HealthFailedJobs Model 2024-01-26 09:41:30 +00:00
fogelito 789e19d26a Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 2024-01-25 19:06:18 +02:00
Jake Barnby fc41b08940 Fix email credential checks 2024-01-25 17:59:26 +01:00
Jake Barnby b3a4722758 Fix validators 2024-01-25 17:59:26 +01:00
Jake Barnby 7a5c226110 Fix tests 2024-01-25 17:59:26 +01:00
Jake Barnby d405106aaa Throw on enable if provider credentials are missing instead of ignoring 2024-01-25 17:59:26 +01:00
fogelito 998c4d282d Fix failing tests 2024-01-25 18:53:51 +02:00
fogelito a782e20315 Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing
 Conflicts:
	app/controllers/api/account.php
	composer.json
	composer.lock
	src/Appwrite/Platform/Tasks/CalcTierStats.php
	tests/e2e/Services/Account/AccountBase.php
2024-01-25 17:44:05 +02:00
Bradley Schofield 47af19dd17
Update app/controllers/api/health.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-25 10:21:52 +00:00
Jake Barnby 52a9b31521
Trigger deletes worker when target is deleted 2024-01-25 20:01:15 +13:00
Bradley Schofield 26d8278a89 Merge branch 'feat-impl-queue-retry' into feat-queue-failed-health-endpoints 2024-01-24 18:00:51 +00:00
Bradley Schofield 867bc0281c Update health.php 2024-01-24 17:48:27 +00:00
Torsten Dittmann b6d85b5a24 fix: email factor for otp 2024-01-24 17:50:16 +01:00
Torsten Dittmann 9070dce6ac Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 16:32:12 +01:00
Torsten Dittmann 88cf7ea9e8 fix: race condition with creating a user with targets 2024-01-24 15:31:58 +01:00
Matej Bačo f4a4cfa207 PR review changes 2024-01-24 12:40:56 +00:00
Torsten Dittmann 62e459c581 fix: workers 2024-01-24 12:29:36 +01:00
Torsten Dittmann 9f5a0312cf Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-01-24 11:24:59 +01:00
Matej Bačo 5bd106afaf Implement better cname validation logging 2024-01-23 15:40:32 +00:00
fogelito 8dd387cfbe Parsing and Throw Error 2024-01-23 17:14:14 +02:00
Matej Bačo 187165f397 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-23 09:12:22 +00:00
Torsten Dittmann f1293d2636 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 18:32:22 +01:00
Torsten Dittmann a9f1e4d78d
feat: delete account (#7392)
* feat: delete account

* fix: new endpoint only for console sdk

* fix: hide endpoint from public sdks

* fix: account delete scope
2024-01-22 18:29:10 +01:00
fogelito 37bdb17cc6 Deprecated changes 2024-01-22 19:24:12 +02:00
Matej Bačo 0c7a69e665 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 16:05:38 +00:00
Christy Jacob cfc25288b5
Merge pull request #7422 from appwrite/feat-email-otp
Feat: Email OTP
2024-01-22 19:18:39 +04:00
Matej Bačo fc3fa8f1d7 PR review changes 2024-01-22 15:02:33 +00:00
Torsten Dittmann 185e4258df Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-22 14:45:07 +01:00
Matej Bačo 3bf89a931d PR review changes 2024-01-22 13:20:48 +00:00
Matej Bačo 9ad5aa79d0 Fix failing tests 2024-01-22 11:20:33 +00:00
Matej Bačo 724b8c8098 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 10:13:28 +00:00
Matej Bačo 32cc186ea6 Merge remote-tracking branch 'origin/1.5.x' into feat-session-renewal 2024-01-22 08:17:52 +00:00
Matej Bačo fc186c69a1 PR review changes 2024-01-22 08:13:46 +00:00
fogelito 667abce8f5 Create indexes & query contains 2024-01-21 18:22:02 +02:00
fogelito 3689435176 Arrays tests 2024-01-21 10:10:18 +02:00
Matej Bačo eb597b2bd2 Try to fix targets bug 2024-01-20 13:07:53 +00:00
Matej Bačo 42eb051368 QA bug fixes 2024-01-20 10:06:30 +00:00
Matej Bačo 311e9a75dd Allow empty values in PATH user service 2024-01-20 09:43:31 +00:00
Matej Bačo df9bc6df56 Implement OTP email endpoint + tests 2024-01-19 13:42:26 +00:00
Matej Bačo 31a67a7667 Merge remote-tracking branch 'origin/1.5.x' into feat-email-otp 2024-01-19 12:12:07 +00:00
Khushboo Verma a134ca7efd Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-19 17:12:14 +05:30
Jake Barnby 5dc9392fe5
Merge pull request #7463 from appwrite/feat-list-message-targets
Add endpoint to list a message's targets
2024-01-19 19:15:21 +13:00
Steven Nguyen 3938c53256
Add endpoint to list a message's targets
This endpoint is needed so that the Console can fetch the associated
targets to display when viewing the details of a message or going in
to edit a message.
2024-01-19 06:03:23 +00:00
Jake Barnby 38d0185c88
Merge pull request #7461 from appwrite/fix-create-push-target
Fix create/update push target routes
2024-01-19 18:49:12 +13:00
Jake Barnby 59c4f5b9e4
Merge pull request #7431 from appwrite/feat-message-scheduling
Feat message scheduling
2024-01-19 16:55:49 +13:00
Jake Barnby fc9cc3aab1
Merge pull request #7381 from appwrite/fix-list-messages-allowed-queries
Fix list messages allowed queries
2024-01-19 16:53:22 +13:00
Jake Barnby c5c832eff6
Merge pull request #7382 from appwrite/feat-search-subscribers
Add search param for list subscribers endpoint
2024-01-19 16:31:48 +13:00
Jake Barnby d292562090
Throw if status scheduled and no schedule set 2024-01-19 16:16:24 +13:00
Jake Barnby 65573adad6
Use status enum 2024-01-19 16:15:54 +13:00
Jake Barnby a3096bc209
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
# Conflicts:
#	app/controllers/api/messaging.php
2024-01-19 15:54:21 +13:00
Jake Barnby 3b7d3e6139
Merge branch '1.5.x' into feat-draft-messages 2024-01-19 14:19:45 +13:00
Bradley Schofield d3b8ce704e Add failed queue endpoint 2024-01-18 16:18:49 +00:00
Torsten Dittmann 442451aa42 feat: mfa console 2024-01-18 16:04:18 +01:00