Matej Bačo
ba32170f72
Improve password validator hook
2024-01-04 16:26:15 +01:00
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
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
Torsten Dittmann
d9b300051a
Merge pull request #7292 from appwrite/fix-7147-user-last-activity-not-updating
...
Fix user last activity not updating
2023-12-28 01:59:23 +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
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
Matej Bačo
8c1363529e
Add Hooks
2023-12-15 23:19:43 +01:00
Steven Nguyen
6d17f8e877
Fix user last activity not updating
...
Add back a section of code that was mistakenly removed.
2023-12-15 21:37:26 +00: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
德华 刘
f334168f90
fix: remove expired cookie
2023-12-13 08:45:47 +00:00
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
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
8b5783d3ff
fix: update setParam
2023-12-08 21:02:07 +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
shimon
9960912bb1
sync against main
2023-11-26 18:52:02 +02: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
Khushboo Verma
695d6f4065
Renamed variables
2023-11-18 00:04:57 +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
cf1c914edb
Update app/controllers/general.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-11-17 18:36:03 +05:30
Khushboo Verma
9329287982
Update app/controllers/general.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-11-17 18:35:51 +05:30
Khushboo Verma
40ec98569e
Update app/controllers/general.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-11-17 18:35:26 +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
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
Khushboo Verma
2e70ed59af
Fix git installation deletion
2023-11-15 11:41:42 +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
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
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
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
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
Bradley Schofield
d921c03ee1
Update mock.php
2023-11-02 17:07:16 +00:00
Bradley Schofield
b15dac16c8
Revert "Remove Mock API"
...
This reverts commit 2d045335ff
.
2023-11-02 17:05:51 +00:00
Bradley Schofield
2d045335ff
Remove Mock API
2023-11-02 17:05:31 +00:00
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
Christy Jacob
281b50ba4a
Merge pull request #7063 from appwrite/1.4.x
...
1.4.x
2023-11-01 12:32:11 +04:00
Steven Nguyen
7c8a9ad4d2
Fix incorrect general_protocol_unsupported error
...
$requestHeaders was being referenced before it was set. This PR reverts
code back to using $swooleRequest to extract the header.
2023-10-31 18:31:36 +00:00