Jake Barnby
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
...
# Conflicts:
# app/config/errors.php
# composer.lock
2023-12-15 02:41:46 +13:00
Jake Barnby
944e474ec4
Fix max array size 1
2023-12-15 02:30:44 +13: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
loks0n
3d4701abf4
Merge branch 'feat-ssr' of https://github.com/appwrite/appwrite into feat-ssr
2023-12-13 10:36:57 +00:00
loks0n
78878c6ba0
chore: fmt
2023-12-13 10:36:49 +00:00
Luke B. Silver
60a0fefe56
Merge branch '1.4.x' into feat-ssr
2023-12-13 10:32:13 +00:00
loks0n
0e25d3e1df
fix: scopes
2023-12-13 10:25:20 +00:00
Serhat Aksakal
e56b30e6a6
Update tr.json
2023-12-13 12:10:44 +03:00
德华 刘
f334168f90
fix: remove expired cookie
2023-12-13 08:45:47 +00:00
loks0n
b2f118d23b
fix: specs
2023-12-12 15:42:22 +00:00
loks0n
fe0001350d
feat: use x-appwrite-session header
2023-12-12 15:39:24 +00:00
loks0n
fda9df069a
feat: enable array sdk.method
2023-12-12 11:24:50 +00:00
loks0n
453c1928ee
fix: teams tests
2023-12-11 20:56:59 +00:00
loks0n
fe695314a9
fix: tests
2023-12-11 19:41:58 +00:00
loks0n
cb788b13bf
chore: remove unused imports
2023-12-11 18:36:17 +00:00
loks0n
1e8a931751
chore: format
2023-12-11 17:13:19 +00:00
loks0n
7ee4ad5ba9
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-12-11 16:52:14 +00:00
loks0n
f0d7312bd3
feat: create session method
2023-12-11 16:24:24 +00:00
Christy Jacob
4f1d8ed6f4
fix: revert files
2023-12-09 01:36:57 +01:00
Christy Jacob
951a749b50
fix: revert files
2023-12-09 01:19:36 +01:00
Christy Jacob
c21a063642
fix: failing tests
2023-12-09 01:02:13 +01:00
Christy Jacob
8b5783d3ff
fix: update setParam
2023-12-08 21:02:07 +01:00
Christy Jacob
ab84fa8a4d
Merge branch 'fix-cookie-issue' of github.com:appwrite/appwrite into fix-cookie-issue
2023-12-08 20:39:14 +01:00
Christy Jacob
9dca3c4300
fix: linter
2023-12-08 20:38:55 +01:00
Christy Jacob
5606402fa3
Merge branch '1.4.x' into fix-cookie-issue
2023-12-08 20:37:06 +01:00
Christy Jacob
5d121c1887
fix: reset the legacy cookie
2023-12-08 20:36:22 +01:00
Christy Jacob
eb61d5c25c
chore: reset old cookie
2023-12-08 20:24:07 +01:00
Christy Jacob
f5c2c8d8f7
chore: reset old cookie
2023-12-08 20:23:04 +01:00
Torsten Dittmann
c1af9f4201
feat: upgrade console to 3.2.15
2023-12-08 18:09:06 +01:00
Prateek Banga
194bbbb350
review changes
2023-12-05 19:24:55 +01:00
Torsten Dittmann
14e2488f98
chore: bump version
2023-12-05 18:20:47 +01:00
Prateek Banga
e7dca6b2d5
adds uniform logic for worker and extra params for email
2023-12-05 15:01:32 +01:00
Prateek Banga
54f574906c
review changes
2023-12-05 12:22:32 +01:00
loks0n
7f164bdbbc
chore: generate specs
2023-12-05 12:01:02 +01:00
loks0n
4471b93a3a
tests: fix
2023-12-05 12:00:26 +01:00
德华 刘
f127ca651f
chore: update console version
2023-12-05 00:54:52 +00:00
loks0n
54c6709a48
fix: verification scopes
2023-12-04 16:17:22 +01:00
Prateek Banga
f9dd40120e
resolve update twilio provider
2023-12-04 15:48:37 +01:00
loks0n
63b2363556
feat: workaround backwards compat
2023-12-04 15:38:12 +01:00
Torsten Dittmann
d79411813a
bump: version
2023-12-04 10:45:18 +01:00
loks0n
0df3ff9e8b
Merge branches 'feat-ssr' and '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-12-03 13:35:23 +00:00
prateek banga
5ed8bdae35
fix search param in list subscribers endpoint
2023-12-01 03:55:29 +05:30
prateek banga
81ec4ff9bc
fix typo in userId index in targets
2023-12-01 03:51:03 +05:30
prateek banga
6ead6f8094
misc changes
...
allow filtering by providerType, userId in subscribers. Adds cancelled status for message status. Validate targets when creating message. delete all targets when user is deleted. fix twilio bug. add db env vars in messaging worker compose.phtml
2023-12-01 03:39:43 +05:30
德华 刘
65b1e1e948
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-refactor-hamster
2023-11-30 21:26:49 +00:00
德华 刘
8218e95f17
chore: revert console
2023-11-30 21:26:07 +00:00
德华 刘
b6fabf80ef
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-refactor-hamster
2023-11-30 21:20:59 +00:00
德华 刘
11a9583c72
feat: update cache buster
2023-11-30 21:16:17 +00:00
德华 刘
e382a9d58b
feat: update console
2023-11-30 20:37:59 +00:00
德华 刘
799fe2acca
chore: address review comments
2023-11-30 17:43:07 +00:00
德华 刘
f3544485e5
chore: address review comments
2023-11-30 17:41:23 +00:00
loks0n
5a63fef157
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-30 12:13:44 +00:00
loks0n
8ea9706174
feat: Matej renaming plan
2023-11-30 11:35:52 +00: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
prateek banga
43b8fc2c31
review changes
2023-11-29 13:47:44 +05:30
Jake Barnby
4b58d08fd8
Add providerType
to Message
2023-11-29 17:09:44 +13:00
Jake Barnby
82c86c0ae2
deliveryTime
-> scheduledAt
2023-11-29 17:08:25 +13:00
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
Bradley Schofield
dea3e74b6a
Implement Job based hamster
2023-11-28 10:19:55 +00:00
Jake Barnby
1a496bbf71
Merge pull request #7180 from appwrite/chore-update-sdks
...
Chore update sdks
2023-11-27 15:04:48 +13:00
prateek banga
858175fe00
adds target object in subscriber model
2023-11-23 14:35:16 +05:30
Prateek Banga
d9826cdce8
makes provider creation fields optional and adds target info in subscriber model
2023-11-23 00:39:55 +05:30
loks0n
88aa4d726c
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-21 14:54:57 +00:00
Torsten Dittmann
5179c4d08a
chore: upgrade console to 3.2.9
2023-11-21 12:08:26 +01:00
prateek banga
9c6cd8512f
review changes
2023-11-21 15:19:19 +05:30
prateek banga
88f228c106
review changes
2023-11-21 15:11:09 +05:30
prateek banga
3394218cb0
adds validation for phone and email identifier
2023-11-21 15:00:02 +05:30
prateek banga
520d19e335
changes TextMagic to Textmagic in all places and uses email validator
2023-11-21 12:35:36 +05:30
prateek banga
b2381798ab
migrates enum attribute size to 255
2023-11-20 22:01:20 +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
Jake Barnby
8b14d96151
Merge remote-tracking branch 'origin/1.4.x' into chore-update-sdks
2023-11-21 00:17:36 +13:00
Jake Barnby
6ad4566b6b
Update CLI
2023-11-21 00:15:50 +13:00
prateek banga
b1eaf97806
review changes
2023-11-20 16:21:06 +05:30
prateek banga
5c1cf3a526
adds user name in subscriber response model
2023-11-20 12:34:50 +05:30
Steven Nguyen
a96e571258
Bump appwrite version to 1.4.13
2023-11-17 20:11:56 +00:00
Steven Nguyen
926e1f3fc8
Bump console to version 3.2.8
2023-11-17 19:34:33 +00:00
Khushboo Verma
695d6f4065
Renamed variables
2023-11-18 00:04:57 +05:30
Khushboo Verma
03e8a29e8d
Merge branch '1.4.x' into fix-error-logging
2023-11-18 00:02:03 +05:30
Khushboo Verma
a76efe7d4e
Merge branch '1.4.x' into fix-rate-limit-error-on-large-uploads
2023-11-17 21:19:27 +05:30
Prateek Banga
b68be491b9
updated description
2023-11-17 20:59:09 +05:30
Prateek Banga
9183f2a875
changes enum size validation in update controller
2023-11-17 20:56:18 +05:30
Khushboo Verma
2a2ff34e20
Merge branch '1.4.x' into fix-error-logging
2023-11-17 20:37:36 +05:30
Prateek Banga
ab35b75c37
fix test message
2023-11-17 20:14:55 +05:30
Prateek Banga
228b813994
fixes test case
2023-11-17 20:06:28 +05:30
Khushboo Verma
93f58fb876
Merge branch '1.4.x' into fix-error-logging
2023-11-17 19:30:58 +05:30
Khushboo Verma
7902defe69
Addressed PR comments
2023-11-17 19:29:57 +05:30
Prateek Banga
827ad84f53
fixes adding longer length enum
2023-11-17 19:09:31 +05:30
Khushboo Verma
cf1c914edb
Update app/controllers/general.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-11-17 18:36:03 +05:30
Khushboo Verma
9329287982
Update app/controllers/general.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-11-17 18:35:51 +05:30
Khushboo Verma
40ec98569e
Update app/controllers/general.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-11-17 18:35:26 +05:30
Khushboo Verma
c34dc4dae0
Add flag to send logs to logger
2023-11-16 23:51:09 +05:30
Khushboo Verma
fccbe405db
Add chunkId to abuse key to prevent rate limit for SDKs
2023-11-16 23:04:38 +05:30
Prateek Banga
f0247930da
Update app/config/collections.php
...
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-11-16 17:15:08 +05:30
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
Jake Barnby
02b6659b35
SDK releases
2023-11-16 21:50:39 +13:00
prateek banga
a282ab38a6
adds target endpoint in account controller for push tokensl
2023-11-16 02:12:06 +05:30