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
fogelito
e5bada0493
typo
2024-02-12 12:03:31 +02:00
fogelito
2ef59134a0
Merge branch '1.5.x' of github.com:appwrite/appwrite into attributes-query-fix
2024-02-12 12:00:26 +02:00
Jake Barnby
e26230cc34
Disallow creating a session if one already exists
2024-02-12 22:59:49 +13:00
fogelito
adbe11fd50
fix Indexes
2024-02-12 11:55:45 +02:00
Jake Barnby
8ed2b1f3a5
Fix tests
2024-02-12 18:35:05 +13:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +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
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