Eldad A. Fux
05dd17bd55
Merge pull request #7949 from appwrite/fix-factors-recovery-code
...
Add recovery code to List factors
2024-04-15 10:48:16 +02:00
Eldad Fux
766b2ba13e
Avatars tests are green!
2024-04-14 22:17:07 +02:00
Matej Bačo
65115f876c
Improve logic for recovery code factor
2024-04-11 07:52:54 +00:00
Matej Bačo
860d292df9
Fix recovery code removal
2024-04-10 14:01:25 +00:00
Matej Bačo
b5b8aa5302
Add recovery code as factor
2024-04-10 13:57:36 +00:00
Jake Barnby
fb408636a4
Set token secrets as sensitive event params
2024-04-03 16:36:53 +13:00
Matej Bačo
d091b37a15
Merge branch 'refactor-usage-sn' into refactor-usage-sn-1.5.x
2024-04-02 18:42:17 +02:00
Eldad Fux
5ce3de4933
Merge remote-tracking branch 'origin/main' into feat-eldad2-coroutines
2024-04-02 02:13:15 +02:00
Eldad Fux
6ce8781af1
Fixed email escaping
2024-04-01 19:39:26 +02:00
Eldad Fux
beda5293b4
Fix format
2024-04-01 13:08:46 +02:00
Eldad Fux
8ed1da4ea8
Updated getEnv to use system lib
2024-04-01 13:02:47 +02:00
Jake Barnby
d5d45c5076
Fix not hiding tokens for clients via realtime
2024-03-26 18:59:56 +13:00
Damodar Lohani
62b2dc0801
use internal ids
2024-03-18 09:22:15 +00:00
Damodar Lohani
c849ff0b0f
use internal ids for query
2024-03-18 08:52:47 +00:00
Matej Bačo
db1674811f
Finish fixing code QL warnings
2024-03-08 13:57:20 +01:00
loks0n
07eca5bca4
Merge branches 'fix-account-endpoint-order' and '1.5.x' of https://github.com/appwrite/appwrite into fix-account-endpoint-order
2024-03-08 00:27:28 +01:00
Matej Bačo
005a239932
Auth fixes
2024-03-07 18:24:01 +01:00
Torsten Dittmann
dfef0e732c
sync: main -> 1.5.x
2024-03-07 17:16:39 +01:00
Matej Bačo
efeb898be1
Import fixes
2024-03-07 15:29:42 +01:00
Matej Bačo
ee065bc64c
Merge branch '1.5.x' into feat-database-proxy
2024-03-07 10:18:49 +01:00
loks0n
4263235463
fix: reorder account endpoints
2024-03-06 19:07:58 +01:00
Torsten Dittmann
0a1d572c72
chore: run formatter
2024-03-06 18:34:21 +01:00
Matej Bačo
a9731cd5bc
Fix account tests
2024-03-06 12:38:51 +01:00
Torsten Dittmann
a53e630536
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2
2024-03-05 10:31:51 +01:00
Torsten Dittmann
8adf6a2b7a
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-main-1.5.x
2024-03-04 10:29:06 +01:00
Torsten Dittmann
ad39c15d99
Merge pull request #7696 from appwrite/feat-mfa-collection
...
feat: mfa collection restructure
2024-03-04 10:18:49 +01:00
Matej Bačo
d4e4337c57
PR review changes
2024-03-04 08:50:50 +00:00
Matej Bačo
ccb5636bed
fix session security
2024-03-04 07:27:26 +00:00
Matej Bačo
c4bd61cdc8
QA changes
2024-03-03 18:11:55 +00:00
Matej Bačo
9bcad451f2
Add recovery codes to users API
2024-03-03 15:17:38 +00:00
Matej Bačo
9137dc82f8
Re-implement mfa protection as hook
2024-03-03 14:18:09 +00:00
Matej Bačo
e6ad1c6830
Add more recovery code endpoints
2024-03-02 13:05:22 +00:00
Matej Bačo
a77f517882
PR review fixes
2024-03-02 09:49:56 +00:00
Matej Bačo
7a29c79fb1
Fix bugs during QA
2024-03-01 17:04:09 +00:00
Christy Jacob
e90f536bd7
Merge branch 'main' of https://github.com/appwrite/appwrite into revert-7629-revert-7614-chore-usage-queue-health
2024-03-01 16:47:24 +00:00
Matej Bačo
5cefca1c22
Fix MFA flows and docs
2024-03-01 16:22:51 +00:00
Christy Jacob
2ffcb9b07e
Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn
2024-03-01 16:08:03 +00:00
Torsten Dittmann
7fa578c901
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x
2024-03-01 14:20:32 +01:00
Torsten Dittmann
fa8d132402
fix: code review
2024-03-01 13:36:38 +01:00
Torsten Dittmann
e12a3edd9e
fix: mfa type class
2024-03-01 13:30:33 +01:00
Torsten Dittmann
6f24645c77
Apply suggestions from code review
...
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
2024-03-01 12:19:55 +01:00
Khushboo Verma
8ee64d43ce
Update endpoint description
2024-03-01 16:35:52 +05:30
Christy Jacob
c8a3b709ee
chore: update error types for create account endpoints
2024-03-01 07:37:31 +00:00
Torsten Dittmann
dd13d17377
feat: const for totp values
2024-03-01 03:07:58 +01:00
Torsten Dittmann
3fe3cd0dec
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa-collection
2024-02-29 22:55:30 +01:00
Torsten Dittmann
13975b8b92
fix: totp backup code logic
2024-02-29 22:55:02 +01:00
Torsten Dittmann
50c2ac9cd6
Merge branch '1.5.x' into feat-rc-sdks
2024-02-29 22:14:02 +01:00
Torsten Dittmann
0815dde045
fix: cached documents
2024-02-29 22:05:19 +01:00
Torsten Dittmann
b7d3996960
feat: mfa collection restructure
2024-02-29 21:59:49 +01:00
loks0n
fff3d14cac
fix: encode secret in oauth workaround
2024-02-28 23:50:40 +00:00
Jake Barnby
6fb1e929cd
Use group hook to block recreating sessions
2024-02-27 22:08:39 +13:00
Jake Barnby
2a85c7cd96
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
2024-02-27 21:56:05 +13:00
Christy Jacob
03d6eb7401
Merge pull request #7669 from appwrite/main
...
Sync main
2024-02-26 17:39:33 +05:30
Jake Barnby
cd554aa17f
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
...
# Conflicts:
# app/config/specs/open-api3-1.5.x-client.json
# app/config/specs/open-api3-1.5.x-console.json
# app/config/specs/open-api3-1.5.x-server.json
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-1.5.x-client.json
# app/config/specs/swagger2-1.5.x-console.json
# app/config/specs/swagger2-1.5.x-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# composer.lock
2024-02-26 18:43:52 +13:00
Jake Barnby
44ec1502f0
Merge remote-tracking branch 'origin/main' into 1.5.x
2024-02-26 18:35:25 +13:00
Vincent (Wen Yu) Ge
b32d40f3e2
Improve messages
2024-02-26 02:25:45 +00:00
navjotNSK
cab2233816
Formatting
2024-02-25 20:24:36 +01:00
navjotNSK
3a8c5a2e65
Default value added for name
2024-02-25 20:24:36 +01:00
Jake Barnby
b1200f4cbd
Merge branch '1.5.x' into refactor-disallow-new-session-with-existing
2024-02-26 01:29:14 +13:00
Jake Barnby
91c52b28eb
Move targets to new session if upgrading to oauth session
2024-02-26 01:13:39 +13:00
Jake Barnby
86a2821a23
Merge pull request #7649 from appwrite/chore-remove-array-sdk-method
...
chore: remove array sdk method
2024-02-26 01:02:01 +13:00
Torsten Dittmann
194c61a47f
fix: mfa backup codes
2024-02-25 11:47:22 +01:00
Christy Jacob
7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints""
2024-02-25 13:42:28 +05:30
Jake Barnby
404e4258f6
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
2024-02-25 20:56:34 +13:00
loks0n
008f086f40
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into chore-remove-array-sdk-method
2024-02-24 14:44:50 +00:00
loks0n
b650884351
chore: fix hide in specs
2024-02-24 14:38:09 +00:00
Jake Barnby
a178dbfc4b
Allow existing session when upgrading from anonymous to oauth
2024-02-25 03:04:35 +13:00
Jake Barnby
4190a09333
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
2024-02-25 03:00:47 +13:00
Jake Barnby
7a24f5fb3d
Fix missing userId on update challenge
2024-02-25 02:21:33 +13:00
loks0n
5ff2121ef7
fix: sdk.hideServer & sdk.hideClient
2024-02-24 13:17:58 +00:00
loks0n
5ba50c842b
chore: remove array sdk method
2024-02-24 12:53:47 +00:00
Jake Barnby
46575b6df7
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
...
# Conflicts:
# app/controllers/api/account.php
# composer.lock
2024-02-25 00:16:40 +13:00
Torsten Dittmann
076ffe8866
fix: missing team variable and added mfa templates to config
2024-02-23 14:59:12 +01:00
Torsten Dittmann
af6091e04a
fix: template name typo for mfa challenge
2024-02-23 14:59:12 +01:00
Torsten Dittmann
f577811c04
fix: formatting on emails
2024-02-23 14:59:12 +01:00
Torsten Dittmann
9ae2948d0e
fix: mfa email template
2024-02-23 14:59:12 +01:00
Jake Barnby
7ab80b9288
Fix account method
2024-02-24 02:00:31 +13:00
Jake Barnby
7c42a59c85
Merge remote-tracking branch 'origin/1.5.x' into feat-rc-sdks
...
# Conflicts:
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# composer.lock
2024-02-23 18:01:59 +13:00
Luke B. Silver
f285173f4e
Merge branch '1.5.x' into feat-ssr-dx
2024-02-22 13:22:41 +00:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints"
2024-02-22 12:21:48 +05:30
Torsten Dittmann
e7259f0a3d
Merge branch '1.5.x' into feat-rc-sdks
2024-02-21 18:22:17 +01:00
Torsten Dittmann
18e4385ca5
fix: change emailPassword factor from email to password
2024-02-21 18:18:56 +01:00
Torsten Dittmann
6cd456a35e
fix: mfa sdk method
2024-02-21 17:54:39 +01:00
Jake Barnby
942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
...
# Conflicts:
# app/config/collections.php
# app/config/errors.php
# app/config/specs/open-api3-latest-client.json
# app/config/specs/open-api3-latest-console.json
# app/config/specs/open-api3-latest-server.json
# app/config/specs/swagger2-latest-client.json
# app/config/specs/swagger2-latest-console.json
# app/config/specs/swagger2-latest-server.json
# app/controllers/api/account.php
# app/controllers/api/teams.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# app/init.php
# app/worker.php
# composer.json
# composer.lock
# docker-compose.yml
# src/Appwrite/Extend/Exception.php
# src/Appwrite/Platform/Services/Tasks.php
# src/Appwrite/Platform/Tasks/Maintenance.php
# src/Appwrite/Platform/Workers/Certificates.php
# src/Appwrite/Platform/Workers/Deletes.php
# src/Appwrite/Platform/Workers/Messaging.php
# src/Appwrite/Platform/Workers/Usage.php
# src/Appwrite/Platform/Workers/UsageHook.php
# src/Appwrite/Specification/Format/OpenAPI3.php
# src/Appwrite/Specification/Format/Swagger2.php
# tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby
1c1a2eab2c
Format
2024-02-21 03:16:01 +13:00
Jake Barnby
64eaf91ee7
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing
2024-02-21 03:15:23 +13:00
Jake Barnby
bbce53cda5
Auto trigger messaging events
2024-02-21 01:06:35 +13:00
loks0n
fa28496b32
feat: ssr dx changes
2024-02-20 11:45:11 +00:00
Jake Barnby
3c727861bb
Fix target permissions
2024-02-16 17:07:16 +13:00
Torsten Dittmann
14ecbd6658
fix: 2fa endpoint params
2024-02-15 11:26:34 +00:00
Christy Jacob
48e87cdc7c
Merge branch 'main' of github.com:appwrite/appwrite into mock-numbers
2024-02-14 21:24:53 +05:30
Christy Jacob
28a16173ab
feat: add tests
2024-02-14 12:10:19 +05:30
Jake Barnby
37522ea66f
Merge branch '1.5.x' into fix-catch-exception
2024-02-13 12:47:36 +13:00
Jake Barnby
06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix
...
fix Indexes
2024-02-13 12:37:59 +13:00
fogelito
ace75b0786
parseQueries
2024-02-12 18:02:04 +02:00
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
be92aa92e5
chore: rename files
2024-02-11 20:28:05 +05:30
Christy Jacob
89dcc34453
feat: initial commit
2024-02-11 20:21:19 +05:30
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
