Christy Jacob
1bbce77c92
chore: poc for new roles
2024-07-18 01:18:15 +04:00
Binyamin Yawitz
b245aab9d8
fix: Adjusting to coroutine
2024-07-17 15:59:25 -04:00
Binyamin Yawitz
19119b573d
chore: Merge and lint
2024-07-17 15:06:06 -04:00
Binyamin Yawitz
927dbc7e11
Merge branch 'refs/heads/1.6.x' into feat-eldad4-coroutines
...
# Conflicts:
# app/console
# app/controllers/api/account.php
# app/controllers/api/functions.php
# app/controllers/api/projects.php
# app/controllers/api/users.php
# app/controllers/api/vcs.php
# app/controllers/general.php
# app/controllers/mock.php
# app/controllers/shared/api.php
# app/init.php
# composer.json
# composer.lock
# src/Appwrite/Platform/Tasks/Doctor.php
# src/Appwrite/Platform/Tasks/ScheduleMessages.php
# src/Appwrite/Platform/Workers/Builds.php
# src/Appwrite/Utopia/Response.php
2024-07-17 14:31:13 -04:00
Bradley Schofield
29541617de
Start implementing database metrics in usage dump worker
2024-07-16 13:14:55 +09:00
Damodar Lohani
7ed877d96a
fix typo
2024-07-15 04:53:27 +00:00
Damodar Lohani
f4a4ec1def
Merge branch '1.6.x' into feat-project-accessed-at
2024-07-10 13:01:00 +05:45
Damodar Lohani
cfb00bf271
fix typo
2024-07-08 01:03:52 +00:00
Damodar Lohani
bfebf79630
update project accessedAt once every 24 hours
2024-07-08 01:02:58 +00:00
Binyamin Yawitz
664c3ad466
chore: Cleanup
2024-07-04 15:04:20 -04:00
Christy Jacob
fdf44c7bab
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-with-main
2024-06-20 15:26:17 +00:00
shimon
4bedb2f52a
Update Expires header via cache shared api
2024-06-13 09:40:36 +03:00
shimon
3f42b03f8e
Update Expires header via cache shared api
2024-06-13 09:40:03 +03:00
shimon
d2a2caedbd
Update Expires header via cache shared api
2024-06-12 18:42:04 +03:00
Binyamin Yawitz
b5a241db8d
merge: Main into Coroutines
2024-06-05 18:38:39 -04:00
Binyamin Yawitz
07582ecc5f
fix: Changing auth function to instance
2024-06-05 13:38:02 -04:00
Matej Bačo
49b2bcf462
Implement JWT dynamic keys test
2024-05-29 09:33:39 +00:00
Jake Barnby
074b807d8d
Merge remote-tracking branch 'origin/refactor-usage-sn' into sync-1.5.x-with-cloud
2024-05-24 16:56:57 +12:00
Steven Nguyen
9db92698dc
fix(cache): use the same cache key when loading and saving files
2024-05-22 23:23:16 +00:00
Steven Nguyen
8d5583f0c6
fix(cache): fix invalid cache document id
...
The document ID should not have special characters like "*" or it will
cause problems with things like cursor based pagination which is done
in migrations.
We did have the cache buster inside the md5 call before, but when the
usage code was reverted and whatnot, the change wasn't added back
properly.
Related: https://github.com/appwrite/appwrite/issues/7887
2024-05-22 19:16:34 +00:00
Jake Barnby
c7106b9147
Merge remote-tracking branch 'origin/refactor-usage-sn' into fix-setting-secrets
2024-05-22 12:50:58 +12:00
Matej Bačo
2e1f67245d
Fix bugs, add old api key test
2024-05-16 08:39:15 +00:00
Matej Bačo
37176e7865
Backwards compatible approach
2024-05-14 12:33:49 +00:00
Matej Bačo
4d249c5d36
Bug fix
2024-05-14 12:27:35 +00:00
Matej Bačo
54c953d559
Add prefix of api key types
2024-05-14 11:58:31 +00:00
Eldad Fux
c53de9fb6b
Merge branch 'main' of github.com:appwrite/appwrite into feat-eldad4-coroutines
2024-05-08 18:21:55 +01:00
Matej Bačo
9252b66493
Add scope tests
2024-05-06 11:27:28 +00:00
Matej Bačo
3a3d5b61a6
PR review changes
2024-05-06 09:55:59 +00:00
Matej Bačo
448b0a5607
Re-add api token auth
2024-05-06 08:35:27 +00:00
Christy Jacob
c7bdcda593
Merge pull request #8028 from appwrite/1.5.x
...
Sync 1.5.x into main
2024-04-26 15:10:09 +04:00
Damodar Lohani
c8bf5f4328
simplify check
2024-04-25 01:23:01 +00:00
Damodar Lohani
4e66f8a8e2
simplify test
2024-04-25 01:01:15 +00:00
Damodar Lohani
67cdde15f5
Update api.php
2024-04-24 09:03:08 +05:45
Damodar Lohani
c163c84478
Merge branch 'main' into fix-usage-skip-main
2024-04-24 08:42:17 +05:45
Damodar Lohani
ac95a7c5eb
Update api.php
2024-04-24 06:44:14 +05:45
Damodar Lohani
dc3aa5e12f
revert
2024-04-24 06:30:32 +05:45
Steven Nguyen
b75f5263a2
Merge branch 'main' into chore-sync-main-into-1.5.x
2024-04-23 23:43:53 +00:00
Bradley Schofield
089af4e137
Update app/controllers/shared/api.php
...
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2024-04-23 16:34:12 +09:00
Bradley Schofield
3d17b64eac
Add Null check before we access factors
2024-04-23 16:24:05 +09:00
Eldad Fux
d67df5feb1
Fixed formatting
2024-04-22 22:45:55 +02:00
Eldad Fux
3b70ae4d9f
Fixed formatting
2024-04-22 07:56:36 +02:00
Torsten Dittmann
9150ceadc7
fix: mfa with admin mode
2024-04-17 11:10:33 +02:00
Damodar Lohani
083c220e37
fix auth mode check
2024-04-17 06:45:15 +05:45
Eldad Fux
766b2ba13e
Avatars tests are green!
2024-04-14 22:17:07 +02:00
Eldad Fux
211bcf8948
Removed proxy db
2024-04-09 21:02:02 +02:00
Jake Barnby
e224ca440b
Allow setting event parameters as sensitive
2024-04-03 16:36:21 +13:00
Eldad Fux
5ce3de4933
Merge remote-tracking branch 'origin/main' into feat-eldad2-coroutines
2024-04-02 02:13:15 +02:00
Eldad Fux
beda5293b4
Fix format
2024-04-01 13:08:46 +02:00
Eldad Fux
8ed1da4ea8
Updated getEnv to use system lib
2024-04-01 13:02:47 +02:00
Matej Bačo
2a0a69f3ed
Fix connections pool
2024-03-09 11:59:45 +01:00
Matej Bačo
db1674811f
Finish fixing code QL warnings
2024-03-08 13:57:20 +01:00
Torsten Dittmann
fc028b953e
fix: formatter
2024-03-08 00:30:23 +01:00
Torsten Dittmann
f51c39cd2b
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-03-08 00:30:02 +01:00
Matej Bačo
005a239932
Auth fixes
2024-03-07 18:24:01 +01:00
Khushboo Verma
8f1aaf69d4
Merge branch 'main' into feat-disable-api
2024-03-07 18:22:34 +01:00
Torsten Dittmann
dfef0e732c
sync: main -> 1.5.x
2024-03-07 17:16:39 +01:00
Matej Bačo
efeb898be1
Import fixes
2024-03-07 15:29:42 +01:00
Matej Bačo
ee065bc64c
Merge branch '1.5.x' into feat-database-proxy
2024-03-07 10:18:49 +01:00
Torsten Dittmann
0a1d572c72
chore: run formatter
2024-03-06 18:34:21 +01:00
Matej Bačo
882d8e5a88
Fix database tests
2024-03-06 16:19:23 +01:00
Matej Bačo
a9731cd5bc
Fix account tests
2024-03-06 12:38:51 +01:00
Torsten Dittmann
a53e630536
Merge branch 'main' of https://github.com/appwrite/appwrite into sync-main-1.5.x-2
2024-03-05 10:31:51 +01:00
Khushboo Verma
d3b0b00917
Allow users to disable APIs
2024-03-04 23:12:54 +01:00
Torsten Dittmann
01e1a43106
fix: wrong namespace
2024-03-01 03:08:30 +01:00
Torsten Dittmann
b7d3996960
feat: mfa collection restructure
2024-02-29 21:59:49 +01:00
Jake Barnby
6fb1e929cd
Use group hook to block recreating sessions
2024-02-27 22:08:39 +13:00
Christy Jacob
7ae09ba795
Revert "Revert "usage/usage-dump queue health endpoints""
2024-02-25 13:42:28 +05:30
Luke B. Silver
f285173f4e
Merge branch '1.5.x' into feat-ssr-dx
2024-02-22 13:22:41 +00:00
Christy Jacob
a8098831a3
Revert "usage/usage-dump queue health endpoints"
2024-02-22 12:21:48 +05:30
Jake Barnby
942847cf3a
Merge remote-tracking branch 'origin/main' into 1.5.x
...
# Conflicts:
# app/config/collections.php
# app/config/errors.php
# 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
# app/controllers/api/account.php
# app/controllers/api/teams.php
# app/controllers/api/users.php
# app/controllers/shared/api.php
# app/init.php
# app/worker.php
# composer.json
# composer.lock
# docker-compose.yml
# src/Appwrite/Extend/Exception.php
# src/Appwrite/Platform/Services/Tasks.php
# src/Appwrite/Platform/Tasks/Maintenance.php
# src/Appwrite/Platform/Workers/Certificates.php
# src/Appwrite/Platform/Workers/Deletes.php
# src/Appwrite/Platform/Workers/Messaging.php
# src/Appwrite/Platform/Workers/Usage.php
# src/Appwrite/Platform/Workers/UsageHook.php
# src/Appwrite/Specification/Format/OpenAPI3.php
# src/Appwrite/Specification/Format/Swagger2.php
# tests/e2e/Services/Account/AccountConsoleClientTest.php
2024-02-22 01:29:28 +13:00
Jake Barnby
b265106af2
Fix tests
2024-02-21 02:20:09 +13:00
Jake Barnby
bbce53cda5
Auto trigger messaging events
2024-02-21 01:06:35 +13:00
loks0n
fa28496b32
feat: ssr dx changes
2024-02-20 11:45:11 +00:00
Jake Barnby
2f711c84ed
Remove callback resources from workers
2024-02-21 00:40:55 +13:00
Torsten Dittmann
b500c085e1
revert: unnecessary style changes
2024-02-16 18:00:49 +00:00
Torsten Dittmann
de0e83f703
fix: move user and project logic from general to api hook
2024-02-16 17:58:51 +00:00
Torsten Dittmann
5193a97ddb
fix: move user logic from general to api hook
2024-02-16 16:26:50 +00:00
Jake Barnby
014464506e
Remove redundant hook
2024-02-13 17:45:03 +13:00
shimon
6b6f04d2d3
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
...
Conflicts:
app/config/collections.php
app/controllers/shared/api.php
2024-02-12 10:55:53 +02:00
Jake Barnby
8ed2b1f3a5
Fix tests
2024-02-12 18:35:05 +13:00
Jake Barnby
18f7168160
Merge main
2024-02-12 14:18:19 +13:00
Khushboo Verma
d40a51b50a
Only disallow console requests
2024-02-02 20:01:54 +05:30
Khushboo Verma
d96d84201e
Add auth group to create email token endpoint
2024-02-02 14:03:20 +05:30
Khushboo Verma
851e5c5154
Remove restrict group and add logic to auth group
2024-02-01 17:40:41 +05:30
Khushboo Verma
dadb94c499
Merge branch '1.5.x' into feat-block-countries
2024-01-31 12:24:21 +05:30
Matej Bačo
738a696ca9
Add proejct ID abuse protection
2024-01-29 20:38:01 +00:00
Matej Bačo
0a518cd47e
Fix failing tests
2024-01-29 20:03:14 +00:00
Christy Jacob
47fc6efb0d
chore: update endpoint
2024-01-29 17:48:12 +00:00
Christy Jacob
0ff6e99354
chore: update auth group
2024-01-29 17:42:14 +00:00
Khushboo Verma
2f88320d4f
Add null check
2024-01-29 18:47:14 +05:30
Khushboo Verma
f4426d553c
Throw 451 exception
2024-01-29 16:49:13 +05:30
Khushboo Verma
4cd5999bb3
Merge branch '1.5.x' into feat-block-countries
2024-01-29 16:25:31 +05:30
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
Khushboo Verma
51d1a38f0f
Added test case
2024-01-24 18:24:48 +05:30
Khushboo Verma
e2cf8c696a
Add restrict group to some APIs
2024-01-24 16:08:51 +05:30
Torsten Dittmann
9f5a0312cf
Merge branch 'main' of https://github.com/appwrite/appwrite into 1.5.x
2024-01-24 11:24:59 +01:00
Khushboo Verma
c07a3889e6
WIP: Add new group to api.php
2024-01-24 14:41:35 +05:30
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
loks0n
f1664c1cd7
fix: remove token auth.type
2024-01-17 12:09:15 +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
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
loks0n
5c803f6eff
Merge branch '1.5.x' of https://github.com/appwrite/appwrite into feat-ssr
2024-01-08 11:41:55 +00:00
shimon
03f2041913
Merge branch 'main' of github.com:appwrite/appwrite into refactor-cache-poc
2024-01-07 18:09:48 +02: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
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
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
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
fogelito
cc5ae73f57
purgeCached changes
2023-12-14 15:32:06 +02:00
Prateek Banga
b8aa2faa7b
adds scheduling commit, still need to resolve pools error
2023-12-07 11:25:19 +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
loks0n
88aa4d726c
Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-21 14:54:57 +00:00
Khushboo Verma
fccbe405db
Add chunkId to abuse key to prevent rate limit for SDKs
2023-11-16 23:04:38 +05:30
loks0n
7823b90bf3
Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr
2023-11-14 14:01:10 +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
b833f29d56
chore: fmt
2023-10-25 14:29:27 +01:00
loks0n
3a9202a46b
chore: christy feedback
2023-10-25 13:20:29 +01:00
shimon
9fad9dca88
usage sync
2023-10-25 10:39:59 +03:00
shimon
94178f8eaf
rollback to Usage
2023-10-15 20:41:09 +03:00
shimon
ce82a9efa9
remove usage executions from shared api
2023-10-03 17:41:11 +03:00
shimon
b02d51c794
migrations worker
2023-10-01 20:39:26 +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
shimon
c30fa277d3
linter fix
2023-09-13 10:24:36 +03:00
shimon
f246d4d6e5
removed $route->setIsActive(false);
...
from cache output
2023-09-05 21:21:24 +03:00
shimon
45f16e560c
sync against master
2023-09-05 21:17:54 +03:00
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
shimon
a46879f1cb
cache key reformat
2023-09-05 18:29:11 +03: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
shimon
8147f3ee7d
rolling back usage flow
2023-08-20 15:29:43 +03:00
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
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
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
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
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
Matej Bačo
d5fd3a28f9
More QA fixes
2023-08-06 15:11:30 +02:00
Matej Bačo
906f86fbb8
Merge branch 'cloud-1.4.x' into feat-git-integration
2023-08-06 09:31:32 +02:00
Steven Nguyen
d960f85da6
Merge branch '1.4.x' into cloud-1.4.x
2023-08-04 18:07:33 -07:00
Steven Nguyen
aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2
2023-08-04 13:55:07 -07:00
prateek banga
1d558fa5f5
Add select queries support to list indexes and list attributes endpoint
2023-08-03 17:34:28 +05:30
Damodar Lohani
078f7e58d6
Merge remote-tracking branch 'origin/master' into feat-sync-1.4-with-master
2023-08-02 09:43:09 +00:00
Vincent (Wen Yu) Ge
f6d2df8115
Update app/controllers/shared/api.php
...
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-08-01 12:21:34 -04:00
Christy Jacob
3b4255c457
fix: error in initialising the Exception constructor in api.php
2023-08-01 18:18:27 +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
shimon
bed88baa6c
added bucketId to cache::deleteByResource
2023-07-22 17:08:28 +03: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
