1
0
Fork 0
mirror of synced 2024-07-05 14:40:42 +12:00
Commit graph

2682 commits

Author SHA1 Message Date
Jake Barnby a1d0b67c6b
Fix SMTP 2023-08-30 00:30:44 -04:00
Jake Barnby 49fa5550bb
Fix sleep wait 2023-08-28 23:15:02 -04:00
Jake Barnby f43f155224
Fix template test 2023-08-28 22:41:48 -04:00
Jake Barnby 34cb1a2229
Fix graphql tests 2023-08-28 22:25:11 -04:00
Jake Barnby 0a1ab4ae60
Add back codes env var 2023-08-28 22:24:52 -04:00
Jake Barnby ef25c176ed
Fix retry build test 2023-08-28 21:11:57 -04:00
Matej Bačo 596e59f2cc response format fix, smtp QA fixes 2023-08-25 17:13:25 +02:00
Matej Bačo 293e44e91e Introduce SMTP ping timeout 2023-08-24 13:04:49 +02:00
Jake Barnby 0f36245f78
Fix message checks 2023-08-23 16:42:16 -04:00
Jake Barnby e8ae7fb49a
Fix test wrong depends 2023-08-23 01:17:14 -04:00
Jake Barnby c30b5b1a77
Fix missing var 2023-08-22 23:39:38 -04:00
Jake Barnby 08cc7e8c56
Fix status code check 2023-08-22 23:22:06 -04:00
Jake Barnby 20de675bae
Poll for deployments instead of sleeping 2023-08-22 23:12:04 -04:00
Jake Barnby a1d62d8d42
Fix project test 2023-08-22 22:12:15 -04:00
Jake Barnby 43ba14fb75
Fix console tests 2023-08-22 21:35:00 -04:00
Jake Barnby a84e669a1f
Add missing accessedAt values when creating users 2023-08-22 21:34:23 -04:00
Jake Barnby 24fcc360e2
GraphQL test fixes 2023-08-22 21:33:33 -04:00
Jake Barnby 6f775a2411
Review updates 2023-08-22 19:14:23 -04:00
Jake Barnby efd25d6a70
Merge remote-tracking branch 'origin/feat-git-integration' into feat-framework-router-v2
# Conflicts:
#	app/controllers/api/users.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Storage/StorageBase.php
2023-08-22 17:58:42 -04:00
Jake Barnby 02f8e7796d
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters 2023-08-22 17:20:50 -04:00
Jake Barnby 9476c064c6
Fix test 2023-08-22 17:17:42 -04:00
Jake Barnby 0094ced967
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4.x-response-filters 2023-08-22 17:13:12 -04:00
Jake Barnby 87b72e4d0d
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-1.4-request-response-filters 2023-08-22 16:01:19 -04:00
Jake Barnby 360935fd28
Apply suggestions from code review 2023-08-22 14:13:37 -04:00
Jake Barnby c3682362e9
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4-request-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:44 -04:00
Jake Barnby e7d5d25263
Merge remote-tracking branch 'origin/feat-git-integration' into feat-1.4.x-response-filters
# Conflicts:
#	app/controllers/api/proxy.php
2023-08-22 13:37:03 -04:00
Jake Barnby c929fe113e
Fix colliding ID overrides 2023-08-22 13:11:32 -04:00
Jake Barnby b48a64d1ad
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	app/controllers/api/functions.php
#	composer.json
#	composer.lock
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-22 00:59:36 -04:00
Jake Barnby 942705b5f3
Fix database upgrade 2023-08-21 23:25:55 -04:00
Steven Nguyen a012a42008
Create 1.4 request filters 2023-08-21 11:52:03 -07:00
Steven Nguyen 0a0a5e9f04
Create 1.4 response filter 2023-08-21 11:48:48 -07:00
shimon 2b62149dda Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback 2023-08-21 10:37:44 +03:00
Jake Barnby a1b10ef7a8
Fix graphql tests 2023-08-20 13:40:44 -04:00
Jake Barnby 4c9c34d929
Fix console test 2023-08-20 13:21:14 -04:00
Jake Barnby 1e4a3cd020
Fix graphql test 2023-08-20 13:20:37 -04:00
shimon e86286e7e3 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-usage-rollback
 Conflicts:
	composer.lock
2023-08-20 18:07:57 +03:00
shimon 83ffea68d1 rolling back usage flow 2023-08-20 16:53:26 +03:00
shimon 8147f3ee7d rolling back usage flow 2023-08-20 15:29:43 +03:00
Matej Bačo efe3793679 PR review changes, fix node test 2023-08-19 20:26:47 +02:00
Matej Bačo 5de7c24ee8 Fix more function tests 2023-08-19 13:37:45 +02:00
Matej Bačo 69cf0161ff Fix more tests 2023-08-19 10:05:49 +02:00
Jake Barnby 2404352f3c
Fix more graphql tests 2023-08-19 01:59:36 -04:00
Jake Barnby 0f98199c85
Fix webhook test 2023-08-18 14:21:54 -04:00
Jake Barnby 4f59570738
Fix storage tests 2023-08-18 14:20:29 -04:00
Jake Barnby e388f1f8e2
Remove redundant tests 2023-08-18 14:14:52 -04:00
Jake Barnby f18fb13afd
Fix graphql tests 2023-08-18 13:52:03 -04:00
Jake Barnby 1e3fd5291e
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks 2023-08-18 13:25:21 -04:00
Jake Barnby a848322687
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.json
#	composer.lock
2023-08-18 13:23:35 -04:00
Khushboo Verma 76c3eb5c65 Merge branch 'feat-git-integration' of github.com:appwrite/appwrite into feat-git-integration 2023-08-18 12:26:11 +05:30
Khushboo Verma 00f6785818 Addressed PR comments 2023-08-18 12:25:44 +05:30
Jake Barnby a77ff0a9b0
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
2023-08-17 19:54:25 -04:00
Jake Barnby a88f90dd90
Merge remote-tracking branch 'origin/1.4.x' into chore-1.4.x-upgrade
# Conflicts:
#	app/config/specs/open-api3-latest-client.json
#	app/config/specs/open-api3-latest-console.json
#	app/config/specs/open-api3-latest-server.json
#	app/config/specs/swagger2-latest-client.json
#	app/config/specs/swagger2-latest-console.json
#	app/config/specs/swagger2-latest-server.json
#	composer.lock
2023-08-17 19:51:36 -04:00
Jake Barnby 92c39470be
Merge pull request #5800 from appwrite/fix-team-update-membership
Update method name for `updateMembershipRoles`
2023-08-17 19:43:56 -04:00
Jake Barnby 6ef5e8bd7e
Fix test 2023-08-17 19:08:30 -04:00
Jake Barnby 49b9003b7f
FIx test 2023-08-17 17:58:04 -04:00
Jake Barnby 3c3326260a
Merge remote-tracking branch 'origin/cl-1.4.x' into feat-git-integration
# Conflicts:
#	composer.lock
2023-08-17 17:39:26 -04:00
Jake Barnby 8de0eefbaa
Lint 2023-08-17 17:38:05 -04:00
prateek banga 27df545fb7 Merge branch '1.4.x' of https://github.com/appwrite/appwrite into fix-5404-update-document-without-relation-permission 2023-08-17 19:15:33 +05:30
Jake Barnby b6ffb385a7
Merge remote-tracking branch 'origin/cl-1.4.x' into fix-collection-disabled-mode-checks
# Conflicts:
#	tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
2023-08-16 15:55:19 -04:00
prateek banga d6f4d76807 adds another scenario in test case 2023-08-16 14:57:50 +05:30
Matej Bačo 3a6f10fa62 Fix failing tests 2023-08-16 08:19:42 +02:00
Bishwajeet Parhi 42f1be0f6c
Update tests/e2e/Services/Teams/TeamsBaseServer.php
Co-authored-by: Jake Barnby <jakeb994@gmail.com>
2023-08-15 09:04:05 +05:30
Jake Barnby ff6d3f39b1
Remove invalid test 2023-08-14 20:47:47 -04:00
Jake Barnby c00c5119b2
Merge remote-tracking branch 'upstream/1.4.x' into feat-whitelist-enums 2023-08-14 19:33:56 -04:00
Jake Barnby 0ca90cee6c
Fix test 2023-08-14 19:30:11 -04:00
prateek banga cb6760a957 removes unnecessary use statement 2023-08-14 22:02:54 +05:30
prateek banga 8e1ef812d3 resolve merge conflicts 2023-08-14 21:59:24 +05:30
Damodar Lohani 9d15f70db5 Merge remote-tracking branch 'origin/cl-1.4.x' into feat-framework-router-v2 2023-08-13 00:45:11 +00:00
Jake Barnby 7cd995ac3c
Apply suggestions from code review 2023-08-11 12:29:55 -04:00
Matej Bačo 897d299ae6 PR review changes, fixes from QA 2023-08-11 15:34:57 +02:00
prateek banga 29e1757364 lint fix 2023-08-11 17:28:32 +05:30
prateek banga 68736a53f9 Adds more complex test scenario 2023-08-11 17:25:34 +05:30
prateek banga 971ebbc686 fix test cases 2023-08-11 16:17:31 +05:30
Jake Barnby 6cd0e328d9
Review fixes 2023-08-10 16:44:38 -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 40047a2ed3 fix test cases 2023-08-10 20:03:02 +05:30
prateek banga 8cefc54ca3 merge resolve conflicts 2023-08-10 17:22:15 +05:30
prateek banga 983c810a45 adds assertion in test case 2023-08-10 17:18:45 +05:30
prateek banga 02d4b6b612 fix test case by adding internal attributes 2023-08-10 15:14:23 +05:30
prateek banga 185d09d764 adds more queries in tests, upgrade db library 2023-08-10 00:11:18 +05:30
Matej Bačo b9d790224f Fix missing model 2023-08-09 13:29:56 +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
Jake Barnby d2ef51551d
Merge branch 'cl-1.4.x' into feat-add-encrypt-param 2023-08-08 23:06:14 -04:00
prateek banga 4d03610755 resolve merge conflicts 2023-08-09 03:23:45 +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
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
Damodar Lohani a6109a0341 Merge remote-tracking branch 'origin/1.4.x' into feat-framework-router-v2 2023-08-07 08:42:04 +00:00
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
Damodar Lohani 18407ce6ff remove failing alias and alias tests 2023-07-31 05:53:27 +00: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
Jake Barnby b615065fd2
Add tests for collection disabled 2023-07-28 11:51:11 -04:00
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