app_ecosystem_v2 to app_api renaming(1) (#68)

Signed-off-by: Andrey Borysenko <[email protected]>
nextcloud · Sep 11, 2023 · 8b3f129 · 8b3f129
1 parent 421d3bb
commit 8b3f129
Show file tree

Hide file tree

Showing 118 changed files with 20,315 additions and 14,344 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -53,7 +53,7 @@ body:
     description: |
       Paste or describe the configuration setting, including software versions, to help diagnose the problem more quickly.
     placeholder: >
-      Example: app_ecosystem_v2 = 1.0.0, nextcloud = 28.0.4, etc.
+      Example: app_api = 1.0.0, nextcloud = 28.0.4, etc.
   validations:
     required: true
 - type: markdown

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -2,7 +2,7 @@
 
 ## Supported Versions
 
-Only the latest non beta release version of `app_ecosystem_v2` are currently being supported with security updates.
+Only the latest non beta release version of `app_api` are currently being supported with security updates.
 
 ## Reporting a Vulnerability
 

diff --git a/.github/workflows/tests-deploy.yml b/.github/workflows/tests-deploy.yml
@@ -97,15 +97,15 @@ jobs:
       - name: Test deploy
         run: |
           php -S 127.0.0.1:8080 &
-          ./occ app_ecosystem_v2:daemon:register docker_local_sock Docker docker-install unix-socket /var/run/docker.sock http://127.0.0.1:8080/index.php
-          ./occ app_ecosystem_v2:app:deploy skeleton docker_local_sock \
+          ./occ app_api:daemon:register docker_local_sock Docker docker-install unix-socket /var/run/docker.sock http://127.0.0.1:8080/index.php
+          ./occ app_api:app:deploy skeleton docker_local_sock \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          ./occ app_ecosystem_v2:app:register skeleton docker_local_sock \
+          ./occ app_api:app:register skeleton docker_local_sock \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          ./occ app_ecosystem_v2:app:enable skeleton
-          ./occ app_ecosystem_v2:app:disable skeleton
-          ./occ app_ecosystem_v2:app:unregister skeleton --silent
-          ./occ app_ecosystem_v2:daemon:unregister docker_local_sock
+          ./occ app_api:app:enable skeleton
+          ./occ app_api:app:disable skeleton
+          ./occ app_api:app:unregister skeleton --silent
+          ./occ app_api:daemon:unregister docker_local_sock
 
       - name: Check logs
         run: |
@@ -164,18 +164,18 @@ jobs:
           docker exec -w /var/www/html/apps nextcloud git clone https://github.com/cloud-py-api/${{ env.APP_NAME }}.git
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git fetch origin $GITHUB_REF
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git checkout FETCH_HEAD
-          docker exec nextcloud sudo -u www-data php occ app:enable app_ecosystem_v2
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:daemon:register \
+          docker exec nextcloud sudo -u www-data php occ app:enable app_api
+          docker exec nextcloud sudo -u www-data php occ app_api:daemon:register \
             docker_local_sock Docker docker-install unix-socket /var/run/docker.sock http://nextcloud/index.php \
             --net=master_bridge
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:deploy skeleton docker_local_sock \
+          docker exec nextcloud sudo -u www-data php occ app_api:app:deploy skeleton docker_local_sock \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:register skeleton docker_local_sock \
+          docker exec nextcloud sudo -u www-data php occ app_api:app:register skeleton docker_local_sock \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:enable skeleton
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:disable skeleton
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:unregister skeleton --silent
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:daemon:unregister docker_local_sock
+          docker exec nextcloud sudo -u www-data php occ app_api:app:enable skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:disable skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:unregister skeleton --silent
+          docker exec nextcloud sudo -u www-data php occ app_api:daemon:unregister docker_local_sock
 
       - name: Copy NC log to host
         run: docker cp nextcloud:/var/www/html/data/nextcloud.log nextcloud.log
@@ -240,20 +240,20 @@ jobs:
           docker exec -w /var/www/html/apps nextcloud git clone https://github.com/cloud-py-api/${{ env.APP_NAME }}.git
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git fetch origin $GITHUB_REF
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git checkout FETCH_HEAD
-          docker exec nextcloud sudo -u www-data php occ app:enable app_ecosystem_v2
+          docker exec nextcloud sudo -u www-data php occ app:enable app_api
           docker cp ./certs/client/ nextcloud:/
           docker exec nextcloud sudo -u www-data php occ security:certificates:import /client/ca.pem
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:daemon:register \
+          docker exec nextcloud sudo -u www-data php occ app_api:daemon:register \
             docker_by_port Docker docker-install https host.docker.internal:8443 http://nextcloud/index.php \
             --net=master_bridge --ssl_cert /client/cert.pem --ssl_key /client/key.pem
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:deploy skeleton docker_by_port \
+          docker exec nextcloud sudo -u www-data php occ app_api:app:deploy skeleton docker_by_port \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:register skeleton docker_by_port \
+          docker exec nextcloud sudo -u www-data php occ app_api:app:register skeleton docker_by_port \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:enable skeleton
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:disable skeleton
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:unregister skeleton --silent
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:daemon:unregister docker_by_port
+          docker exec nextcloud sudo -u www-data php occ app_api:app:enable skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:disable skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:unregister skeleton --silent
+          docker exec nextcloud sudo -u www-data php occ app_api:daemon:unregister docker_by_port
 
       - name: Copy NC log to host
         run: docker cp nextcloud:/var/www/html/data/nextcloud.log nextcloud.log
@@ -317,20 +317,20 @@ jobs:
           docker exec -w /var/www/html/apps nextcloud git clone https://github.com/cloud-py-api/${{ env.APP_NAME }}.git
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git fetch origin $GITHUB_REF
           docker exec -w /var/www/html/apps/${{ env.APP_NAME }} nextcloud git checkout FETCH_HEAD
-          docker exec nextcloud sudo -u www-data php occ app:enable app_ecosystem_v2
+          docker exec nextcloud sudo -u www-data php occ app:enable app_api
           docker cp ./certs/client/ nextcloud:/
           docker exec nextcloud sudo -u www-data php occ security:certificates:import /client/ca.pem
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:daemon:register \
+          docker exec nextcloud sudo -u www-data php occ app_api:daemon:register \
             docker_by_port Docker docker-install https host.docker.internal:8443 http://localhost:8080/index.php \
             --net=host --hostname=host.docker.internal --ssl_cert /client/cert.pem --ssl_key /client/key.pem
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:deploy skeleton docker_by_port \
+          docker exec nextcloud sudo -u www-data php occ app_api:app:deploy skeleton docker_by_port \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:register skeleton docker_by_port \
+          docker exec nextcloud sudo -u www-data php occ app_api:app:register skeleton docker_by_port \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:enable skeleton
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:disable skeleton
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:app:unregister skeleton --silent
-          docker exec nextcloud sudo -u www-data php occ app_ecosystem_v2:daemon:unregister docker_by_port
+          docker exec nextcloud sudo -u www-data php occ app_api:app:enable skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:disable skeleton
+          docker exec nextcloud sudo -u www-data php occ app_api:app:unregister skeleton --silent
+          docker exec nextcloud sudo -u www-data php occ app_api:daemon:unregister docker_by_port
 
       - name: Copy NC log to host
         run: docker cp nextcloud:/var/www/html/data/nextcloud.log nextcloud.log
@@ -464,15 +464,15 @@ jobs:
       - name: Test deploy
         run: |
           php -S 127.0.0.1:8080 &
-          ./occ app_ecosystem_v2:daemon:register docker_local_sock Docker docker-install unix-socket /var/run/docker.sock http://127.0.0.1:8080/index.php
-          ./occ app_ecosystem_v2:app:deploy skeleton docker_local_sock \
+          ./occ app_api:daemon:register docker_local_sock Docker docker-install unix-socket /var/run/docker.sock http://127.0.0.1:8080/index.php
+          ./occ app_api:app:deploy skeleton docker_local_sock \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          ./occ app_ecosystem_v2:app:register skeleton docker_local_sock \
+          ./occ app_api:app:register skeleton docker_local_sock \
             --info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
-          ./occ app_ecosystem_v2:app:enable skeleton
-          ./occ app_ecosystem_v2:app:disable skeleton
-          ./occ app_ecosystem_v2:app:unregister skeleton --silent
-          ./occ app_ecosystem_v2:daemon:unregister docker_local_sock
+          ./occ app_api:app:enable skeleton
+          ./occ app_api:app:disable skeleton
+          ./occ app_api:app:unregister skeleton --silent
+          ./occ app_api:daemon:unregister docker_local_sock
 
       - name: Check logs
         run: |
@@ -487,7 +487,7 @@ jobs:
 
       - name: Check redis keys
         run: |
-          docker exec redis redis-cli keys '*app_ecosystem_v2*' || error
+          docker exec redis redis-cli keys '*app_api*' || error
 
       - name: Upload Container info
         if: always()

diff --git a/.github/workflows/tests-special.yml b/.github/workflows/tests-special.yml
@@ -114,8 +114,8 @@ jobs:
           echo $! > /tmp/_install.pid
           cd ..
           sleep 5s
-          php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
-          php occ app_ecosystem_v2:app:register nc_py_api manual_install --json-info \
+          php occ app_api:daemon:register manual_install "Manual Install" manual-install 0 0 0
+          php occ app_api:app:register nc_py_api manual_install --json-info \
             "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"port\":$APP_PORT,\"scopes\":{\"required\":[\"SYSTEM\", \"FILES\", \"FILES_SHARING\"],\"optional\":[\"USER_INFO\", \"USER_STATUS\", \"NOTIFICATIONS\", \"WEATHER_STATUS\", \"TALK\"]},\"protocol\":\"http\",\"system_app\":1}" \
             -e --force-scopes
           kill -15 $(cat /tmp/_install.pid)

diff --git a/.tx/config b/.tx/config
@@ -2,8 +2,8 @@
 host = https://www.transifex.com
 lang_map = hu_HU: hu, nb_NO: nb, sk_SK: sk, th_TH: th, ja_JP: ja, bg_BG: bg, cs_CZ: cs, fi_FI: fi
 
-[o:nextcloud:p:nextcloud:r:app_ecosystem_v2]
-file_filter = translationfiles/<lang>/app_ecosystem_v2.po
-source_file = translationfiles/templates/app_ecosystem_v2.pot
+[o:nextcloud:p:nextcloud:r:app_api]
+file_filter = translationfiles/<lang>/app_api.po
+source_file = translationfiles/templates/app_api.pot
 source_lang = en
 type = PO
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ docs html:
 
 .PHONY: help
 help:
-	@echo "Welcome to AppEcosystemV2 development. Please use \`make <target>\` where <target> is one of"
+	@echo "Welcome to AppAPI development. Please use \`make <target>\` where <target> is one of"
 	@echo "  docs               make HTML docs"
 	@echo "  html               make HTML docs"
 	@echo " "

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Nextcloud Application Ecosystem V2
+# Nextcloud AppAPI
 
 [![Tests - Deploy](https://github.com/cloud-py-api/app_ecosystem_v2/actions/workflows/tests-deploy.yml/badge.svg)](https://github.com/cloud-py-api/app_ecosystem_v2/actions/workflows/tests-deploy.yml)
 [![Tests](https://github.com/cloud-py-api/app_ecosystem_v2/actions/workflows/tests.yml/badge.svg)](https://github.com/cloud-py-api/app_ecosystem_v2/actions/workflows/tests.yml)

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -1,53 +1,53 @@
 <?xml version="1.0"?>
 <info>
-	<id>app_ecosystem_v2</id>
-	<name>App Ecosystem V2</name>
-	<summary>Nextcloud App Ecosystem V2 integration</summary>
+	<id>app_api</id>
+	<name>AppAPI</name>
+	<summary>Nextcloud AppAPI</summary>
 	<description>
-	<![CDATA[Nextcloud App Ecosystem V2 provides a new API for external apps on different programming languages]]>
+	<![CDATA[Nextcloud AppAPI provides a new API for external apps on different programming languages]]>
 	</description>
 	<version>1.0.0</version>
 	<licence>agpl</licence>
 	<author mail="[email protected]" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
 	<author mail="[email protected]" homepage="https://github.com/bigcat88">Alexander Piskun</author>
-	<namespace>AppEcosystemV2</namespace>
+	<namespace>AppAPI</namespace>
 	<documentation>
-		<developer>https://github.com/nextcloud/app_ecosystem_v2</developer>
+		<developer>https://github.com/nextcloud/app_api</developer>
 	</documentation>
 	<category>integration</category>
-	<website>https://github.com/nextcloud/app_ecosystem_v2</website>
-	<bugs>https://github.com/nextcloud/app_ecosystem_v2/issues</bugs>
-	<repository type="git">https://github.com/nextcloud/app_ecosystem_v2.git</repository>
+	<website>https://github.com/nextcloud/app_api</website>
+	<bugs>https://github.com/nextcloud/app_api/issues</bugs>
+	<repository type="git">https://github.com/nextcloud/app_api.git</repository>
 	<dependencies>
 		<php min-version="8.1"/>
 		<nextcloud min-version="26" max-version="28"/>
 	</dependencies>
 	<repair-steps>
 		<install>
-			<step>OCA\AppEcosystemV2\Migration\DataInitializationStep</step>
+			<step>OCA\AppAPI\Migration\DataInitializationStep</step>
 		</install>
 	</repair-steps>
 	<commands>
-		<command>OCA\AppEcosystemV2\Command\ExApp\Deploy</command>
-		<command>OCA\AppEcosystemV2\Command\ExApp\Register</command>
-		<command>OCA\AppEcosystemV2\Command\ExApp\Unregister</command>
-		<command>OCA\AppEcosystemV2\Command\ExApp\Update</command>
-		<command>OCA\AppEcosystemV2\Command\ExApp\Enable</command>
-		<command>OCA\AppEcosystemV2\Command\ExApp\Disable</command>
-		<command>OCA\AppEcosystemV2\Command\ExApp\ListExApps</command>
-		<command>OCA\AppEcosystemV2\Command\ExApp\Scopes\ListScopes</command>
-		<command>OCA\AppEcosystemV2\Command\ExApp\Users\ListUsers</command>
-		<command>OCA\AppEcosystemV2\Command\ExAppConfig\GetConfig</command>
-		<command>OCA\AppEcosystemV2\Command\ExAppConfig\SetConfig</command>
-		<command>OCA\AppEcosystemV2\Command\ExAppConfig\DeleteConfig</command>
-		<command>OCA\AppEcosystemV2\Command\ExAppConfig\ListConfig</command>
-		<command>OCA\AppEcosystemV2\Command\Daemon\RegisterDaemon</command>
-		<command>OCA\AppEcosystemV2\Command\Daemon\UnregisterDaemon</command>
-		<command>OCA\AppEcosystemV2\Command\Daemon\ListDaemons</command>
-		<command>OCA\AppEcosystemV2\Command\ApiScopes\ListApiScopes</command>
+		<command>OCA\AppAPI\Command\ExApp\Deploy</command>
+		<command>OCA\AppAPI\Command\ExApp\Register</command>
+		<command>OCA\AppAPI\Command\ExApp\Unregister</command>
+		<command>OCA\AppAPI\Command\ExApp\Update</command>
+		<command>OCA\AppAPI\Command\ExApp\Enable</command>
+		<command>OCA\AppAPI\Command\ExApp\Disable</command>
+		<command>OCA\AppAPI\Command\ExApp\ListExApps</command>
+		<command>OCA\AppAPI\Command\ExApp\Scopes\ListScopes</command>
+		<command>OCA\AppAPI\Command\ExApp\Users\ListUsers</command>
+		<command>OCA\AppAPI\Command\ExAppConfig\GetConfig</command>
+		<command>OCA\AppAPI\Command\ExAppConfig\SetConfig</command>
+		<command>OCA\AppAPI\Command\ExAppConfig\DeleteConfig</command>
+		<command>OCA\AppAPI\Command\ExAppConfig\ListConfig</command>
+		<command>OCA\AppAPI\Command\Daemon\RegisterDaemon</command>
+		<command>OCA\AppAPI\Command\Daemon\UnregisterDaemon</command>
+		<command>OCA\AppAPI\Command\Daemon\ListDaemons</command>
+		<command>OCA\AppAPI\Command\ApiScopes\ListApiScopes</command>
 	</commands>
 	<settings>
-		<admin>OCA\AppEcosystemV2\Settings\Admin</admin>
-		<admin-section>OCA\AppEcosystemV2\Settings\AdminSection</admin-section>
+		<admin>OCA\AppAPI\Settings\Admin</admin>
+		<admin-section>OCA\AppAPI\Settings\AdminSection</admin-section>
 	</settings>
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -4,7 +4,7 @@
 
 return [
 	'routes' => [
-		// AppEcosystemV2 admin settings
+		// AppAPI admin settings
 		['name' => 'config#setAdminConfig', 'url' => '/admin-config', 'verb' => 'PUT'],
 
 		// ExApps actions

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
-	"name": "nextcloud/app_ecosystem_v2",
-	"description": "Nextcloud App Ecosystem V2 provides a new API for external apps on different programming languages",
+	"name": "nextcloud/app_api",
+	"description": "Nextcloud AppAPI provides a new API for external apps on different programming languages",
 	"type": "project",
 	"license": "AGPL-3.0-or-later",
 	"authors": [
@@ -18,7 +18,7 @@
 	"require-dev": {
 		"nextcloud/ocp": "dev-master",
 		"roave/security-advisories": "dev-latest",
-		"psalm/phar": "^5.13",
+		"psalm/phar": "^5.15",
 		"nextcloud/coding-standard": "^1.1",
 		"friendsofphp/php-cs-fixer": "3.16"
 	},
@@ -41,7 +41,7 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"OCA\\AppEcosystemV2\\": "lib/"
+			"OCA\\AppAPI\\": "lib/"
 		}
 	},
 	"autoload-dev": {