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
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
0a72b37b3e
Fix session response model
2024-02-06 02:17:04 +13:00
Khushboo Verma
e8523e38f7
Merge branch '1.5.x' into feat-block-countries
2024-02-05 13:26:52 +05:30
Jake Barnby
bb9947bfd3
Remove invalid injection
2024-02-04 04:15:16 +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
Khushboo Verma
d96d84201e
Add auth group to create email token endpoint
2024-02-02 14:03:20 +05:30
Jake Barnby
d1bad7c3cd
Remove redundant usage labels
2024-02-02 17:16:31 +13: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
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
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
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
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
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
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
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
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
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
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
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
Torsten Dittmann
057496dbaa
feat: mfa users endpoints
2024-01-18 14:56:58 +01:00
Jake Barnby
f1c1e4b208
Merge branch 'fix-create-push-target' of github.com:appwrite/appwrite into fix-create-push-target
2024-01-19 02:06:21 +13:00
Jake Barnby
7b9bee9a2a
Fix missing scope for push target create/update
2024-01-19 02:04:54 +13:00
Torsten Dittmann
86f5bd20fb
style: run formatter
2024-01-18 13:45:48 +01:00
Torsten Dittmann
d802e86593
fix: merge conflicts
2024-01-18 13:43:49 +01: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
1ab3dc2236
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa
2024-01-18 13:10:15 +01:00
Jake Barnby
3159d505ea
Update app/controllers/api/account.php
...
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-01-18 20:55:40 +13:00
Matej Bačo
240f20b2cf
PR review changes
2024-01-17 13:20:47 +00:00
loks0n
a9b42c63bf
chore: remove var dumps
2024-01-17 13:05:14 +00:00
Jake Barnby
a92d526125
Remove docs label, fix throw on no provider
2024-01-18 01:50:09 +13:00
loks0n
f1664c1cd7
fix: remove token auth.type
2024-01-17 12:09:15 +00:00
loks0n
498ddbf14c
test: add create email session test for server
2024-01-17 11:58:40 +00:00
loks0n
39a351adc1
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-17 11:22:45 +00:00
loks0n
0092af7ac6
chore: rename new scopes
2024-01-17 11:17:03 +00:00
loks0n
bc1858c516
chore: do not auto create accounts in users endpoints
2024-01-17 11:03:04 +00:00
Jake Barnby
58f87ef27f
Fix account target route not added to specs
2024-01-17 22:21:15 +13:00
loks0n
d488cadee4
docs: verb noun desc file pattern
2024-01-16 10:33:54 +00:00
Matej Bačo
12a0596c6e
Implement session renewal test
2024-01-15 20:04:36 +00:00
Matej Bačo
39997c817f
Fix failing tests
2024-01-15 14:37:47 +00:00
Matej Bačo
4f5755e7d0
Implement session renewal
2024-01-15 13:43:21 +00:00
Jake Barnby
4d9fb1d687
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling
...
# Conflicts:
# src/Appwrite/Platform/Workers/Messaging.php
2024-01-15 20:07:01 +13:00
loks0n
0a0479f4c5
chore: fmt
2024-01-13 10:11:25 +00:00
loks0n
521cb963a5
fix: hide oauth in specs
2024-01-13 10:09:02 +00:00
loks0n
56fe939713
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-13 09:55:44 +00:00
loks0n
d2ff3f6bb8
docs: standardise account md names
2024-01-13 09:32:03 +00:00
loks0n
642582c283
docs: fix links to create email password session
2024-01-12 17:39:44 +00:00
loks0n
ca511bd459
chore: use customId validators
2024-01-12 17:26:01 +00:00
Matej Bačo
e9de0332cc
Remove passwordAgain ( #7441 )
2024-01-12 14:33:10 +01:00
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
loks0n
2bbcdf61dd
Merge branch 'feat-ssr' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-12 12:14:28 +00:00
Matej Bačo
b8b9fe383d
Fix token param
2024-01-12 13:12:28 +01:00
loks0n
487376afd6
chore: oauth token param before scopes
2024-01-12 12:08:45 +00: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
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
loks0n
136faf9630
docs: improve exchange endpoint desc
2024-01-11 10:54:41 +00:00
loks0n
032ce1ec0c
feat: standardise token length
2024-01-11 10:51:26 +00:00
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
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
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
Matej Bačo
788fa04606
Improve magic URL design
2024-01-10 11:33:55 +01:00
loks0n
94e45da5c7
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-10 10:15:29 +00:00
loks0n
9a34c92fac
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-09 16:42:00 +00:00
loks0n
ded48cb618
chore: fmt
2024-01-09 16:41:42 +00:00
loks0n
d9b25a3167
feat: add token
param to oath
2024-01-09 16:38:29 +00:00
loks0n
de2a4e754a
feat: alias PUT token methods for backwards compat
2024-01-09 15:56:01 +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
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
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
Jake Barnby
51b2019ab6
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
...
# Conflicts:
# composer.lock
2024-01-09 13:56:01 +13: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
loks0n
5c803f6eff
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-08 11:41:55 +00: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
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
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
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
Matej Bačo
a0b2443a8b
Rename email endpoint
2023-12-22 09:38:52 +00:00
Matej Bačo
3f1faa44ad
Rename form exchange to create
2023-12-22 09:31:19 +00:00
loks0n
1b6a833bed
fix: encode session for ssr clients
2023-12-19 15:45:44 +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
Jake Barnby
fc101b7c05
Update lock
2023-12-15 18:24:37 +13:00
Jake Barnby
9c79e6bc23
Fix cache purge
2023-12-15 17:45:25 +13:00
fogelito
4ce312560b
Connection problem
2023-12-14 18:17:19 +02:00
fogelito
cc5ae73f57
purgeCached changes
2023-12-14 15:32:06 +02: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
Luke B. Silver
60a0fefe56
Merge branch '1.4.x' into feat-ssr
2023-12-13 10:32:13 +00:00
德华 刘
f334168f90
fix: remove expired cookie
2023-12-13 08:45:47 +00:00
loks0n
fda9df069a
feat: enable array sdk.method
2023-12-12 11:24:50 +00:00
loks0n
fe695314a9
fix: tests
2023-12-11 19:41:58 +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
951a749b50
fix: revert files
2023-12-09 01:19:36 +01:00
Christy Jacob
9dca3c4300
fix: linter
2023-12-08 20:38:55 +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
Prateek Banga
b8aa2faa7b
adds scheduling commit, still need to resolve pools error
2023-12-07 11:25:19 +01:00
Torsten Dittmann
83c411e5fd
fix: some fixes
2023-12-07 10:05:37 +01:00
fogelito
2fe50717d1
TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE
2023-12-06 15:10:40 +01:00
loks0n
4471b93a3a
tests: fix
2023-12-05 12:00:26 +01:00
loks0n
54c6709a48
fix: verification scopes
2023-12-04 16:17:22 +01:00
loks0n
63b2363556
feat: workaround backwards compat
2023-12-04 15:38:12 +01:00