Torsten Dittmann
0a4c62085c
chore: run linter
2024-01-12 14:06:52 +01:00
Torsten Dittmann
e2a0c2d825
sync: with 1.5.x
2024-01-12 14:04:31 +01:00
Torsten Dittmann
99259ebf2b
fix: enable mfa in console
2024-01-11 20:24:37 +01:00
Khushboo Verma
807d295303
Resolve merge conflicts
2024-01-11 22:49:33 +05:30
Khushboo Verma
74b9324001
Use strip_tags in post request too
2024-01-11 21:58:21 +05:30
Khushboo Verma
d922feb4c7
Use strip_tags to remove <p> tag
2024-01-11 18:54:08 +05:30
Khushboo Verma
dc0b0c8ab7
Merge branch '1.5.x' into fix-otp-template
2024-01-11 18:24:45 +05:30
Khushboo Verma
c84af966df
Make OTP template more contextual
2024-01-11 18:20:01 +05:30
Matej Bačo
539bee8850
Update app/controllers/api/account.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2024-01-11 10:20:51 +01:00
Torsten Dittmann
07f44593c0
feat: delete authenticator endpoint
2024-01-10 17:22:32 +01:00
Matej Bačo
2d204d593a
code formatting
2024-01-10 15:10:05 +00:00
Matej Bačo
bf14d1d97d
Add random security phrases
2024-01-10 15:09:39 +00:00
Matej Bačo
931efe24a9
Added security phrase to magic URL
2024-01-10 14:52:32 +00:00
Torsten Dittmann
cb25d5209e
fix: di
2024-01-09 16:30:18 +01: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
Torsten Dittmann
bbf6480c15
fix: merge conflicts
2024-01-08 12:31:46 +01:00
Torsten Dittmann
208abe17e7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-08 12:20: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
Torsten Dittmann
83c411e5fd
fix: some fixes
2023-12-07 10:05:37 +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
