Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 08:58:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
18873 commits 1266 branches 495 tags 510 MiB
Commit graph

908 commits

Author SHA1 Message Date
prateek banga
fdca55b0de fix test cases 2023-11-15 01:24:55 +05:30
prateek banga
adc76c5797 adds target when account is created or email or phone is updated 2023-11-14 22:46:20 +05:30
prateek banga
7ae614fe13 adds provider type in target 2023-11-14 18:14:07 +05:30
Prateek Banga
3ade88897c Merge branch 'main' of https://github.com/appwrite/appwrite into chore-sync-main-1.5.x 2023-11-10 12:49:05 +05:30
Steven Nguyen
0c264a107a
Merge branch '1.4.x' into fix-4797-verified-user-getting-email-verifications 2023-11-08 17:37:43 -08:00
loks0n
df0271c56a chore: rename to 'custom' sessions 2023-11-02 13:22:10 +00:00
loks0n
af0d689aff feat: sessions scope 2023-10-31 15:05:02 +00:00
loks0n
4559cf77e9 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-31 12:08:48 +00:00
prateek banga
06daa544e8 review changes 2023-10-30 23:37:57 +05:30
Steven Nguyen
836ce852ed
Refactor email templates 
Update the mails worker to only be responsible for building the final
email using the base (layout) template and the user, team, project, and
redirect variables.

It is the responsibility of the controller to perform localization and
determine whether a custom or default email template should be used.
If the default one is used, it has to be rendered using the hello,
footer, thanks, and signature variables so that it matches the custom
template. Then, it can be sent to the worker.
 2023-10-26 16:47:14 -07:00
Steven Nguyen
70a3820009
Remove unused mail vars 2023-10-26 16:23:58 -07:00
Prateek Banga
5a9b1f0c24 removes provider from topics 2023-10-26 19:44:06 +05:30
loks0n
49425fb8fc test: fix 2023-10-26 15:04:47 +01:00
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
loks0n
1343d4851a Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-10-23 09:10:57 +01:00
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
593e5ab316 some fixes 2023-10-17 22:08:01 +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
loks0n
250e9ae9f7 chore: cleanup pr 2023-10-13 16:10:55 +01:00
loks0n
63d3a2bc73 chore: revert abuse-key changes 2023-10-13 11:08:25 +01:00
loks0n
81c4a9bbd5 chore: fmt 2023-10-13 11:05:14 +01:00
loks0n
8ab429b92f feat: replace session confirmation endpoints 2023-10-12 14:38:32 +01:00
loks0n
b299ed056e chore: rename $sessionSecret 2023-10-11 17:07:02 +01: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
loks0n
c343d7550f chore: fmt 2023-10-10 14:41:02 +01:00
loks0n
c30c024805 test: fix magic url assertions 2023-10-10 14:36:53 +01:00
loks0n
a88175fc46 fix: unhash session responses 2023-10-10 13:30:42 +01:00
loks0n
c4e82e4191 fix: edge cases 2023-10-09 14:49:07 +01:00
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
429dabaaee sync with 1.4 2023-10-03 19:50:48 +03:00
shimon
2bb4d8fb89 sync with 1.4 2023-10-02 17:02:48 +03:00
shimon
b02d51c794 migrations worker 2023-10-01 20:39:26 +03:00
loks0n
739be813e0 feat: oauth ssr token flow 2023-09-28 13:45:52 +01:00
loks0n
5ed2da4cf1 feat: add userId to abuse-keys 2023-09-28 11:33:01 +01:00
loks0n
b8f2c1deec chore: revert oauth workaround 2023-09-28 11:26:44 +01:00
loks0n
ef93c59698 Merge branch 'main' of https://github.com/appwrite/appwrite into feat-ssr 2023-09-28 11:21:26 +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
234f7f003b updated test cases for msg91 provider, moves worker to use provider from settings 2023-09-27 18:58:00 +05:30
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
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
Prateek Banga
975b444761 fix test cases and bug fix in messaging worker 2023-09-20 20:51:03 +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
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
prateek banga
38d81c058b lint fix 2023-09-05 23:10:33 +05:30
prateek banga
78a53aee37 adds messaging event and updates messaging worker 2023-09-05 22:40:48 +05:30
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
prateek banga
e104e6d0f2 Merge branch 'feat-add-messaging-collections-in-config' into feat-add-messaging-providers 2023-08-31 18:16:48 +05:30
Christy Jacob
5dbec3d406 chore: remove redundant attribute 2023-08-30 18:43:09 -04:00
Christy Jacob
861921526e fix: remove redundant name property 2023-08-30 18:34:20 -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
3d0ae4b9d9
Remove invites codes 2023-08-30 00:31:38 -04:00
Jake Barnby
a1d0b67c6b
Fix SMTP 2023-08-30 00:30:44 -04:00
Matej Bačo
c98d5bd3cd Fix SMTP after QA 2023-08-29 11:40:30 +02:00
Matej Bačo
89c9f8da6a Implement proper behaviour for SMTP sender 2023-08-28 14:19:37 +02:00
Bradley Schofield
82f400d177 Add more HTML back 2023-08-28 09:03:55 +01:00
Bradley Schofield
1be5f58fd9 Update account.php 2023-08-28 06:14:43 +01:00
Bradley Schofield
ee0563c46f Cover other routes and cleanup code 2023-08-28 06:09:28 +01:00
Bradley Schofield
608b6b3847
Continue work 2023-08-27 23:45:37 +01:00
Matej Bačo
596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Jake Barnby
55deaec8b2
Fix missing env 2023-08-23 17:53:24 -04:00
Matej Bačo
43b1c196e0 Merge branch 'feat-git-integration' into feat-git-integration-copy 2023-08-23 10:16:23 +02:00
Jake Barnby
a84e669a1f
Add missing accessedAt values when creating users 2023-08-22 21:34:23 -04:00
Vincent (Wen Yu) Ge
31b8c77b5c Fix typos, improve a few errors 2023-08-22 20:30:00 +00:00
Vincent (Wen Yu) Ge
07a7a710ee Improve error and copy in params/models 2023-08-22 20:11:33 +00: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
Jake Barnby
942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
shimon
8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Jake Barnby
a3895b041a
Apply suggestions from code review 2023-08-17 21:48:21 -04:00
prateek banga
92e587769a resolve merge conflicts 2023-08-16 15:16:45 +05:30
Steven Nguyen
09254aeae0
Add description for the delete account identity's identityId param 2023-08-09 09:25:29 -07:00
Steven Nguyen
5801a2cc39
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-09 09:01:29 -07:00
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
Christy Jacob
82a206d808 Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-08-08 16:48:59 +00:00
Steven Nguyen
f3fa7922d4
Merge branch 'cl-1.4.x' into feat-user-identities-cl-1.4.x 2023-08-08 08:34:01 -07:00
Eldad A. Fux
4b7cd5c372
Merge pull request #5715 from appwrite/fix-phone-abuse-param 
fix: abuse label for creating phone session
 2023-08-07 15:16:40 +03:00
prateek banga
9057a50a10 rename provider param in config 2023-08-07 15:54:00 +05:30
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
Steven Nguyen
b8e22151f6
Remove identity status 
Until we have a clearer picture of why we need it, it would be best to
remove it since it's easier to add it later than to remove it after it's
released.
 2023-08-02 15:37:22 -07:00
Steven Nguyen
b9c2b9322f
Don't set password when oauth2 creates a user 
Setting a password can cause problems with other APIs that expect the
password to be null. In addition, it doesn't match the implementation
for the other APIs that create a user without a password (Create Magic
URL Session, Create Phone Session, Create Anonymous Session, etc).
 2023-08-02 15:36:06 -07:00
Steven Nguyen
a235024268
Separate OAuth2 info from Sessions into Identities 
This allows us to retain the OAuth2 info even if the session is
deleted. This also provides a foundation for allowing multiple emails,
phone numbers, etc, not from an OAuth2 provider.
 2023-08-02 15:36:06 -07:00
Eldad A. Fux
05a316bf48
Merge pull request #5895 from appwrite/feat-2591-improve-oauth2-error-handling 
Improve OAuth2 error handling
 2023-08-01 22:55:58 +03:00
Dakshi
12228ccef4 converted desc to sentence case 2023-08-01 20:56:48 +05:30
Eldad A. Fux
be4660a4a0
Merge pull request #5884 from appwrite/fix-oauth-endpoint 
Remove the OAuth2 Callback endpoints from api group
 2023-07-28 10:09:29 +03:00
Steven Nguyen
2621c08c4a
Update OAuth2 params 
1. Make code optional so we can show the error via redirect
2. Capture error and error_description params from the OAuth2 provider
 2023-07-27 17:19:49 -07:00
Steven Nguyen
a7c9e4bb7e
Improve OAuth2 Error Handling 
Update the OAuth2 class to throw an exception if an API call to the
OAuth2 provider fails and update the endpoint to redirect to the
failure url with the information from the OAuth2 provider.
 2023-07-27 17:19:49 -07:00