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

4397 commits

Author SHA1 Message Date
prateek banga
c7dec3762b Adds getTarget and list targets controller to user and account 2023-08-16 20:13:38 +05:30
prateek banga
92e587769a resolve merge conflicts 2023-08-16 15:16:45 +05:30
Jake Barnby
c00c5119b2
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-14 19:33:56 -04:00
Bishwajeet Parhi
d0755a587f Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-10 22:31:53 +05:30
prateek banga
4d03610755 resolve merge conflicts 2023-08-09 03:23:45 +05:30
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
prateek banga
51ceb5d74a prohibit select queries in list attributes and remove static method 2023-08-09 00:12:53 +05:30
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
b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
prateek banga
7e185cd799 moved formatting logic to relationship attribute model 2023-08-08 03:34:13 +05:30
prateek banga
52e800cc59 refactor according to review feedback 2023-08-08 02:56:20 +05:30
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
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
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
prateek banga
9057a50a10 rename provider param in config 2023-08-07 15:54:00 +05:30
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
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
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
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
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
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
prateek banga
27e0ec339a fix more lint issues 2023-07-27 02:59:06 +05:30
Steven Nguyen
611524476b
Merge branch 'master' into feat-master-to-1.4.x 2023-07-26 13:33:49 -07:00
prateek banga
301af0d3fe fixes lint issues and adds status in list attributes query support 2023-07-27 01:24:47 +05:30
Prateek Banga
98a226dae9 adds collection and database calls for better error messages 2023-07-27 01:20:16 +05:30