Jake Barnby
513ed9de05
Merge remote-tracking branch 'origin/1.5.x' into scheduling-temp
...
# Conflicts:
# app/controllers/api/messaging.php
# tests/e2e/Services/Messaging/MessagingBase.php
2024-01-11 13:06:15 +13:00
Matej Bačo
86158838a1
Magic URL improvements
2024-01-09 12:23:13 +00:00
Jake Barnby
af019369e9
Merge branch 'main' into 1.5.x
2024-01-09 22:03:35 +13: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
Damodar Lohani
640ab7bf87
Merge branch 'main' into to-sync-with-main
2024-01-03 00:11:42 +00:00
Matej Bačo
554e9f93b6
Implement max password length
2024-01-02 10:59:35 +00: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
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
Prateek Banga
b8aa2faa7b
adds scheduling commit, still need to resolve pools error
2023-12-07 11:25:19 +01:00
prateek banga
739cc36fdc
updated providerType wherever left to update
2023-11-29 15:22:26 +05:30
prateek banga
fa8dc133b4
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-message-provider-type
2023-11-29 15:01:47 +05:30
Jake Barnby
4bc23afc65
Add constants for message types
2023-11-29 17:05:37 +13:00
prateek banga
ee4c2d0e0d
adds target when creating user via server endpoint
2023-11-28 18:42:34 +05:30
Jake Barnby
0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x
...
# Conflicts:
# app/config/errors.php
# composer.lock
# src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00
prateek banga
7536d8eb0f
review changes
2023-11-16 17:09:08 +05:30
prateek banga
bf95736da0
review changes
2023-11-16 16:47:36 +05:30
prateek banga
f854622705
review changes
2023-11-16 16:26:36 +05:30
prateek banga
a282ab38a6
adds target endpoint in account controller for push tokensl
2023-11-16 02:12:06 +05:30
prateek banga
c24664f5d9
removes internal provider
2023-11-16 01:30:47 +05:30
prateek banga
2aa8391c5e
review fixes
2023-11-15 12:52:27 +05:30
prateek banga
fdca55b0de
fix test cases
2023-11-15 01:24:55 +05:30
prateek banga
adc76c5797
adds target when account is created or email or phone is updated
2023-11-14 22:46:20 +05:30
prateek banga
7ae614fe13
adds provider type in target
2023-11-14 18:14:07 +05:30
Prateek Banga
3ade88897c
Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x
2023-11-10 12:49:05 +05:30
Steven Nguyen
0c264a107a
Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications
2023-11-08 17:37:43 -08:00
prateek banga
06daa544e8
review changes
2023-10-30 23:37:57 +05:30
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
Prateek Banga
5a9b1f0c24
removes provider from topics
2023-10-26 19:44:06 +05:30
prateek banga
fd4a81c4fc
made review changes
2023-10-25 23:03:23 +05:30
prateek banga
161bbfb822
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x
2023-10-20 14:55:17 +05:30
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
Yatharth Verma
96f389cee5
merge 1.4.x changes to my branch
2023-10-14 11:57:40 +05:30
Prateek Banga
d842191cc6
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-10-06 03:53:16 +05:30
Prateek Banga
d5cc214546
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x
2023-10-06 03:44:36 +05:30
Prateek Banga
22d445587e
review changes
2023-10-05 16:57:48 +05:30
Prateek Banga
48b91e39a8
review changes
2023-10-04 16:15:59 +05:30
shimon
429dabaaee
sync with 1.4
2023-10-03 19:50:48 +03:00
shimon
2bb4d8fb89
sync with 1.4
2023-10-02 17:02:48 +03:00
shimon
b02d51c794
migrations worker
2023-10-01 20:39:26 +03:00
shimon
dcf0107a79
sync with master
2023-09-27 20:10:21 +03:00
shimon
c4bd6e008e
Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
...
Conflicts:
.env
app/cli.php
app/config/collections.php
app/console
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
app/init.php
app/worker.php
app/workers/audits.php
app/workers/builds.php
app/workers/certificates.php
app/workers/databases.php
app/workers/deletes.php
app/workers/functions.php
app/workers/mails.php
bin/worker-usage
composer.json
composer.lock
docker-compose.yml
src/Appwrite/Event/Delete.php
src/Appwrite/Event/Mail.php
src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case
2023-09-27 11:11:58 -04:00
Prateek Banga
234f7f003b
updated test cases for msg91 provider, moves worker to use provider from settings
2023-09-27 18:58:00 +05:30
Yatharth Verma
6b47999120
fix conflicts
2023-09-22 22:56:07 +05:30
Yatharth Verma
f07f246f8d
fix conflicts
2023-09-22 22:53:41 +05:30
Prateek Banga
06a05a3358
adds param messageId in send an email endpoint, tokenId as messageId in create phone session, membershipId as messageId in create team membership
2023-09-21 21:17:15 +05:30
Prateek Banga
975b444761
fix test cases and bug fix in messaging worker
2023-09-20 20:51:03 +05:30
Prateek Banga
a2e34b5b64
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider
2023-09-20 16:59:07 +05:30