Commit graph

5550 commits

Author SHA1 Message Date
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
Khushboo Verma
f6830f4e85 Resolve merge conflict 2024-01-10 19:38:55 +05:30
Matej Bačo
788fa04606 Improve magic URL design 2024-01-10 11:33:55 +01:00
loks0n
94e45da5c7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-10 10:15:29 +00:00
Khushboo Verma
b74c7671e8 Resolve merge conflicts 2024-01-10 13:13:09 +05:30
Steven Nguyen
e7d3797234
Remove the endpoint param for APNS providers
The endpoint was removed from utopia-php/messaging.
2024-01-09 21:30:56 +00:00
loks0n
332bd532e1 fix: specs 2024-01-09 19:04:47 +00:00
loks0n
9a34c92fac Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-09 16:42:00 +00:00
loks0n
ded48cb618 chore: fmt 2024-01-09 16:41:42 +00:00
loks0n
d9b25a3167 feat: add token param to oath 2024-01-09 16:38:29 +00:00
loks0n
de2a4e754a feat: alias PUT token methods for backwards compat 2024-01-09 15:56:01 +00:00
Torsten Dittmann
cb25d5209e fix: di 2024-01-09 16:30:18 +01:00
Matej Bačo
86158838a1 Magic URL improvements 2024-01-09 12:23:13 +00:00
Torsten Dittmann
d344ba46c4
feat: account delete (#7415)
* feat: account delete

* chore: run specs

* release: console sdk

* chore: run formatter

* tests: fix project tests
2024-01-09 12:58:36 +01:00
Jake Barnby
af019369e9
Merge branch 'main' into 1.5.x 2024-01-09 22:03:35 +13:00
Eldad A. Fux
b0a8aac0b7
Merge pull request #7348 from appwrite/fix-delete-identity-event
Update the delete identity endpoints to set the params and payload
2024-01-09 07:52:08 +01:00
Steven Nguyen
44182b4444
Fix incorrect response model 2024-01-09 03:10:43 +00:00
Jake Barnby
b3819186cb
Fix chunked upload file ID validation for first chunk 2024-01-09 15:38:56 +13:00
Jake Barnby
baf807d389
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
2024-01-09 14:08:39 +13:00
Jake Barnby
51b2019ab6
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
2024-01-09 13:56:01 +13:00
Jake Barnby
219f091925
Merge branch '1.5.x' into messaging-uniform-logic 2024-01-09 12:40:07 +13:00
Torsten Dittmann
9ba2eafa83
fix: escape html in email params (#7409)
* fix: escape html in email params

* revert: phpunit stop on failure

* chore: fix linter
2024-01-08 18:08:17 +01:00
loks0n
5c803f6eff Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr 2024-01-08 11:41:55 +00:00
Torsten Dittmann
bbf6480c15 fix: merge conflicts 2024-01-08 12:31:46 +01:00
Torsten Dittmann
208abe17e7 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mfa 2024-01-08 12:20:08 +01:00
shimon
03f2041913 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc 2024-01-07 18:09:48 +02:00
Matej Bačo
fae28b468c Fix password hashing bug 2024-01-07 13:40:45 +01:00
Khushboo Verma
bbd551cf0d Reset attempts to 0 on successful request 2024-01-05 17:54:20 +05:30
Matej Bačo
e5f0e00742 Apply password validation to all places 2024-01-05 12:31:38 +01:00
Matej Bačo
0a2be34ceb Fix PHP refference bug 2024-01-05 12:07:41 +01:00
Khushboo Verma
6d8443d5cd Addressed PR comments 2024-01-05 15:13:54 +05:30
Steven Nguyen
7e9525f0f9
Update validation of topics, users, and targets
They should be an array of UID and not just array of Text.
2024-01-05 00:10:57 +00:00
Matej Bačo
ba32170f72 Improve password validator hook 2024-01-04 16:26:15 +01:00
Khushboo Verma
fb9e393c97 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-04 16:42:47 +05:30
Damodar Lohani
640ab7bf87 Merge branch 'main' into to-sync-with-main 2024-01-03 00:11:42 +00:00
Steven Nguyen
50aab32f0f
Add search param for list subscribers endpoint 2024-01-02 23:39:46 +00:00
Khushboo Verma
cfca9f232c Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2024-01-02 21:57:58 +05:30
Matej Bačo
554e9f93b6 Implement max password length 2024-01-02 10:59:35 +00:00
Khushboo Verma
671b1624d5 Update exception for github session not found 2024-01-02 16:20:20 +05:30
Khushboo Verma
f14285b65b Update webhook endpoints 2024-01-02 16:17:02 +05:30
shimon
99f1543f1b Merge branch 'main' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	Dockerfile
	app/console
	app/init.php
	composer.lock
	src/Appwrite/Platform/Services/Workers.php
	src/Appwrite/Platform/Tasks/Hamster.php
2024-01-02 11:49:23 +02:00
Damodar Lohani
879320e23e
update comment regarding validation 2024-01-02 11:53:48 +05:45
Damodar Lohani
b2b863f09f
Merge branch 'main' into fix-chunk-upload-permission 2024-01-02 11:51:09 +05:45
Damodar Lohani
a2ad870084 use compression constant from utopia/storage 2023-12-31 11:46:45 +00:00
Damodar Lohani
1c236959ba fix algorithm attribute on file if size is above read buffer size 2023-12-29 01:49:56 +00:00
Damodar Lohani
9cb5eb0180 use constants for compression type 2023-12-28 11:42:40 +00:00
Damodar Lohani
a28be2bf48 return when response is sent to prevent further execution 2023-12-28 11:32:04 +00:00
Damodar Lohani
5455db7c7f improve order 2023-12-28 11:26:45 +00:00
shimon
260b280e10 preview_output_fix 2023-12-28 11:54:21 +02:00
Khushboo Verma
d418a581b7 Allow only public domains in webhook url 2023-12-28 15:16:08 +05:30
Damodar Lohani
94a18ede78 fix formatting 2023-12-28 01:35:10 +00:00
Damodar Lohani
e8ff828039 fix for file extension not supported
- the error occured with jfif extension, which is essentially a jpeg file
2023-12-28 01:31:25 +00:00
Torsten Dittmann
0fdc28e034
Merge pull request #7280 from appwrite/fix-7190-user-identity-incorrect-user
Fix user identity attaching to wrong user
2023-12-28 01:59:58 +01:00
Steven Nguyen
f1ba7b08ab
Update the delete identity endpoints to set the params and payload
Because no payload was set, the event params (userId and identityId)
wasn't picked up automatically. This updates the endpoints so that the
payload is set, but also makes sure to set the userId and identityId
params since the identityId param's key doesn't match the key in the
payload.
2023-12-27 23:35:32 +00:00
Damodar Lohani
cbd3e85b38 fix formatting 2023-12-25 06:07:28 +00:00
Damodar Lohani
26ac88c32e validate create permission while updating chunk uploaded file 2023-12-25 05:54:59 +00:00
Matej Bačo
a0b2443a8b Rename email endpoint 2023-12-22 09:38:52 +00:00
Matej Bačo
3f1faa44ad Rename form exchange to create 2023-12-22 09:31:19 +00:00
fogelito
dc203a494e Syntax change 2023-12-20 12:55:09 +02:00
Eldad Fux
90e8e04e08 Fixed test 2023-12-20 00:15:45 +01:00
Eldad Fux
ed999031d0 Fixed whitespace 2023-12-19 22:46:35 +01:00
prateek banga
5d7eca7c99 lint fix and tests fix 2023-12-19 23:45:20 +05:30
loks0n
1b6a833bed fix: encode session for ssr clients 2023-12-19 15:45:44 +00:00
Eldad Fux
64138d6ccf Added new endpoint 2023-12-19 16:08:09 +01:00
Damodar Lohani
1f558442d9 linter fix 2023-12-18 10:18:40 +00:00
Damodar Lohani
5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
Prateek Banga
6de2659793 adds mock providers in project for benchmarking, fixes bug in scheduling
removes scheduling from array in schedulemessage task
2023-12-18 15:27:09 +05:30
Jake Barnby
23b39fee02
FIx FCM tests 2023-12-17 12:41:20 +13:00
Matej Bačo
8c1363529e Add Hooks 2023-12-15 23:19:43 +01:00
Jake Barnby
fc101b7c05
Update lock 2023-12-15 18:24:37 +13:00
Jake Barnby
121521d7c5
Merge remote-tracking branch 'origin/1.5.x' into json-parsing
# Conflicts:
#	composer.lock
#	src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
#	src/Appwrite/Platform/Tasks/Hamster.php
2023-12-15 18:22:08 +13:00
Jake Barnby
9c79e6bc23
Fix cache purge 2023-12-15 17:45:25 +13:00
Khushboo Verma
557565b949 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-15 01:46:47 +05:30
Khushboo Verma
d5cc9d9eea Addressed PR Comments 2023-12-15 01:45:17 +05:30
fogelito
4ce312560b Connection problem 2023-12-14 18:17:19 +02:00
Jake Barnby
4e26bdb5df
Update update route params 2023-12-15 03:45:51 +13:00
Jake Barnby
7b99fab512
Use targets for cc/bcc 2023-12-15 03:19:24 +13:00
Jake Barnby
2eace5a627
Merge remote-tracking branch 'origin/1.5.x' into messaging-uniform-logic
# Conflicts:
#	app/controllers/api/messaging.php
#	composer.lock
2023-12-15 02:47:59 +13:00
Jake Barnby
91e3ea4bae
Merge pull request #7287 from appwrite/fix-list-sizes
Fix max array size 1
2023-12-15 02:42:45 +13:00
Jake Barnby
5135262b79
Merge remote-tracking branch 'origin/1.4.x' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
2023-12-15 02:41:46 +13:00
fogelito
cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
Jake Barnby
944e474ec4
Fix max array size 1 2023-12-15 02:30:44 +13:00
德华 刘
dc89501012 chore: linter 2023-12-14 04:51:36 +00:00
德华 刘
1307f73c31 chore: refactor code 2023-12-14 04:49:16 +00:00
Steven Nguyen
92a307c164
Fix user identity attaching to wrong user
Suppose a user has 2 accounts on Appwrite:

1. joe@example.com
2. joe@gmail.com

Prior to this PR, if joe@example.com created a Google OAuth2 session
using his joe@gmail.com email, a new joe@gmail.com identity would be
created linked to joe@example.com.

This is especially problematic because if the user tried to create a
Google OAuth2 session using joe@gmail.com, Appwrite would lookup the
user via email and find the joe@gmail.com user, but then find an
identity from joe@example.com. This mismatching user ID would then
cause an error.

This PR prevents an identity from being created if the email from the
OAuth2 provider matches another user's email.
2023-12-13 18:45:05 +00:00
Luke B. Silver
60a0fefe56
Merge branch '1.4.x' into feat-ssr 2023-12-13 10:32:13 +00:00
Jake Barnby
276d671921
Add temp parsing code 2023-12-13 22:45:01 +13:00
德华 刘
f334168f90 fix: remove expired cookie 2023-12-13 08:45:47 +00:00
Khushboo Verma
16addeba10 Fixed some errors 2023-12-13 03:00:16 +05:30
shimon
41ae96ea77 change execution usage trigger 2023-12-12 21:55:01 +02:00
shimon
bdf9a64771 change execution usage trigger 2023-12-12 21:21:47 +02:00
Torsten Dittmann
063db1e2bf feat: add execution aggregation to project usage 2023-12-12 18:48:21 +01:00
loks0n
fda9df069a feat: enable array sdk.method 2023-12-12 11:24:50 +00:00
loks0n
fe695314a9 fix: tests 2023-12-11 19:41:58 +00:00
Khushboo Verma
ff7cfc6602 Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-12-12 00:17:21 +05:30
loks0n
cb788b13bf chore: remove unused imports 2023-12-11 18:36:17 +00:00
loks0n
1e8a931751 chore: format 2023-12-11 17:13:19 +00:00
loks0n
7ee4ad5ba9 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-12-11 16:52:14 +00:00
loks0n
f0d7312bd3 feat: create session method 2023-12-11 16:24:24 +00:00
Torsten Dittmann
5e74c5bbc4 fix: typo usage 2023-12-11 17:12:43 +01:00
Torsten Dittmann
1794b1395a chore: run formatter 2023-12-11 16:33:15 +01:00
Torsten Dittmann
ba75f69969 feat: usage breakdown by project 2023-12-11 16:19:08 +01:00
Torsten Dittmann
c37e31e6c3 fix: inconsistent timestamp generation 2023-12-10 20:58:38 +01:00
Torsten Dittmann
bb934080ba feat: project usage custom date range 2023-12-10 10:26:33 +01:00
Christy Jacob
4f1d8ed6f4 fix: revert files 2023-12-09 01:36:57 +01:00
Christy Jacob
951a749b50 fix: revert files 2023-12-09 01:19:36 +01:00
Christy Jacob
c21a063642 fix: failing tests 2023-12-09 01:02:13 +01:00
Christy Jacob
9dca3c4300 fix: linter 2023-12-08 20:38:55 +01:00
Christy Jacob
5d121c1887 fix: reset the legacy cookie 2023-12-08 20:36:22 +01:00
Christy Jacob
eb61d5c25c chore: reset old cookie 2023-12-08 20:24:07 +01:00
Christy Jacob
f5c2c8d8f7 chore: reset old cookie 2023-12-08 20:23:04 +01:00
Jake Barnby
4710310629
Check if self-hosted 2023-12-08 18:33:35 +01:00
Prateek Banga
b8aa2faa7b adds scheduling commit, still need to resolve pools error 2023-12-07 11:25:19 +01:00
Torsten Dittmann
83c411e5fd fix: some fixes 2023-12-07 10:05:37 +01:00
fogelito
4af00914a5 changes 2023-12-06 16:15:21 +01:00
fogelito
2fe50717d1 TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE 2023-12-06 15:10:40 +01:00
Prateek Banga
194bbbb350 review changes 2023-12-05 19:24:55 +01:00
Prateek Banga
e7dca6b2d5 adds uniform logic for worker and extra params for email 2023-12-05 15:01:32 +01:00
Prateek Banga
54f574906c review changes 2023-12-05 12:22:32 +01:00
loks0n
4471b93a3a tests: fix 2023-12-05 12:00:26 +01:00
loks0n
54c6709a48 fix: verification scopes 2023-12-04 16:17:22 +01:00
Prateek Banga
f9dd40120e resolve update twilio provider 2023-12-04 15:48:37 +01:00
loks0n
63b2363556 feat: workaround backwards compat 2023-12-04 15:38:12 +01:00
prateek banga
5ed8bdae35 fix search param in list subscribers endpoint 2023-12-01 03:55:29 +05:30
prateek banga
6ead6f8094 misc changes
allow filtering by providerType, userId in subscribers. Adds cancelled status for message status. Validate targets when creating message. delete all targets when user is deleted. fix twilio bug. add db env vars in messaging worker compose.phtml
2023-12-01 03:39:43 +05:30
loks0n
8ea9706174 feat: Matej renaming plan 2023-11-30 11:35:52 +00:00
Jake Barnby
7e12da5a2a
Use hard-coded DB name instead of project attribute 2023-11-30 16:32:15 +13:00
prateek banga
739cc36fdc updated providerType wherever left to update 2023-11-29 15:22:26 +05:30
prateek banga
fa8dc133b4 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-message-provider-type 2023-11-29 15:01:47 +05:30
prateek banga
43b8fc2c31 review changes 2023-11-29 13:47:44 +05:30
Jake Barnby
4b58d08fd8
Add providerType to Message 2023-11-29 17:09:44 +13:00
Jake Barnby
82c86c0ae2
deliveryTime -> scheduledAt 2023-11-29 17:08:25 +13:00
Jake Barnby
4bc23afc65
Add constants for message types 2023-11-29 17:05:37 +13:00
prateek banga
ee4c2d0e0d adds target when creating user via server endpoint 2023-11-28 18:42:34 +05:30
Jake Barnby
7104f9e2c8
Add comments marking shareTables project attributes + header overrides as temporary 2023-11-28 02:08:04 +13:00
Jake Barnby
2c71de1d1b
Merge remote-tracking branch 'origin/1.4.x' into feat-isolation-modes
# Conflicts:
#	composer.lock
2023-11-28 00:57:17 +13:00
Jake Barnby
9472bff8f9
Fix project create tenant set/reset 2023-11-28 00:27:41 +13:00
Jake Barnby
7b8e37b03d
Update method names 2023-11-27 15:22:05 +13:00
shimon
1869852985 Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/controllers/shared/api.php
	composer.lock
	src/Appwrite/Platform/Workers/Deletes.php
2023-11-26 16:29:18 +02:00
shimon
21895e3ac0 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	app/controllers/api/storage.php
	app/init.php
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Services/Tasks.php
	src/Appwrite/Usage/Calculators/TimeSeries.php
2023-11-26 10:28:17 +02:00
prateek banga
858175fe00 adds target object in subscriber model 2023-11-23 14:35:16 +05:30
Prateek Banga
d9826cdce8 makes provider creation fields optional and adds target info in subscriber model 2023-11-23 00:39:55 +05:30
Jake Barnby
f44543f083
Add shareTables attribute to project 2023-11-23 01:12:19 +13:00
Jake Barnby
cefc1b6519
Add base share tables check when creating project 2023-11-23 01:11:48 +13:00
loks0n
88aa4d726c Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-21 14:54:57 +00:00
prateek banga
9c6cd8512f review changes 2023-11-21 15:19:19 +05:30
prateek banga
88f228c106 review changes 2023-11-21 15:11:09 +05:30
prateek banga
3394218cb0 adds validation for phone and email identifier 2023-11-21 15:00:02 +05:30
prateek banga
520d19e335 changes TextMagic to Textmagic in all places and uses email validator 2023-11-21 12:35:36 +05:30
Khushboo Verma
2c04c98801 Renamed webhook variables 2023-11-20 19:49:15 +05:30
Khushboo Verma
2bcb6c18fb Merge branch '1.5.x' into fix-limit-failed-webhook-attempts 2023-11-20 17:40:32 +05:30
Jake Barnby
0b01f7140f
Merge remote-tracking branch 'origin/main' into 1.5.x
# Conflicts:
#	app/config/errors.php
#	composer.lock
#	src/Appwrite/Extend/Exception.php
2023-11-21 00:19:17 +13:00
prateek banga
b1eaf97806 review changes 2023-11-20 16:21:06 +05:30
prateek banga
5c1cf3a526 adds user name in subscriber response model 2023-11-20 12:34:50 +05:30
Khushboo Verma
03e8a29e8d Merge branch '1.4.x' into fix-error-logging 2023-11-18 00:02:03 +05:30
Khushboo Verma
a76efe7d4e
Merge branch '1.4.x' into fix-rate-limit-error-on-large-uploads 2023-11-17 21:19:27 +05:30
Prateek Banga
b68be491b9 updated description 2023-11-17 20:59:09 +05:30
Prateek Banga
9183f2a875 changes enum size validation in update controller 2023-11-17 20:56:18 +05:30
Khushboo Verma
2a2ff34e20 Merge branch '1.4.x' into fix-error-logging 2023-11-17 20:37:36 +05:30
Prateek Banga
ab35b75c37 fix test message 2023-11-17 20:14:55 +05:30
Prateek Banga
228b813994 fixes test case 2023-11-17 20:06:28 +05:30
Khushboo Verma
93f58fb876 Merge branch '1.4.x' into fix-error-logging 2023-11-17 19:30:58 +05:30
Khushboo Verma
7902defe69 Addressed PR comments 2023-11-17 19:29:57 +05:30
Prateek Banga
827ad84f53 fixes adding longer length enum 2023-11-17 19:09:31 +05:30
Khushboo Verma
c34dc4dae0 Add flag to send logs to logger 2023-11-16 23:51:09 +05:30
Khushboo Verma
fccbe405db Add chunkId to abuse key to prevent rate limit for SDKs 2023-11-16 23:04:38 +05:30
fogelito
04afeb4a8d tests 2023-11-16 15:56:52 +02:00
prateek banga
7536d8eb0f review changes 2023-11-16 17:09:08 +05:30
prateek banga
bf95736da0 review changes 2023-11-16 16:47:36 +05:30
prateek banga
f854622705 review changes 2023-11-16 16:26:36 +05:30
prateek banga
a282ab38a6 adds target endpoint in account controller for push tokensl 2023-11-16 02:12:06 +05:30
prateek banga
c24664f5d9 removes internal provider 2023-11-16 01:30:47 +05:30
Torsten Dittmann
115ca23a58
Merge pull request #5174 from yatharth1706/fix-4797-verified-user-getting-email-verifications
Fix verified user getting email verifications
2023-11-15 13:35:23 +01:00
loks0n
830544e245 fix: logged in ssr cases 2023-11-15 11:57:27 +00:00
prateek banga
2aa8391c5e review fixes 2023-11-15 12:52:27 +05:30
Khushboo Verma
2e70ed59af Fix git installation deletion 2023-11-15 11:41:42 +05:30
prateek banga
fdca55b0de fix test cases 2023-11-15 01:24:55 +05:30
prateek banga
adc76c5797 adds target when account is created or email or phone is updated 2023-11-14 22:46:20 +05:30
prateek banga
1870524be5 fixes error name 2023-11-14 21:34:17 +05:30
Matej Bačo
7e1b618769 Fix permission issues with repositories collection 2023-11-14 16:50:59 +01:00
Khushboo Verma
141b864a56 Update permissions for create repository document 2023-11-14 19:49:23 +05:30
loks0n
7823b90bf3 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-11-14 14:01:10 +00:00
prateek banga
7ae614fe13 adds provider type in target 2023-11-14 18:14:07 +05:30
prateek banga
c5aaa670a9 adds provider details in message search attribute 2023-11-14 15:20:21 +05:30
Khushboo Verma
22f02243c6 Resolved merge conflicts 2023-11-14 14:29:46 +05:30
Khushboo Verma
3f584b85be Limit webhook failure attempts to 10 2023-11-14 14:20:26 +05:30
prateek banga
f84a00dded adds search attribute filter 2023-11-14 14:07:52 +05:30
prateek banga
8f53301209 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into more_review_changes 2023-11-14 12:26:35 +05:30
Matej Bačo
967854d34a Fix grammar 2023-11-13 14:39:33 +01:00
Matej Bačo
a029287e5a Implement health tresholds 2023-11-13 14:07:11 +01:00
Jake Barnby
458c2d1446
Merge remote-tracking branch 'origin/main' into chore-sync-main 2023-11-13 16:46:05 +13:00
Prateek Banga
4f681cfe10
Merge branch '1.5.x' into chore-sync-main-1.5.x 2023-11-10 23:12:40 +05:30
Prateek Banga
3ade88897c Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x 2023-11-10 12:49:05 +05:30
Prateek Banga
76ed15f2a1 adds more assertion in logs tests 2023-11-10 02:20:55 +05:30
Christy Jacob
d33b8c2ce1
Merge branch '1.4.x' into fix-null-password-history 2023-11-09 07:44:44 -08:00
Bradley Schofield
56310bc4fa
Merge branch 'main' into fix-null-password-history 2023-11-09 10:41:17 +00:00
Prateek Banga
3654799cc7 links ISO 8601, move params in messaging controllers 2023-11-09 14:53:42 +05:30
Prateek Banga
4c970cbc46
Merge branch '1.5.x' into feat-logs-messaging-api 2023-11-09 13:42:51 +05:30
Prateek Banga
8d5bfdabc6 revert wrong aduits.event label 2023-11-09 12:29:16 +05:30
Steven Nguyen
0c264a107a
Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications 2023-11-08 17:37:43 -08:00
Eldad A. Fux
d64d56069f
Merge pull request #6828 from appwrite/feat-improve-migration-validations
Improve Error Handling and Add more Validation
2023-11-08 16:03:04 -05:00
prateek banga
b9de4a0169 added tests for logs endpoint 2023-11-08 23:26:46 +05:30
shimon
d54615d376 project.php 2023-11-08 18:12:36 +02:00
Bradley Schofield
54e5985940 Fix wrong operator for password history
This fixes a potential chance for nulls to be introduced into the password history array when $password is null and $passwordHistory != 0
2023-11-08 14:35:16 +00:00
shimon
dd9d8010c1 db health api throws an error when ping fails 2023-11-08 15:20:50 +02:00
shimon
ad63a377ab added inf metric 2023-11-08 11:09:32 +02:00
Christy Jacob
fd7b354113
Merge pull request #7084 from appwrite/fix-proxy-create-rule-500
fix: proxy create rule 500
2023-11-07 10:49:52 -08:00
Christy Jacob
8feb01d857
Merge pull request #7085 from appwrite/fix-missing-sessionId-error
fix: missing sessionId error
2023-11-07 10:43:05 -08:00
Christy Jacob
2d2400fdff
Merge branch '1.4.x' into fix-missing-sessionId-error 2023-11-07 10:27:46 -08:00
Christy Jacob
f4cdd0accc
Merge branch '1.4.x' into fix-proxy-create-rule-500 2023-11-07 10:27:31 -08:00
德华 刘
9acc23049c Merge branch 'main' of https://github.com/appwrite/appwrite into sync-1.4.x-main 2023-11-07 18:12:58 +00:00
Christy Jacob
f53fbc19d4
Merge branch '1.4.x' into fix-missing-functionId-error 2023-11-07 10:10:03 -08:00
Bradley Schofield
d5d7440a68 Merge branch 'main' into feat-improve-migration-validations 2023-11-07 16:21:35 +00:00
loks0n
7e37c973ce fix: missing functionId error on create execution 2023-11-07 10:25:33 +00:00
Steven Nguyen
55a73efeab Ensure usage endpoints don't throw 500 when usage is disabled 2023-11-06 21:28:45 +00:00
loks0n
dfc8c919d4 fix: missing sessionId error 2023-11-06 15:06:56 +00:00
loks0n
75669b9b2e chore: better error msg 2023-11-06 14:49:33 +00:00
loks0n
4440859c05 chore: fmt 2023-11-06 14:48:54 +00:00
loks0n
61c5f371b7 chore: use base Exception 2023-11-06 14:45:56 +00:00
loks0n
8b24c44fb9 fix: proxy create rule 500 2023-11-06 14:44:00 +00:00
shimon
f64d0ab8a8 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-usage-sn
 Conflicts:
	.gitmodules
	CHANGES.md
	Dockerfile
	composer.lock
	src/Appwrite/Migration/Migration.php
2023-11-05 17:03:13 +02:00
Steven Nguyen
9f7bbe4869 Fix the Health service's get X queue endpoints
Before this, the endpoints called $client->sumProcessingJobs() which
only gets the currently processing jobs, but this endpoint should return
what's currently in queue, pending to be processed. This should be
retrieved using $client->getQueueSize().
2023-11-03 16:57:30 +00:00
Christy Jacob
9fc7c1384a
Merge pull request #7071 from appwrite/fix-swoole-warning
feat: fix swoole warning
2023-11-03 19:46:59 +04:00
loks0n
305c781206 feat: fix swoole warning 2023-11-03 12:18:24 +00:00
loks0n
df0271c56a chore: rename to 'custom' sessions 2023-11-02 13:22:10 +00:00
loks0n
9206390d01 feat: custom expire paramter createTokenSession 2023-11-02 12:52:43 +00:00
Prateek Banga
f97d1fa9e3 adds log api in messaging controller 2023-11-02 18:00:17 +05:30
Prateek Banga
61d46bee5c Merge branch '1.5.x_review_changes' of https://github.com/appwrite/appwrite into event-label-messaging 2023-11-02 16:53:55 +05:30
Prateek Banga
270e6e7c15 review changes 2023-11-02 16:43:24 +05:30
Bradley Schofield
e158d134b0 Merge branch 'main' into feat-improve-migration-validations 2023-11-02 10:48:38 +00:00
shimon
1c1028412a refactor users, project, functions usage display 2023-11-01 20:44:06 +02:00
shimon
04290730b2 refactor storage, databases usage display 2023-11-01 17:20:12 +02:00
prateek banga
fda4e6a8bd fixes typo in event label 2023-11-01 14:33:13 +05:30
Prateek Banga
2aa5c5742b remove unnecessary injection 2023-11-01 12:09:00 +05:30
prateek banga
f7529140bd adds event label to remaining messaging api 2023-10-31 23:53:46 +05:30
Prateek Banga
a719c3f46b adds event label to create providers endpoint 2023-10-31 23:17:58 +05:30
loks0n
af0d689aff feat: sessions scope 2023-10-31 15:05:02 +00:00
loks0n
4559cf77e9 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-31 12:08:48 +00:00
Christy Jacob
9fded16d3f
Merge pull request #7053 from appwrite/1.4.x
Sync main with 1.4.x
2023-10-31 12:27:08 +04:00
prateek banga
a01d361886 review changes 2023-10-31 01:12:31 +05:30
prateek banga
06daa544e8 review changes 2023-10-30 23:37:57 +05:30
德华 刘
744f2fbc1c chore: update project creation database allocation 2023-10-30 14:46:54 +00:00
Christy Jacob
e17bb94e39
Merge pull request #6495 from appwrite/fix-mails
Fix certificate emails and add support for variables in email template subject
2023-10-27 19:17:50 +04:00
Khushboo Verma
cba20d8b96 Addressed PR comments 2023-10-27 19:38:33 +05:30
Prateek Banga
bc6df4bab7 add recipients array check in API instead of worker 2023-10-27 13:42:27 +05:30
Steven Nguyen
836ce852ed
Refactor email templates
Update the mails worker to only be responsible for building the final
email using the base (layout) template and the user, team, project, and
redirect variables.

It is the responsibility of the controller to perform localization and
determine whether a custom or default email template should be used.
If the default one is used, it has to be rendered using the hello,
footer, thanks, and signature variables so that it matches the custom
template. Then, it can be sent to the worker.
2023-10-26 16:47:14 -07:00
Steven Nguyen
3206cee36f
Leave user placeholder in default email template
This matches up with the default template and gives the developer an
idea about the available variables and how to use them.
2023-10-26 16:23:58 -07:00
Steven Nguyen
70a3820009
Remove unused mail vars 2023-10-26 16:23:58 -07:00
Prateek Banga
5a9b1f0c24 removes provider from topics 2023-10-26 19:44:06 +05:30
loks0n
49425fb8fc test: fix 2023-10-26 15:04:47 +01:00
prateek banga
c2cd544948 review changes 2023-10-26 13:46:45 +05:30
Prateek Banga
34b3ed68ee adds total count for subscribers in topics model 2023-10-26 12:37:39 +05:30
prateek banga
f6f4397aab Merge branch 'providers-from-attribute' of https://github.com/appwrite/appwrite into review-changes-1.5.x 2023-10-25 23:55:45 +05:30
prateek banga
887eeef585 review changes 2023-10-25 23:09:38 +05:30
prateek banga
fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
loks0n
b4773a7fbd Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-25 13:20:42 +01:00
loks0n
3a9202a46b chore: christy feedback 2023-10-25 13:20:29 +01:00
shimon
4c6976488c clean up 2023-10-25 15:06:54 +03:00
shimon
b775c53666 clean up 2023-10-25 13:16:25 +03:00
shimon
c11b3ff522 workers start hook 2023-10-25 12:46:45 +03:00
shimon
b7675df9b9 usage workers 2023-10-25 11:38:44 +03:00
shimon
9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
Jake Barnby
d5b6421285
Merge remote-tracking branch 'origin/1.4.x' into sync-1.4.x-to-1.5.x
# Conflicts:
#	composer.lock
2023-10-24 19:46:57 +13:00
prateek banga
b60cbcada5 adds from field in remaining providers 2023-10-24 01:05:46 +05:30
loks0n
a67ca55af5 fix: use queueForEvents in users 2023-10-23 11:32:09 +01:00
Khushboo Verma
2cf8639b68 Resolve merge conflicts 2023-10-23 15:06:01 +05:30
德华 刘
3dee8d6ecd fix: update incorrect method call 2023-10-23 08:34:57 +00:00
Shimon Newman
808f682fa7
Update app/controllers/api/projects.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-10-23 11:25:31 +03:00
shimon
2ef8490691 fix mod condition 2023-10-23 11:22:28 +03:00
loks0n
1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
shimon
b09a254d3c fix mod condition 2023-10-23 10:46:15 +03:00
shimon
a841734d50 fix mod condition 2023-10-23 01:05:10 +03:00
shimon
ac231914d4 fix mod condition 2023-10-23 00:55:57 +03:00
shimon
0d5127d90b fix mod condition 2023-10-23 00:08:55 +03:00
德华 刘
00d2a5ffcd chore: update create projects endpoints 2023-10-22 18:33:15 +00:00
德华 刘
79612bd80f Merge branch 'main' of https://github.com/appwrite/appwrite into feat-sm-db 2023-10-22 18:30:14 +00:00
prateek banga
af40c63357 review changes 2023-10-20 17:02:13 +05:30
prateek banga
6c260223ba Merge branch '1.5.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 15:00:22 +05:30
prateek banga
161bbfb822 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.4.x-to-1.5.x 2023-10-20 14:55:17 +05:30
Prateek Banga
d714760eb8 review changeS 2023-10-20 13:51:13 +05:30
prateek banga
24b2d70441 review changes 2023-10-20 13:33:27 +05:30
prateek banga
e4d2d15f70 review changes 2023-10-20 13:31:56 +05:30
prateek banga
db9e7b0199 review changes 2023-10-20 13:28:23 +05:30
Christy Jacob
21b9716bb2
Merge pull request #6959 from appwrite/chore-update-backup-timings
chore: update backup timings
2023-10-19 20:40:43 +04:00
德华 刘
de8b9638d5 chore: update backup timings 2023-10-19 16:07:54 +00:00
shimon
8048766d28 queues fixes 2023-10-19 18:28:01 +03:00
Christy Jacob
01e842782f
Merge branch '1.4.x' into feat-1.4.6-release-prep 2023-10-19 05:28:02 -04:00
Christy Jacob
18dc8749d5 chore: update health API 2023-10-19 09:25:38 +00:00
prateek banga
99b5ac8669 adds push and sms controllers 2023-10-19 13:29:48 +05:30
Jake Barnby
354211950f
Add timeout test 2023-10-19 17:06:57 +13:00
Jake Barnby
b6b8fe7d51
Allow overriding timeout per request in dev mode 2023-10-19 16:19:40 +13:00
Jake Barnby
db3fa21468
Update database 2023-10-19 14:26:44 +13:00
Steven Nguyen
1d7c9d84d2
Fix get database queue endpoint params
A path param cannot be optional so change it to a query param.
2023-10-18 17:42:27 -07:00
Christy Jacob
3d7cd91176 chore: fix injections 2023-10-18 19:54:56 +00:00
Christy Jacob
be26e4b729 chore: remove resque library and update health check endpoints 2023-10-18 19:44:06 +00:00
Christy Jacob
133cb62b4e fix: update injection name 2023-10-18 19:07:17 +00:00
Christy Jacob
4724d729fb Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:59:51 +00:00
Christy Jacob
066dd6393d Merge branch 'refactor-workers-sn' of https://github.com/appwrite/appwrite into feat-delegate-deletes 2023-10-18 18:57:16 +00:00
Christy Jacob
72d0865ad8 chore: use deletes worker for deleting audit logs 2023-10-18 18:54:20 +00:00
Christy Jacob
050cb28d4f fix: incorrect events 2023-10-18 20:30:47 +04:00
Khushboo Verma
979054e5ca Merge branch 'main' into refactor-vcs-tests 2023-10-18 13:25:40 +05:30
Prateek Banga
4bef86d88b review changes 2023-10-18 13:19:21 +05:30
shimon
593e5ab316 some fixes 2023-10-17 22:08:01 +03:00
Prateek Banga
ffeb3f8fcf review work 2023-10-17 22:53:26 +05:30
Jake Barnby
dbfe5e45aa
Delegate custom deletes 2023-10-17 12:18:51 +13:00
Prateek Banga
4ccffb6649 adds graphql tests for topics, subcribers, email 2023-10-17 03:41:42 +05:30
shimon
2451d9fef1 Merge branch '1.4.x' of github.com:appwrite/appwrite into refactor-workers-sn
 Conflicts:
	src/Appwrite/Platform/Workers/Deletes.php
2023-10-16 17:06:59 +03:00
shimon
0e2c1c1f2d small fixes 2023-10-16 16:20:41 +03:00
loks0n
dfeb49951b Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-16 10:26:51 +01:00
shimon
94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03:00
Yatharth Verma
96f389cee5 merge 1.4.x changes to my branch 2023-10-14 11:57:40 +05:30
Bradley Schofield
5274f1234b Merge branch 'main' into feat-improve-migration-validations 2023-10-13 16:23:25 +01:00
Bradley Schofield
d4b53e5014 Run Linter 2023-10-13 16:23:20 +01:00
loks0n
250e9ae9f7 chore: cleanup pr 2023-10-13 16:10:55 +01:00
Torsten Dittmann
3778939605 fix: relative links to absolute 2023-10-13 15:43:23 +02:00
Khushboo Verma
f18d33a0d6 Resolved merge conflicts 2023-10-13 18:54:14 +05:30
Khushboo Verma
66ec7f2e1d VCS tests 2023-10-13 18:50:58 +05:30
Prateek Banga
feac25f401 adds already sent exception in update message 2023-10-13 18:35:49 +05:30
Prateek Banga
0b1b7646d5 review changes 2023-10-13 18:26:54 +05:30
loks0n
63d3a2bc73 chore: revert abuse-key changes 2023-10-13 11:08:25 +01:00
loks0n
07286e5864 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-13 11:05:22 +01:00
loks0n
81c4a9bbd5 chore: fmt 2023-10-13 11:05:14 +01:00
Prateek Banga
4a44fb3330 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-10-13 14:52:02 +05:30
Steven Nguyen
3f2f6ab43a
Ensure permissions are updated when a project moves orgs
Since the following collections also have permissions set to the team,
the team should be updated for consistency:

- installations
- repositories
- vcsComments
2023-10-12 17:34:53 -07:00
Steven Nguyen
3bb22c38cc
Update teamInternalId when updating project team
This is important because when an organization is deleted, projects are
fetched by the teamInternalId and if the teamInternalId is not updated
when the project team is updated, the project will be deleted if the
previous organization is deleted.
2023-10-12 17:03:45 -07:00
Khushboo Verma
bb75036efe WIP: Mocked GitHub installation 2023-10-13 01:45:27 +05:30
loks0n
8ab429b92f feat: replace session confirmation endpoints 2023-10-12 14:38:32 +01:00
Prateek Banga
cc1769ed41 review changes 2023-10-12 11:48:26 +05:30
loks0n
b299ed056e chore: rename $sessionSecret 2023-10-11 17:07:02 +01:00
loks0n
f9d6ebd3a0 docs: add descriptions to universal token endpoints 2023-10-11 16:31:32 +01:00
loks0n
e41fab769f fix: edge cases 2023-10-11 13:20:25 +01:00
shimon
893b1d0ba7 Merge branch 'main' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.gitmodules
	app/controllers/api/functions.php
	app/controllers/api/health.php
	app/init.php
	app/views/install/compose.phtml
	composer.lock
	src/Appwrite/Migration/Migration.php
	src/Appwrite/Platform/Workers/Builds.php
	src/Appwrite/Platform/Workers/Deletes.php
	src/Appwrite/Platform/Workers/Functions.php
	src/Executor/Executor.php
2023-10-11 12:08:13 +03:00
shimon
002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
Prateek Banga
17ba6355e0 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-10-10 19:52:19 +05:30
loks0n
c343d7550f chore: fmt 2023-10-10 14:41:02 +01:00
loks0n
c30c024805 test: fix magic url assertions 2023-10-10 14:36:53 +01:00
Prateek Banga
bb52647366 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-10 19:06:39 +05:30
loks0n
a88175fc46 fix: unhash session responses 2023-10-10 13:30:42 +01:00
Prateek Banga
1e5a2a78aa Merge branch '1.4.x' of https://github.com/appwrite/appwrite into sync-1.5.x-with-1.4.x 2023-10-10 17:46:44 +05:30
loks0n
c4e82e4191 fix: edge cases 2023-10-09 14:49:07 +01:00
Prateek Banga
a77a212e2c adds scheduling for messaging worker 2023-10-09 17:29:26 +05:30
shimon
e2989afda8 queueForBuilds fix via functions controller 2023-10-09 13:28:06 +03:00
shimon
24e09d3d8e queueForBuilds fix via functions controller 2023-10-09 13:16:05 +03:00
shimon
31466c44d8 update projects database 2023-10-08 16:44:14 +03:00
Bradley Schofield
9cb1cf418c Improve Error Handling and Add more Validation 2023-10-06 17:02:01 +01:00
Prateek Banga
a92390dda2 review changes 2023-10-06 19:23:46 +05:30
Prateek Banga
d842191cc6 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-10-06 03:53:16 +05:30
Prateek Banga
d5cc214546 Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x 2023-10-06 03:44:36 +05:30
Prateek Banga
8e9f270ef0 update id param 2023-10-06 03:30:47 +05:30
shimon
948f36a023 sync with 1.4 2023-10-05 16:15:39 +03:00
Prateek Banga
22d445587e review changes 2023-10-05 16:57:48 +05:30
loks0n
e94631f730 fix: token verification 2023-10-05 11:18:19 +01:00
Christy Jacob
32ba34cba5 chore: add database overrides 2023-10-05 05:58:52 +00:00
Christy Jacob
adbbb6dc20 chore: add database overrides 2023-10-05 05:53:49 +00:00
Prateek Banga
fb98d21ae5 adds graphql test cases for provider endpoints 2023-10-05 02:12:04 +05:30
Prateek Banga
5891872fad Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-10-04 17:27:56 +05:30
Prateek Banga
c9c49158a3 changes to validator length 2023-10-04 16:24:29 +05:30
Prateek Banga
61785ab35a typo fix 2023-10-04 16:19:05 +05:30
Prateek Banga
48b91e39a8 review changes 2023-10-04 16:15:59 +05:30
shimon
7f1507f810 sync with 1.4 2023-10-04 11:20:32 +03:00
shimon
e3668a4d06 sync with 1.4 2023-10-03 21:56:36 +03:00
shimon
429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
Christy Jacob
ff3c25d352 chore: update database 2023-10-02 22:23:35 +00:00
Christy Jacob
29ad61d461 chore: update database 2023-10-02 22:01:42 +00:00
Christy Jacob
b456c9df2c chore: remove DB creates 2023-10-02 21:32:05 +00:00
shimon
2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
shimon
75d8741eaa sync against master 2023-10-01 21:30:52 +03:00
shimon
b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
Matej Bačo
1502bfef74 Increase timeout 2023-09-30 17:24:09 +02:00
Matej Bačo
78dd0ca439 Merge branch 'cl-1.4.x' into patch-sync-exec-timeout 2023-09-30 16:02:33 +02:00
Christy Jacob
43de260b33
Merge pull request #6366 from appwrite/1.4.x
Update cl-1.4.x
2023-09-30 10:02:15 -04:00
Matej Bačo
d9f2f1c37b Introduce execution sync timeout 2023-09-30 11:54:54 +02:00
Steven Nguyen
9d47237da9
Merge branch '1.4.x' into fix-skip-non-ascii-chars-image 2023-09-29 11:07:31 -07:00
Bradley Schofield
1136dc9e64 Add Test and don't stop on special char 2023-09-29 16:27:59 +01:00
Bradley Schofield
615d61d962 Merge branch '1.4.x' into fix-skip-non-ascii-chars-image 2023-09-29 09:21:17 +01:00
Christy Jacob
a65c1c1ee5 chore: fix merge conflict 2023-09-28 22:22:44 +00:00
loks0n
739be813e0 feat: oauth ssr token flow 2023-09-28 13:45:52 +01:00
loks0n
5ed2da4cf1 feat: add userId to abuse-keys 2023-09-28 11:33:01 +01:00
loks0n
b8f2c1deec chore: revert oauth workaround 2023-09-28 11:26:44 +01:00
loks0n
ef93c59698 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-09-28 11:21:26 +01:00
Christy Jacob
ac844d33ef Merge branch '1.4.x' of https://github.com/appwrite/appwrite into cl-1.4.x 2023-09-27 23:25:48 +00:00
Christy Jacob
9fa93e0449 chore: review comments 2023-09-27 22:13:03 +00:00
Matej Bačo
e58bf7f695 Rename audits back to logs 2023-09-27 21:24:56 +00:00
Matej Bačo
5120152369 Add all worker health endpoints 2023-09-27 21:24:41 +00:00
Christy Jacob
50600d6f2a
Merge pull request #6343 from appwrite/master
Merge master into 1.4.x
2023-09-27 17:20:32 -04:00
shimon
dcf0107a79 sync with master 2023-09-27 20:10:21 +03:00
shimon
c4bd6e008e Merge branch 'master' of github.com:appwrite/appwrite into refactor-workers
 Conflicts:
	.env
	app/cli.php
	app/config/collections.php
	app/console
	app/controllers/api/account.php
	app/controllers/api/databases.php
	app/controllers/api/functions.php
	app/controllers/api/projects.php
	app/controllers/api/storage.php
	app/controllers/api/teams.php
	app/controllers/api/users.php
	app/controllers/general.php
	app/controllers/shared/api.php
	app/init.php
	app/worker.php
	app/workers/audits.php
	app/workers/builds.php
	app/workers/certificates.php
	app/workers/databases.php
	app/workers/deletes.php
	app/workers/functions.php
	app/workers/mails.php
	bin/worker-usage
	composer.json
	composer.lock
	docker-compose.yml
	src/Appwrite/Event/Delete.php
	src/Appwrite/Event/Mail.php
	src/Appwrite/Platform/Tasks/Maintenance.php
2023-09-27 18:51:17 +03:00
Vincent (Wen Yu) Ge
86f0e6008c
Merge branch 'master' into sentence-case 2023-09-27 11:11:58 -04:00
Prateek Banga
90352c57ac Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-27 18:58:18 +05:30
Prateek Banga
234f7f003b updated test cases for msg91 provider, moves worker to use provider from settings 2023-09-27 18:58:00 +05:30
Prateek Banga
63bd4d6daf Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-27 16:57:07 +05:30
Prateek Banga
a0858ccc4e adds message description, options to mailgun provider 2023-09-26 13:12:44 +05:30
Steven Nguyen
4a0c77a8df
Update avatar font and default colors 2023-09-25 15:55:15 -07:00
Christy Jacob
2273cb50b4 Merge branch '1.4.x' of github.com:appwrite/appwrite into cl-1.4.x 2023-09-26 00:02:19 +04:00
Matej Bačo
c35f05f495 Increase max body size 2023-09-25 11:12:41 +02:00
Matej Bačo
725897c896 Rename audits back to logs 2023-09-24 14:36:20 +02:00
Matej Bačo
24204bce54 Add all worker health endpoints 2023-09-24 14:07:37 +02:00
Yatharth Verma
6b47999120 fix conflicts 2023-09-22 22:56:07 +05:30
Yatharth Verma
f07f246f8d fix conflicts 2023-09-22 22:53:41 +05:30
Christy Jacob
9dde039adf
Merge pull request #6290 from appwrite/fix-deployment-delete
Fix deployment delete
2023-09-22 11:37:50 -04:00
Prateek Banga
e00b273577 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-21 22:19:30 +05:30
Prateek Banga
e2acb608fa fix tests with real sms providers 2023-09-21 22:16:02 +05:30
Prateek Banga
d63eaf3ef0 fixes get message endpoint 2023-09-21 21:49:40 +05:30
Prateek Banga
06a05a3358 adds param messageId in send an email endpoint, tokenId as messageId in create phone session, membershipId as messageId in create team membership 2023-09-21 21:17:15 +05:30
Prateek Banga
3ebcfe548d Adds get message endpoint 2023-09-21 16:26:53 +05:30
Prateek Banga
342f122365 adds key auth to providers endpoint 2023-09-21 16:18:20 +05:30
Prateek Banga
b4de44c905 fix small bug in worker and send email endpoint 2023-09-21 16:12:56 +05:30
Christy Jacob
c7e6efc050 chore: update backups schedule 2023-09-21 10:23:55 +00:00
Steven Nguyen
9ca82b7662
Fix missing resourceInternalId on deployments 2023-09-20 19:26:23 -07:00
Prateek Banga
39854239fb skip authorization in adding subscriber on targets 2023-09-21 02:29:57 +05:30
Prateek Banga
0510de5eab Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-20 23:37:35 +05:30
Prateek Banga
35d842171c review changes 2023-09-20 23:37:10 +05:30
Prateek Banga
87011af914 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-20 23:00:48 +05:30
Prateek Banga
975b444761 fix test cases and bug fix in messaging worker 2023-09-20 20:51:03 +05:30
Prateek Banga
8d9e0ae7d0 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-20 17:53:08 +05:30
Prateek Banga
3456ad4e8c fixes merge conflict issue 2023-09-20 17:52:25 +05:30
Prateek Banga
afef225339 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-20 17:39:36 +05:30
Prateek Banga
f9030132a5 messaging worker logic to send message to providers batch limit 2023-09-20 17:38:29 +05:30
Prateek Banga
a2e34b5b64 Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-20 16:59:07 +05:30
Prateek Banga
67397cd763 fix tests and code changes 2023-09-20 15:55:22 +05:30
Prateek Banga
bd36a09473 adds search in messaging controllers, updated mailgun endpoint with isEu param 2023-09-19 15:36:40 +05:30
Matej Bačo
007d6953bf PR review changes 2023-09-19 09:21:11 +02:00
Jake Barnby
9ba609c46e
Merge pull request #6238 from appwrite/1.4.x
1.4.x
2023-09-15 18:49:55 -04:00
Christy Jacob
2ea8dbff29 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-bun-support 2023-09-14 15:21:31 +00:00
Prateek Banga
350549db7d Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-add-messaging-response-models 2023-09-14 02:17:34 +05:30
Prateek Banga
15dd6863dd removes comments 2023-09-14 01:07:30 +05:30
Prateek Banga
f8c9c2f39b fixes manual internal id insertion 2023-09-14 00:48:50 +05:30
Matej Bačo
0690b00c30 Add Bun auto detection 2023-09-13 21:08:49 +02:00
prateek banga
4bb611efc4 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-13 17:48:18 +05:30
prateek banga
0066216bef adds enabled param for provider endpoints and review changes 2023-09-13 17:47:38 +05:30
Prateek Banga
fbd4712a72 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-13 00:54:02 +05:30
Prateek Banga
d742b0c0a9 removes provider type from create user target 2023-09-13 00:53:25 +05:30
Steven Nguyen
6b0c24a9d6
Update user creation from teams and users services to not set accessedAt
accessedAt should only be updated when a user performs some sort of
action. Creating a user via the users API or by adding them to a team
is an action done by someone else, not the user themselves. As such,
the accessedAt timestamp shouldn't update.
2023-09-12 12:05:11 -07:00
Prateek Banga
420eb8857a Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-13 00:07:32 +05:30
Prateek Banga
6affa6b5a0 Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider 2023-09-13 00:07:09 +05:30
Prateek Banga
11a458f1df change providers to authProviders in remaining places 2023-09-13 00:06:18 +05:30
Binyamin Yawitz
5cb03da001 Extracting function event validator to its own class. 2023-09-11 23:24:11 -04:00
Prateek Banga
32970ba8a0 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-11 19:54:24 +05:30
Prateek Banga
2ecf9ee98a udpates send email endpoint according to collection changes 2023-09-11 19:53:48 +05:30
Matej Bačo
93e2a4fb8d Add v2 old vars support 2023-09-11 12:22:16 +02:00
Matej Bačo
418c8e3764 Fix redeploys 2023-09-07 11:33:42 +02:00
Christy Jacob
12b03f3fb0
Merge pull request #6162 from appwrite/fix-webhook-secret-validation
Fix webhook secret validation and executor path validation
2023-09-06 13:59:13 -04:00
Vincent (Wen Yu) Ge
3bc085ea3f
Update app/controllers/api/vcs.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-09-06 13:57:46 -04:00
Christy Jacob
4ea0541623
Merge pull request #6150 from appwrite/fix-global-vars
Fix: Global variables
2023-09-06 13:51:13 -04:00
Khushboo Verma
39a4447103 Update webhook secret check 2023-09-06 22:34:03 +05:30
Christy Jacob
db763b180c
Merge pull request #6142 from appwrite/fix-v2-functions
Fix: v2 functions
2023-09-06 12:43:51 -04:00
Matej Bačo
6964477429 Increase labels maximum limit 2023-09-06 18:15:03 +02:00
prateek banga
a81006e961 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-06 16:31:07 +05:30
prateek banga
15773a3561 sets the correct response for send email 2023-09-06 16:30:46 +05:30
prateek banga
06361828a9 Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-06 15:41:19 +05:30
prateek banga
039e717d72 fixes in send email endpoint 2023-09-06 15:40:56 +05:30
Bradley Schofield
8e0e131824 Remove Special Chars from Initials 2023-09-06 09:54:59 +01:00
Khushboo Verma
0fbe9d6ce9 Revert allowing empty string in path 2023-09-06 13:46:01 +05:30
Matej Bačo
9060aa1ba7 Remove unnessessary cache clear 2023-09-06 09:53:02 +02:00
Khushboo Verma
af4be4051f Skip validation if webhook secret is empty 2023-09-06 13:12:27 +05:30
shimon
45f16e560c sync against master 2023-09-05 21:17:54 +03:00
Bradley Schofield
8357d20be7 Make URL optional for API and Serverside Requests 2023-09-05 19:13:47 +01:00
prateek banga
3d286a2171 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-09-05 23:10:59 +05:30
prateek banga
38d81c058b lint fix 2023-09-05 23:10:33 +05:30
prateek banga
6aa443454b Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller 2023-09-05 22:58:43 +05:30
prateek banga
78a53aee37 adds messaging event and updates messaging worker 2023-09-05 22:40:48 +05:30
shimon
ec93239630 Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/config/collections.php
	app/controllers/api/storage.php
	app/controllers/shared/api.php
	app/init.php
	app/workers/deletes.php
2023-09-05 19:19:59 +03:00
Matej Bačo
8e509efcec Add global env var test 2023-09-05 13:55:02 +02:00
Matej Bačo
79726dbfb6 Fix formatting 2023-09-05 13:16:20 +02:00
Matej Bačo
5538c47b3f Improve installation exception when missconfigured 2023-09-05 12:14:43 +02:00
Matej Bačo
1a6530fb57 Fix project variables 2023-09-05 10:21:36 +02:00
Matej Bačo
7588a9c4ec Make v2 functions work again 2023-09-04 19:53:25 +02:00
Christy Jacob
22745e0418
Merge pull request #6125 from appwrite/fix-functions-backwards-compatibility
Fix CLI backwards compatibility
2023-09-04 12:28:03 -04:00
Steven Nguyen
605ee2f7c5
Update create deployment default commands
Default to function commands only if commands weren't supplied.
2023-09-04 09:04:15 -07:00
Steven
62065a1c33 Fix create phone session abuse key
Create phone session doesn't have anything to do with email. The key
name should be email just for clarity (even though, technically, it
doesn't matter).
2023-09-03 21:37:02 +00:00
Steven Nguyen
a609759951
Make runtime optional when updating a function
This is important for backwards compatibility since it wasn't possible
to update a function runtime in previous versions and it was never
included in the request.
2023-09-02 16:37:40 -07:00
Jake Barnby
f47aa91ff1
Merge pull request #6109 from appwrite/fix-1.4-bugs
Fix events not triggering functions and path not a string bugs
2023-09-01 15:15:55 -04:00
Khushboo Verma
7013bc94a6 Fix events triggering functions and path not a string bugs 2023-09-01 21:15:53 +05:30
Steven Nguyen
9bc6011876
Fix fileSecurity check
Because of the `getAttributes()` call, `$fileSecurity` was always true
which lead to invalid permission check. This resulted in files being
deleted when a user had delete permissions on the file even though
they didn't on the bucket.
2023-08-31 20:28:13 -07:00
prateek banga
82e165c4c3 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-31 18:33:02 +05:30
prateek banga
1762c81b8d Merge branch 'feat-messages-event-config' into feat-mailgun-provider 2023-08-31 18:32:26 +05:30
prateek banga
e104e6d0f2 Merge branch 'feat-add-messaging-collections-in-config' into feat-add-messaging-providers 2023-08-31 18:16:48 +05:30
Jake Barnby
fdb7218978
Update firebase connect scope 2023-08-30 22:48:51 -04:00
Jake Barnby
922332042e
Fix template strings 2023-08-30 20:31:11 -04:00
Christy Jacob
5dbec3d406 chore: remove redundant attribute 2023-08-30 18:43:09 -04:00
Christy Jacob
4e19c94d08 Merge branch '1.4.x' of github.com:appwrite/appwrite into fix-email-templates 2023-08-30 18:40:39 -04:00
Christy Jacob
21dc3b16b0 chore: update changelog 2023-08-30 18:36:40 -04:00
Christy Jacob
861921526e fix: remove redundant name property 2023-08-30 18:34:20 -04:00
Christy Jacob
74012158b3 fix: variable names 2023-08-30 17:54:26 -04:00
Christy Jacob
05615d1449 fix: missing variable in email templates 2023-08-30 17:52:55 -04:00
Christy Jacob
75e957ed4a fix: missing variable in email templates 2023-08-30 17:48:25 -04:00
Jake Barnby
fc3ff188b1
Fix VCS + migrations scopes 2023-08-30 14:44:33 -04:00
Torsten Dittmann
3b2cb9b868
Merge pull request #6059 from appwrite/fix-smtp
Fix smtp
2023-08-30 16:09:10 +02:00
Torsten Dittmann
e507fb6715 fix: hide services from server/client sdks 2023-08-30 13:28:43 +02:00
Torsten Dittmann
0427c2e4eb chore: generate 1.4.x specs 2023-08-30 11:19:55 +02:00
Eldad A. Fux
7835fa9bbc
Update app/controllers/api/proxy.php 2023-08-30 09:43:23 +03:00
Eldad A. Fux
75a9b2c1c5
Update app/controllers/api/console.php 2023-08-30 09:43:11 +03:00
Jake Barnby
ff16fd7d9c
Check link after fetching page as well 2023-08-30 02:14:19 -04:00
Jake Barnby
085b50be8b
Check if host is public domain before requesting 2023-08-30 02:04:52 -04:00
Jake Barnby
d3929a5bae
Fix forced username and password requirement 2023-08-30 01:31:02 -04:00
Jake Barnby
3d0ae4b9d9
Remove invites codes 2023-08-30 00:31:38 -04:00
Jake Barnby
a1d0b67c6b
Fix SMTP 2023-08-30 00:30:44 -04:00
Jake Barnby
07f8e9411a
Apply suggestions from code review 2023-08-29 13:41:40 -04:00
Khushboo Verma
1293e7bc5f Optimised list repositories endpoint 2023-08-29 23:07:34 +05:30
prateek banga
24eabf29d0 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-29 22:30:02 +05:30
prateek banga
112c7a5133 adds default attribute for providers 2023-08-29 22:29:48 +05:30
Matej Bačo
c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
prateek banga
1d6276eb9f lint fix 2023-08-28 20:43:18 +05:30
prateek banga
264f0bd5dd adds subscriber controllers 2023-08-28 20:41:05 +05:30
Matej Bačo
d4acbcf4f0 Add domain_enabled var 2023-08-28 16:08:50 +02:00
Matej Bačo
f130a9ebc9 linter fix 2023-08-28 14:21:35 +02:00
Matej Bačo
89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Bradley Schofield
82f400d177 Add more HTML back 2023-08-28 09:03:55 +01:00
Bradley Schofield
88d48715c5 Run Linter 2023-08-28 06:53:26 +01:00
Bradley Schofield
11dca76a70 Update teams.php 2023-08-28 06:53:02 +01:00
Bradley Schofield
1be5f58fd9 Update account.php 2023-08-28 06:14:43 +01:00
Bradley Schofield
ee0563c46f Cover other routes and cleanup code 2023-08-28 06:09:28 +01:00
Bradley Schofield
1f1e7dd397 Remove Testing Bypasses 2023-08-28 05:55:40 +01:00
Bradley Schofield
608b6b3847
Continue work 2023-08-27 23:45:37 +01:00
Matej Bačo
596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
prateek banga
639fae3156 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-25 16:03:37 +05:30
prateek banga
d7c8562260 removes target controllers from account service 2023-08-25 16:02:46 +05:30
prateek banga
24853004f9 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-25 04:49:02 +05:30
prateek banga
9be0592dab lint fix 2023-08-25 04:46:15 +05:30
prateek banga
a266682951 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-25 04:44:13 +05:30
prateek banga
94b7f67e44 changes id to providerId for provider create controllers 2023-08-25 04:43:40 +05:30
prateek banga
d0c50403c8 adds test cases for topic controller 2023-08-25 04:36:41 +05:30
prateek banga
f835e1b52e Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-25 03:01:38 +05:30
prateek banga
048e8e81ba removes permission from provider controllers 2023-08-25 02:59:06 +05:30
prateek banga
33028ebbf2 Merge branch 'feat-mailgun-provider' into feat-topics-controller 2023-08-25 02:34:10 +05:30
prateek banga
33f4bd6ac4 adds custom id for provider controlers, fixes subquery 2023-08-25 02:32:51 +05:30
prateek banga
52f6b72f23 adds topic controllers 2023-08-25 01:45:17 +05:30
prateek banga
df77f92860 adds sub query for targets and topics, permission for user target 2023-08-25 01:22:16 +05:30
Matej Bačo
293e44e91e Introduce SMTP ping timeout 2023-08-24 13:04:49 +02:00
prateek banga
eafea1c41d formats messaging controller 2023-08-24 14:31:22 +05:30
prateek banga
5ca8dc0a73 merge cl-1.4.x 2023-08-24 14:10:26 +05:30
prateek banga
e8cc60b0c2 adds audit resource in messaging controllers 2023-08-24 14:05:51 +05:30
prateek banga
82d220e158 fixes audit events 2023-08-24 13:43:30 +05:30
Jake Barnby
55deaec8b2
Fix missing env 2023-08-23 17:53:24 -04:00
prateek banga
a95c29d546 lint fix 2023-08-24 01:55:08 +05:30
prateek banga
ec54000263 adds test for target controllers 2023-08-24 01:54:25 +05:30
prateek banga
ac33d7828f Revert "Pint linter ran"
This reverts commit bf5f0a8419.
2023-08-24 01:53:52 +05:30
wess
bf5f0a8419 Pint linter ran 2023-08-23 13:12:43 -04:00
Matej Bačo
8802e318d5 Fix pools resource 2023-08-23 13:52:17 +02:00
prateek banga
c225563d77 adds test for provider controllers 2023-08-23 15:31:29 +05:30
Matej Bačo
bdc9cb5bb5 QA changes 2023-08-23 10:29:01 +02:00
Matej Bačo
43b1c196e0 Merge branch 'feat-git-integration' into feat-git-integration-copy 2023-08-23 10:16:23 +02:00
Jake Barnby
3ec84986b2
Fix project imports 2023-08-22 22:04:36 -04:00
Jake Barnby
2286c7a4b7
Fix param order 2023-08-22 22:03:12 -04:00
Jake Barnby
c99288229f
Add back missing route 2023-08-22 21:36:32 -04:00
Jake Barnby
537756551e
Fix missing accessedAt 2023-08-22 21:36:04 -04:00
Jake Barnby
339893f4f1
Fix param order 2023-08-22 21:35:27 -04:00
Jake Barnby
43ba14fb75
Fix console tests 2023-08-22 21:35:00 -04:00
Jake Barnby
a84e669a1f
Add missing accessedAt values when creating users 2023-08-22 21:34:23 -04:00
Jake Barnby
efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
# Conflicts:
#	app/controllers/api/users.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04:00
Vincent (Wen Yu) Ge
31b8c77b5c Fix typos, improve a few errors 2023-08-22 20:30:00 +00:00
Vincent (Wen Yu) Ge
07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00:00
Jake Barnby
87b72e4d0d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4-request-response-filters 2023-08-22 16:01:19 -04:00
Jake Barnby
00dd77e930
Fix exception condition 2023-08-22 14:14:57 -04:00
Jake Barnby
c3682362e9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:44 -04:00
Jake Barnby
c929fe113e
Fix colliding ID overrides 2023-08-22 13:11:32 -04:00
prateek banga
ab89abfc89 lint fix 2023-08-22 22:16:09 +05:30
prateek banga
78385a59c6 adds remaining provider controllers 2023-08-22 22:15:31 +05:30
Matej Bačo
eea43e17bd Fix function request filter 2023-08-22 15:16:07 +02:00
prateek banga
9f19bec7a7 lint fix 2023-08-22 18:21:30 +05:30
Matej Bačo
e345ef071a Allow custom deployment entrypoint 2023-08-22 11:47:10 +02:00
Matej Bačo
7c1a387a37 Improve commands quality 2023-08-22 10:16:17 +02:00
Jake Barnby
b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	app/controllers/api/functions.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Vincent (Wen Yu) Ge
caf6bcae95 Remove mention of environment variables in docs 2023-08-22 04:16:41 +00:00
Jake Barnby
6c67172fd7
Fix missing ID 2023-08-21 23:45:32 -04:00
Jake Barnby
942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
Eldad A. Fux
8e46bdf7cb
Merge branch 'feat-git-integration' into feat-usage-rollback 2023-08-21 22:46:09 +03:00
Matej Bačo
fedac9592b Fix id null schedule bug 2023-08-21 19:43:03 +02:00
prateek banga
4406c7bd55 adds messaging worker and send an email controller 2023-08-21 22:15:15 +05:30
Matej Bačo
7c184498bb Fix GitHub app auth and migrations 2023-08-21 15:16:02 +02:00
Bradley Schofield
b7d053f60d
Update migrations.php 2023-08-21 13:42:02 +01:00
Khushboo Verma
d5968f3f2a Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-21 17:03:40 +05:30
shimon
1969ea9d16 rolling back usage flow 2023-08-21 13:50:45 +03:00
shimon
722a7ce8c9 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback 2023-08-21 13:50:34 +03:00
prateek banga
a6d613542b adds messaging api controlle for mailgun provider 2023-08-21 16:14:50 +05:30
Bradley Schofield
9d88017e1f
Add Download Deployment Function 2023-08-21 11:21:18 +01:00
shimon
7ba42b0d6c rolling back usage flow 2023-08-21 11:53:00 +03:00
prateek banga
fe8b8d3dc6 fix lint 2023-08-21 14:14:06 +05:30
prateek banga
5e3065c30a merge resolve conflicts 2023-08-21 14:07:18 +05:30
shimon
3cca907465 rolling back usage flow 2023-08-21 11:10:23 +03:00
shimon
99a43dec8c rolling back usage flow 2023-08-21 10:34:34 +03:00
shimon
f261ef8b70 rolling back usage flow 2023-08-21 10:31:12 +03:00
shimon
e86286e7e3 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
 Conflicts:
	composer.lock
2023-08-20 18:07:57 +03:00
shimon
83ffea68d1 rolling back usage flow 2023-08-20 16:53:26 +03:00
shimon
8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Khushboo Verma
e83f0f7b56 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-20 15:13:13 +05:30
Khushboo Verma
afbadf9322 Add search attribute to redeploy endpoint 2023-08-20 15:13:05 +05:30
Matej Bačo
60d24e0072 Downgrade assistant 2023-08-20 11:42:17 +02:00
Matej Bačo
20a2d3755e Add vars for Console 2023-08-20 10:10:42 +02:00
Matej Bačo
efe3793679 PR review changes, fix node test 2023-08-19 20:26:47 +02:00
Khushboo Verma
78a224be14 Fix deployment creation on branch creation 2023-08-19 18:24:43 +05:30
Khushboo Verma
3305e300b1 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-19 18:21:40 +05:30
Khushboo Verma
1284449765 Fixed GitHub comments 2023-08-19 18:21:27 +05:30
Matej Bačo
5de7c24ee8 Fix more function tests 2023-08-19 13:37:45 +02:00
Jake Barnby
9b2226b243
Fix manual and VCS redeploys 2023-08-19 02:15:47 -04:00
prateek banga
36a5d1e245 adds remaining controllers for target in account and users 2023-08-18 23:28:12 +05:30
Jake Barnby
1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks 2023-08-18 13:25:21 -04:00
Jake Barnby
a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# 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.json
#	composer.lock
2023-08-18 13:23:35 -04:00
Bradley Schofield
0ebd6d43d5
Merge branch 'feat-git-integration' into feat-git-integration-migrations 2023-08-18 11:18:58 +01:00
Khushboo Verma
c1b7b6cd0d Update limits 2023-08-18 12:44:13 +05:30
Khushboo Verma
76c3eb5c65 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-18 12:26:11 +05:30
Khushboo Verma
00f6785818 Addressed PR comments 2023-08-18 12:25:44 +05:30
Jake Barnby
a3895b041a
Apply suggestions from code review 2023-08-17 21:48:21 -04:00
Jake Barnby
a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# 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
2023-08-17 19:54:25 -04:00
Jake Barnby
a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# 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
2023-08-17 19:51:36 -04:00
Jake Barnby
92c39470be
Merge pull request #5800 from appwrite/fix-team-update-membership
Update method name for `updateMembershipRoles`
2023-08-17 19:43:56 -04:00
Jake Barnby
861ed521a0
Merge branch '1.4.x' into fix-team-update-membership
# Conflicts:
#	app/config/specs/open-api3-1.4.x-client.json
#	app/config/specs/open-api3-1.4.x-console.json
#	app/config/specs/open-api3-1.4.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.4.x-client.json
#	app/config/specs/swagger2-1.4.x-console.json
#	app/config/specs/swagger2-1.4.x-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2023-08-17 17:51:24 -04:00
Jake Barnby
3c3326260a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	composer.lock
2023-08-17 17:39:26 -04:00
Jake Barnby
07c985ebc3
Fix missing params from redeploy event 2023-08-17 17:37:52 -04:00
prateek banga
f73b3bf272 deletes user cache document 2023-08-18 01:07:42 +05:30
Bradley Schofield
e8056834aa
Run Formatter 2023-08-17 15:55:28 +01:00
Bradley Schofield
6577fc17a9
Remove ./vendor import and add missing envvars 2023-08-17 15:54:19 +01:00
Khushboo Verma
4285d99f08 Added exception for repo creation + small fixes 2023-08-17 19:24:57 +05:30
prateek banga
27df545fb7 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into fix-5404-update-document-without-relation-permission 2023-08-17 19:15:33 +05:30
prateek banga
860e9958c7 lint fix 2023-08-17 19:04:41 +05:30
prateek banga
c83e4db23d lint fix 2023-08-17 19:02:07 +05:30
prateek banga
07b7a9db0f adds controller for creating a user target 2023-08-17 17:24:45 +05:30
Jake Barnby
414d85be8e
Update mode checks 2023-08-16 17:58:25 -04:00
Jake Barnby
b6ffb385a7
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-16 15:55:19 -04:00
Bradley Schofield
47b10fa82b
Implement IAM Custom Roles 2023-08-16 18:17:20 +01:00
Bradley Schofield
a0cd65b94b
Fix Migrations Stability 2023-08-16 16:01:56 +01:00
prateek banga
e53f189b3b lint fix 2023-08-16 20:17:36 +05:30
prateek banga
c7dec3762b Adds getTarget and list targets controller to user and account 2023-08-16 20:13:38 +05:30
prateek banga
92e587769a resolve merge conflicts 2023-08-16 15:16:45 +05:30
Matej Bačo
3a6f10fa62 Fix failing tests 2023-08-16 08:19:42 +02:00
Jake Barnby
8820d422be
Update app/controllers/api/databases.php 2023-08-14 20:45:05 -04:00
Jake Barnby
4ddb0ce6a7
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param 2023-08-14 19:37:37 -04:00
Jake Barnby
c00c5119b2
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-14 19:33:56 -04:00
prateek banga
8e1ef812d3 resolve merge conflicts 2023-08-14 21:59:24 +05:30
Damodar Lohani
9d15f70db5 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2 2023-08-13 00:45:11 +00:00
Matej Bačo
ec82fec59f Re-enable assistant 2023-08-12 21:08:44 +02:00
Matej Bačo
c24e2786fb Even more PR review changes 2023-08-11 18:52:13 +02:00
Matej Bačo
f0125ac3bb PR review changes 2023-08-11 18:44:05 +02:00
Matej Bačo
897d299ae6 PR review changes, fixes from QA 2023-08-11 15:34:57 +02:00
prateek banga
971ebbc686 fix test cases 2023-08-11 16:17:31 +05:30
Matej Bačo
1bd96228bf Fix file responses from router 2023-08-11 11:19:05 +02:00
Matej Bačo
5032fd7d08 Fix AI endpoints 2023-08-11 09:52:08 +02:00
Jake Barnby
16cb495a41
Lint 2023-08-10 21:31:31 -04:00
Jake Barnby
6cd0e328d9
Review fixes 2023-08-10 16:44:38 -04:00
Bishwajeet Parhi
d0755a587f Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-10 22:31:53 +05:30
Khushboo Verma
dfd686436a Fix fetch commit details condition 2023-08-10 17:52:10 +05:30
prateek banga
8cefc54ca3 merge resolve conflicts 2023-08-10 17:22:15 +05:30
Matej Bačo
2a94dacdd1 Fix deployment issues from QA server 2023-08-10 02:31:49 +02:00
Matej Bačo
b9c52d8583 QA after merge fix 2023-08-10 01:44:00 +02:00
Matej Bačo
899bc38069 Merge branch 'cl-1.4.x' into feat-git-integration 2023-08-10 01:12:09 +02:00
Matej Bačo
75e66e675b Move oauth secret to identity 2023-08-10 01:02:13 +02:00
Bradley Schofield
d001f14249
Add Service Account Role Assignment 2023-08-09 23:46:23 +01:00
Matej Bačo
3ed4a65828 Fix VCS after lib upgrade 2023-08-09 23:00:04 +02:00
Matej Bačo
a2a50d066b More deployment changes 2023-08-09 20:00:25 +02:00
Khushboo Verma
ced6eed6fa Add urls in deployment details 2023-08-09 23:05:23 +05:30
Bradley Schofield
fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-09 18:08:40 +01:00
Bradley Schofield
0d58d20635
Update Migration Lib 2023-08-09 18:08:10 +01:00
Steven Nguyen
09254aeae0
Add description for the delete account identity's identityId param 2023-08-09 09:25:29 -07:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-09 09:01:29 -07:00
Khushboo Verma
a63a668601 Add additional deployment info 2023-08-09 21:23:58 +05:30
Bradley Schofield
1135060681
Start work on identities implementation 2023-08-09 16:18:17 +01:00
Christy Jacob
7d60e4272d Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations 2023-08-09 13:59:44 +00:00
Khushboo Verma
e267349a88 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-09 16:33:49 +05:30
Khushboo Verma
056b7120a6 Add additional information to deployments 2023-08-09 16:24:46 +05:30
Matej Bačo
9d0eda68d6 Upgrade after conflict 2023-08-09 12:35:04 +02:00
Matej Bačo
93735ac4a7 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-09 12:30:45 +02:00
Matej Bačo
a60b54f434 Use identities table 2023-08-09 11:52:34 +02:00
Khushboo Verma
c6cdc0c37c Fix broken functions flow 2023-08-09 13:16:17 +05:30
Eldad A. Fux
6ce3045f89
Merge pull request #5921 from appwrite/feat-user-identities-git-integration
Separate OAuth2 info from Sessions into Identities
2023-08-09 10:18:43 +03:00
Jake Barnby
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04:00
prateek banga
4d03610755 resolve merge conflicts 2023-08-09 03:23:45 +05:30
Christy Jacob
c009a12a25 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into 1.4.x 2023-08-08 20:51:31 +00:00
Jake Barnby
b196914638
Fix console/API key checks 2023-08-08 15:46:01 -04:00
Bradley Schofield
47ebf77ff0 Continue work on OAuth Firebase last stage 2023-08-08 20:28:38 +01:00
prateek banga
51ceb5d74a prohibit select queries in list attributes and remove static method 2023-08-09 00:12:53 +05:30
Christy Jacob
82a206d808 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-08-08 16:48:59 +00:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-08 08:34:01 -07:00
Bradley Schofield
f0477a7f2b Move collections and update redirect sig 2023-08-08 14:36:44 +01:00
Matej Bačo
26aa37ccf0 Linter fix 2023-08-08 11:46:43 +02:00
Matej Bačo
2b96fb6c6f Allow editing runtime 2023-08-08 11:28:25 +02:00
Bishwajeet Parhi
b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
Bishwajeet Parhi
2f3e14932a fix: Tests 2023-08-08 11:34:02 +05:30
Bishwajeet Parhi
c3ebdc46e2 Merge branch 'master' into feat-add-encrypt-param 2023-08-08 11:04:28 +05:30
prateek banga
385f76d7f2 lint fix 2023-08-08 04:42:00 +05:30
prateek banga
60236b3af6 refactor according to review comments 2023-08-08 04:40:07 +05:30
prateek banga
7e185cd799 moved formatting logic to relationship attribute model 2023-08-08 03:34:13 +05:30
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration 2023-08-07 14:46:00 -07:00
prateek banga
52e800cc59 refactor according to review feedback 2023-08-08 02:56:20 +05:30
Khushboo Verma
d19769415f Throw exception from createRepo 2023-08-07 21:09:51 +05:30
Matej Bačo
11068696c9 QA changes 2023-08-07 17:37:36 +02:00
Bradley Schofield
91c82f0d7d Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-07 16:09:28 +01:00
prateek banga
0630f56dd5 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-query-support-attributes-indexes 2023-08-07 20:35:55 +05:30
Eldad A. Fux
90e89aa02e
Merge pull request #5934 from appwrite/feat-appwrite-assistant
Feat appwrite assistant
2023-08-07 17:56:22 +03:00
Eldad A. Fux
4b7cd5c372
Merge pull request #5715 from appwrite/fix-phone-abuse-param
fix: abuse label for creating phone session
2023-08-07 15:16:40 +03:00
Bradley Schofield
f27345fb92 Update SDK 2023-08-07 11:56:42 +01:00
prateek banga
9057a50a10 rename provider param in config 2023-08-07 15:54:00 +05:30
Damodar Lohani
a6109a0341 Merge remote-tracking branch 'origin/1.4.x' into feat-framework-router-v2 2023-08-07 08:42:04 +00:00
Matej Bačo
d5fd3a28f9 More QA fixes 2023-08-06 15:11:30 +02:00
Matej Bačo
345df3f2ca More QA fixes 2023-08-06 12:30:38 +02:00
Matej Bačo
e60456cfda QA after merge with 1.4 2023-08-06 10:51:53 +02:00
Matej Bačo
906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Matej Bačo
eb63ec9b10 Support failure url on vcs 2023-08-05 20:53:42 +02:00
Matej Bačo
8a9f3f1b54 Update build to use 1 logs attribute 2023-08-05 16:50:28 +02:00
Eldad A. Fux
a56f91b054
Merge branch 'master' into feat-5542-validate-x-appwrite-id-header-for-CreateFile 2023-08-05 06:36:21 +03:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x 2023-08-04 18:07:33 -07:00
Steven Nguyen
cb7abdb906
Remove identity status
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-04 15:07:36 -07:00
Steven Nguyen
bcd44432d1
Don't set password when oauth2 creates a user
Setting a password can cause problems with other APIs that expect the
password to be null. In addition, it doesn't match the implementation
for the other APIs that create a user without a password (Create Magic
URL Session, Create Phone Session, Create Anonymous Session, etc).
2023-08-04 15:07:36 -07:00
Steven Nguyen
27e212553d
Separate OAuth2 info from Sessions into Identities
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-04 15:07:36 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Bradley Schofield
8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01:00
Bishwajeet Parhi
5f1a515f00 Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-04 19:20:44 +05:30
Damodar Lohani
767a3caef8 remove unused injection 2023-08-04 13:17:23 +00:00
Damodar Lohani
cd18853fed add abuse labels 2023-08-04 13:16:57 +00:00
Damodar Lohani
64321cfb0b remove authorization 2023-08-04 13:08:59 +00:00
Safwan Parkar
451f4bee19 Fixed an incorrect test for team deletion
This commit contains changes in 3 places.

- First I changed the placement of an informative comment in the DELETE TEAM controller, and moved it outside of the loop. I did this when Steven pointed out that the behaviour I describe in the comment is for the whole loop.

- The second change is the removal of my first test. I was facing quite a few issues with creating users in the test, and ended up using the CREATE TEAM MEMBERSHIP to perform 2 actions at once -> create a new user if one doesn't exist with the provided email, and create a membership for the user. Before this approach, I had quite a bit of code that didn't work, and it seems like I removed some things that weren't supposed to be removed, and didn't change variable names where necessary. Anyway, I figured that the problem has something to do with the user being created on the client side, so I moved the test to the server side.

- The new test I implemented does the same thing as my previous failed test, but in more detailed and distinct steps. The test first creates 5 new users inside of a loop, and pushes each new user's ID to an array called 'new_users' if the response is as expected. Then a new team is created. The next step is to create memberships for all 5 users. If all these steps pass, the new team that was just created, is deleted, and we check to make sure the new users have 0 team memberships each.

Formatter and linter showed no errors. Tests were successful on localhost.
2023-08-04 15:40:42 +04:00
Matej Bačo
8bc933ab91 Fix template issues 2023-08-04 10:56:46 +02:00
Damodar Lohani
49085be4e4 fix formatting 2023-08-04 02:17:02 +00:00
Damodar Lohani
45afea9175 moved assistant endpoint to console, and add env support 2023-08-04 01:42:22 +00:00
Safwan Parkar
d142620c5e invalidate cached document of user
- cache caused stale data in memberships
2023-08-03 22:08:27 +04:00
Safwan Parkar
a14d89eb3c remove error-causing condition 2023-08-03 21:39:18 +04:00
prateek banga
ea57a303d0 lint fixes 2023-08-03 17:39:13 +05:30
prateek banga
f797c2574a resolve merge conflicts with 1.4.x 2023-08-03 17:38:22 +05:30
prateek banga
1d558fa5f5 Add select queries support to list indexes and list attributes endpoint 2023-08-03 17:34:28 +05:30
Damodar Lohani
2a7ec490af setup appwrite assistant for test 2023-08-03 10:29:36 +00:00
prateek banga
f8ae04f3b9 resolve merge conflicts with 1.4.x branch 2023-08-03 15:25:48 +05:30
Steven Nguyen
b8e22151f6
Remove identity status
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
2023-08-02 15:37:22 -07:00
Steven Nguyen
b9c2b9322f
Don't set password when oauth2 creates a user
Setting a password can cause problems with other APIs that expect the
password to be null. In addition, it doesn't match the implementation
for the other APIs that create a user without a password (Create Magic
URL Session, Create Phone Session, Create Anonymous Session, etc).
2023-08-02 15:36:06 -07:00
Steven Nguyen
a235024268
Separate OAuth2 info from Sessions into Identities
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
2023-08-02 15:36:06 -07:00
Safwan Parkar
2bc2061f09 fix showing of stale team memberships 2023-08-02 18:44:43 +04:00
Safwan Parkar
c5233d9ece removed unnecessary code 2023-08-02 12:18:21 +04:00
Dakshi
16a2135d4a updated based on review 2023-08-02 02:19:20 +05:30
Eldad A. Fux
05a316bf48
Merge pull request #5895 from appwrite/feat-2591-improve-oauth2-error-handling
Improve OAuth2 error handling
2023-08-01 22:55:58 +03:00
Safwan Parkar
a45c62ab24 run composer scripts 2023-08-01 23:24:46 +04:00
Safwan Parkar
0fe59d457b fixed stale team memberships on user 2023-08-01 22:57:59 +04:00
prateek banga
40b0c081f7 remove checkPermission from Appwrite and more complex test case
This commit removes check pemission from update document in appwrite as permission is being checked by Utopia already. This commits also improves the test case to have 3 levels of depth with relationships
2023-08-01 23:29:15 +05:30
Dakshi
12228ccef4 converted desc to sentence case 2023-08-01 20:56:48 +05:30
Khushboo Verma
5b9f71afe5 Add try-catch to listRepositories 2023-08-01 14:10:16 +05:30
Jake Barnby
ff83751450
Allow privileged user/app user/admin mode access to all resources when disabled 2023-07-31 14:24:21 -04:00
Steven Nguyen
eb7526601d
Delete duplicate 'Update Email Verification' endpoint 2023-07-31 11:00:30 -07:00
prateek banga
409376ef16 refactors checkPermission to throw exception when a change is found in updateDocument 2023-07-31 14:03:11 +05:30
Matej Bačo
ac2ca267d7 Address more PR reviews 2023-07-31 08:47:47 +02:00
Damodar Lohani
18407ce6ff remove failing alias and alias tests 2023-07-31 05:53:27 +00:00
Matej Bačo
c7605b85e0 Remove vcs prefix 2023-07-30 21:10:25 +02:00
Matej Bačo
57a4d5ad66 Upgrade console, formatting 2023-07-30 15:30:30 +02:00
Matej Bačo
6cea5a12bb Improve performance of listRepositores 2023-07-30 15:24:10 +02:00
Matej Bačo
280b2fc994 Rename repositories and installation IDs 2023-07-30 11:51:13 +02:00
Damodar Lohani
fa8fab184b fix remove duplicate endpoints 2023-07-30 09:23:12 +00:00
Matej Bačo
96338954d2 Better runtime detection 2023-07-30 10:30:47 +02:00
Matej Bačo
a718f09f74 Update execution model, add detection to repository 2023-07-30 09:17:23 +02:00
Matej Bačo
2e177873c0 Update execution response model 2023-07-29 18:20:20 +02:00
Matej Bačo
22f638e6aa rename vcsRepos to vcsRepositories 2023-07-29 18:04:43 +02:00
Matej Bačo
e6d1a3424f Fix github state 2023-07-29 18:03:18 +02:00
prateek banga
f7e96282db adds attribute for update method and makes test case to check more complex scenario 2023-07-29 12:01:10 +05:30
Jake Barnby
aa94310259
Fix missing admin mode checks for collections 2023-07-28 11:37:14 -04:00
Matej Bačo
f13d70d5be Rename env vars 2023-07-28 10:53:07 +02:00
Matej Bačo
37c0cc122a More PR review changes 2023-07-28 10:27:16 +02:00
Matej Bačo
1bd226ab81 Merge branch 'feat-git-integration' of https://github.com/appwrite/appwrite into feat-git-integration 2023-07-28 09:56:12 +02:00
Matej Bačo
ce98b04348 Address PR reviews 2023-07-28 09:56:07 +02:00
Khushboo Verma
460e07dab0 Moved detection endpoint near listRepos 2023-07-28 13:21:53 +05:30
Khushboo Verma
2c291d53b9 Renamed variables, addressed PR comments 2023-07-28 13:10:19 +05:30
Eldad A. Fux
be4660a4a0
Merge pull request #5884 from appwrite/fix-oauth-endpoint
Remove the OAuth2 Callback endpoints from api group
2023-07-28 10:09:29 +03:00
Steven Nguyen
2621c08c4a
Update OAuth2 params
1. Make code optional so we can show the error via redirect
2. Capture error and error_description params from the OAuth2 provider
2023-07-27 17:19:49 -07:00
Steven Nguyen
a7c9e4bb7e
Improve OAuth2 Error Handling
Update the OAuth2 class to throw an exception if an API call to the
OAuth2 provider fails and update the endpoint to redirect to the
failure url with the information from the OAuth2 provider.
2023-07-27 17:19:49 -07:00
prateek banga
27e0ec339a fix more lint issues 2023-07-27 02:59:06 +05:30
prateek banga
6247e524b6 fix lint issues 2023-07-27 02:27:31 +05:30
prateek banga
e631f393fc fix lint issues and remove sleep from test 2023-07-27 02:23:20 +05:30
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Prateek Banga
5c5a8a9115 format issues 2023-07-27 02:03:17 +05:30
Prateek Banga
54ea98afb5 updated logic to skip checking permission if no change in new document 2023-07-27 02:03:10 +05:30
Prateek Banga
0fc0255a38 Skipping checking permission of relations that are not being updated 2023-07-27 02:02:34 +05:30
prateek banga
301af0d3fe fixes lint issues and adds status in list attributes query support 2023-07-27 01:24:47 +05:30
Prateek Banga
98a226dae9 adds collection and database calls for better error messages 2023-07-27 01:20:16 +05:30
Prateek Banga
a6abc7c4e8 add support of queries in list indexes 2023-07-27 01:19:48 +05:30
Prateek Banga
165268cb71 remove unnecessary db call 2023-07-27 01:17:19 +05:30
Prateek Banga
a842d7eeae fix queries param description 2023-07-27 01:17:10 +05:30
Prateek Banga
ead77d6cad Add support for queries in List attributes endpoint 2023-07-27 01:16:34 +05:30
Steven Nguyen
25016b4cc0
Remove the OAuth2 Callback endpoints from api group
Prevent missing project ID error.
2023-07-26 11:32:28 -07:00
Khushboo Verma
c449aa0a68 Remove functions from installation response model 2023-07-26 15:15:45 +05:30
Bishwajeet Parhi
f160c55ecb Chore: remove encrypt param on update Atrribute and tests as well 2023-07-26 11:25:25 +05:30
Bishwajeet Parhi
a15551368f Merge branch 'master' into feat-add-encrypt-param 2023-07-26 11:20:06 +05:30
Prateek Banga
f7c02d9308 removes extra db call and uses document find method 2023-07-24 23:41:49 +05:30
Matej Bačo
743c214a66 PR review changes 2023-07-24 15:12:36 +02:00
Khushboo Verma
8655d71a67 Minor fixes 2023-07-24 15:41:30 +05:30
Prateek Banga
7d412b4741 adds get db call and get collection call 2023-07-24 12:02:28 +05:30
Matej Bačo
e5adc5772c Add support for all runtime start commands 2023-07-24 08:23:23 +02:00
Khushboo Verma
9484994c4c
Update app/controllers/api/vcs.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2023-07-24 02:09:16 +05:30
shimon
ef12b75013 Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-poc
 Conflicts:
	app/init.php
2023-07-22 17:09:49 +03:00
shimon
bed88baa6c added bucketId to cache::deleteByResource 2023-07-22 17:08:28 +03:00
Matej Bačo
7e386b885c Upgrade console, reword commands into 1 param 2023-07-21 13:52:14 +02:00
Prateek Banga
d569c17764 Merge branch 'master' of https://github.com/appwrite/appwrite into change-use-find-instead-iterating-index-array 2023-07-21 00:49:15 +05:30
Khushboo Verma
e86382ce55 Add vcsState to user collection 2023-07-20 23:38:33 +05:30
Christy Jacob
882698d6e4 chore: update specs 2023-07-20 17:41:28 +04:00
Christy Jacob
c26194e189 Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 17:19:18 +04:00
Christy Jacob
6cdc8a97b7 chore: update tests 2023-07-20 17:12:41 +04:00
Christy Jacob
0feaf41fcb Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools 2023-07-20 11:53:36 +00:00
Prateek Banga
b700336d45 fix get index route to use find 2023-07-20 14:52:05 +05:30
Steven Nguyen
9908a9021f
Update get logs by user to pass user internal id
The userId in audit is actually the userInternalId.
2023-07-19 22:49:51 -07:00
Steven Nguyen
187f3dc6ff
Update get logs APIs to return userId from data
The audit userId is actually the internal id and the user id is in the
data attribute.
2023-07-19 22:49:51 -07:00
Steven Nguyen
2befa60350
Track a user's last activity
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.

To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
2023-07-19 22:22:58 -07:00
Eldad A. Fux
66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp
[FEAT] Custom SMTP and Template support
2023-07-20 07:09:11 +03:00
Christy Jacob
4c8608b49c chore: update naming conventions 2023-07-20 02:24:32 +04:00
Christy Jacob
e493551f8a Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 01:44:25 +04:00
Christy Jacob
257776a54e fix: failing tests 2023-07-20 01:34:27 +04:00
Torsten Dittmann
28fb6a0c16 fix: generate specs 2023-07-19 15:08:32 +02:00
Torsten Dittmann
978007ca98 fix: run formatter 2023-07-19 14:43:23 +02:00
Torsten Dittmann
500cfdb4c9 fix: remove hotp support for now 2023-07-19 14:40:59 +02:00