Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-15 13:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
23640 commits 1237 branches 495 tags 494 MiB
Commit graph

5550 commits

Author SHA1 Message Date
loks0n
6bd407eae9 chore: refactor finally block 2024-05-20 18:55:15 +01:00
Christy Jacob
d258240f08 Merge pull request #8152 from appwrite/fix-improve-cold-start-error 
fix: improve cold start error
 2024-05-20 17:26:58 +01:00
loks0n
b3c00c4d32 chore: create doc 2024-05-20 11:46:41 +01:00
loks0n
863a2ce0a9 chore: matej review 2024-05-20 11:44:08 +01:00
Jake Barnby
5b82716986
Change from 1 in 20 to 1 in 5 projects on shared tables DB 2024-05-20 14:00:48 +12:00
Matej Bačo
2e1f67245d Fix bugs, add old api key test 2024-05-16 08:39:15 +00:00
Christy Jacob
10722aa736 chore: cleanup obsolete tasks and workers 2024-05-16 07:11:00 +00:00
Ketan Baitule
894f001c7a
Update app/controllers/api/teams.php 
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
 2024-05-16 08:00:46 +05:30
Steven Nguyen
03fd62cc04
Merge branch 'main' into 1.5.x 2024-05-15 11:36:15 -07:00
Ketan Baitule
6ff3fc5c6b fix: Allow Adding User Over Limit From Console In Team Membership 2024-05-15 15:03:46 +05:30
Matej Bačo
37176e7865 Backwards compatible approach 2024-05-14 12:33:49 +00:00
Matej Bačo
9846b573bd Merge remote-tracking branch 'origin/main' into feat-function-tokens 2024-05-14 11:59:43 +00:00
Matej Bačo
54c953d559 Add prefix of api key types 2024-05-14 11:58:31 +00:00
Torsten Dittmann
0365f4818b
Merge pull request #8102 from appwrite/fix-7268-oauth-apple-name 
Fix email used for name when user is created via Apple OAuth2
 2024-05-14 11:40:45 +02:00
Steven Nguyen
1626168d37
fix(project): set limit to retrieve all stats for the usage range 
Because limit was not passed for the find() query, the limit defaulted to 25. As such, when requesting stats for the last 30 days, only the last 25 were retrieved.
 2024-05-13 21:23:47 +00:00
fogelito
661329b977 Invalid cursor value 2024-05-09 19:54:28 +03:00
Matej Bačo
5002b0f3fa PR review changes 2024-05-09 11:50:45 +00: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
Jake Barnby
f7cd1e2361
Ensure namespace is set if override equals shared tables 2024-05-08 16:04:28 +12:00
Jake Barnby
921eb2b900
App::getEnv -> System::getEnv 2024-05-07 22:08:00 +12:00
Matej Bačo
08bf5aace4 Mark email verified after email OTP 2024-05-07 09:01:57 +00:00
Jake Barnby
e9bac08de0
Fix header test 2024-05-07 17:59:24 +12:00
Jake Barnby
356d155df2
Add shared tables enabled flag for quick toggle 2024-05-07 17:29:12 +12:00
Jake Barnby
74a147f3b2
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables 
# Conflicts:
#	tests/e2e/Services/Projects/ProjectsCustomServerTest.php
 2024-05-07 15:53:58 +12:00
Jake Barnby
912e3b01dc
Add clarifying comments 2024-05-07 14:07:04 +12: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
9252b66493 Add scope tests 2024-05-06 11:27:28 +00:00
Matej Bačo
3a3d5b61a6 PR review changes 2024-05-06 09:55:59 +00:00
Matej Bačo
9a0d9cee15 Merge remote-tracking branch 'origin/main' into feat-function-tokens 2024-05-06 08:35:14 +00:00
Jake Barnby
52c52fa519
Add scheme to DSN on fail 2024-05-06 18:13:41 +12:00
Jake Barnby
db94070162
Use DSN for project database 2024-05-06 17:33:36 +12:00
Damodar Lohani
14a0dd3166 Merge remote-tracking branch 'origin/main' into feat-security-emails 2024-05-06 01:04:44 +00:00
shimon
8e291f3700 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into fix-file-size-limit 
 Conflicts:
	app/controllers/api/storage.php
	composer.lock
 2024-05-05 11:52:49 +03:00
Eldad A. Fux
b2c57e2d8b
Merge pull request #7934 from appwrite/fix-custom-domain 
Prevent functions domain to be used as custom domain
 2024-05-05 06:53:29 +01:00
Damodar Lohani
74264582cc
Update proxy.php 2024-05-05 11:07:59 +05:45
Damodar Lohani
1094238820 add test 2024-05-05 04:56:49 +00:00
Damodar Lohani
9b0bacb1a2 Merge remote-tracking branch 'origin/refactor-usage-sn' into pea-699 2024-05-05 04:06:25 +00:00
Jake Barnby
c4deb0ba93
Allow shared tables namespace override 2024-05-03 21:30:38 +12:00
Jake Barnby
99d05b3d8c
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-shared-tables 2024-05-03 14:24:57 +12:00
Khushboo Verma
ce5dd899a5 Remove unnecessary code 2024-05-02 20:48:36 +05:30
Khushboo Verma
abcd74d224 Remove logger code from avatars.php 2024-05-02 19:49:55 +05:30
Khushboo Verma
fba60f974e Throw exception for cancellation if build is already complete 2024-04-30 15:46:58 +05:30
Jake Barnby
b2e956a14d
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes 
# Conflicts:
#	.gitignore
#	app/cli.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	app/init.php
#	app/realtime.php
#	app/worker.php
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/GetMigrationStats.php
#	src/Appwrite/Platform/Workers/Databases.php
#	src/Appwrite/Platform/Workers/Deletes.php
#	src/Appwrite/Platform/Workers/Hamster.php
#	tests/e2e/General/HTTPTest.php
#	tests/e2e/Services/Databases/DatabasesCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
 2024-04-30 19:40:47 +12:00
Khushboo Verma
ea9c71757c Fix tests 2024-04-30 00:19:14 +05:30
Khushboo Verma
2b69f0b7e2 Fix formatting 2024-04-29 19:14:37 +05:30
Khushboo Verma
564fe96eec Resolve merge conflicts 2024-04-29 19:05:51 +05:30
ItzNotABug
02ece2637f fix: use resourceInternalId. 2024-04-29 15:54:22 +05:30
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
shimon
4e639526d6 pull changes 2024-04-24 12:25:49 +03:00
Steven Nguyen
b75f5263a2
Merge branch 'main' into chore-sync-main-into-1.5.x 2024-04-23 23:43:53 +00:00
Eldad Fux
9fc0342cf1 Updated injections 2024-04-23 13:30:20 +02:00
Steven Nguyen
f88887abad
fix(mfa): fix delete authenticator response model 2024-04-22 22:24:20 +00:00
Eldad Fux
7381ababb8 Merge remote-tracking branch 'refs/remotes/origin/feat-eldad4-coroutines' into feat-eldad4-coroutines 2024-04-22 23:02:59 +02:00
Eldad Fux
d67df5feb1 Fixed formatting 2024-04-22 22:45:55 +02:00
Eldad A. Fux
6c8b228b6c
Merge branch 'main' into feat-eldad4-coroutines 2024-04-22 22:37:10 +02:00
Eldad Fux
86b46353ad Fixed for general tests 2024-04-22 22:35:38 +02:00
Eldad Fux
99994f6278 Fixed storage tests 2024-04-22 21:43:57 +02:00
Eldad Fux
ab6744df3a Fixed webhooks tests 2024-04-22 14:12:09 +02:00
Eldad Fux
c413a6cab5 Updated database service 2024-04-22 09:01:48 +02:00
Eldad Fux
3b70ae4d9f Fixed formatting 2024-04-22 07:56:36 +02:00
Eldad Fux
aff328c660 Fixed test 2024-04-22 07:51:24 +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 Fux
13eb3bccd0 Fixed users tests 2024-04-15 12:36:42 +02: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
fd2410d2ae Fixed bootstrap 2024-04-14 22:42:31 +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
Damodar Lohani
99cb38c674 fix linter issues 2024-04-08 03:57:08 +00:00
Damodar Lohani
d3bbcce302
Prevent functions domain to be used as custom domain 2024-04-08 09:31:15 +05:45
Damodar Lohani
4612636144 fix test 2024-04-08 03:45:02 +00:00
Damodar Lohani
82e6db903a prevent functions domain and subdomain to be added as custom domain 2024-04-08 03:29:35 +00:00
Steven Nguyen
f53dd03b93
feat(messaging): Add attachments param to update email endpoint 
The param is added to the end to reduce the impact on param order
in SDKs.
 2024-04-04 08:06:33 -07:00
Jake Barnby
1f79d953d7
Merge pull request #7906 from appwrite/fix-7832-missing-event-param 
Fix delete message event not firing
 2024-04-04 14:53:31 +13:00
Steven Nguyen
4a2056890d
fix(storage): add missing chunkId param to create file abuse key 
A previous PR added chunkId as an abuse key param to fix a problem where uploading multiple chunks of a file would trigger the `general_rate_limit_exceeded` error. For some reason, the parameter disappeared from the abuse key causing a regression. This PR adds the param back to fix the regression.

Reference:
* https://github.com/appwrite/appwrite/issues/7879
* https://github.com/appwrite/appwrite/pull/7154
 2024-04-03 13:28:41 -07:00
Jake Barnby
fb408636a4
Set token secrets as sensitive event params 2024-04-03 16:36:53 +13:00
Matej Bačo
aaa1465e21 Fix code bugs 2024-04-02 16:58:45 +00:00
Matej Bačo
1234770dc8 CI/CD fixes 2024-04-02 18:48:12 +02: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
Steven Nguyen
18603ac266
fix(messaging): fix delete message event not firing 
The parameter and paylaod was missing from the request so it
failed to trigger.

Manually setting the payload is important because the payload
isn't in the response body like it is for create/update
operations.
 2024-04-02 08:14:25 -07:00
Eldad Fux
a1db69b7e7 Fixed missing System namespace 2024-04-02 08:13:28 +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
b570368f10 Fixed auth error in users usage 2024-04-01 23:57:20 +02:00
Eldad Fux
6ce8781af1 Fixed email escaping 2024-04-01 19:39:26 +02:00
Steven Nguyen
955eb297ab
Merge pull request #7681 from appwrite/1.5.x-api-descriptions 
Email attachment example
 2024-04-01 09:50:54 -07:00
Vincent (Wen Yu) Ge
2e2c38871d
Update app/controllers/api/messaging.php 
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
 2024-04-01 10:30:12 -04:00
Vincent (Wen Yu) Ge
0ef562ef4d
Update app/controllers/api/messaging.php 
Co-authored-by: Steven Nguyen <1477010+stnguyen90@users.noreply.github.com>
 2024-04-01 10:30:06 -04:00
Eldad A. Fux
0f321421c1
Merge pull request #7895 from appwrite/feat-use-system-for-env 
Updated getEnv to use system lib
 2024-04-01 14:58:12 +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
ItzNotABug
f2305c2b6c update: remove the redundant call to fetch the topic document again. 2024-04-01 13:46:09 +05:30
Damodar Lohani
00c45c2507 new environment for certificates and security emails 2024-03-31 03:32:55 +00:00
Vincent (Wen Yu) Ge
acd7f6ef02 Add same updates for push notifications 2024-03-29 15:59:35 +00:00
Matej Bačo
5275d0b021 Merge branch 'refactor-usage-sn' into feat-configurable-collections 2024-03-29 10:48:11 +01:00
Jake Barnby
d5d45c5076
Fix not hiding tokens for clients via realtime 2024-03-26 18:59:56 +13:00
Christy Jacob
380b5f7f84
Merge pull request #7414 from appwrite/remove-cloud-scripts 
remove cloud related scripts
 2024-03-21 01:27:34 +05:30
shimon
938f98d8fd Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into fix-file-size-limit 2024-03-20 11:06:27 +02:00
Christy Jacob
446ebfffee
Merge pull request #7683 from appwrite/fix-vcs-silent-mode 
Fix vcs silent mode
 2024-03-20 02:57:10 +05:30
shimon
fa97ac7019 maximumFileSize fix 2024-03-19 15:16:21 +02:00
shimon
0ee4b95648 maximumFileSize fix 2024-03-19 15:09:03 +02:00
shimon
2213ddb54d maximumFileSize fix 2024-03-19 12:54:47 +02:00
shimon
63a30ed083 maximumFileSize fix 2024-03-19 12:15:39 +02:00
Eldad A. Fux
f824c3c83e
Merge pull request #7838 from appwrite/fix-identities-query-to-use-internal-ids 
use internal ids for query
 2024-03-18 18:35:01 +01:00
Christy Jacob
eeba452fb5 chore: linter 2024-03-18 12:43:42 +00:00
Christy Jacob
5e6c94d307 chore: update checks 2024-03-18 12:41:51 +00:00
Christy Jacob
a306cb87d8 chore: update avatars API 2024-03-18 12:07:14 +00:00
Damodar Lohani
62b2dc0801 use internal ids 2024-03-18 09:22:15 +00:00
Damodar Lohani
21d4b8feef check user internal Id on membership 2024-03-18 09:01:54 +00:00
Damodar Lohani
2a6da11842 Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-identities-query-to-use-internal-ids 2024-03-18 08:55:30 +00:00
Damodar Lohani
c849ff0b0f use internal ids for query 2024-03-18 08:52:47 +00:00
Damodar Lohani
d4bc65260f fix linter issues 2024-03-17 09:39:21 +00:00
Damodar Lohani
21d33eaceb
Use team internal ID for checks and queries for membership 2024-03-17 15:08:43 +05:45
Damodar Lohani
05221334e2
use team internal id in delete memberships 2024-03-17 14:55:31 +05:45
Damodar Lohani
4fcb399867
use team internal id for membership check on update 2024-03-17 14:54:08 +05:45
Damodar Lohani
24319b8417
Fix membership query to use internalId 2024-03-17 14:51:27 +05:45
Jake Barnby
2d03fc1ce0
Fix msg91 params 2024-03-13 15:42:16 +01:00
Jake Barnby
c8e817a019
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes 
# Conflicts:
#	app/controllers/api/teams.php
 2024-03-12 10:47:50 +01:00
Jake Barnby
22b3ea7e8d
Catch auth fixes 2024-03-11 13:03:30 +01:00
Jake Barnby
cea4e0d8b6
Wrap all db exceptions in error handler 2024-03-11 12:54:42 +01:00
Steven Nguyen
b19efb619b
feat(events): update build event reset to reset everything 
Instead of using setType('') to prevent events from triggering, it
makes more sense to use reset(). However, reset() didn't properly
reset type, resource, deployment, or template. This change makes
sure to reset all those private variables.
 2024-03-11 11:17:40 +01:00
Steven Nguyen
8e348dbd92
refactor(vcs): reduce nested code 2024-03-10 23:12:19 +01:00
Steven Nguyen
9d6595f85d
fix(vcs): prevent an error with one function deployment stopping others 2024-03-10 23:12:19 +01:00
Steven Nguyen
47fddbe8e5
fix(vcs): fix deployments stuck at processing 
Ensure project is passed in the event because the init hook
isn't able to detect the project.

Make sure the build is triggered for each function.

Reset the build event so the shutdown hook doesn't trigger
again.
 2024-03-10 23:10:47 +01:00
Matej Bačo
2a0a69f3ed Fix connections pool 2024-03-09 11:59:45 +01:00
Matej Bačo
db1674811f Finish fixing code QL warnings 2024-03-08 13:57:20 +01:00
Jake Barnby
6a795f4d7a
Fix tests 2024-03-08 12:42:15 +01:00
Jake Barnby
207ad5fed6
Fix param order 2024-03-08 11:51:24 +01:00
Torsten Dittmann
0be79cadd8 fix: formatting 2024-03-08 11:25:07 +01:00
Torsten Dittmann
f486767b65 fix: messaging hostname 2024-03-08 11:22:58 +01:00
Jake Barnby
7d3f8a80ea
Push SDKs 2024-03-08 10:58:46 +01:00
Torsten Dittmann
b8b3a69a55 fix: specs 2024-03-08 10:28:25 +01:00
Torsten Dittmann
c1eb549fd5
Merge pull request #7751 from appwrite/feat-image-jwts 
Feat image jwts
 2024-03-08 10:06:50 +01:00
Jake Barnby
2c92837d3a
Remove permissions check 2024-03-08 09:46:43 +01:00
Torsten Dittmann
4ab32a119a
Merge pull request #7739 from appwrite/fix-account-endpoint-order 
fix: account endpoint order
 2024-03-08 00:37:20 +01:00
Torsten Dittmann
fc028b953e fix: formatter 2024-03-08 00:30:23 +01:00
Torsten Dittmann
f51c39cd2b Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x 2024-03-08 00:30:02 +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
Jake Barnby
2318fad508
Remove JWT param 2024-03-07 20:51:47 +01:00
Jake Barnby
f6521670d0
Remove permissions validations 2024-03-07 20:45:09 +01:00
Jake Barnby
2d02a7df53
Add JWT preview route for push images 2024-03-07 20:43:20 +01:00
Jake Barnby
7d896c3155
Add bucketId and fileId to image data 2024-03-07 18:40:45 +01:00
Matej Bačo
005a239932 Auth fixes 2024-03-07 18:24:01 +01:00
Khushboo Verma
8f1aaf69d4 Merge branch 'main' into feat-disable-api 2024-03-07 18:22:34 +01:00
Jake Barnby
664df69a5f
Fix method refs 2024-03-07 17:49:59 +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
Jake Barnby
8a73203635
Revert debugs 2024-03-07 14:52:13 +01:00
Jake Barnby
1db9d8b9ab
Fix method refs 2024-03-07 10:40:03 +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
shimon
dfac3d585a Merge branch 'main' of github.com:appwrite/appwrite into remove-cloud-scripts 2024-03-06 17:58:58 +01:00
Matej Bačo
a9731cd5bc Fix account tests 2024-03-06 12:38:51 +01:00
Jake Barnby
1b7ce8fc61
Debug 2024-03-06 10:59:05 +01:00
Torsten Dittmann
b8b1d8629f fix: tests 2024-03-05 11:09:19 +01:00
Torsten Dittmann
4d873eb5a2 fix: stats collection name 2024-03-05 10:36:23 +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
Khushboo Verma
3d720c7495 Disable all APIs 2024-03-04 23:28:42 +01:00
Khushboo Verma
d3b0b00917 Allow users to disable APIs 2024-03-04 23:12:54 +01:00
Khushboo Verma
974104f8b0 address PR comments 2024-03-04 21:30:06 +01:00
Jake Barnby
74a3d6531f
Merge remote-tracking branch 'origin/refactor-usage-sn' into feat-isolation-modes 
# Conflicts:
#	composer.json
#	composer.lock
#	src/Appwrite/Platform/Tasks/CalcTierStats.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
 2024-03-04 19:50:10 +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
Christy Jacob
d91f6960f7
Merge pull request #7661 from appwrite/chore-usage-queue-health 
usage/usage-dump queue health endpoints
 2024-03-01 21:25:02 +05:30
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
Khushboo Verma
a2b19ef116 Merge branch 'main' into feat-cancel-build-deployment 2024-03-01 18:27:34 +05:30
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
Khushboo Verma
4e2120952f Fix vcs silent mode 2024-02-28 13:27:36 +05:30
Vincent (Wen Yu) Ge
0cde18ef74
Merge branch '1.5.x' into 1.5.x-api-descriptions 2024-02-27 10:49:29 -05:00
Vincent (Wen Yu) Ge
7914eac0c4 Add attachment ID format 2024-02-27 15:43:25 +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
Jake Barnby
16071d9056
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
 2024-02-27 18:19:02 +13:00
Khushboo Verma
af3d6b2308 Allow ssl along with tls in custom smtp 2024-02-26 20:40:41 +05:30
Christy Jacob
03d6eb7401
Merge pull request #7669 from appwrite/main 
Sync main
 2024-02-26 17:39:33 +05:30
Jake Barnby
7945f1398f
Fix tests 2024-02-27 00:27:35 +13:00
Jake Barnby
1da971ce75
Change status param to draft and base status on draft and scheduledAt params 2024-02-26 23:52:32 +13:00
Jake Barnby
1867dce002
Merge remote-tracking branch 'origin/fix-rescheduling' into feat-remove-status-param 2024-02-26 23:38:09 +13:00
Jake Barnby
564c1df701
Fix rescheduling with existing schedule 2024-02-26 23:37:12 +13:00
Khushboo Verma
56760b14cb Restore create build endpoint 2024-02-26 15:37:47 +05:30
Jake Barnby
a89c0540ad
Fix scheduledAt not updated 2024-02-26 18:46:26 +13:00
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
Jake Barnby
821e323a40
Merge pull request #7648 from UtkarshAhuja2003/fix-7587-list-api-select 
[Fix]: Remove internal attributes on select query
 2024-02-26 18:33:36 +13:00
Jake Barnby
d7a16ae7b0
Merge branch '1.5.x' into fix-password-validation 2024-02-26 17:52:41 +13:00
Jake Barnby
d3cf892001
Named params 2024-02-26 17:50:52 +13:00
Jake Barnby
36ebb89a9b
Merge pull request #7667 from appwrite/1.5.x-api-descriptions 
1.5.x api descriptions
 2024-02-26 17:47:39 +13:00
Jake Barnby
36845edc2f
Rescheduling fixes 2024-02-26 17:14:59 +13:00
Jake Barnby
a4ff6e4eba
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 
# Conflicts:
#	tests/e2e/Services/Account/AccountCustomClientTest.php
 2024-02-26 15:50:48 +13:00
Jake Barnby
19d7e533fa
Usage desc updates 2024-02-26 15:44:20 +13:00
Jake Barnby
00c3bc0f8a
Remove invalid index type 2024-02-26 15:38:58 +13:00
Vincent (Wen Yu) Ge
b32d40f3e2 Improve messages 2024-02-26 02:25:45 +00:00
Vincent (Wen Yu) Ge
ab36133a8f Add descriptions 2024-02-25 22:58:33 +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
Khushboo Verma
353092ba00 Remove create build endpoint 2024-02-26 00:05:00 +05:30
Matej Bačo
5327c02870 Improve tests 2024-02-25 18:42:24 +01:00
Matej Bačo
862cba1a5b Check against false positive for MFA 2024-02-25 18:42:24 +01:00
Khushboo Verma
ed4773c2d9 Merge branch 'main' into feat-cancel-build-deployment 2024-02-25 19:14:42 +05:30
Khushboo Verma
0e3a354f1f Create build document in API instead of worker 2024-02-25 19:13:55 +05:30
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
Jake Barnby
7027c3296a
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-25 23:31:04 +13:00
Torsten Dittmann
3963b65f68 fix: mfa delete 2024-02-25 11:21:56 +01:00
Matej Bačo
cb7da26d53 Fix empty pass with personal data check 2024-02-25 09:19:30 +00:00
fogelito
03ce64d41a Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2 
 Conflicts:
	composer.lock
 2024-02-25 11:01:08 +02:00
fogelito
1474bd65b0 Rename $collectionDocument 2024-02-25 10:57:41 +02:00
fogelito
af34f195c6 Address comments 2024-02-25 10:26:02 +02: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
Jake Barnby
209c29991b
Only return allowed runtimes in runtime list route 2024-02-25 18:49:25 +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
Utkarsh Ahuja
8c4473932f fix: list api select query 2024-02-24 10:55:33 +00:00
Jake Barnby
0a37a0dd20
Merge pull request #7645 from appwrite/feat-dev-apns 
Allow setting APNS to sandbox mode
 2024-02-24 14:07:20 +13:00
Jake Barnby
4ce6eabf40
Merge pull request #7638 from appwrite/fix-update-topics-permissions 
Fix update topics permissions
 2024-02-24 13:35:23 +13:00
Jake Barnby
11e9f43982
Allow setting APNS to sandbox mode 2024-02-24 13:34:08 +13:00
Khushboo Verma
141cdf4c82 Fix content-type of file 2024-02-23 20:10:25 +05:30
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
aa6778712f
Merge pull request #7640 from appwrite/fix-tests 
Fix tests
 2024-02-24 02:54:59 +13:00
Jake Barnby
7ab80b9288
Fix account method 2024-02-24 02:00:31 +13:00
Jake Barnby
0d62ecf90f
Merge pull request #7625 from appwrite/provider-null 
Provider null
 2024-02-24 01:17:58 +13:00
Jake Barnby
8742bfaee8
Fix missing subscribe on topic update 2024-02-23 23:56:49 +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
Christy Jacob
3f5e40ad46
Merge pull request #7591 from appwrite/feat-storage-health-check 
Add storage health check
 2024-02-22 12:16:10 +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
a877850707
Fix GraphQL tests 2024-02-22 02:26:17 +13: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
fogelito
b762a9cedd Check user false 2024-02-21 11:48:16 +02:00
fogelito
a851a5f244 providerInternalId nulls 2024-02-21 11:43:04 +02:00
Jake Barnby
9498d680fb
Add doc refs 2024-02-21 22:04:27 +13:00
Jake Barnby
607ba5b32f
Merge remote-tracking branch 'origin/1.5.x' into refactor-disallow-new-session-with-existing 2024-02-21 18:40:01 +13:00
Jake Barnby
3aeb62377c
Fix missed update with image 2024-02-21 17:07:52 +13:00
Jake Barnby
41be4da5c9
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 13:01:53 +13:00
Jake Barnby
a9d1aa5bca
Merge pull request #7620 from appwrite/refactor-remove-resource-collection 
Refactor remove resource collection
 2024-02-21 13:00:48 +13:00
Jake Barnby
ad8450af32
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 2024-02-21 03:29:00 +13:00
Jake Barnby
400b28de8a
Replace resourceCollection with switch 2024-02-21 03:25:01 +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
379c79dae9
Consistent naming for device resources 2024-02-21 03:10:51 +13:00
Jake Barnby
35441dc542
Merge remote-tracking branch 'origin/1.5.x' into feat-email-attachments 2024-02-21 02:33:35 +13:00
Jake Barnby
b9b54b808c
Merge pull request #7618 from appwrite/feat-remove-callback-resources 
Remove callback resources from workers
 2024-02-21 02:30:32 +13:00
Jake Barnby
439e7b1ccf
Merge remote-tracking branch 'origin/feat-remove-callback-resources' into feat-email-attachments 
# Conflicts:
#	app/worker.php
#	src/Appwrite/Platform/Workers/Messaging.php
 2024-02-21 02:00:46 +13:00
loks0n
1fa0f18e44 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr-dx 2024-02-20 12:43:50 +00: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
2f711c84ed
Remove callback resources from workers 2024-02-21 00:40:55 +13:00
Jake Barnby
6c4b0ecd5b
Simplify allow list 2024-02-20 23:27:40 +13:00
Jake Barnby
5747b33e38
Make self-hosted and cloud specs consistent 2024-02-20 23:15:46 +13:00
Christy Jacob
35562715ad
Merge branch 'main' into mock-numbers 2024-02-20 12:27:14 +05:30
Jake Barnby
4bc6c202d9
Use compound ID for push notification image 2024-02-20 18:25:57 +13:00
Jake Barnby
42e1b0dfe3
Merge remote-tracking branch 'origin/feat-email-attachments' into feat-push-images 2024-02-20 18:06:29 +13:00
shimon
1577be9172 usage/usage-dump queue health endpoints 2024-02-19 21:36:14 +02:00
Jake Barnby
022c4678ec
Allow attaching files from storage to emails 2024-02-20 00:08:57 +13:00
Jake Barnby
7a420000fa
Fix image permissions check and URL 2024-02-19 20:48:52 +13:00
Jake Barnby
1bb75fdd63
Merge remote-tracking branch 'origin/1.5.x' into feat-push-images 
# Conflicts:
#	src/Appwrite/Extend/Exception.php
 2024-02-19 20:44:11 +13:00
Damodar Lohani
928ae74ffe fix project network usage 2024-02-19 06:04:29 +00:00
Khushboo Verma
e4a86d9777 Remove global function 2024-02-19 09:19:54 +05:30
Eldad A. Fux
ad78259c10
Merge pull request #7375 from appwrite/fix-sentry-errors 
Update exception for github session not found
 2024-02-18 22:37:00 +01:00
Khushboo Verma
ada1f2abb7 Mark cancelled first, then kill container 2024-02-19 00:44:21 +05:30
Khushboo Verma
12f2e761ef Updated description and response model 2024-02-18 23:25:57 +05:30
Khushboo Verma
3b1233eaa9 Add deviceFunctions and deviceBuilds as well 2024-02-18 18:28:41 +05:30
Khushboo Verma
f5919aad4a Merge branch 'main' into feat-cancel-build-deployment 2024-02-18 18:03:21 +05:30
Khushboo Verma
ed3d598f2e Added cancel build endpoint 2024-02-18 18:01:25 +05:30
Jake Barnby
14a243cc37
Merge pull request #7457 from appwrite/1.5.x-response-request-models 
Update Response and Request filters aswell as Migrations for 1.5.x
 2024-02-16 20:58:08 +13:00
Jake Barnby
3c727861bb
Fix target permissions 2024-02-16 17:07:16 +13:00
Jake Barnby
c192f14d01
Merge remote-tracking branch 'origin/1.5.x' into feat-topic-totals-per-type 2024-02-16 14:08:04 +13:00
Torsten Dittmann
14ecbd6658 fix: 2fa endpoint params 2024-02-15 11:26:34 +00:00
Jake Barnby
2fffbd93f8
Lint fix 2024-02-15 22:41:45 +13:00
Jake Barnby
d38197380e
Support adding image to push notification via storage file 2024-02-15 22:36:34 +13:00
Khushboo Verma
00db19257d Add health storage check 2024-02-15 11:57:24 +05:30
Jake Barnby
5f59f4c5c8
Fix syntax error 2024-02-15 17:56:06 +13:00
Jake Barnby
afba7f75f0
Update appropriate total count when mutating topic 2024-02-15 17:23:30 +13:00
Jake Barnby
ae7a5c6c9c
Merge pull request #7580 from appwrite/feat-subscribe-permission 
Feat subscribe permission
 2024-02-15 16:47:44 +13:00
Christy Jacob
48e87cdc7c Merge branch 'main' of github.com:appwrite/appwrite into mock-numbers 2024-02-14 21:24:53 +05:30
fogelito
84acf990ec Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2 2024-02-14 16:53:58 +02:00
Christy Jacob
28a16173ab feat: add tests 2024-02-14 12:10:19 +05:30
Jake Barnby
0246fb254a
Merge pull request #7578 from appwrite/fix-smtp-provider-update 
Fix smtp provider update
 2024-02-14 12:48:38 +13:00
fogelito
b9000e6d2f Changes message like Utopia 2024-02-13 12:29:36 +02:00
fogelito
99fed365db Update comment 2024-02-13 12:05:47 +02:00
fogelito
796e44a1ed Merge branch '1.5.x' of github.com:appwrite/appwrite into twoWayKey-2 2024-02-13 11:46:33 +02:00
Bradley Schofield
b60c591f8f Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-13 09:45:59 +00:00
shimon
dac0e2a543 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 
 Conflicts:
	src/Appwrite/Platform/Workers/UsageHook.php
 2024-02-13 10:48:47 +02:00
shimon
96317f0acb sync with main 2024-02-13 10:46:24 +02:00
Jake Barnby
1f470aecd2
Add subscribe permission to topics 2024-02-13 17:24:31 +13:00
Jake Barnby
01e88e65d6
Fix swapping options/credentials on create/update smtp provider 2024-02-13 15:16:37 +13:00
Jake Barnby
66e51c0f18
Merge remote-tracking branch 'origin/1.5.x' into 1.5.x-response-request-models 
# Conflicts:
#	src/Appwrite/Platform/Workers/Usage.php
#	src/Appwrite/Platform/Workers/UsageHook.php
 2024-02-13 15:07:16 +13:00
Jake Barnby
37522ea66f
Merge branch '1.5.x' into fix-catch-exception 2024-02-13 12:47:36 +13:00
Jake Barnby
ff1f7e4819
Merge pull request #7569 from appwrite/fix-telesign-params 
Fix telesign params
 2024-02-13 12:38:49 +13:00
Jake Barnby
0bd3fe6473
Merge pull request #7571 from appwrite/fix-updating-message-status 
Fix updating message status
 2024-02-13 12:38:39 +13:00
Jake Barnby
06b15c79ff
Merge pull request #7572 from appwrite/attributes-query-fix 
fix Indexes
 2024-02-13 12:37:59 +13:00
Christy Jacob
c076dfe6f1
Merge pull request #7576 from appwrite/refactor-usage-sn 
Refactor usage sn
 2024-02-12 23:05:56 +05:30
fogelito
4018224cc6 parseQueries 2024-02-12 18:06:37 +02:00
fogelito
ace75b0786 parseQueries 2024-02-12 18:02:04 +02:00
fogelito
6c064430fb Merge branch '1.5.x' of github.com:appwrite/appwrite into json_syntax_error 2024-02-12 17:41:42 +02:00
fogelito
2f9cadf4c0 remove var_dump 2024-02-12 15:30:34 +02:00
fogelito
6aae8cbf64 Add cursor test 2024-02-12 15:27:19 +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
e2f71cbf3a
Merge pull request #7557 from appwrite/create-array-index 
Hardcode size and orders for Json Key Indexes
 2024-02-12 22:27:15 +13:00
shimon
e7ace61273 Sync against main 2024-02-12 11:10:52 +02:00
shimon
6b6f04d2d3 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 
 Conflicts:
	app/config/collections.php
	app/controllers/shared/api.php
 2024-02-12 10:55:53 +02:00
Jake Barnby
8ed2b1f3a5
Fix tests 2024-02-12 18:35:05 +13:00
Jake Barnby
3ba6652be8
Only set schedule active is status is scheduled 2024-02-12 16:55:34 +13:00
Jake Barnby
f237e863de
Throw on updating sent, processing, failed message 2024-02-12 16:55:00 +13:00
Jake Barnby
05884e154e
Update telesign credentials 2024-02-12 15:10:18 +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
Damodar Lohani
eb7e2fd23b fix injection 2024-02-11 09:46:39 +00:00
Damodar Lohani
36eabfa2dd fix check twice 2024-02-11 09:45:36 +00:00
Damodar Lohani
2634c928c7 fix format 2024-02-11 09:34:13 +00:00
Damodar Lohani
e462d73f65 prevent user with active team, from deletion 2024-02-11 09:31:09 +00: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
Christy Jacob
5abcb86fd7 fix: use atomic operations for updating team count 2024-02-09 23:18:18 +05:30
shimon
179a045399 Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc 
 Conflicts:
	composer.lock
 2024-02-09 16:29:26 +02:00
Souptik Datta
e6a97bb36a
Merge branch 'master' into fix-7109-user-activity-log 2024-02-09 00:40:36 +05:30
Souptik Datta
8d7be399d3
fix: Fix project user activity log's missing fields and total count 
Signed-off-by: Souptik Datta <souptikdatta2001@gmail.com>
 2024-02-09 00:15:48 +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
fogelito
bcc6564e5b typo 2024-02-08 18:18:39 +02:00
fogelito
7176d7feab Remove comment 2024-02-08 18:12:43 +02:00
fogelito
103fec1664 parseQueries 2024-02-08 18:10:25 +02:00
fogelito
2c57f9a44a Merge branch '1.5.x' of github.com:appwrite/appwrite into create-array-index 2024-02-08 15:04:43 +02:00
fogelito
98a6b96af9 Hardcode size and orders 2024-02-08 15:01:20 +02:00
shimon
790cdc297b composer update 2024-02-08 10:26:45 +02:00
shimon
632f78140f Merge branch 'refactor-usage-sn' of github.com:appwrite/appwrite into usage-queue-poc 
 Conflicts:
	composer.json
	composer.lock
 2024-02-08 09:29:12 +02:00
Christy Jacob
243ddd4b33
Merge pull request #7519 from appwrite/update-param-name 
Update param name
 2024-02-08 12:55:19 +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
Matej Bačo
abb1007385 Rework project creation 2024-02-07 12:04:46 +01:00
Jake Barnby
66a38898eb
Fix message status values and enums 2024-02-07 23:50:05 +13:00
Matej Bačo
a89b73d20b Fix bug 2024-02-07 10:48:02 +01:00
Matej Bačo
d5216d5b14 Linter fix 2024-02-07 10:17:34 +01:00
Matej Bačo
939aec866e Add getProxyProjectDatabase hook 2024-02-07 10:16:17 +01:00
Jake Barnby
7014b2c2cd
Fix user API mfa route auth 2024-02-07 18:08:51 +13:00
Bradley Schofield
559fa924c0 Merge branch '1.5.x' into 1.5.x-response-request-models 2024-02-06 17:10:43 +00:00
Matej Bačo
a7e95588c6 Fix bug on ZDT 2024-02-06 16:08:42 +01:00
Matej Bačo
8154b4c131 Linter fix 2024-02-06 12:11:27 +01:00
Matej Bačo
d4afe22396 Add ZDT migration support to project creation 2024-02-06 12:07:47 +01:00
Khushboo Verma
fb127270ce Add test for empty domain 2024-02-06 16:04:58 +05:30
Khushboo Verma
11ceeff5ca Add health certificate validity endpoint 2024-02-06 15:15:03 +05:30
Jake Barnby
0a72b37b3e
Fix session response model 2024-02-06 02:17:04 +13:00
Matej Bačo
25f8702429 Fix formatting 2024-02-05 10:40:53 +00:00
Matej Bačo
7beb9080fa Merge remote-tracking branch 'origin/1.5.x' into fix-empty-user-updates 2024-02-05 10:38:48 +00:00
Khushboo Verma
e8523e38f7 Merge branch '1.5.x' into feat-block-countries 2024-02-05 13:26:52 +05:30
Jake Barnby
15f433794f
Add missing enum cases 2024-02-05 20:25:34 +13:00
shimon
6a6c3445fa updates 2024-02-04 20:02:01 +02:00
shimon
a63977455f Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 
 Conflicts:
	.gitmodules
 2024-02-04 09:27:08 +02:00
Jake Barnby
bb9947bfd3
Remove invalid injection 2024-02-04 04:15:16 +13:00
Jake Barnby
68931c8672
Merge pull request #7538 from appwrite/fix-spec-generation 
Fix spec generation
 2024-02-03 04:04:00 +13:00
Jake Barnby
f14c0cc0aa
Merge remote-tracking branch 'origin/1.5.x' into fix-spec-generation 
# 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
 2024-02-03 03:35:14 +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
Jake Barnby
0e8e455903
Fix spec generation 2024-02-02 23:54:34 +13:00
Jake Barnby
df3042dc55
Merge pull request #7536 from appwrite/fix-invalid-usage-labels 
Remove redundant usage labels
 2024-02-02 22:21:20 +13:00
Khushboo Verma
d96d84201e Add auth group to create email token endpoint 2024-02-02 14:03:20 +05:30
Jake Barnby
499f0a53ea
Update to standard namespacing for enums 2024-02-02 17:53:19 +13:00
Jake Barnby
d1bad7c3cd
Remove redundant usage labels 2024-02-02 17:16:31 +13:00
shimon
a254bb7edb Merge branch '1.5.x' of github.com:appwrite/appwrite into 1.5.x-response-request-models 2024-02-01 17:13:38 +02: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
shimon
350d72eb1f updates 2024-02-01 12:21:50 +02:00
loks0n
d84cfab244 feat: remove users.createSession 2024-02-01 10:21:38 +00:00
Jake Barnby
21f0ce5b82
Set port, username and password to defaults if not provided 2024-02-01 17:45:41 +13:00
Jake Barnby
a6b5734884
Fix encryption type options 2024-02-01 17:44:42 +13:00
Jake Barnby
acc7131c95
Remove redundant key existence check 2024-02-01 17:42:19 +13:00
Jake Barnby
19fdc193b6
Fix credential enabled check 2024-02-01 17:41:24 +13:00
Jake Barnby
d275d36a0b
Fix param order 2024-02-01 02:33:14 +13:00
Jake Barnby
e4194c690f
Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-provider 
# Conflicts:
#	composer.lock
 2024-02-01 01:50:36 +13:00
Jake Barnby
49a753509b
Merge pull request #7067 from appwrite/feat-php-8-1 
Upgrade to PHP 8.2
 2024-02-01 01:47:57 +13:00
Jake Barnby
d9f53cacfa
Add SMTP provider 2024-02-01 01:30:09 +13:00
Jake Barnby
39312a83ef
Merge pull request #7518 from appwrite/feat-remove-description 
Feat remove description
 2024-02-01 00:33:49 +13:00
Jake Barnby
79c324527e
Merge pull request #7510 from appwrite/feat-delete-message 
Add message delete route
 2024-01-31 19:55:11 +13: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
shimon
5518ca165e remarks 2024-01-30 13:24:57 +02:00
Christy Jacob
3c7fae7843 chore: update param name 2024-01-30 08:10:13 +00:00
Jake Barnby
ee4b50ce51
Merge pull request #7504 from appwrite/labels-limit 
Labels limit
 2024-01-30 19:43:32 +13:00
Jake Barnby
ab0fae216d
Merge remote-tracking branch 'origin/1.5.x' into feat-php-8-1 
# Conflicts:
#	composer.lock
 2024-01-30 18:44:16 +13:00
Jake Barnby
d7c9f9df59
Merge remote-tracking branch 'origin/1.5.x' into feat-remove-description 2024-01-30 16:58:20 +13:00
Jake Barnby
14a279eb57
Merge remote-tracking branch 'origin/1.5.x' into feat-delete-message 2024-01-30 16:58:04 +13:00
Jake Barnby
afb32b49d5
Throw if status still scheduled and scheduled time before now 2024-01-30 16:33:18 +13: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
Matej Bačo
ba6f5c1a57 Revert unnessessary changes 2024-01-29 11:21:51 +00:00
Matej Bačo
36ce992e9f Add API Tokens 2024-01-29 11:15:07 +00:00
Christy Jacob
6c09d04038 fix: use atomic operations for count updates 2024-01-29 10:54:58 +00:00
fogelito
53efc930c0 Remove Database::INDEX_ARRAY 2024-01-29 08:58:11 +02:00
fogelito
9c8c017618 Merge branch '1.5.x' of github.com:appwrite/appwrite into feat-php-8-1 
 Conflicts:
	app/controllers/api/databases.php
	app/controllers/api/projects.php
	app/controllers/api/users.php
	composer.json
	composer.lock
 2024-01-29 08:50:53 +02:00
Jake Barnby
61dd4a123c
Remove descriptions 2024-01-29 19:29:58 +13:00
Jake Barnby
d94962f086
Add message delete route 2024-01-29 17:20:45 +13:00
shimon
44ed6826a9 refactor usage poc 2024-01-28 15:33:04 +02:00
fogelito
974783f54a Increase labels max value 2024-01-28 12:51:05 +02:00
shimon
7a2ee683e3 refactor usage poc 2024-01-28 11:28:59 +02: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
Christy Jacob
91e625cfc2 chore: linter 2024-01-26 18:04:06 +00:00
Bradley Schofield
126c3a38de Add threshold 2024-01-26 15:55:55 +00:00
Christy Jacob
7e444b037d
Merge pull request #7482 from appwrite/feat-improve-cname-logging 
Feat: CNAME validation logs
 2024-01-26 19:08:26 +04:00
Bradley Schofield
772d42cef8 Update health.php 2024-01-26 09:52:41 +00:00
Bradley Schofield
e2c05fea8c Update health.php 2024-01-26 09:42:21 +00:00
Bradley Schofield
73b1837d66 Remove HealthFailedJobs Model 2024-01-26 09:41:30 +00:00
fogelito
789e19d26a Merge branch '1.5.x' of github.com:appwrite/appwrite into json-parsing 2024-01-25 19:06:18 +02:00
Jake Barnby
fc41b08940 Fix email credential checks 2024-01-25 17:59:26 +01:00
Jake Barnby
b3a4722758 Fix validators 2024-01-25 17:59:26 +01:00
Jake Barnby
7a5c226110 Fix tests 2024-01-25 17:59:26 +01:00
Jake Barnby
d405106aaa Throw on enable if provider credentials are missing instead of ignoring 2024-01-25 17:59:26 +01: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
Bradley Schofield
47af19dd17
Update app/controllers/api/health.php 
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
 2024-01-25 10:21:52 +00:00
Jake Barnby
52a9b31521
Trigger deletes worker when target is deleted 2024-01-25 20:01:15 +13:00
Bradley Schofield
26d8278a89 Merge branch 'feat-impl-queue-retry' into feat-queue-failed-health-endpoints 2024-01-24 18:00:51 +00:00
Bradley Schofield
867bc0281c Update health.php 2024-01-24 17:48:27 +00: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
88cf7ea9e8 fix: race condition with creating a user with targets 2024-01-24 15:31:58 +01:00
Matej Bačo
f4a4cfa207 PR review changes 2024-01-24 12:40:56 +00: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
Matej Bačo
5bd106afaf Implement better cname validation logging 2024-01-23 15:40:32 +00:00
fogelito
8dd387cfbe Parsing and Throw Error 2024-01-23 17:14:14 +02:00
Matej Bačo
187165f397 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-23 09:12:22 +00: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
fogelito
37bdb17cc6 Deprecated changes 2024-01-22 19:24:12 +02:00
Matej Bačo
0c7a69e665 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 16:05:38 +00: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
724b8c8098 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-22 10:13:28 +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
fogelito
667abce8f5 Create indexes & query contains 2024-01-21 18:22:02 +02:00
fogelito
3689435176 Arrays tests 2024-01-21 10:10:18 +02:00
Matej Bačo
eb597b2bd2 Try to fix targets bug 2024-01-20 13:07:53 +00:00
Matej Bačo
42eb051368 QA bug fixes 2024-01-20 10:06:30 +00:00
Matej Bačo
311e9a75dd Allow empty values in PATH user service 2024-01-20 09:43:31 +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
Khushboo Verma
a134ca7efd Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-19 17:12:14 +05:30
Jake Barnby
5dc9392fe5
Merge pull request #7463 from appwrite/feat-list-message-targets 
Add endpoint to list a message's targets
 2024-01-19 19:15:21 +13:00
Steven Nguyen
3938c53256
Add endpoint to list a message's targets 
This endpoint is needed so that the Console can fetch the associated
targets to display when viewing the details of a message or going in
to edit a message.
 2024-01-19 06:03:23 +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
59c4f5b9e4
Merge pull request #7431 from appwrite/feat-message-scheduling 
Feat message scheduling
 2024-01-19 16:55:49 +13:00
Jake Barnby
fc9cc3aab1
Merge pull request #7381 from appwrite/fix-list-messages-allowed-queries 
Fix list messages allowed queries
 2024-01-19 16:53:22 +13:00
Jake Barnby
c5c832eff6
Merge pull request #7382 from appwrite/feat-search-subscribers 
Add search param for list subscribers endpoint
 2024-01-19 16:31:48 +13:00
Jake Barnby
d292562090
Throw if status scheduled and no schedule set 2024-01-19 16:16:24 +13:00
Jake Barnby
65573adad6
Use status enum 2024-01-19 16:15:54 +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
Jake Barnby
3b7d3e6139
Merge branch '1.5.x' into feat-draft-messages 2024-01-19 14:19:45 +13:00
Bradley Schofield
d3b8ce704e Add failed queue endpoint 2024-01-18 16:18:49 +00:00
Torsten Dittmann
442451aa42 feat: mfa console 2024-01-18 16:04:18 +01:00
Torsten Dittmann
057496dbaa feat: mfa users endpoints 2024-01-18 14:56:58 +01:00
Torsten Dittmann
e7c40d1cb1 fix: teams session 2024-01-18 14:19:30 +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
shimon
8581df9c14 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 2024-01-18 14:05:58 +02:00
Khushboo Verma
e9aab8d9ee Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-18 15:21:55 +05:30
Khushboo Verma
3a1fe3b2a7 Add webhook tests 2024-01-18 15:19:57 +05:30
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
Steven Nguyen
96de1617ed
Update the content in the subscriber's search attribute 2024-01-18 02:32:32 +00:00
Steven Nguyen
6eeb8c4cac
Update create and update message APIs to support draft messages 2024-01-17 17:30:55 -08: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
Matej Bačo
f64989dd13 Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-17 11:26:16 +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
Matej Bačo
20322589dd Improve SMTP test email design 2024-01-17 11:22:08 +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
Jake Barnby
2f786c03a2
Merge remote-tracking branch 'origin/1.5.x' into feat-message-scheduling 
# Conflicts:
#	tests/e2e/Services/GraphQL/Base.php
 2024-01-17 19:07:40 +13:00
Jake Barnby
bc37984cdb
Merge pull request #7430 from appwrite/fix-default-topic-description 
Default topic description to an empty string instead of null
 2024-01-17 19:05:55 +13:00
Steven Nguyen
fae7a758ff
Fix docs for list messages allowed attributes 2024-01-17 02:39:02 +00:00
loks0n
a8adfe8f8a fix: users create session event 2024-01-16 11:13:42 +00:00
loks0n
77b1762514 chore: fix token event 2024-01-16 10:40:49 +00: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
Matej Bačo
ffa4ad09ec Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test 2024-01-15 11:07:32 +00:00
Matej Bačo
8668f15835 Linter fix 2024-01-15 11:02:05 +00:00
Matej Bačo
d5be48a846 Finish custom SMTP feature 2024-01-15 10:18:17 +00:00
Khushboo Verma
882e049ac9 Merge branch 'feat-migrate-cloud-templates' into fix-limit-failed-webhook-attempts 2024-01-15 13:05:05 +05:30
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
Jake Barnby
44a28173e4
Merge branch '1.5.x' into feat-remove-apns-endpoint 2024-01-15 16:33:43 +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
07da41bd69 docs: better descriptions for create token params 2024-01-12 17:35:16 +00:00
loks0n
c8ce360ce9 chore: remove 'universal' references 2024-01-12 17:30:36 +00:00
loks0n
02b83bf26e chore: changes to expire param create token 2024-01-12 17:28:56 +00:00
loks0n
ca511bd459 chore: use customId validators 2024-01-12 17:26:01 +00:00
loks0n
90c5d6413c feat: create new user if none create session 2024-01-12 17:14:11 +00:00
loks0n
ee96b220c3 docs: create session 2024-01-12 17:10:23 +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
Khushboo Verma
d443602cbc resolve merge conflicts 2024-01-12 01:55:32 +05:30
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
loks0n
9068941772 feat: create user with create token if not exists 2024-01-11 14:55:37 +00:00
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
5827c52372
Merge branch '1.5.x' into feat-search-subscribers 2024-01-11 20:04:17 +13:00
Jake Barnby
cb3e354cf1
Fix tests 2024-01-11 19:47:55 +13:00
Jake Barnby
a40c6fce64
Add resource collection to schedules 2024-01-11 16:00:48 +13:00
Jake Barnby
9063b4e77f
Fix controller scheduling, ensuring created when message updated and none exists 2024-01-11 15:58:24 +13:00
Steven Nguyen
74a7ffbf7a
Default topic description to an empty string instead of null 
Not using nulls makes things more type safe.
 2024-01-11 02:06:56 +00: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