1
0
Fork 0
mirror of synced 2024-08-19 12:11:55 +12:00
Commit graph

1016 commits

Author SHA1 Message Date
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
Torsten Dittmann
978007ca98 fix: run formatter 2023-07-19 14:43:23 +02:00
Torsten Dittmann
500cfdb4c9 fix: remove hotp support for now 2023-07-19 14:40:59 +02: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
1f46d03e8c feat: initial mfa implementation 2023-06-22 15:35:49 +02: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
Damodar Lohani
81add700c6 fix error 2023-02-20 04:01:08 +00:00
Damodar Lohani
9f3e815167
Merge branch 'feat-password-history' into feat-password-dictionary 2023-02-20 07:56:17 +05:45
Damodar Lohani
4e1a4b961c update attribute errors 2023-02-20 01:51:56 +00:00
Damodar Lohani
7e055c585d formatting fix 2023-02-20 01:37:33 +00:00
Damodar Lohani
452ee5c086 update dictonary validator 2023-02-20 01:34:05 +00:00
Eldad A. Fux
6696373d28
Merge pull request #4974 from appwrite/lohanidamodar-patch-3
Oauth2 check if provider is enabled
2023-02-19 08:53:41 +02:00
Damodar Lohani
5acd78463a Merge remote-tracking branch 'origin/feat-db-pools' into feat-db-pools-master-sync 2023-02-16 00:44:29 +00:00
Damodar Lohani
171f30adb1 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-16 00:29:37 +00:00
Damodar Lohani
2d702b62b2 switch SDK response model from account to user 2023-02-15 00:10:54 +00:00
Damodar Lohani
71d2c45a92 Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-02-14 04:35:19 +00:00
Jake Barnby
f6fc9a8d8c
Merge remote-tracking branch 'origin/master' into feat-technical-debt-2
# Conflicts:
#	composer.lock
2023-02-14 14:22:08 +13:00
shimon
5850a454e0 addressing comments 2023-02-05 22:07:46 +02:00
Bhaskar Singh
e9d53cbc46 Adding missing audits.userId to routes 2023-02-05 12:32:56 +05:30
munyoudoum
ff5c5c7138 fix(api/account): formatTz for expire property in POST email sessions 2023-01-30 00:32:05 +07:00
Damodar Lohani
31b4c73b16
use variable 2023-01-29 15:30:39 +05:45
Christy Jacob
e5a6db6133
Merge pull request #4890 from appwrite/doc-clarify-permission
Update permission and ID param descriptions for grammar and clarity.
2023-01-28 04:15:20 +05:30
Vincent (Wen Yu) Ge
b25dc38a63 clarify custom ID vs unique ID 2023-01-20 22:22:16 +00:00
Christy Jacob
4142ffdb70 feat: update account codes 2023-01-19 17:26:41 +05:30
fogelito
c4ae047833 Merge branch 'master' of github.com:appwrite/appwrite into feat-technical-debt-2
 Conflicts:
	app/init.php
	composer.json
	composer.lock
2023-01-16 10:24:37 +02:00
Damodar Lohani
4f35353289 Merge branch 'feat-password-history' of https://github.com/appwrite/appwrite into feat-password-dictionary 2023-01-16 05:09:55 +00:00
Damodar Lohani
fe472e5b36 Merge branch '1.3.x' of https://github.com/appwrite/appwrite into feat-password-history 2023-01-16 05:04:13 +00:00
shimon
a852672bff Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats 2023-01-15 17:18:32 +02:00
Vincent (Wen Yu) Ge
45aea5b941 Update branch with master 2023-01-13 14:53:54 -05:00
Vincent (Wen Yu) Ge
92a384e31c Fix descriptions for ID and regen 1.2.x specs 2023-01-13 14:27:08 -05:00
Bradley Schofield
31b718d829 Replace Appwrite Validators with backported Utopia ones
+ Updated Utopia Framework to 0.26.0
+ Replaced Appwrite Validators with Utopia ones
2023-01-13 15:28:04 +00:00
Damodar Lohani
f41e3b1e8f Merge remote-tracking branch 'origin/master' into feat-db-pools-master-sync 2023-01-12 07:25:23 +00:00
Eldad A. Fux
f0bb8dcc33
Merge pull request #4859 from appwrite/refactor-mails-next
refactor: make mails event and worker general
2023-01-12 09:07:43 +02:00
Christy Jacob
837bad59a4 feat: add tests 2023-01-11 18:10:49 +05:30
Christy Jacob
71150ced1a feat: add tests 2023-01-11 18:05:07 +05:30
Christy Jacob
2bc85e4708 feat: linter fixes 2023-01-11 17:12:29 +05:30
Christy Jacob
9f9daf900a feat: review comments 2023-01-11 17:11:33 +05:30
Christy Jacob
e3a2135515 feat: linter fixes 2023-01-10 20:18:45 +05:30
Christy Jacob
59adaff541 feat: linter fixes 2023-01-10 14:23:08 +05:30
Damodar Lohani
d2ca803753 add provider enabled check in the redirect 2023-01-10 04:52:21 +00:00
Christy Jacob
3f992b316e feat: add code to account creation endpoint 2023-01-09 22:52:15 +05:30
Christy Jacob
b751af6db9 feat: add code to account creation endpoint 2023-01-09 22:46:02 +05:30
Christy Jacob
78a057ebf9 feat: add code to account creation endpoint 2023-01-09 22:39:58 +05:30
Damodar Lohani
b238a1ef2d fix format 2023-01-09 10:44:28 +00:00
Damodar Lohani
87c7e76a16
Oauth2 check if provider is enabled 2023-01-09 16:20:03 +05:45
Damodar Lohani
8927c71b69 fix formatting 2022-12-26 10:34:41 +00:00
Damodar Lohani
0760ea90d6 use dictionary validator 2022-12-26 10:22:49 +00:00
Damodar Lohani
a9078cded5 rename resource 2022-12-26 09:24:51 +00:00
Damodar Lohani
276032b3f7 error fix 2022-12-26 05:55:02 +00:00
Damodar Lohani
574ffa4d4b check dictionary is enabled before checking password 2022-12-26 05:52:49 +00:00
Damodar Lohani
e9710bdb76 formatting fix 2022-12-26 05:47:20 +00:00
Damodar Lohani
1ff8ce2382 check against passwords dictionary 2022-12-26 05:24:26 +00:00
Damodar Lohani
2603f91a6a use password history on account create and update password 2022-12-23 07:19:35 +00:00
Bradley Schofield
c0daed3644 Refactor names and cleanup code 2022-12-20 16:11:30 +00:00
Bradley Schofield
886a1a2abb Port Deletes and Builds worker 2022-12-20 12:22:58 +00:00
Damodar Lohani
5b1c54c440 fix suggestions 2022-12-19 05:07:41 +00:00
Damodar Lohani
30ece2d36a validator for password history 2022-12-18 09:08:51 +00:00
Damodar Lohani
f7dd37a9d1 format fix 2022-12-18 08:54:53 +00:00
Damodar Lohani
d098c8c698 use array slice 2022-12-18 08:47:02 +00:00
Damodar Lohani
4abc30eed1 refactor: fix formatting issues 2022-12-18 06:31:14 +00:00
Damodar Lohani
0eae73e7b8 fix: password comparison 2022-12-18 06:27:41 +00:00
Damodar Lohani
51ad9c6479 fix: get history limit before adding password to history 2022-12-18 04:38:27 +00:00
Damodar Lohani
0b1b7b8170 feat: check history limit 2022-12-16 10:47:08 +00:00
Damodar Lohani
61e03eeedf add new password to the history 2022-12-16 10:29:20 +00:00
Damodar Lohani
8e7b89ec03 feat: check password history 2022-12-16 10:22:39 +00:00
Damodar Lohani
12302d5b3d refactor: remove empty param 2022-12-16 06:34:03 +00:00
Damodar Lohani
495da1bfd4 fix: template path 2022-12-16 06:11:12 +00:00
Damodar Lohani
5d195659bd refactor: mails refactor 2022-12-15 09:22:05 +00:00
fogelito
8ade726932 Changing Role + Permissions namespace 2022-12-14 18:04:06 +02:00
fogelito
f96128e14f Changing Id 2022-12-14 17:42:25 +02:00
Damodar Lohani
5741a960c7 refactor: use refactored maile event and worker 2022-12-14 06:35:04 +00:00
Damodar Lohani
e0be09ded6 refactor: use session group for session limit 2022-12-11 08:33:52 +00:00
shimon
d3bc4da15c Merge branch 'feat-db-pools' of github.com:appwrite/appwrite into feat-new-usage-stats 2022-12-04 10:35:56 +02:00
Christy Jacob
f239296059 Merge branch 'master' of https://github.com/appwrite/appwrite into feat-db-pools 2022-11-23 19:05:19 +00:00
Steven Nguyen
01556184c7
Fix the default oauth paths to match the route 2022-11-23 09:57:49 -08:00
Eldad Fux
95e835a902 Deprecated Usage stats 2022-11-23 19:08:42 +02:00
gepd
64ba896738
bug fix: failure status shoudn't be nulled 2022-11-22 17:05:04 -03:00
Matej Baco
5ec548cc06 Fix more failing tests 2022-11-18 14:13:33 +01:00
Bradley Schofield
0b883df5ec Fix Tests 2022-11-14 09:42:18 +00:00
Bradley Schofield
66b805829c Move authDuration into auths attribute in project 2022-11-14 09:30:45 +00:00
Bradley Schofield
4dfafd1169 Merge branch 'master' into feat-implement-session-length-api 2022-11-04 16:11:38 +00:00
Bradley Schofield
e1f9a8e0ce Clean up a couple things and fix tests 2022-11-04 14:48:29 +00:00
Bradley Schofield
4cfc3b3a7f Update authDuration fallback value 2022-11-04 10:12:02 +00:00
Bradley Schofield
94676a6c16 Alter sessionVerify to remove expire 2022-11-04 09:50:59 +00:00
Eldad A. Fux
44ca7d9459
Merge pull request #4631 from appwrite/feat-fix-account-naming
Updated titles on account routes
2022-11-03 18:19:41 +02:00
Eldad Fux
103469928e Updated routes 2022-11-03 17:24:32 +02:00
Bradley Schofield
4b8287c097 Remove 'expire' from sessions 2022-11-03 15:03:39 +00:00
Bradley Schofield
cddacfbb78 Handle Eldad's Comments 2022-11-01 14:43:18 +00:00
Bradley Schofield
5dc8a2dee0 Add Tests and fix bugs 2022-11-01 11:15:45 +00:00
Bradley Schofield
d34359fd49 Implement Variable Session Duration 2022-10-31 14:54:15 +00:00
Vincent (Wen Yu) Ge
4cee87273c
Merge branch 'master' into doc-unique-id 2022-10-04 10:51:38 -04:00
Vincent (Wen Yu) Ge
ae2100244f Update unique() to be ID.unique() 2022-10-03 20:22:28 +00:00
Torsten Dittmann
0c1222f0f5 Merge branch 'master' of https://github.com/appwrite/appwrite into 1.0.x 2022-09-30 14:23:06 +02:00
Matej Bačo
46c91899e7
Merge branch '0.16.x' into feat-improve-sms-e2e-tests 2022-09-23 08:23:29 +02:00
Christy Jacob
7abb426e3f fix: hash phone auth code 2022-09-23 03:55:17 +05:30
Matej Bačo
a983e792d8 Refactor required param values 2022-09-19 10:05:42 +00:00
Matej Bačo
6e8a4cc97b Update sms mock to use request catcher 2022-09-19 08:09:48 +00:00
Christy Jacob
626e4b1b8a feat: update getSessions to listSessions in users and accounts API 2022-09-14 03:43:04 +05:30
Christy Jacob
937674a373 feat: update getLogs to listLogs in users and account API 2022-09-14 02:35:03 +05:30
shimon
342c4a3253 audits.resource label update 2022-09-08 16:06:16 +03:00
shimon
834e4e03e3 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label-desc-decoupling
 Conflicts:
	app/controllers/api/storage.php
2022-09-08 15:13:22 +03:00
Eldad Fux
01fb4045bd Sync with 0.16 2022-09-07 14:11:10 +03:00
Eldad Fux
1f17fb34e4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into fix-response-syntax 2022-09-07 14:07:40 +03:00
Eldad Fux
0895a25615 Fixed response syntax with new FW version 2022-09-07 14:02:36 +03:00
shimon
1362902082 audit event name reformation 2022-09-05 11:00:08 +03:00
shimon
db715f3e7d decouple audits log from events 2022-09-04 13:31:38 +03:00
shimon
8e1dc84a48 account labels 2022-09-04 10:32:56 +03:00
Matej Bačo
63c02677a0
PR review changes 2022-08-30 13:55:23 +02:00
Matej Bačo
889eaff418 Merge remote-tracking branch 'origin/feat-list-users-queries' into feat-list-endpoints-queries 2022-08-29 08:52:28 +00:00
Jake Barnby
82bea82d94 Update passwordUpdate check 2022-08-27 15:17:48 +12:00
Matej Bačo
c85363f355 Fix bugs after merge 2022-08-25 09:59:28 +00:00
Matej Baco
fd1068a600 Merge branch 'feat-list-users-queries' into feat-list-endpoints-queries 2022-08-25 10:56:06 +02:00
Jake Barnby
625608804e Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# 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
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/workers/builds.php
#	src/Appwrite/Stats/Usage.php
#	src/Appwrite/Usage/Calculators/Database.php
2022-08-25 18:21:15 +12:00
Matej Bačo
2d82eed4be Linter fix 2022-08-23 13:10:27 +00:00
Matej Bačo
b1348dbdd8 Upgrade account logs queries 2022-08-23 13:06:59 +00:00
Damodar Lohani
6af467398b update usage labels 2022-08-21 02:04:52 +00:00
Jake Barnby
24875e352d Merge fixes 2022-08-19 17:05:39 +12:00
Jake Barnby
cb6fc7f618 Merge branch 'origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	.gitignore
#	app/config/collections.php
#	app/controllers/api/account.php
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/api/users.php
#	composer.lock
#	tests/e2e/Services/Account/AccountCustomClientTest.php
2022-08-19 16:49:34 +12:00
Jake Barnby
5f990ecb6d Fix imports 2022-08-19 16:28:40 +12:00
Jake Barnby
7019be987c Merge remote-tracking branch 'origin/0.16.x' into origin/datetime-attributes
# 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
#	app/controllers/api/account.php
#	app/controllers/api/users.php
#	app/controllers/shared/api.php
#	app/workers/deletes.php
#	composer.lock
#	docker-compose.yml
#	phpunit.xml
#	src/Appwrite/Event/Delete.php
2022-08-19 16:20:19 +12:00
Jake Barnby
66539bbe3a Review updates for role helper usage 2022-08-19 16:04:33 +12:00
Damodar Lohani
db9faebcc9
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-18 16:04:19 +05:45
Damodar Lohani
4d482ebb81 fix accounts PR 2022-08-18 00:31:56 +00:00
Damodar Lohani
a1e6f7bdf4 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 09:34:40 +00:00
shimon
cc887beae9 sync with 0.16 2022-08-17 10:32:42 +03:00
shimon
2dc8fba40a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/users.php
	composer.json
	composer.lock
2022-08-17 10:05:37 +03:00
Damodar Lohani
3bc0aa8dca fix merge issues 2022-08-17 02:35:55 +00:00
Damodar Lohani
80dfa85c82 Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-17 00:45:07 +00:00
shimon
7ad7d1807e fill gaps from merge 2022-08-16 17:56:05 +03:00
shimon
5d284b8c27 fill gaps from merge 2022-08-16 16:20:35 +03:00
Matej Bačo
1e96f8c3d9 Revert changes regarding AccountAPI createAccount 2022-08-16 12:05:46 +00:00
shimon
de42895096 fill gaps from merge 2022-08-16 14:27:50 +03:00
shimon
923a741c5a Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
2022-08-16 12:47:51 +03:00
Jake Barnby
326220762e Exception fixes 2022-08-16 21:07:30 +12:00
shimon
8f8f033d1a fill gaps from merge 2022-08-16 12:00:28 +03:00
Jake Barnby
bbf7f8d8c3 Merge remote-tracking branch 'origin/origin/datetime-attributes' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	src/Appwrite/Extend/Exception.php
2022-08-16 20:30:00 +12:00
Jake Barnby
fb34ecfa7d Merge remote-tracking branch 'origin/0.16.x' into datetime-attributes-merge
# Conflicts:
#	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
2022-08-16 19:20:26 +12:00
Christy Jacob
5b7b39a300
Revert "Fix Endpoint Order" 2022-08-16 12:29:03 +05:30
Damodar Lohani
34fd6763e1
Update app/controllers/api/account.php
Co-authored-by: Eldad A. Fux <eldad.fux@gmail.com>
2022-08-16 11:14:55 +05:45
shimon
f091774afd fill gaps from merge 2022-08-15 20:04:23 +03:00
shimon
590c1467bc Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label
 Conflicts:
	app/controllers/api/account.php
	app/controllers/api/functions.php
	app/controllers/api/users.php
2022-08-15 18:19:59 +03:00
Jake Barnby
77a28a2de7 Don't use ID helper with existing ID's 2022-08-15 23:24:31 +12:00
Eldad A. Fux
72e524963c
Update app/controllers/api/account.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2022-08-15 11:30:58 +03:00
Christy Jacob
7723c633a0 feat: fix tests 2022-08-15 13:24:54 +05:30
Christy Jacob
509f9083c9 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-reorder-endpoints-2 2022-08-15 12:43:24 +05:30
Eldad Fux
95181546b4 Adpated tests 2022-08-14 21:09:24 +03:00
Eldad Fux
bd77354926 Fixed test 2022-08-14 20:22:01 +03:00
Eldad Fux
22c38a484f Merge branch 'feat-password-hash-algos' of https://github.com/appwrite/appwrite into feat-missing-phone-param 2022-08-14 19:43:53 +03:00
Eldad Fux
98fc8669e1 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into feat-password-hash-algos 2022-08-14 19:23:30 +03:00
Eldad Fux
2ed9199bf1 Added the ability to create a user with a phone number 2022-08-14 18:10:12 +03:00
Jake Barnby
613a0f8006 ID and test fixes 2022-08-15 02:22:38 +12:00
Eldad Fux
b36c24c508 Decouple Auth code from SMS provider adapter 2022-08-14 17:19:58 +03:00
Eldad Fux
25f176875d Changed provider name from phone to sms 2022-08-14 16:43:41 +03:00
Eldad A. Fux
d641fbb635
Merge pull request #3588 from appwrite/feat-simplify-exceptions
Simplify Exception Creation
2022-08-14 15:27:52 +03:00
Jake Barnby
9c260164ef Merge remote-tracking branch 'origin/feat-datetime-attributes-with-database-query-update' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/controllers/api/databases.php
#	app/controllers/api/storage.php
#	app/controllers/general.php
#	app/controllers/shared/api.php
#	composer.json
#	composer.lock
2022-08-14 23:46:34 +12:00
Damodar Lohani
5120158bdb Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-14 11:39:41 +00:00
Jake Barnby
6a5de3e0b6 Merge remote-tracking branch 'origin/fix-datetime-attributes' into refactor-permissions-inc-queries-update-datetime-fixes
# Conflicts:
#	app/config/collections.php
#	app/controllers/api/databases.php
#	app/controllers/api/projects.php
#	app/controllers/api/teams.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Account/AccountBase.php
#	tests/e2e/Services/Databases/DatabasesBase.php
#	tests/e2e/Services/Functions/FunctionsCustomServerTest.php
#	tests/e2e/Services/Projects/ProjectsConsoleClientTest.php
#	tests/e2e/Services/Storage/StorageBase.php
#	tests/e2e/Services/Storage/StorageCustomClientTest.php
#	tests/e2e/Services/Storage/StorageCustomServerTest.php
#	tests/e2e/Services/Teams/TeamsBase.php
#	tests/e2e/Services/Webhooks/WebhooksBase.php
#	tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php
#	tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
#	tests/unit/Auth/AuthTest.php
2022-08-14 23:11:05 +12:00
Jake Barnby
b007acfa95 ID updates 2022-08-14 22:33:36 +12:00
Christy Jacob
bb4693ddfc feat: update email session endpoint 2022-08-14 15:41:21 +05:30
Steven
610ec1a6a4 Update database query syntax 2022-08-14 05:44:55 +00:00
Jake Barnby
fe5d3a1892 Use permission helpers 2022-08-14 17:21:11 +12:00
Christy Jacob
5296e61d35 feat: address issues on accounts controller 2022-08-13 20:45:19 +05:30
shimon
630954c94e some fixes 2022-08-13 17:55:27 +03:00
Christy Jacob
8b23dcd69e fix: update constructor, remove account entity, add missing ID error 2022-08-13 20:14:04 +05:30
Jake Barnby
ed712fb196 Merge remote-tracking branch 'origin/0.16.x' into refactor-permissions-inc-console-fix
# Conflicts:
#	app/controllers/general.php
#	composer.lock
2022-08-14 02:31:06 +12:00
Jake Barnby
68cc919aaa Test fixes 2022-08-14 02:10:28 +12:00
shimon
51e3fc8cab some fixes 2022-08-13 12:59:34 +03:00
shimon
48b2fb0b36 Merge branch '0.16.x' of github.com:appwrite/appwrite into feat-audits-label 2022-08-13 10:34:25 +03:00
shimon
cc9dad6bb8 Tidy up 2022-08-13 10:34:03 +03:00
Eldad Fux
3c7a7f0fa4 Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-08-13 06:21:50 +03:00
Damodar Lohani
be00b64b7e Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-13 03:14:28 +00:00
Steven
1abe9d4c01 Merge branch '0.16.x' into fix-datetime-attributes 2022-08-12 22:54:33 +00:00
Jake Barnby
09b001e891 PR fixes 2022-08-13 02:41:57 +12:00
Bradley Schofield
d86e4ac0b6 Run Linter 2022-08-12 15:15:58 +01:00
Bradley Schofield
d9104ceced Update capitalisation on some names 2022-08-12 15:15:36 +01:00
Bradley Schofield
7af92b3b30 Fix Endpoint Order 2022-08-12 15:10:41 +01:00
shimon
1af95fcdaa Tidy up 2022-08-12 16:21:32 +03:00
shimon
90cfac9b52 replace request param extractions 2022-08-12 14:01:12 +03:00
Jake Barnby
1d7c25b561 Single role per permissions entry 2022-08-12 22:36:59 +12:00
shimon
b5f977e46d adding user to audits labels 2022-08-11 16:19:05 +03:00
Damodar Lohani
cb369dd326 update account routes usage labels 2022-08-10 08:45:10 +00:00
Damodar Lohani
16fe9e241a Merge branch 'feat-audits-label' of https://github.com/appwrite/appwrite into feat-usage-updates 2022-08-10 01:49:27 +00:00
shimon
d2519c9a5b addressing comments 2022-08-09 17:38:54 +03:00
Damodar Lohani
bce998cb53 update imports and fix database usage 2022-08-09 06:28:38 +00:00
Jake Barnby
fb0168ea50 Fix erroneous whitespace 2022-08-09 14:48:39 +12:00
shimon
62ef532801 leftovers 2022-08-08 17:32:54 +03:00
shimon
89f164bdd7 resource namespace 2022-08-08 15:19:41 +03:00
shimon
a6a9ad8cc0 databases controller 2022-08-08 11:14:27 +03:00
shimon
e9ef94e8af account controller 2022-08-07 18:49:30 +03:00
Jake Barnby
e8af744c97 More write ref updates 2022-08-05 18:00:56 +12:00
Jake Barnby
62b1eba836 Replace write refs 2022-08-05 17:23:18 +12:00
Jake Barnby
7b9fb32fae Update role references 2022-08-03 21:52:34 +12:00
Jake Barnby
dbb8e5421a Fix syntax error 2022-08-03 17:43:03 +12:00
Jake Barnby
1ab86c9331 Role reference updates 2022-08-03 16:17:49 +12:00
Jake Barnby
ce38e74ba2 Update remaining services to new permissions 2022-08-02 21:21:53 +12:00
Matej Bačo
15b5df10a4 Fix search attribute regarding phone number 2022-07-28 09:36:08 +00:00
Bradley Schofield
96c6c0ff00 Migrate all exceptions to new signature 2022-07-26 15:24:32 +01:00
Matej Bačo
ef3496d55b Bug fixing afte merge 2022-07-25 12:37:29 +00:00
Matej Bačo
dbccf39a9f Merge branch 'master' into feat-password-hash-algos 2022-07-25 12:37:07 +00:00
Bradley Schofield
40022decb4 Start working on simplifying exceptions 2022-07-22 15:38:06 +01:00
Torsten Dittmann
5604a6837f Merge branch '0.16.x' of https://github.com/appwrite/appwrite into origin/datetime-attributes 2022-07-14 14:14:05 +02:00
fogelito
45ac40cc85 change function names 2022-07-13 17:02:49 +03:00
fogelito
f384a3352b change class from database:: to dateTime:: 2022-07-12 16:32:39 +03:00
Steven
3666d0ab73 Add alias for POST /v1/account/sessions/email
Add /v1/account/sessions as an alias for POST /v1/account/sessions/email
for backwards compatibility.
2022-07-07 22:23:52 +00:00
fogelito
acba505144 addCookie timestamp 2022-07-05 21:24:10 +03:00
fogelito
203b3058a2 providerAccessTokenExpiry 2022-07-05 16:06:55 +03:00
fogelito
a9a91603d1 account expire 2022-07-05 13:59:03 +03:00
fogelito
903ca342cb Model changes 2022-07-04 13:11:38 +03:00
fogelito
8628105eef Model changes 2022-07-04 12:55:11 +03:00
Christy Jacob
9fdaa92bd1 feat: trigger sms for createVerification 2022-06-29 01:04:08 +02:00
Christy Jacob
43f834c0bd feat: add new errors for phone auth 2022-06-24 12:49:00 +02:00
Torsten Dittmann
9d7b6927d6 Merge branch '0.15.x' of https://github.com/appwrite/appwrite into feat-increase-array-element-length 2022-06-22 11:10:03 +02:00
Matej Bačo
bd9cb92035 Fix tests 2022-06-22 08:00:12 +00:00
Matej Bačo
d9a88515bc Merge remote-tracking branch 'origin/0.15.x' into feat-password-hash-algos 2022-06-21 14:03:19 +00:00