1
0
Fork 0
mirror of synced 2024-09-09 22:27:06 +12:00
Commit graph

5040 commits

Author SHA1 Message Date
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
Steven Nguyen
f88887abad
fix(mfa): fix delete authenticator response model 2024-04-22 22:24:20 +00: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
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
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
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
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
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
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
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