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

4997 commits

Author SHA1 Message Date
Jake Barnby
b6b8fe7d51
Allow overriding timeout per request in dev mode 2023-10-19 16:19:40 +13:00
Jake Barnby
389d367fca
Set hard timeouts for API dbs 2023-10-19 15:32:45 +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
Khushboo Verma
2914a4d1c5 Add test for createRepo endpoint 2023-10-18 13:24:32 +05:30
shimon
593e5ab316 some fixes 2023-10-17 22:08:01 +03:00
Jake Barnby
dbfe5e45aa
Delegate custom deletes 2023-10-17 12:18:51 +13:00
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
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
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
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
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
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
shimon
948f36a023 sync with 1.4 2023-10-05 16:15:39 +03: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
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
shimon
ce82a9efa9 remove usage executions from shared api 2023-10-03 17:41:11 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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