1
0
Fork 0
mirror of synced 2024-10-03 19:53:33 +13:00
Commit graph

9489 commits

Author SHA1 Message Date
Matej Bačo
9d0eda68d6 Upgrade after conflict 2023-08-09 12:35:04 +02:00
Matej Bačo
93735ac4a7 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration 2023-08-09 12:30:45 +02:00
Matej Bačo
ebeda626cd Update console 2023-08-09 11:53:17 +02:00
Matej Bačo
a60b54f434 Use identities table 2023-08-09 11:52:34 +02:00
Khushboo Verma
c6cdc0c37c Fix broken functions flow 2023-08-09 13:16:17 +05:30
Eldad A. Fux
6ce3045f89
Merge pull request #5921 from appwrite/feat-user-identities-git-integration
Separate OAuth2 info from Sessions into Identities
2023-08-09 10:18:43 +03: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
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
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
Steven Nguyen
073b9963d2
Merge branch 'feat-git-integration' into feat-user-identities-git-integration 2023-08-07 14:46:00 -07:00
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
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
Matej Bačo
2bbdbaebd3 Upgrade SDKs 2023-08-06 21:14:25 +02:00
Matej Bačo
3b15dccc84 More QA fixes 2023-08-06 15:42:18 +02: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
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
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
9ac4c998ae
Ensure a user's identities are deleted when user is deleted 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
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
Matej Bačo
787a5c42de Remove debug logs 2023-08-04 10:57:42 +02:00
Matej Bačo
8bc933ab91 Fix template issues 2023-08-04 10:56:46 +02:00
Matej Bačo
1db0c57518 PR review changes 2023-08-04 07:59:23 +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
Khushboo Verma
0b6fb471f6 Updated GitHub comment table 2023-08-04 01:04:04 +05:30
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
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
43d5c96f7d
Ensure a user's identities are deleted when user is deleted 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
Safwan Parkar
2bc2061f09 fix showing of stale team memberships 2023-08-02 18:44:43 +04:00
Damodar Lohani
078f7e58d6 Merge remote-tracking branch 'origin/master' into feat-sync-1.4-with-master 2023-08-02 09:43:09 +00:00
Safwan Parkar
c5233d9ece removed unnecessary code 2023-08-02 12:18:21 +04:00
Eldad A. Fux
75894987f9
Merge pull request #5917 from appwrite/doc-dsn-url-encode
Update the docs for the _APP_SMS_PROVIDER env var
2023-08-02 08:43:58 +03:00
Eldad A. Fux
be67fe96f6
Merge pull request #5922 from appwrite/feat-error-page
Style Appwrite Error Page
2023-08-02 08:43:03 +03: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
ee6e65ffbc
Style appwrite error page 2023-08-01 11:23:27 -07:00
Vincent (Wen Yu) Ge
f6d2df8115
Update app/controllers/shared/api.php
Co-authored-by: Christy Jacob <christyjacob4@gmail.com>
2023-08-01 12:21:34 -04:00
Christy Jacob
3b4255c457
fix: error in initialising the Exception constructor in api.php 2023-08-01 18:18:27 +05:30
Khushboo Verma
5b9f71afe5 Add try-catch to listRepositories 2023-08-01 14:10:16 +05:30
Matej Bačo
c8010ecae8 Fix CURL 2023-08-01 09:45:37 +02:00
Steven Nguyen
eb7526601d
Delete duplicate 'Update Email Verification' endpoint 2023-07-31 11:00:30 -07:00
Steven Nguyen
5b36a820a4
Update the docs for the _APP_SMS_PROVIDER env var
To handle special characters like '@' or '/', the user
and secret values must be URL encoded.
2023-07-31 10:53:42 -07:00
Matej Bačo
ac2ca267d7 Address more PR reviews 2023-07-31 08:47:47 +02:00
Matej Bačo
c7605b85e0 Remove vcs prefix 2023-07-30 21:10:25 +02:00
Matej Bačo
57a4d5ad66 Upgrade console, formatting 2023-07-30 15:30:30 +02:00
Matej Bačo
6cea5a12bb Improve performance of listRepositores 2023-07-30 15:24:10 +02:00
Matej Bačo
c3cef56e39 Bug fixing after QA 2023-07-30 15:12:55 +02:00
Matej Bačo
34d310154f Upgrade console 2023-07-30 14:17:50 +02:00
Matej Bačo
280b2fc994 Rename repositories and installation IDs 2023-07-30 11:51:13 +02:00
Matej Bačo
96338954d2 Better runtime detection 2023-07-30 10:30:47 +02:00
Matej Bačo
a718f09f74 Update execution model, add detection to repository 2023-07-30 09:17:23 +02:00
Matej Bačo
2e177873c0 Update execution response model 2023-07-29 18:20:20 +02:00
Matej Bačo
22f638e6aa rename vcsRepos to vcsRepositories 2023-07-29 18:04:43 +02:00
Matej Bačo
e6d1a3424f Fix github state 2023-07-29 18:03:18 +02:00
Matej Bačo
6fb72db7c4 Rename exception 2023-07-29 18:03:13 +02:00
Eldad A. Fux
a22685fd07
Merge pull request #5898 from appwrite/fix-5588-delete-org-and-project
Delete project when deleting org
2023-07-29 06:50:47 +03:00
Matej Bačo
f13d70d5be Rename env vars 2023-07-28 10:53:07 +02:00
Matej Bačo
37c0cc122a More PR review changes 2023-07-28 10:27:16 +02:00
Matej Bačo
1bd226ab81 Merge branch 'feat-git-integration' of https://github.com/appwrite/appwrite into feat-git-integration 2023-07-28 09:56:12 +02:00
Matej Bačo
ce98b04348 Address PR reviews 2023-07-28 09:56:07 +02:00