1
0
Fork 0
mirror of synced 2024-07-06 23:21:05 +12:00
Commit graph

9279 commits

Author SHA1 Message Date
Jake Barnby 8820d422be
Update app/controllers/api/databases.php 2023-08-14 20:45:05 -04:00
Jake Barnby 4ddb0ce6a7
Merge remote-tracking branch 'upstream/cl-1.4.x' into feat-add-encrypt-param 2023-08-14 19:37:37 -04:00
Matej Bačo 75e66e675b Move oauth secret to identity 2023-08-10 01:02:13 +02:00
Bradley Schofield c6302014f5
Run Linter 2023-08-09 23:51:36 +01:00
Bradley Schofield f4ef252bf2
Update migrations.php 2023-08-09 23:47:51 +01:00
Bradley Schofield d001f14249
Add Service Account Role Assignment 2023-08-09 23:46:23 +01:00
Bradley Schofield fead8eb47a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-implement-migrations 2023-08-09 18:08:40 +01:00
Bradley Schofield 0d58d20635
Update Migration Lib 2023-08-09 18:08:10 +01:00
Steven Nguyen 09254aeae0
Add description for the delete account identity's identityId param 2023-08-09 09:25:29 -07:00
Steven Nguyen c7c546bfe7
Add a secrets attribute to the identities collection
These secrets can be used to store data from the provider that may or
may not be sensitive.

For example, this will be used by the migration API when connecting to
Firebase to store the service account used for the migration.

This data will only be used internally inside Appwrite and not exposed
to an end user or developer.
2023-08-09 09:01:51 -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
Bradley Schofield 1135060681
Start work on identities implementation 2023-08-09 16:18:17 +01:00
Christy Jacob 7d60e4272d Merge branch 'cl-1.4.x' of https://github.com/appwrite/appwrite into feat-implement-migrations 2023-08-09 13:59:44 +00:00
Jake Barnby d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04:00
Christy Jacob 5be55f05e8 feat: update error page 2023-08-08 21:25:48 +00: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
Bradley Schofield 47ebf77ff0 Continue work on OAuth Firebase last stage 2023-08-08 20:28:38 +01:00
Christy Jacob 347cd4d13f feat: generte specs 2023-08-08 16:58:06 +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
Christy Jacob 5b42d2c21f feat: review comments 2023-08-08 16:47:51 +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
Bradley Schofield f4cbcb1383 Re-Add collections 2023-08-08 13:45:33 +01: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
Bradley Schofield e28dd260c3 Update init.php 2023-08-07 16:17:34 +01: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
Eldad A. Fux 88e1deefb5
Merge pull request #5929 from appwrite/feat-sync-1.4-with-master
Sync with master
2023-08-07 17:57:43 +03:00
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 04b8030a27
Merge pull request #5875 from appwrite/fix-aac-file-issue
audio/aac mime type added
2023-08-07 17:33:50 +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
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
Eldad A. Fux 06570a081a
Merge pull request #5928 from safwanyp/fix-5517-fix-stale-team-memberships-on-user
Fixed bug where memberships remained after a team is deleted
2023-08-05 06:34:48 +03:00
Eldad A. Fux 702424ed31
Merge pull request #5694 from Miguelii/fix-5693-portuguese-email-template-missing-word
Added missing word to portuguese email template
2023-08-05 06:32:11 +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 d1c0bccb59
Merge tag '1.3.8' into cloud-1.3.x 2023-08-04 14:12:58 -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 84b159938e Regenerate Specs 2023-08-04 17:23:42 +01:00
Bradley Schofield 8f5d79e668 Move to new branch 2023-08-04 17:21:41 +01: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
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