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

3545 commits

Author SHA1 Message Date
Jake Barnby
d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04: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
Bishwajeet Parhi
2f3e14932a fix: Tests 2023-08-08 11:34:02 +05:30
Bishwajeet Parhi
c3ebdc46e2 Merge branch 'master' into feat-add-encrypt-param 2023-08-08 11:04:28 +05:30
Eldad A. Fux
90e89aa02e
Merge pull request #5934 from appwrite/feat-appwrite-assistant
Feat appwrite assistant
2023-08-07 17:56:22 +03: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
Eldad A. Fux
a56f91b054
Merge branch 'master' into feat-5542-validate-x-appwrite-id-header-for-CreateFile 2023-08-05 06:36:21 +03: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
Damodar Lohani
767a3caef8 remove unused injection 2023-08-04 13:17:23 +00:00
Damodar Lohani
cd18853fed add abuse labels 2023-08-04 13:16:57 +00:00
Damodar Lohani
64321cfb0b remove authorization 2023-08-04 13:08:59 +00:00
Safwan Parkar
451f4bee19 Fixed an incorrect test for team deletion
This commit contains changes in 3 places.

- First I changed the placement of an informative comment in the DELETE TEAM controller, and moved it outside of the loop. I did this when Steven pointed out that the behaviour I describe in the comment is for the whole loop.

- The second change is the removal of my first test. I was facing quite a few issues with creating users in the test, and ended up using the CREATE TEAM MEMBERSHIP to perform 2 actions at once -> create a new user if one doesn't exist with the provided email, and create a membership for the user. Before this approach, I had quite a bit of code that didn't work, and it seems like I removed some things that weren't supposed to be removed, and didn't change variable names where necessary. Anyway, I figured that the problem has something to do with the user being created on the client side, so I moved the test to the server side.

- The new test I implemented does the same thing as my previous failed test, but in more detailed and distinct steps. The test first creates 5 new users inside of a loop, and pushes each new user's ID to an array called 'new_users' if the response is as expected. Then a new team is created. The next step is to create memberships for all 5 users. If all these steps pass, the new team that was just created, is deleted, and we check to make sure the new users have 0 team memberships each.

Formatter and linter showed no errors. Tests were successful on localhost.
2023-08-04 15:40:42 +04:00
Damodar Lohani
49085be4e4 fix formatting 2023-08-04 02:17:02 +00:00
Damodar Lohani
45afea9175 moved assistant endpoint to console, and add env support 2023-08-04 01:42:22 +00:00
Safwan Parkar
d142620c5e invalidate cached document of user
- cache caused stale data in memberships
2023-08-03 22:08:27 +04:00
Safwan Parkar
a14d89eb3c remove error-causing condition 2023-08-03 21:39:18 +04:00
Damodar Lohani
2a7ec490af setup appwrite assistant for test 2023-08-03 10:29:36 +00:00
Safwan Parkar
2bc2061f09 fix showing of stale team memberships 2023-08-02 18:44:43 +04:00
Safwan Parkar
c5233d9ece removed unnecessary code 2023-08-02 12:18:21 +04: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
Safwan Parkar
a45c62ab24 run composer scripts 2023-08-01 23:24:46 +04:00
Safwan Parkar
0fe59d457b fixed stale team memberships on user 2023-08-01 22:57:59 +04:00
Steven Nguyen
eb7526601d
Delete duplicate 'Update Email Verification' endpoint 2023-07-31 11:00:30 -07:00
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
Bishwajeet Parhi
f160c55ecb Chore: remove encrypt param on update Atrribute and tests as well 2023-07-26 11:25:25 +05:30
Bishwajeet Parhi
a15551368f Merge branch 'master' into feat-add-encrypt-param 2023-07-26 11:20:06 +05:30
Prateek Banga
f7c02d9308 removes extra db call and uses document find method 2023-07-24 23:41:49 +05:30
Prateek Banga
7d412b4741 adds get db call and get collection call 2023-07-24 12:02:28 +05:30
Prateek Banga
d569c17764 Merge branch 'master' of https://github.com/appwrite/appwrite into change-use-find-instead-iterating-index-array 2023-07-21 00:49:15 +05:30
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
Christy Jacob
6cdc8a97b7 chore: update tests 2023-07-20 17:12:41 +04:00
Christy Jacob
0feaf41fcb Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into feat-db-pools 2023-07-20 11:53:36 +00:00
Prateek Banga
b700336d45 fix get index route to use find 2023-07-20 14:52:05 +05:30
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
187f3dc6ff
Update get logs APIs to return userId from data
The audit userId is actually the internal id and the user id is in the
data attribute.
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
Prateek Banga
8328dac86b lint issues 2023-07-19 14:08:02 +05:30
Prateek Banga
131e9658a5 change to use findOne instead of iterating index array 2023-07-19 14:04:35 +05:30
Damodar Lohani
4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00