1
0
Fork 0
mirror of synced 2024-07-15 19:36:08 +12:00
Commit graph

615 commits

Author SHA1 Message Date
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
loks0n 9068941772 feat: create user with create token if not exists 2024-01-11 14:55:37 +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
Jake Barnby af019369e9
Merge branch 'main' into 1.5.x 2024-01-09 22:03:35 +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
Matej Bačo fae28b468c Fix password hashing bug 2024-01-07 13:40:45 +01:00
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
Matej Bačo ba32170f72 Improve password validator hook 2024-01-04 16:26:15 +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 5e59d73f78 rename stats collection 2023-12-18 10:11:10 +00:00
fogelito cc5ae73f57 purgeCached changes 2023-12-14 15:32:06 +02:00
loks0n fe695314a9 fix: tests 2023-12-11 19:41:58 +00:00
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 f0d7312bd3 feat: create session method 2023-12-11 16:24:24 +00:00
fogelito 2fe50717d1 TYPE_CURSOR_AFTER TYPE_CURSOR_BEFORE 2023-12-06 15:10:40 +01:00
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
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 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
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 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
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
Jake Barnby 458c2d1446
Merge remote-tracking branch 'origin/main' into chore-sync-main 2023-11-13 16:46:05 +13:00
Christy Jacob d33b8c2ce1
Merge branch '1.4.x' into fix-null-password-history 2023-11-09 07:44:44 -08: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 ad63a377ab added inf metric 2023-11-08 11:09:32 +02:00
loks0n dfc8c919d4 fix: missing sessionId error 2023-11-06 15:06:56 +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
shimon 1c1028412a refactor users, project, functions usage display 2023-11-01 20:44:06 +02:00
prateek banga f7529140bd adds event label to remaining messaging api 2023-10-31 23:53:46 +05:30
prateek banga fd4a81c4fc made review changes 2023-10-25 23:03:23 +05:30
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 9fad9dca88 usage sync 2023-10-25 10:39:59 +03:00
loks0n a67ca55af5 fix: use queueForEvents in users 2023-10-23 11:32:09 +01:00
loks0n 1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
prateek banga af40c63357 review changes 2023-10-20 17:02:13 +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
shimon 94178f8eaf rollback to Usage 2023-10-15 20:41:09 +03: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 002fc19d60 tests fix 2023-10-10 21:02:24 +03:00
loks0n c343d7550f chore: fmt 2023-10-10 14:41:02 +01:00
loks0n c4e82e4191 fix: edge cases 2023-10-09 14:49:07 +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 22d445587e review changes 2023-10-05 16:57:48 +05:30
loks0n e94631f730 fix: token verification 2023-10-05 11:18:19 +01:00
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 429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
loks0n 739be813e0 feat: oauth ssr token flow 2023-09-28 13:45:52 +01: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 35d842171c review changes 2023-09-20 23:37:10 +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 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 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 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
Matej Bačo 6964477429 Increase labels maximum limit 2023-09-06 18:15:03 +02:00
prateek banga 1762c81b8d Merge branch 'feat-messages-event-config' into feat-mailgun-provider 2023-08-31 18:32:26 +05:30
prateek banga df77f92860 adds sub query for targets and topics, permission for user target 2023-08-25 01:22:16 +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
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
Jake Barnby c99288229f
Add back missing route 2023-08-22 21:36:32 -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
prateek banga 78385a59c6 adds remaining provider controllers 2023-08-22 22:15:31 +05:30
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
Jake Barnby 942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04: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 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