Commit graph

1301 commits

Author SHA1 Message Date
loks0n
d765c76576 fix: typo 2024-07-16 14:42:46 +01:00
loks0n
20e77a1e9e feat: optimise 2024-07-16 13:03:26 +01:00
loks0n
67ec4b49ed feat: only send after first session 2024-07-16 13:01:23 +01:00
Bradley Schofield
996911e385 Update delete authenticator to remove OTP Validation 2024-07-08 10:42:27 +09:00
Binyamin Yawitz
a3682b72e1
Merge remote-tracking branch 'refs/remotes/origin/main' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	app/console
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
2024-07-03 17:03:24 -04:00
Richard
1539fc2b7c
Merge branch 'main' into update-acct-api-reference 2024-07-03 09:04:45 -04:00
Matej Bačo
b5fc9d5789 PR review changes 2024-07-03 09:35:56 +00:00
Matej Bačo
2262d516f1 Merge remote-tracking branch 'origin/1.6.x' into mock-numbers 2024-07-03 09:30:11 +00:00
Binyamin Yawitz
6f62f915d9
feat: Adding Authentication injection for user id and secret 2024-06-28 14:33:13 -04:00
loks0n
d0125398f1 fix: test 2024-06-26 15:46:12 +01:00
Luke B. Silver
ecf761beab
Merge branch '1.6.x' into feat-new-session-alert 2024-06-26 12:44:49 +01:00
loks0n
6353de6f10 chore: fix template 2024-06-26 09:42:01 +01:00
Christy Jacob
7cec278d27 Merge branch '1.6.x' of https://github.com/appwrite/appwrite into mock-numbers 2024-06-25 15:17:22 +00:00
loks0n
0d987045bf chore: revert fmt 2024-06-25 08:46:51 +01:00
Binyamin Yawitz
78d321b33b
chore: rearrange account.php methods 2024-06-24 15:52:22 -04:00
loks0n
0ea2438069 fix: implementation 2024-06-24 14:12:09 +01:00
loks0n
fbeca34df8 fix: func 2024-06-24 10:34:06 +01:00
loks0n
f3f233eb14 feat: new session alert 2024-06-21 19:21:05 +01:00
choir27
6a406454ba docs: update api reference 2024-06-21 10:41:46 -04:00
Christy Jacob
a2f27ec15f Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-21 13:11:35 +00:00
Binyamin Yawitz
6c26e2eb51
Merge branch 'refs/heads/main' into feat-eldad4-coroutines
# Conflicts:
#	app/cli.php
#	composer.json
#	composer.lock
2024-06-20 17:23:15 -04:00
Christy Jacob
991a22f642
Merge pull request #8290 from appwrite/1.5.x
Sync 1.5.x into refactor-usage-sn
2024-06-21 00:38:21 +05:30
Christy Jacob
fdf44c7bab Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main 2024-06-20 15:26:17 +00:00
Christy Jacob
c5fa7eb7dc Merge branch '1.6.x' of github.com:appwrite/appwrite into mock-numbers 2024-06-20 20:53:06 +05:30
Christy Jacob
814b59a13a Merge branch 'main' of github.com:appwrite/appwrite into mock-numbers 2024-06-20 20:42:29 +05:30
Christy Jacob
1b1cfc38c8 fix: undefined variable 2024-06-20 20:31:20 +05:30
Christy Jacob
392aaca681 chore: fix tests 2024-06-20 20:19:56 +05:30
Christy Jacob
868e57a9a3
Merge pull request #8281 from appwrite/main
Sync main into 1.5.x
2024-06-19 12:18:12 +05:30
Christy Jacob
9e1541d96a Merge branch 'main' of https://github.com/appwrite/appwrite into mock-numbers 2024-06-16 07:28:22 +00:00
Christy Jacob
a912bbe374 chore: update variable name 2024-06-16 07:19:10 +00:00
Bishwajeet Parhi
190560b8ef chore: append attributes instead of replace 2024-06-11 21:17:25 +05:30
Jake Barnby
a4c1275764
Add abuse limit for update password 2024-06-10 18:09:30 +12:00
Steven Nguyen
a09a09a7a9
fix(auth): fix MFA verification for OAuth2 sessions
Before this, users who only signed in with OAuth2 were not able to
verify their sessions with MFA because their session already used an
email factor and they couldn't use an additional email factor.

This commit changes the OAuth2 session to include 2 factors: email and
oauth2. This second special factor is used to bypass MFA checks. It is
fine to bypass MFA checks because OAuth2 is supposed to handle the
entire authentication process, verifying who the user is and we, as the
resource provider, only need to trust the OAuth2 provider.
2024-06-07 16:45:14 -07:00
Binyamin Yawitz
b5a241db8d
merge: Main into Coroutines 2024-06-05 18:38:39 -04:00
Bishwajeet Parhi
cccda2a46c fix: Don't set target attribute if no existing Target found 2024-06-05 23:34:01 +05:30
Matej Bačo
3b8799353d PR review changes 2024-05-29 07:51:51 +00:00
Matej Bačo
711e26c605 Relay on lib to verify JWT expiry 2024-05-28 10:59:53 +00:00
Matej Bačo
b1ff989c3f Implement tests, fix JWT maxAge 2024-05-28 09:25:54 +00:00
Matej Bačo
613677e9f7 Implement users.createJWT 2024-05-27 20:04:50 +00:00
Jake Barnby
9bb9f1eee7
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets
# Conflicts:
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
2024-05-23 15:37:13 +12:00
Christy Jacob
aa76862692 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-with-1.5.x 2024-05-22 19:43:31 +00:00
Jake Barnby
680cd5194d
Fix returning hashed secrets 2024-05-22 14:11:06 +12:00
Jake Barnby
c7106b9147
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets 2024-05-22 12:50:58 +12:00
Steven Nguyen
03fd62cc04
Merge branch 'main' into 1.5.x 2024-05-15 11:36:15 -07:00
Steven Nguyen
c76e29077c
feat(auth): try to get user name from request param if not from oauth2
This is only applicable for Apple OAuth2 because this is the only
provider that does not return user name from an API call and only
returns the name in the callback URL.

Reference:
* https://developer.apple.com/documentation/sign_in_with_apple/sign_in_with_apple_js/incorporating_sign_in_with_apple_into_other_platforms#3332115
2024-05-08 16:35:17 -07:00
Steven Nguyen
df064adce3
feat(auth): forward OAuth2 callback params
The only place Apple includes the user's name is in the params so we
need to forward the params to the redirect endpoint so they can be used
when creating the user.
2024-05-08 17:36:46 +00:00
Eldad Fux
c53de9fb6b Merge branch 'main' of github.com:appwrite/appwrite into feat-eldad4-coroutines 2024-05-08 18:21:55 +01:00
Jake Barnby
f01922daf9
Fix syntax error 2024-05-08 21:06:30 +12:00
Matej Bačo
08bf5aace4 Mark email verified after email OTP 2024-05-07 09:01:57 +00:00
Steven Nguyen
5b5505cf97
fix(auth): ensure session factors don't contain duplicates 2024-05-06 17:48:44 -07:00
Steven Nguyen
7e07f6b958
feat(auth): ensure user isn't kicked out after enabling MFA
User's were kicked out and forced to verify their session after enabling
MFA if they already had factors enabled. This change ensures that they
are not kicked out of their current session after MFA is enabled by
adding all relevant factors to the session.
2024-05-06 17:48:08 -07:00
Steven Nguyen
98d18ecc47
refactor(auth): remove auth duration from Auth::sessionVerify() calls
The paramter was removed from the method so we don't need to pass it
in anymore.
2024-05-06 17:16:56 -07:00
Matej Bačo
9616de7576 Merge branch 'main' into refactor-usage-sn-1.5.x 2024-04-26 13:11:21 +02:00
Christy Jacob
92c41954af Merge branch 'main' of https://github.com/appwrite/appwrite into refactor-usage-sn-1.5.x 2024-04-26 09:19:09 +00:00
Damodar Lohani
fbdaf7616c
Fix response code label 2024-04-25 07:19:02 +05:45
Steven Nguyen
b75f5263a2
Merge branch 'main' into chore-sync-main-into-1.5.x 2024-04-23 23:43:53 +00:00
Steven Nguyen
f88887abad
fix(mfa): fix delete authenticator response model 2024-04-22 22:24:20 +00:00
Eldad A. Fux
6c8b228b6c
Merge branch 'main' into feat-eldad4-coroutines 2024-04-22 22:37:10 +02:00
Eldad Fux
ab6744df3a Fixed webhooks tests 2024-04-22 14:12:09 +02:00
Vincent (Wen Yu) Ge
c57fa3546f Ran formatter 2024-04-18 17:22:41 -04:00
Vincent (Wen Yu) Ge
404de48cc3 Update user create error message for console to be console specific 2024-04-18 17:08:47 -04:00
Steven Nguyen
2f7aff3a44
fix(auth): fix challenge type check
The factor parameter is case insensitive so we need to make sure
comparing the parameter to the constant is case insensitive too.
2024-04-16 23:44:46 -07:00
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