CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-07-01 04:30:59 +12:00
Code Issues Projects Releases Wiki Activity
18862 commits 207 branches 384 tags 327 MiB
Commit graph

856 commits

Author SHA1 Message Date
Christy Jacob e90f536bd7 Merge branch 'main' of https://github.com/appwrite/appwrite into revert-7629-revert-7614-chore-usage-queue-health 2024-03-01 16:47:24 +00:00
Christy Jacob 2ffcb9b07e Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn 2024-03-01 16:08:03 +00:00
Christy Jacob c8a3b709ee chore: update error types for create account endpoints 2024-03-01 07:37:31 +00:00
Christy Jacob 03d6eb7401
Merge pull request #7669 from appwrite/main 
Sync main
 2024-02-26 17:39:33 +05:30
navjotNSK cab2233816 Formatting 2024-02-25 20:24:36 +01:00
navjotNSK 3a8c5a2e65 Default value added for name 2024-02-25 20:24:36 +01:00
Christy Jacob 7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints"" 2024-02-25 13:42:28 +05:30
Christy Jacob a8098831a3
Revert "usage/usage-dump queue health endpoints" 2024-02-22 12:21:48 +05:30
Jake Barnby f5aebe6673
Merge pull request #7559 from Souptik2001/fix-7109-user-activity-log 
Fix missing user activity logs
 2024-02-12 23:04:20 +13: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
Souptik Datta e6a97bb36a
Merge branch 'master' into fix-7109-user-activity-log 2024-02-09 00:40:36 +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
Christy Jacob 8d7705a2e3 chore: update rate limits 2024-01-30 15:28:48 +00: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
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
shimon a0b38a5a7c Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 2024-01-18 14:19:19 +02:00
Torsten Dittmann 78f7b1897e
fix: hotfix for redirect param in custom templates (#7437) 
* fix: hotfix for redirect param in custom templates
* fix: redirect param variables
* fix: variable typo
* chore: update comments for template variables
 2024-01-11 21:36:05 +01:00
Torsten Dittmann d344ba46c4
feat: account delete (#7415) 
* feat: account delete

* chore: run specs

* release: console sdk

* chore: run formatter

* tests: fix project tests
 2024-01-09 12:58:36 +01:00
Eldad A. Fux b0a8aac0b7
Merge pull request #7348 from appwrite/fix-delete-identity-event 
Update the delete identity endpoints to set the params and payload
 2024-01-09 07:52:08 +01:00
Torsten Dittmann 9ba2eafa83
fix: escape html in email params (#7409) 
* fix: escape html in email params

* revert: phpunit stop on failure

* chore: fix linter
 2024-01-08 18:08:17 +01:00
Matej Bačo e5f0e00742 Apply password validation to all places 2024-01-05 12:31:38 +01:00
Matej Bačo 0a2be34ceb Fix PHP refference bug 2024-01-05 12:07:41 +01:00
Matej Bačo ba32170f72 Improve password validator hook 2024-01-04 16:26:15 +01:00
shimon 99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	Dockerfile
	app/console
	app/init.php
	composer.lock
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/Hamster.php
 2024-01-02 11:49:23 +02:00
Steven Nguyen f1ba7b08ab
Update the delete identity endpoints to set the params and payload 
Because no payload was set, the event params (userId and identityId)
wasn't picked up automatically. This updates the endpoints so that the
payload is set, but also makes sure to set the userId and identityId
params since the identityId param's key doesn't match the key in the
payload.
 2023-12-27 23:35:32 +00:00
Damodar Lohani 1f558442d9 linter fix 2023-12-18 10:18:40 +00:00
Matej Bačo 8c1363529e Add Hooks 2023-12-15 23:19:43 +01:00
Steven Nguyen 92a307c164
Fix user identity attaching to wrong user 
Suppose a user has 2 accounts on Appwrite:

1. joe@example.com
2. joe@gmail.com

Prior to this PR, if joe@example.com created a Google OAuth2 session
using his joe@gmail.com email, a new joe@gmail.com identity would be
created linked to joe@example.com.

This is especially problematic because if the user tried to create a
Google OAuth2 session using joe@gmail.com, Appwrite would lookup the
user via email and find the joe@gmail.com user, but then find an
identity from joe@example.com. This mismatching user ID would then
cause an error.

This PR prevents an identity from being created if the email from the
OAuth2 provider matches another user's email.
 2023-12-13 18:45:05 +00:00
shimon 21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
 2023-11-26 10:28:17 +02:00
Steven Nguyen 0c264a107a
Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications 2023-11-08 17:37:43 -08:00
shimon f64d0ab8a8 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn 
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	composer.lock
	src/Appwrite/Migration/Migration.php
 2023-11-05 17:03:13 +02:00
Steven Nguyen 836ce852ed
Refactor email templates 
Update the mails worker to only be responsible for building the final
email using the base (layout) template and the user, team, project, and
redirect variables.

It is the responsibility of the controller to perform localization and
determine whether a custom or default email template should be used.
If the default one is used, it has to be rendered using the hello,
footer, thanks, and signature variables so that it matches the custom
template. Then, it can be sent to the worker.
 2023-10-26 16:47:14 -07:00
Steven Nguyen 70a3820009
Remove unused mail vars 2023-10-26 16:23:58 -07:00
shimon 4c6976488c clean up 2023-10-25 15:06:54 +03:00
shimon b7675df9b9 usage workers 2023-10-25 11:38:44 +03:00
shimon 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
shimon 593e5ab316 some fixes 2023-10-17 22:08:01 +03:00
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00