1
0
Fork 0
mirror of synced 2024-07-15 19:36:08 +12:00
Commit graph

15453 commits

Author SHA1 Message Date
Bishwajeet Parhi b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
Eldad A. Fux a7094310d7
Merge pull request #5550 from Suven-p/feat-5542-validate-x-appwrite-id-header-for-CreateFile
Validate value of x-appwrite-id header
2023-08-05 13:23:52 +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
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
Safwan Parkar 4a9af13f16 run formatter and linter
Run the composer format and lint commands, which I forgot to run before.
2023-08-04 23:41:29 +04:00
Safwan Parkar 0295c6ec1b improve test by removing user creation loop
The CREATE TEAM MEMBERSHIP endpoint requires the email of the user to be added to the team. If the user does not exist in the project, a new user is created with the specified email and added to the team.

The first version of the test creates 5 users, and then adds them to the newly created team. This process is more streamlined now, by using the CREATE TEAM MEMBERSHIPS behaviour to create a user on the go and create a membership for them immediately after.

I also change the way I add user IDs to the array, by using the shorthand notation instead of the `array_push` function.
2023-08-04 23:17:41 +04:00
Bishwajeet Parhi dfc7ab97ab update spec files 2023-08-04 19:28:38 +05:30
Bishwajeet Parhi 5f1a515f00 Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-04 19:20:44 +05:30
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
Safwan Parkar 06e1191063 added test 2023-08-04 00:34:01 +04: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
Eldad A. Fux 9f7f99ba83
Merge pull request #5935 from appwrite/feat-vcs-logos
Add VCS assets
2023-08-03 14:47:54 +03:00
Khushboo Verma 717f9ca471 Add VCS assets 2023-08-03 16:56:32 +05:30
Eldad A. Fux 8ed4029169
Merge pull request #5867 from appwrite/feat-base-image-upgrade
test updated docker-base version
2023-08-03 10:30:04 +03: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 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
Eldad A. Fux b86a62bb3b
Merge pull request #5918 from appwrite/fix-5717-duplicate-users-endpoint
Delete duplicate users endpoint
2023-08-01 22:46:19 +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
Christy Jacob fcd4a69ad1
Merge pull request #5924 from appwrite/christyjacob4-patch-1
fix: error in initialising the Exception constructor in api.php
2023-08-01 20:51:49 +04: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
Eldad A. Fux 264c7bf9a9
Merge pull request #5916 from appwrite/fix-5913-dsn-with-special-chars
Update DSN to support special chars for user and password
2023-08-01 09:32:11 +03: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
Steven Nguyen b960634088
Update DSN to support special chars for user and password
Previously, DSN would not be able to parse special characters like "@"
or "/". This adds support by requiring the input to be url encoded and
then DSN would decode it after parsing.
2023-07-31 09:36:49 -07:00
Damodar Lohani 42e6400660 update base image 2023-07-30 01:29:18 +00: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
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 1319fd1f81
Delete project from console when org is deleted 2023-07-27 18:29:23 -07: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 3499a7028c
Create OAuth2 exception class 2023-07-27 17:19:49 -07:00
Steven Nguyen 7de29e2991
Fix typing issues in OAuth2 2023-07-27 15:29:48 -07:00
Eldad A. Fux 0b30c7def8
Merge pull request #5886 from appwrite/feat-master-to-1.4.x
Merge master into 1.4.x
2023-07-27 13:56:42 +03:00
Damodar Lohani 116f459bab test swoole 5.0.1 2023-07-27 07:13:37 +00:00
Damodar Lohani ba84579a8a update base image version 2023-07-27 00:41:59 +00: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
Damodar Lohani 844c60f35a upgrade base image and utopia-swoole 2023-07-26 07:23:25 +00:00
Eldad A. Fux 887abad190
Merge pull request #5707 from appwrite/docs-delete-session
Update delete session description to be actually correct
2023-07-26 02:10:00 +03:00
Eldad A. Fux f6d96237e7
Merge pull request #5755 from mendelgordon/doc-fix-magic-session-typo
Fix small typo in docs
2023-07-25 22:09:31 +03:00
Damodar Lohani bd428fc436 update composer versions 2023-07-25 09:37:05 +00:00
Damodar Lohani dc07758f4d fix composer version 2023-07-25 09:10:27 +00:00