1
0
Fork 0
mirror of synced 2024-07-05 22:51:24 +12:00
Commit graph

2542 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
prateek banga ebcb43bbad use getUser to fetch userId in test 2023-08-08 21:20:19 +05:30
Bishwajeet Parhi b3e962ba05 Merge branch 'master' into feat-whitelist-enums 2023-08-08 11:35:36 +05:30
Bishwajeet Parhi c3ebdc46e2 Merge branch 'master' into feat-add-encrypt-param 2023-08-08 11:04:28 +05:30
Matej Bačo 906f86fbb8 Merge branch 'cloud-1.4.x' into feat-git-integration 2023-08-06 09:31:32 +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 aa3c2faed9
Merge tag '1.3.8' into cloud-1.3.x-2 2023-08-04 13:55:07 -07: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
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
prateek banga f797c2574a resolve merge conflicts with 1.4.x 2023-08-03 17:38:22 +05:30
prateek banga f8ae04f3b9 resolve merge conflicts with 1.4.x branch 2023-08-03 15:25:48 +05:30
prateek banga fb3bab7e2e fix lint issues 2023-08-01 23:32:15 +05:30
prateek banga 40b0c081f7 remove checkPermission from Appwrite and more complex test case
This commit removes check pemission from update document in appwrite as permission is being checked by Utopia already. This commits also improves the test case to have 3 levels of depth with relationships
2023-08-01 23:29:15 +05:30
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
prateek banga f7e96282db adds attribute for update method and makes test case to check more complex scenario 2023-07-29 12:01:10 +05:30
prateek banga 484ad8280e fixes test case assertion 2023-07-27 02:29:14 +05:30
prateek banga e631f393fc fix lint issues and remove sleep from test 2023-07-27 02:23:20 +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 21bc2ae560 lint issues 2023-07-27 02:03:01 +05:30
Prateek Banga b8b3d13f22 added test case for verifying permission issue with relations 2023-07-27 02:02:55 +05:30
Prateek Banga a6abc7c4e8 add support of queries in list indexes 2023-07-27 01:19:48 +05:30
Prateek Banga ead77d6cad Add support for queries in List attributes endpoint 2023-07-27 01:16:34 +05:30
Bishwajeet Parhi f160c55ecb Chore: remove encrypt param on update Atrribute and tests as well 2023-07-26 11:25:25 +05:30
Bishwajeet Parhi a15551368f Merge branch 'master' into feat-add-encrypt-param 2023-07-26 11:20:06 +05:30
Steven Nguyen 5be6d8e90b
Update Project providers to also include the provider key
Pass the provider key and name back so that a nicely formatted name
can be shown in the Appwrite Console.
2023-07-20 16:53:33 -07:00
Christy Jacob c26194e189 Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 17:19:18 +04:00
Christy Jacob 6cdc8a97b7 chore: update tests 2023-07-20 17:12:41 +04:00
Steven Nguyen 2befa60350
Track a user's last activity
A user will have an accessedAt timestamp that will update at most once
per day if they make some API call. This timestamp can then be used
find active users and calculate daily, weekly, and monthly active users.

To ensure consistent updates to the user the $user from the resource
is always updated to the user making the request, including requests
like Create Account, Update Team Membership Status, and Create Phone
Session (confirmation). This ensures the shutdown can update the
accessedAt timestamp if there was a $user set.
2023-07-19 22:22:58 -07:00
Eldad A. Fux 66fee90af9
Merge pull request #5199 from appwrite/feat-custom-smtp
[FEAT] Custom SMTP and Template support
2023-07-20 07:09:11 +03:00
Damodar Lohani 6e54b79812 fix 2023-07-20 01:35:01 +00:00
Damodar Lohani cb8341fa5b fix test 2023-07-20 01:33:27 +00:00
Damodar Lohani 0c2848bece using maildev for smtp test 2023-07-20 01:32:19 +00:00
Steven cc42700299
Fix test after session expire format was updated 2023-07-19 23:52:33 +00:00
Christy Jacob 4c8608b49c chore: update naming conventions 2023-07-20 02:24:32 +04:00
Christy Jacob 43ee8e1ed4 fix: update tests 2023-07-20 02:17:16 +04:00
Christy Jacob e493551f8a Merge branch '1.4.x' of github.com:appwrite/appwrite into disallow-personal-data 2023-07-20 01:44:25 +04:00
Christy Jacob cd57da8ead fix: update tests 2023-07-20 01:42:42 +04:00
Damodar Lohani 9289ec1959 fix date format in test 2023-07-19 08:49:20 +00:00
Damodar Lohani 4fd5c72f34 Merge branch 'master' into feat-1.4.x-with-1.3.x-master 2023-07-19 07:39:37 +00:00
Damodar Lohani 8dc5c2cb4c Merge remote-tracking branch 'origin/1.4.x' into feat-custom-smtp 2023-07-19 07:24:58 +00:00
Eldad A. Fux 7a2c789c6b
Merge pull request #5745 from vaibhavagarwal220/fix-5220-handle-null-name
fixed null $name error for anonymous user
2023-07-19 00:21:09 +03:00
Eldad A. Fux b2b1b6e2e4
Merge pull request #5562 from fanatic75/fix-4846-added-expiry-value-to-account-sessions
fix expire field in list account sessions api
2023-07-19 00:17:53 +03:00
Eldad A. Fux 6bf6bc7dc3
Merge pull request #5743 from appwrite/feature-restrict-project-id-chars
Restrict characters for project ID
2023-07-18 18:06:01 +03:00
Torsten Dittmann 74308b445e
Merge pull request #5587 from appwrite/feat-user-labels
Add a new labels attribute to the Users collection
2023-07-18 14:59:18 +02:00
jaivik 6380004678
Merge branch 'appwrite:master' into fix-5768-pull-request-to-return-team-id-conflict-error 2023-07-18 10:35:52 +05:30
Eldad A. Fux 11c9066c4d
Merge pull request #5402 from appwrite/fix-chunked-upload
content-range end should be 1 less than file size
2023-07-18 06:55:05 +03:00
jaivix b78401923f test case minor fix 2023-07-13 12:10:52 +05:30
Christy Jacob e0aa3db21e Merge branch '1.4.x' of https://github.com/appwrite/appwrite into disallow-personal-data 2023-07-11 19:36:37 +00:00
Damodar Lohani fa94e4830c function usage fix name 2023-07-11 04:35:27 +00:00
vaibhavagarwal220 48fc58d365 fixed linting errors 2023-07-11 09:33:02 +05:30
Damodar Lohani 6e505f17ff fix server test 2023-07-11 02:37:58 +00:00
Prateek Banga e1ba324196 fix formatting issues in comments according to feedback in PR. 2023-07-10 13:34:32 +05:30
Damodar Lohani f59d3563f4 Merge remote-tracking branch 'origin/feat-db-pools-master' into feat-db-pools-db-pools-master-sync 2023-07-10 03:06:48 +00:00
jaivix a6671a5caa fixed team creation response if teamId already exists 2023-07-09 16:50:09 +05:30
Bishwajeet Parhi f71fdfb0b9 chore: add encrypt param on update string attr + unit tests 2023-07-08 20:58:41 +05:30
Prateek Banga a98248478f lint issues 2023-07-08 01:31:20 +05:30
Prateek Banga 4542ec34ae added test case to verify update of two way relationship 2023-07-08 01:28:24 +05:30
vaibhavagarwal220 4e24b7eb42 update e2e test for anonymous user verification 2023-07-07 00:20:13 +05:30
Bishwajeet Parhi 96f1284cbf Merge remote-tracking branch 'upstream/master' into feat-add-encrypt-param 2023-07-06 19:52:50 +05:30
Steven Nguyen 33f5cbeca6
Restrict characters for project ID
Only allow lowercase alphanumeric chars and hyphens
because the project ID is used as part of url
schemes to redirect users back to mobile apps
and certain characters are not allowed.
2023-06-23 16:22:42 -07:00
Bishwajeet Parhi ed8bdc66c8 chore: fix indentation 2023-06-23 15:59:23 +05:30
Prateek Banga c4ef7fddc0
Merge branch 'appwrite:master' into fix-4846-added-expiry-value-to-account-sessions 2023-06-23 08:04:38 +05:30
Christy Jacob 9f2bf844c7
Merge pull request #5580 from appwrite/fix-project-deletion-master
remove password required for project deletion
2023-06-22 22:52:59 +05:30
Bishwajeet Parhi ee30a3e9f4 chore: refactor tests and param positioning changes 2023-06-22 09:59:09 +05:30
Bishwajeet Parhi 09162e8880 chore: fix failing tests 2023-06-21 16:25:22 +05:30
Bishwajeet Parhi 7ce10023c0 chore: add tests and remove encrypt param on url,enum,ip,email 2023-06-21 16:15:00 +05:30
Bishwajeet Parhi 3aabaeb8be Merge branch 'master' into feat-add-encrypt-param 2023-06-21 15:12:47 +05:30
Christy Jacob 1980b8c677 Merge branch 'feat-db-pools-master' of https://github.com/appwrite/appwrite into refactor-collections-config-db-pools 2023-06-15 14:30:27 +00:00
Christy Jacob 18f5418f5c chore: update tests 2023-06-15 13:23:15 +00:00
Christy Jacob ede673cc7e chore: linter 2023-06-15 12:55:10 +00:00
Christy Jacob 6853a44f03 feat: update tests 2023-06-15 11:06:04 +00:00
Jake Barnby 813e0d6c6c
Increase sleep 2023-06-15 17:40:36 +12:00
Jake Barnby 0363993f13
Fix errors 2023-06-15 17:28:35 +12:00
Damodar Lohani 57411db2d3 upadate to use refactored collections config 2023-06-15 00:34:12 +00:00
Jake Barnby 031f8270ff
Merge remote-tracking branch 'origin/1.4.x' into validator-mv
# Conflicts:
#	composer.lock
2023-06-15 12:28:32 +12:00
Christy Jacob a9e2eca8a4
Merge pull request #5683 from appwrite/master
Update 1.4.x from Master
2023-06-12 13:20:26 +05:30
Steven Nguyen 09f3577256
Update Appwrite to add User labels to Auth roles 2023-06-09 10:18:51 -07:00
Steven Nguyen 8400394857
Add an endpoint to update user labels 2023-06-09 10:18:51 -07:00
Bishwajeet Parhi 320579209e add new unit tests [failing] 2023-06-08 16:34:57 +05:30
Steven Nguyen 85a40bf82d
Add a new labels attribute to the Users collection
This labels attribute can be used apply labels to users. These labels
can eventually be used:

* with permissions to grant access
* to filter users in the Users collection
2023-06-05 14:12:28 -07:00
Damodar Lohani fcf558b58b fix team 2023-06-05 07:11:44 +00:00
Steven Nguyen 092f0cfcaf Fix the routing for the default OAuth2 pages 2023-06-03 20:05:45 +05:30
Steven Nguyen e87e2fc16d Fix the routing for the default OAuth2 pages 2023-06-03 14:16:47 +05:30
Christy Jacob 73f410cc60
Merge pull request #5640 from appwrite/fix-oauth-routes 2023-06-03 12:51:41 +05:30
Steven Nguyen bd6b0dcc43
Fix the routing for the default OAuth2 pages 2023-06-02 14:22:28 -07:00
Torsten Dittmann 223663aa89
Merge pull request #5637 from appwrite/1.3.x
sync 1.3.x
2023-06-02 16:30:55 +02:00
Torsten Dittmann a664363525 fix: trailing wildcards 2023-06-02 15:20:58 +02:00
Prateek Banga 5dc65ea374 fix updated test case to check if expire is valid iso string or not 2023-06-02 15:15:06 +05:30
Prateek Banga 1475497ffb Merge branch 'master' of https://github.com/fanatic75/appwrite into fix-4846-added-expiry-value-to-account-sessions 2023-06-02 14:53:26 +05:30
Damodar Lohani db44001f34 update test 2023-06-01 05:46:14 +00:00
Christy Jacob 44fd41d2ea Merge branch 'master' of https://github.com/appwrite/appwrite into 1.3.x 2023-05-30 16:58:22 +00:00
Jake Barnby e44e4e7766
Merge pull request #5603 from appwrite/hotfix-route-mismatch
Update framework to fix route mismatches
2023-05-30 23:33:17 +12:00
Jake Barnby d2bfe46fca
Set min length to 0 for default value when creating or updating a string attribute
(cherry picked from commit c61e54f69b)
2023-05-30 19:42:13 +12:00
Jake Barnby 5f5ed7dc19
Fix graphql upload test path 2023-05-30 19:41:06 +12:00
Jake Barnby edce3cceed
Fix tests
(cherry picked from commit 0661f1f889)
(cherry picked from commit bab804b8e1)

# Conflicts:
#	tests/e2e/Client.php
2023-05-30 19:01:46 +12:00
Jake Barnby 91c5e066ec
Update framework to fix route mismatches
(cherry picked from commit d42f6738a9)

# Conflicts:
#	composer.lock
(cherry picked from commit c2e711b021)

# Conflicts:
#	composer.json
#	composer.lock
2023-05-30 19:00:42 +12:00
Jake Barnby bab804b8e1
Fix tests
(cherry picked from commit 0661f1f889)
2023-05-30 18:29:20 +12:00