Skip to content

API v2 #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jotoeri merged 2 commits into from
Jun 3, 2022
Merged

API v2 #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f92c504
Move API to v2
jotoeri Mar 29, 2022
e90412e
Some basic API tests
jotoeri Mar 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ jobs:
- name: Set up Nextcloud
env:
DB_PORT: 4444
OC_PASS: test
run: |
mkdir data
./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
./occ user:add --password-from-env --display-name="Test Displayname" test
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &

Expand All @@ -68,14 +70,23 @@ jobs:
working-directory: apps/${{ env.APP_NAME }}
run: composer test:integration

- name: Upload coverage
- name: Upload Unit coverage
if: matrix.php-versions == matrix.coverage-on
uses: codecov/codecov-action@v1
with:
root_dir: apps/${{ env.APP_NAME }}
files: apps/${{ env.APP_NAME }}/tests/clover.unit.xml
fail_ci_if_error: true
flags: unittests
flags: unit

- name: Upload Integration coverage
if: matrix.php-versions == matrix.coverage-on
uses: codecov/codecov-action@v1
with:
root_dir: apps/${{ env.APP_NAME }}
files: apps/${{ env.APP_NAME }}/tests/clover.integration.xml
fail_ci_if_error: true
flags: integration

mysql:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -127,9 +138,11 @@ jobs:
- name: Set up Nextcloud
env:
DB_PORT: 4444
OC_PASS: test
run: |
mkdir data
./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
./occ user:add --password-from-env --display-name="Test Displayname" test
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &

Expand Down Expand Up @@ -193,9 +206,11 @@ jobs:
- name: Set up Nextcloud
env:
DB_PORT: 4444
OC_PASS: test
run: |
mkdir data
./occ maintenance:install --verbose --database=${{ matrix.databases }} --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
./occ user:add --password-from-env --display-name="Test Displayname" test
./occ app:enable --force ${{ env.APP_NAME }}
php -S localhost:8080 &

Expand Down Expand Up @@ -224,7 +239,7 @@ jobs:
oracle:
image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
ports:
- "1521:1521"
- 4444:1521/tcp

steps:
- name: Checkout server
Expand Down Expand Up @@ -252,10 +267,14 @@ jobs:
run: composer i

- name: Set up Nextcloud
env:
DB_PORT: 4444
OC_PASS: test
run: |
mkdir data
./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin
php -f index.php
./occ user:add --password-from-env --display-name="Test Displayname" test
./occ app:enable --force ${{ env.APP_NAME }}

- name: PHPUnit
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [v3.0 0]
### Breaking
- Moving completely from API v1 to v2. With this, we fundamentally change the way how the forms sharing works, now much more flexible and closer to how it is done in server.

### Deprecated


## [v2.5.0](https://github.com/nextcloud/forms/tree/v2.5.0) (2022-04-08)

[Full Changelog](https://github.com/nextcloud/forms/compare/v2.4.0...v2.5.0)
Expand Down
40 changes: 20 additions & 20 deletions appinfo/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,47 +59,47 @@
'url' => '/api/{apiVersion}/forms',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#newForm',
'url' => '/api/{apiVersion}/form',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#getForm',
'url' => '/api/{apiVersion}/form/{id}',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#cloneForm',
'url' => '/api/{apiVersion}/form/clone/{id}',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#updateForm',
'url' => '/api/{apiVersion}/form/update',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#deleteForm',
'url' => '/api/{apiVersion}/form/{id}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
Expand All @@ -115,7 +115,7 @@
'url' => '/api/{apiVersion}/shared_forms',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],

Expand All @@ -125,31 +125,31 @@
'url' => '/api/{apiVersion}/question',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#updateQuestion',
'url' => '/api/{apiVersion}/question/update',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#reorderQuestions',
'url' => '/api/{apiVersion}/question/reorder',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#deleteQuestion',
'url' => '/api/{apiVersion}/question/{id}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],

Expand All @@ -159,23 +159,23 @@
'url' => '/api/{apiVersion}/option',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#updateOption',
'url' => '/api/{apiVersion}/option/update',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#deleteOption',
'url' => '/api/{apiVersion}/option/{id}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],

Expand Down Expand Up @@ -203,47 +203,47 @@
'url' => '/api/{apiVersion}/submissions/{hash}',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#exportSubmissions',
'url' => '/api/{apiVersion}/submissions/export/{hash}',
'verb' => 'GET',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#exportSubmissionsToCloud',
'url' => '/api/{apiVersion}/submissions/export',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#deleteAllSubmissions',
'url' => '/api/{apiVersion}/submissions/{formId}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#insertSubmission',
'url' => '/api/{apiVersion}/submission/insert',
'verb' => 'POST',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
[
'name' => 'api#deleteSubmission',
'url' => '/api/{apiVersion}/submission/{id}',
'verb' => 'DELETE',
'requirements' => [
'apiVersion' => 'v1(\.1)?'
'apiVersion' => 'v2'
]
],
]
Expand Down
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"require-dev": {
"bamarni/composer-bin-plugin": "^1.5",
"christophwurst/nextcloud": "^23.0",
"phpunit/phpunit": "^9"
"phpunit/phpunit": "^9",
"guzzlehttp/guzzle": "^7.4"
},
"require": {
"league/csv": "^9.7.3"
Expand Down
Loading