1
0
Fork 0
mirror of synced 2024-07-02 21:20:58 +12:00
Commit graph

924 commits

Author SHA1 Message Date
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
Steven Nguyen 611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
Steven Nguyen 25016b4cc0
Remove the OAuth2 Callback endpoints from api group
Prevent missing project ID error.
2023-07-26 11:32:28 -07:00
Christy Jacob 882698d6e4 chore: update specs 2023-07-20 17:41:28 +04:00
Christy Jacob c26194e189 Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 17:19:18 +04:00
Steven Nguyen 9908a9021f
Update get logs by user to pass user internal id
The userId in audit is actually the userInternalId.
2023-07-19 22:49:51 -07: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
Eldad A. Fux 66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp
[FEAT] Custom SMTP and Template support
2023-07-20 07:09:11 +03:00
Christy Jacob 4c8608b49c chore: update naming conventions 2023-07-20 02:24:32 +04:00
Christy Jacob e493551f8a Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 01:44:25 +04:00
Christy Jacob 257776a54e fix: failing tests 2023-07-20 01:34:27 +04:00
Damodar Lohani 4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Damodar Lohani 8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00
Eldad A. Fux 9fafd39fef
Merge pull request #5211 from Pranav2612000/fix-5095-trigger-email-subscription-on-email-verification
fix: trigger account subscription event on email verification
2023-07-19 00:24:33 +03:00
Eldad A. Fux 7a2c789c6b
Merge pull request #5745 from vaibhavagarwal220/fix-5220-handle-null-name
fixed null $name error for anonymous user
2023-07-19 00:21:09 +03:00
Eldad A. Fux b2b1b6e2e4
Merge pull request #5562 from fanatic75/fix-4846-added-expiry-value-to-account-sessions
fix expire field in list account sessions api
2023-07-19 00:17:53 +03:00
Eldad A. Fux 50f258b6db
Merge pull request #5740 from appwrite/fix-create-phone-verification
Fix phone verification secret in events & payload
2023-07-18 23:18:16 +03:00
Eldad A. Fux 9cdf124a81
Merge pull request #5739 from appwrite/fix-anonymous-user
Fix anonymous user
2023-07-18 23:07:52 +03:00
Eldad A. Fux 6f499cfa26
Merge pull request #5567 from fanatic75/fix-4982-expire-sessions-format-for-multiple-api
fixed expire format for phone session, anonymous session, oauth session
2023-07-18 22:57:10 +03:00
Eldad A. Fux d4ed77b5e8
Merge pull request #5568 from fanatic75/fix-5429-expire-format-fix-for-get-session
fix: expire format for get session api
2023-07-18 22:56:47 +03:00
Eldad A. Fux 3a17f30374
Merge pull request #5566 from fanatic75/fix-5428-fixed-expire-format-for-magic-url-sessions
fix: expire format in magic url sessions
2023-07-18 22:56:35 +03:00
Torsten Dittmann 74308b445e
Merge pull request #5587 from appwrite/feat-user-labels
Add a new labels attribute to the Users collection
2023-07-18 14:59:18 +02:00
Damodar Lohani 8d106a39b0 null safe 2023-07-18 07:05:09 +00:00
Steven Nguyen ca6e9a7f1e
Update get logs by user to pass user internal id
The userId in audit is actually the userInternalId.
2023-07-12 10:56:24 -07:00
Christy Jacob e0aa3db21e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-07-11 19:36:37 +00:00
loks0n 074e974481 chore: include secret instead of encoded 2023-07-10 11:14:23 +01:00
Damodar Lohani f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
loks0n 7cee36ac5a feat: poc oauth2 ssr 2023-07-06 21:10:52 +01:00
loks0n f384fc01f8 feat: return encodedSecret in session body 2023-07-06 16:20:56 +01:00
Steven Nguyen 8258d70b78
Update user's search attribute using database filter
Using a database filter is the cleanest approach because it ensures
the logic is applied whenever the user is updated regardless of
whichever endpoint was used.
2023-07-05 12:17:47 -07:00
vaibhavagarwal220 fecde6bdba fixed null $name error for anonymous user 2023-06-24 13:57:02 +05:30
Steven Nguyen 5d385c9a9d
Fix phone verification secret in events & payload
The secret in events & payload should match the secret sent to
messaging.
2023-06-22 17:54:09 -07:00
Steven Nguyen 37ad61933c
Set email & name after OAuth if they're empty
The logic before was incorrect. Really, email and name should only be
set if they're empty.
2023-06-22 17:46:09 -07:00
Torsten Dittmann fd154f04d3 fix: abuse phone param 2023-06-16 12:42:24 +02:00
Jake Barnby d3e7830620
Update changes 2023-06-16 14:16:19 +12:00
Jake Barnby 031f8270ff
Merge remote-tracking branch 'origin/1.4.x' into validator-mv
# Conflicts:
#	composer.lock
2023-06-15 12:28:32 +12:00
Christy Jacob a9e2eca8a4
Merge pull request #5683 from appwrite/master
Update 1.4.x from Master
2023-06-12 13:20:26 +05:30
shimon 57bc7d0584 functions/builds/deletes worker 2023-06-11 17:08:48 +03:00
Steven Nguyen b3c9a34e5e
Make users searchable by label 2023-06-09 10:19:57 -07:00
Prateek Banga 1475497ffb Merge branch 'master' of https://github.com/fanatic75/appwrite into fix-4846-added-expiry-value-to-account-sessions 2023-06-02 14:53:26 +05:30
Steven Nguyen 5afc49784e
Update the Update Phone API to also set the password
This is to ensure the behavior matches the Update Email endpoint.
2023-05-31 13:52:05 -07:00
Steven Nguyen 5ef3162cee
Don't rely on isAnonymousUser to check whether to verify password
It's possible for a user to not be anonymous and not have a password.
Using passwordUpdate is a better indicator as to whether the user has
set a password or not.
2023-05-30 17:17:20 -07:00
Steven Nguyen 7dec6c7321
Fix 500 error when a passwordless user creates an email session 2023-05-30 16:59:55 -07:00
shimon f1466c05cf refactor workers 2023-05-29 16:58:45 +03:00
Steven Nguyen 9d13d72c71
Update the Update Account Status API to clear the cookie
After a user updates their status, their session no longer works
however, the cookie may still exist in their browser, preventing other
API calls from completing successfully.
2023-05-23 10:40:31 -07:00
Prateek Banga 977279b679 fix: expire format for get session api 2023-05-22 18:34:51 +05:30
Prateek Banga 249bec5124 fixed expire format for phone session, anonymous session, oauth session 2023-05-22 18:18:52 +05:30
Prateek Banga 8673df4ac5 fix: expire format in magic url sessions 2023-05-22 17:52:25 +05:30
Prateek Banga 19a3db69f8 fix updated expire format to iso format 2023-05-20 21:09:48 +05:30
Prateek Banga 5cb9cc9dfd fix expire field in list account sessions api 2023-05-20 02:36:45 +05:30
Steven Nguyen 9961609d71
Update the Update Account Status API to clear the cookie
After a user updates their status, their session no longer works
however, the cookie may still exist in their browser, preventing other
API calls from completing successfully.
2023-05-19 11:58:17 -07:00
fogelito f6153b7626 Use array instead of variadic 2023-05-16 15:56:20 +03:00
Matej Bačo 6885e6ea0e linter fix 2023-05-01 17:51:31 +02:00
Matej Bačo 70b5281a0b Improve GitHub oauth email discovery 2023-05-01 15:54:33 +02:00
fogelito 9dcf4c0984 validations changes 2023-04-25 14:35:49 +03:00
Damodar Lohani ac9f434c85 more fixes and reset endpoints 2023-04-19 08:44:22 +00:00
Damodar Lohani 0177ddccb3 use custom templates to send email when enabled 2023-04-19 08:29:29 +00:00
Christy Jacob 0fb34433b9 feat: personal data filters to enhance password protection 2023-04-14 00:20:03 +04:00
Christy Jacob 8a5a3db082 Merge branch 'master' of github.com:appwrite/appwrite into disallow-personal-data 2023-04-13 12:55:49 +04:00
Damodar Lohani d394715b56 Merge remote-tracking branch 'origin/master' into feat-custom-smtp 2023-04-13 01:35:56 +00:00
Torsten Dittmann 52d7dcf082 fix: update prefs endpoints to not fallback to stdClass 2023-04-12 18:02:43 +02:00
Christy Jacob 9ca700f04a Merge branch 'master' of github.com:appwrite/appwrite into disallow-personal-data 2023-04-12 15:12:06 +04:00
Christy Jacob 8690c57a7c feat: initial commit 2023-04-12 03:01:50 +04:00
Jake Barnby 5cbb08d6f1
Fix response model types for update password + update status 2023-04-11 20:41:24 +12:00
Jake Barnby 7f8f34793e
Merge remote-tracking branch 'origin/1.3.x' into doc-db-relationships
# Conflicts:
#	composer.lock
2023-04-11 15:57:35 +12:00
Damodar Lohani 41d22fb50b Merge remote-tracking branch 'origin' into feat-db-pools-master-sync-2 2023-03-30 08:02:31 +00:00
Vincent (Wen Yu) Ge 19d5ea03b9 Updates links for query page 2023-03-29 19:38:39 +00:00
Damodar Lohani 7764073bdd fix typo 2023-03-17 00:58:21 +00:00
Damodar Lohani 893d305453 fix template issues 2023-03-17 00:55:00 +00:00
Matej Bačo c01fcb130c Merge branch 'feat-db-pools-master' into feat-db-pools-sync 2023-03-14 12:58:54 +01:00
Damodar Lohani c633eda501 return default template 2023-03-14 09:09:34 +00:00
Damodar Lohani c7db44b45f default sms template 2023-03-14 09:07:42 +00:00
Damodar Lohani 82498459db update project smtp using hook 2023-03-13 09:21:16 +00:00
Damodar Lohani 07010a5192 set SMTP config from project 2023-03-12 02:14:03 +00:00
Pranav2612000 c97a4868b1 fix: trigger account subscription event on email verification 2023-03-11 00:23:49 +05:30
Damodar Lohani ad8ae92a6d
Merge branch '1.3.x' into feat-reset-sdk-account-model 2023-03-09 07:06:24 +05:45
Steven Nguyen 85a2d623a6
Update APIs to check X-Appwrite-Timestamp header
Appwrite will refer to the X-Appwrite-Timestamp header for when the
request was originally sent and reject the request if the Timestamp
is older than the updatedAt timestamp of the document.
2023-03-07 10:54:52 -08:00
Torsten Dittmann ae32536be2 Merge branch 'master' of https://github.com/appwrite/appwrite into chore-release-1-3-console-sdk 2023-02-28 14:45:34 +05:30
Damodar Lohani dd9eab65c8
Merge branch 'master' into feat-reset-sdk-account-model 2023-02-26 10:46:07 +05:45
Torsten Dittmann 8b7dd6eaa6
Merge pull request #5083 from singhbhaskar/fix-5070-session-create-event-doesnt-show-in-Appwrite-Console-user-activity-for-OAuth-Sessions
Adding missing audits.userId to routes
2023-02-24 15:29:21 +05:30
Torsten Dittmann dacb713450
Merge branch 'master' into fix-4982-email-session-expire-string-formattz 2023-02-24 15:23:33 +05:30
Steven Nguyen c5ebcbab2b
Add offline support labels on endpoints 2023-02-23 14:47:45 -08:00
Christy Jacob 10b7503d62 feat: support case insensitive emails 2023-02-22 17:09:22 +05:30
Damodar Lohani 6b6f9edbd6
Merge branch '1.3.x' into feat-13x-master-sync 2023-02-21 07:38:46 +05:45
Damodar Lohani 104d99e636 fix default value error 2023-02-20 07:08:27 +00:00