1
0
Fork 0
mirror of synced 2024-08-03 12:32:28 +12:00
Commit graph

5037 commits

Author SHA1 Message Date
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
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
Christy Jacob
6a28499f1b
Merge pull request #6329 from appwrite/patch-oauth-flows-1.4.x
Patch: Disable console protection
2023-09-25 09:34:43 -04:00
Matej Bačo
420d2a9c36 @Meldiron Disable console endpoint protection 2023-09-25 15:05:51 +02: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
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
Matej Bačo
3e41578d61 Merge branch '1.4.x' into cl-1.4.x 2023-09-21 16:36:09 +02:00
Matej Bačo
cebfc5a22d Fix migrations 2023-09-21 16:09:51 +02:00
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
Christy Jacob
864092d81c
Merge pull request #6272 from appwrite/feat-router-protection
Feat: router protection
2023-09-21 05:13:34 -04:00
Christy Jacob
f78b520f12
Merge pull request #6269 from appwrite/feat-https-function-domains
Feat: Function domains force https
2023-09-21 05:11:06 -04: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
8926d24a0d One more env var rename 2023-09-19 09:35:32 +02:00
Matej Bačo
d87dbad768 PR review changes 2023-09-19 09:31:57 +02:00
Matej Bačo
007d6953bf PR review changes 2023-09-19 09:21:11 +02:00
Matej Bačo
6afba0b9c9 Linter fix 2023-09-18 13:22:06 +02:00
Matej Bačo
a1049bd2d5 Implement router protection 2023-09-18 13:18:58 +02:00
Matej Bačo
6a7950aa34 Add function domains force https 2023-09-18 12:27:47 +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
shimon
c30fa277d3 linter fix 2023-09-13 10:24:36 +03:00
shimon
eddb269513 Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-key 2023-09-13 10:24:00 +03:00
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
shimon
922f0a5c84 Merge branch 'master' of github.com:appwrite/appwrite into refactor-cache-key
 Conflicts:
	app/controllers/shared/api.php
2023-09-12 10:44:34 +03:00
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
Jake Barnby
d4f6b99ee2
Fix mock enum endpoint 2023-09-07 19:25:42 -04:00
Jake Barnby
fa01f5d67f
Merge remote-tracking branch 'origin/master' into feat-mock-enums 2023-09-07 17:24:44 -04:00
Jake Barnby
cf92936fcc
Add mock endpoint with whitelist param 2023-09-07 17:21:06 -04:00
Matej Bačo
418c8e3764 Fix redeploys 2023-09-07 11:33:42 +02:00
Christy Jacob
47427972bf fix: test failures 2023-09-07 00:57:23 -04:00
Christy Jacob
90eed32311 fix: add check for localhost domain 2023-09-06 18:39:53 +00:00
Christy Jacob
67698cce88
Merge pull request #6155 from appwrite/fix-unknown-domains
Fix: Untrusted custom domains + auto-ssl
2023-09-06 14:09:17 -04: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
Matej Bačo
adb4c72a9c Fix project internal ID 2023-09-06 10:31:40 +02:00
Matej Bačo
0d6abda431 Fix autossl domain query 2023-09-06 10:27:21 +02:00
Khushboo Verma
0fbe9d6ce9 Revert allowing empty string in path 2023-09-06 13:46:01 +05:30
Matej Bačo
933f9631d5 Fix v2 endpoint description 2023-09-06 10:00:04 +02:00
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
Matej Bačo
cafe792879 Fix API returning html 2023-09-06 09:34:02 +02:00
shimon
f246d4d6e5 removed $route->setIsActive(false);
from cache output
2023-09-05 21:21:24 +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
a46879f1cb cache key reformat 2023-09-05 18:29:11 +03:00
Matej Bačo
cda58d2256 Re-add automatic ssl generation 2023-09-05 17:09:54 +02:00
Matej Bačo
f4ada97d1a Allow any hostname, and serve API+Console by default 2023-09-05 17:02:07 +02:00
Matej Bačo
9a1d13f9db Add v2 function test 2023-09-05 15:47:59 +02: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
Jake Barnby
017cd75071
Merge pull request #6102 from appwrite/fix-file-security-check
Fix fileSecurity check
2023-09-01 15:11:03 -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
Steven Nguyen
073172d84b
Remove route setIsActive() call
The method has been removed since it's no longer necessary.
2023-08-31 19:18: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
Steven Nguyen
24efa0de82
Fix router error
It's possible for the route to be null (no match) which leads to an
error like:

```
appwrite  | [Error] Timestamp: 2023-08-30T21:39:58+00:00
appwrite  | [Error] Type: Error
appwrite  | [Error] Message: Call to a member function label() on null
appwrite  | [Error] File: /usr/src/code/app/controllers/general.php
appwrite  | [Error] Line: 50
```

This adds a null check to prevent the error.
2023-08-30 16:07:11 -07: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
Jake Barnby
b2f9506130
Update app/controllers/mock.php 2023-08-30 17:57:38 -04:00
Jake Barnby
b77d83d246
Add back headers route 2023-08-30 17:55:27 -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