Commit Graph

4120 Commits

Author SHA1 Message Date
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
Bradley Schofield f0477a7f2b Move collections and update redirect sig 2023-08-08 14:36:44 +01:00
Matej Bačo 26aa37ccf0 Linter fix 2023-08-08 11:46:43 +02:00
Matej Bačo 2b96fb6c6f Allow editing runtime 2023-08-08 11:28:25 +02:00
Bishwajeet Parhi b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
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
prateek banga 385f76d7f2 lint fix 2023-08-08 04:42:00 +05:30
prateek banga 60236b3af6 refactor according to review comments 2023-08-08 04:40:07 +05:30
prateek banga 7e185cd799 moved formatting logic to relationship attribute model 2023-08-08 03:34:13 +05:30
Steven Nguyen 073b9963d2 Merge branch 'feat-git-integration' into feat-user-identities-git-integration 2023-08-07 14:46:00 -07:00
prateek banga 52e800cc59 refactor according to review feedback 2023-08-08 02:56:20 +05:30
Khushboo Verma d19769415f Throw exception from createRepo 2023-08-07 21:09:51 +05:30
Matej Bačo 11068696c9 QA changes 2023-08-07 17:37:36 +02:00
Bradley Schofield 91c82f0d7d Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-07 16:09:28 +01:00
prateek banga 0630f56dd5 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into feat-query-support-attributes-indexes 2023-08-07 20:35:55 +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
Bradley Schofield f27345fb92 Update SDK 2023-08-07 11:56:42 +01:00
Damodar Lohani a6109a0341 Merge remote-tracking branch 'origin/1.4.x' into feat-framework-router-v2 2023-08-07 08:42:04 +00:00
Matej Bačo d5fd3a28f9 More QA fixes 2023-08-06 15:11:30 +02:00
Matej Bačo 345df3f2ca More QA fixes 2023-08-06 12:30:38 +02:00
Matej Bačo e60456cfda QA after merge with 1.4 2023-08-06 10:51:53 +02:00
Matej Bačo 906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +02:00
Matej Bačo eb63ec9b10 Support failure url on vcs 2023-08-05 20:53:42 +02:00
Matej Bačo 8a9f3f1b54 Update build to use 1 logs attribute 2023-08-05 16:50:28 +02: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 cb7abdb906 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-04 15:07:36 -07:00
Steven Nguyen bcd44432d1 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-04 15:07:36 -07:00
Steven Nguyen 27e212553d 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-04 15:07:36 -07:00
Steven Nguyen aa3c2faed9 Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07:00
Bradley Schofield 8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01:00
Bishwajeet Parhi 5f1a515f00 Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-04 19:20:44 +05:30
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
Matej Bačo 8bc933ab91 Fix template issues 2023-08-04 10:56:46 +02: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
prateek banga ea57a303d0 lint fixes 2023-08-03 17:39:13 +05:30
prateek banga f797c2574a resolve merge conflicts with 1.4.x 2023-08-03 17:38:22 +05:30
prateek banga 1d558fa5f5 Add select queries support to list indexes and list attributes endpoint 2023-08-03 17:34:28 +05:30
Damodar Lohani 2a7ec490af setup appwrite assistant for test 2023-08-03 10:29:36 +00:00
prateek banga f8ae04f3b9 resolve merge conflicts with 1.4.x branch 2023-08-03 15:25:48 +05:30
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