From e514f26714e8403dfcad006f08787f8df44f1199 Mon Sep 17 00:00:00 2001
From: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>
Date: Tue, 15 Aug 2023 18:41:23 +0300
Subject: [PATCH] reworked app-scopes definition (#83)

CI will fail, waiting for AppEcosystem update

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
---
 .github/workflows/analysis-coverage.yml       | 10 ++--
 .run/to_gif.run.xml                           |  4 +-
 CHANGELOG.md                                  |  3 ++
 examples/COPYING                              | 20 ++++++++
 examples/as_app/skeleton/Dockerfile           | 10 ++++
 examples/as_app/skeleton/Makefile             | 46 +++++++++++++++++++
 examples/as_app/skeleton/appinfo/info.xml     | 36 +++++++++++++++
 examples/as_app/skeleton/requirements.txt     |  1 +
 examples/as_app/skeleton/src/main.py          | 27 +++++++++++
 examples/as_app/to_gif/Dockerfile             |  4 +-
 examples/as_app/to_gif/Makefile               |  4 +-
 examples/as_app/to_gif/{ => appinfo}/info.xml | 15 ++++--
 examples/as_app/to_gif/{ => src}/main.py      | 24 ++++------
 nc_py_api/ex_app/__init__.py                  |  8 +---
 nc_py_api/ex_app/defs.py                      | 22 +++------
 nc_py_api/ex_app/integration_fastapi.py       | 11 -----
 nc_py_api/ex_app/uvicorn_fastapi.py           | 27 +++++++++++
 nc_py_api/talk.py                             |  3 --
 scripts/dev_register.sh                       |  2 +-
 tests/_install.py                             | 27 +----------
 tests/_install_only_enabled_handler.py        | 16 +------
 21 files changed, 213 insertions(+), 107 deletions(-)
 create mode 100644 examples/COPYING
 create mode 100644 examples/as_app/skeleton/Dockerfile
 create mode 100644 examples/as_app/skeleton/Makefile
 create mode 100644 examples/as_app/skeleton/appinfo/info.xml
 create mode 100644 examples/as_app/skeleton/requirements.txt
 create mode 100644 examples/as_app/skeleton/src/main.py
 rename examples/as_app/to_gif/{ => appinfo}/info.xml (68%)
 rename examples/as_app/to_gif/{ => src}/main.py (86%)
 create mode 100644 nc_py_api/ex_app/uvicorn_fastapi.py
 delete mode 100644 nc_py_api/talk.py

diff --git a/.github/workflows/analysis-coverage.yml b/.github/workflows/analysis-coverage.yml
index b93db4a8..fc576158 100644
--- a/.github/workflows/analysis-coverage.yml
+++ b/.github/workflows/analysis-coverage.yml
@@ -136,7 +136,7 @@ jobs:
           cd ..
           php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
           php occ app_ecosystem_v2:app:register $APP_ID 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,\"protocol\":\"http\",\"system_app\":1}" \
+            "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
             -e --force-scopes
           kill -15 $(cat /tmp/_install.pid)
           timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
@@ -290,7 +290,7 @@ jobs:
           cd ..
           php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
           php occ app_ecosystem_v2:app:register $APP_ID 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,\"protocol\":\"http\",\"system_app\":1}" \
+            "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
             -e --force-scopes
           kill -15 $(cat /tmp/_install.pid)
           timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
@@ -429,7 +429,7 @@ jobs:
           cd ..
           php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
           php occ app_ecosystem_v2:app:register $APP_ID 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,\"protocol\":\"http\",\"system_app\":1}" \
+            "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
             -e --force-scopes
           kill -15 $(cat /tmp/_install.pid)
           timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
@@ -549,7 +549,7 @@ jobs:
           cd ..
           php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
           php occ app_ecosystem_v2:app:register $APP_ID 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,\"protocol\":\"http\",\"system_app\":1}" \
+            "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
             -e --force-scopes
           kill -15 $(cat /tmp/_install.pid)
           timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
@@ -794,7 +794,7 @@ jobs:
           cd ..
           php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
           php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \
-            "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"protocol\":\"http\",\"port\":$APP_PORT,\"system_app\":1}" \
+            "{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"protocol\":\"http\",\"port\":$APP_PORT,\"system_app\":1}" \
             -e --force-scopes
           kill -15 $(cat /tmp/_install.pid)
           timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
diff --git a/.run/to_gif.run.xml b/.run/to_gif.run.xml
index 2cdac2f1..28bc7b67 100644
--- a/.run/to_gif.run.xml
+++ b/.run/to_gif.run.xml
@@ -4,12 +4,12 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
       <env name="APP_ID" value="to_gif" />
       <env name="APP_PORT" value="9029" />
       <env name="APP_SECRET" value="12345" />
       <env name="APP_VERSION" value="1.0.0" />
       <env name="NEXTCLOUD_URL" value="http://nextcloud.local/index.php" />
-      <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
     <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -17,7 +17,7 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/examples/as_app/to_gif/main.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/examples/as_app/to_gif/src/main.py" />
     <option name="PARAMETERS" value="" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e8795f4..6406555a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,9 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - `Nextcloud.response_headers` property, to get headers from last response.
+### Changed
+
+- Reworked `External API` declarations, skeleton made much simpler.
 
 ## [0.0.29 - 2023-08-13]
 
diff --git a/examples/COPYING b/examples/COPYING
new file mode 100644
index 00000000..acc13833
--- /dev/null
+++ b/examples/COPYING
@@ -0,0 +1,20 @@
+
+                             MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/examples/as_app/skeleton/Dockerfile b/examples/as_app/skeleton/Dockerfile
new file mode 100644
index 00000000..e4890205
--- /dev/null
+++ b/examples/as_app/skeleton/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.11.4-slim-bookworm
+
+COPY requirements.txt /
+ADD /src/ /app/
+
+RUN \
+  python3 -m pip install -r requirements.txt && rm -rf ~/.cache && rm requirements.txt
+
+WORKDIR /app
+ENTRYPOINT ["python3", "main.py"]
diff --git a/examples/as_app/skeleton/Makefile b/examples/as_app/skeleton/Makefile
new file mode 100644
index 00000000..3b7faea0
--- /dev/null
+++ b/examples/as_app/skeleton/Makefile
@@ -0,0 +1,46 @@
+.DEFAULT_GOAL := help
+
+.PHONY: help
+help:
+	@echo "Welcome to app_python_skeleton example. Please use \`make <target>\` where <target> is one of"
+	@echo " "
+	@echo "  Next commands are only for dev environment with nextcloud-docker-dev!"
+	@echo "  They should run from the host you are developing on(with activated venv) and not in the container with Nextcloud!"
+	@echo "  "
+	@echo "  build-push        build image and upload to ghcr.io"
+	@echo "  "
+	@echo "  deploy            deploy example to registered 'docker_dev'"
+	@echo "  "
+	@echo "  run28             install app_python_skeleton for Nextcloud 28"
+	@echo "  run27             install app_python_skeleton for Nextcloud 27"
+	@echo "  "
+	@echo "  For development of this example use PyCharm run configurations. Development is always set for last Nextcloud."
+	@echo "  First run 'app_python_skeleton' and then 'make manual_register', after that you can use/debug/develop it and easy test."
+	@echo "  "
+	@echo "  manual_register   perform registration of running 'app_python_skeleton' into 'manual_install' deploy daemon."
+
+.PHONY: build-push
+build-push:
+	docker login ghcr.io
+	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/py_app_v2-skeleton:latest .
+
+.PHONY: deploy
+deploy:
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:deploy app_python_skeleton docker_dev \
+		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/skeleton/appinfo/info.xml
+
+.PHONY: run28
+run28:
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:unregister app_python_skeleton --silent || true
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:register app_python_skeleton docker_dev -e --force-scopes
+
+.PHONY: run27
+run27:
+	docker exec master-stable27-1 sudo -u www-data php occ app_ecosystem_v2:app:unregister app_python_skeleton --silent || true
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:register app_python_skeleton docker_dev -e --force-scopes
+
+.PHONY: manual_register
+manual_register:
+	docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:register app_python_skeleton manual_install --json-info \
+  "{\"appid\":\"app_python_skeleton\",\"name\":\"App Python Skeleton\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9029,\"scopes\":{\"required\":[],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  -e --force-scopes
diff --git a/examples/as_app/skeleton/appinfo/info.xml b/examples/as_app/skeleton/appinfo/info.xml
new file mode 100644
index 00000000..d8c17242
--- /dev/null
+++ b/examples/as_app/skeleton/appinfo/info.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<info>
+	<id>app_python_skeleton</id>
+	<name>App Python Skeleton</name>
+	<summary>Nextcloud Python Application Skeleton</summary>
+	<description>
+	<![CDATA[Example of the Nextcloud application written in python]]>
+	</description>
+	<version>1.0.0</version>
+	<licence>MIT</licence>
+	<author mail="andrey18106x@gmail.com" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
+	<author mail="bigcat88@icloud.com" homepage="https://github.com/bigcat88">Alexander Piskun</author>
+	<namespace>PyAppV2_skeleton</namespace>
+	<category>tools</category>
+	<website>https://github.com/cloud-py-api/nc_py_api</website>
+	<bugs>https://github.com/cloud-py-api/nc_py_api/issues</bugs>
+	<repository type="git">https://github.com/cloud-py-api/nc_py_api</repository>
+	<dependencies>
+		<nextcloud min-version="27" max-version="28"/>
+	</dependencies>
+	<ex-app>
+		<docker-install>
+			<registry>ghcr.io</registry>
+			<image>cloud-py-api/py_app_v2-skeleton</image>
+			<image-tag>latest</image-tag>
+		</docker-install>
+		<scopes>
+			<required>
+			</required>
+			<optional>
+			</optional>
+		</scopes>
+		<protocol>http</protocol>
+		<system>0</system>
+	</ex-app>
+</info>
diff --git a/examples/as_app/skeleton/requirements.txt b/examples/as_app/skeleton/requirements.txt
new file mode 100644
index 00000000..ea451402
--- /dev/null
+++ b/examples/as_app/skeleton/requirements.txt
@@ -0,0 +1 @@
+nc_py_api[app]
diff --git a/examples/as_app/skeleton/src/main.py b/examples/as_app/skeleton/src/main.py
new file mode 100644
index 00000000..8f08cf6a
--- /dev/null
+++ b/examples/as_app/skeleton/src/main.py
@@ -0,0 +1,27 @@
+"""
+Simplest example.
+"""
+
+from fastapi import FastAPI
+
+from nc_py_api import NextcloudApp
+from nc_py_api.ex_app import LogLvl, run_app
+
+APP = FastAPI()
+
+
+def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
+    # This will be called each time application is `enabled` or `disabled`
+    # All scopes that application required already granted before this step.
+    # NOTE: `user` is unavailable on this step, so all NC API calls that require it will fail as unauthorized.
+    print(f"enabled={enabled}")
+    if enabled:
+        nc.log(LogLvl.WARNING, f"Hello from {nc.app_cfg.app_name} :)")
+    else:
+        nc.log(LogLvl.WARNING, f"Bye bye from {nc.app_cfg.app_name} :(")
+    # In case of an error, a non-empty short string should be returned, which will be shown to the NC administrator.
+    return ""
+
+
+if __name__ == "__main__":
+    run_app(APP, enabled_handler, "main:APP", log_level="trace")
diff --git a/examples/as_app/to_gif/Dockerfile b/examples/as_app/to_gif/Dockerfile
index ca53ce93..b3935935 100644
--- a/examples/as_app/to_gif/Dockerfile
+++ b/examples/as_app/to_gif/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.11.4-bookworm
 
 COPY requirements.txt /
-ADD main.py /app/
+ADD /src/ /app/
 
 RUN \
     apt-get update && \
@@ -9,7 +9,7 @@ RUN \
     ffmpeg libsm6 libxext6 gifsicle
 
 RUN \
-  python3 -m pip install -r requirements.txt
+  python3 -m pip install -r requirements.txt && rm -rf ~/.cache && rm requirements.txt
 
 WORKDIR /app
 ENTRYPOINT ["python3", "main.py"]
diff --git a/examples/as_app/to_gif/Makefile b/examples/as_app/to_gif/Makefile
index 7a6520ce..c1597b7f 100644
--- a/examples/as_app/to_gif/Makefile
+++ b/examples/as_app/to_gif/Makefile
@@ -27,7 +27,7 @@ build-push:
 .PHONY: deploy
 deploy:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:deploy to_gif docker_dev \
-		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/to_gif/info.xml
+		--info-xml https://raw.githubusercontent.com/cloud-py-api/nc_py_api/main/examples/as_app/to_gif/appinfo/info.xml
 
 .PHONY: run28
 run28:
@@ -42,5 +42,5 @@ run27:
 .PHONY: manual_register
 manual_register:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_ecosystem_v2:app:register to_gif manual_install --json-info \
-  "{\"appid\":\"to_gif\",\"name\":\"to_gif\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9029,\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"to_gif\",\"name\":\"to_gif\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9029,\"scopes\":{\"required\":[10],\"optional\":[32]},\"protocol\":\"http\",\"system_app\":0}" \
   -e --force-scopes
diff --git a/examples/as_app/to_gif/info.xml b/examples/as_app/to_gif/appinfo/info.xml
similarity index 68%
rename from examples/as_app/to_gif/info.xml
rename to examples/as_app/to_gif/appinfo/info.xml
index 57f14c39..aea88c50 100644
--- a/examples/as_app/to_gif/info.xml
+++ b/examples/as_app/to_gif/appinfo/info.xml
@@ -9,11 +9,12 @@
 	<version>1.0.0</version>
 	<licence>MIT</licence>
 	<author mail="andrey18106x@gmail.com" homepage="https://github.com/andrey18106">Andrey Borysenko</author>
+	<author mail="bigcat88@icloud.com" homepage="https://github.com/bigcat88">Alexander Piskun</author>
 	<namespace>ToGifExample</namespace>
 	<category>tools</category>
-	<website>https://github.com/cloud-py-api/nc_py_apy</website>
-	<bugs>https://github.com/cloud-py-api/nc_py_apy/issues</bugs>
-	<repository type="git">https://github.com/cloud-py-api/nc_py_apy</repository>
+	<website>https://github.com/cloud-py-api/nc_py_api</website>
+	<bugs>https://github.com/cloud-py-api/nc_py_api/issues</bugs>
+	<repository type="git">https://github.com/cloud-py-api/nc_py_api</repository>
 	<dependencies>
 		<nextcloud min-version="27" max-version="28"/>
 	</dependencies>
@@ -23,6 +24,14 @@
 			<image>cloud-py-api/to_gif</image>
 			<image-tag>latest</image-tag>
 		</docker-install>
+		<scopes>
+			<required>
+				<value>2</value>
+			</required>
+			<optional>
+				<value>32</value>
+			</optional>
+		</scopes>
 		<protocol>http</protocol>
 		<system>0</system>
 	</ex-app>
diff --git a/examples/as_app/to_gif/main.py b/examples/as_app/to_gif/src/main.py
similarity index 86%
rename from examples/as_app/to_gif/main.py
rename to examples/as_app/to_gif/src/main.py
index b3bd51d9..9c52a8de 100644
--- a/examples/as_app/to_gif/main.py
+++ b/examples/as_app/to_gif/src/main.py
@@ -1,28 +1,23 @@
 """Simplest example of files_dropdown_menu + notification."""
 
 import tempfile
-from os import environ, path
+from os import path
 from typing import Annotated
 
 import cv2
 import imageio
 import numpy
-import urllib3
-import uvicorn
 from fastapi import BackgroundTasks, Depends, FastAPI
 from pygifsicle import optimize
 from requests import Response
 
 from nc_py_api import NextcloudApp
 from nc_py_api.ex_app import (
-    ApiScope,
     LogLvl,
     UiActionFileInfo,
     UiFileActionHandlerInfo,
-    enable_heartbeat,
     nc_app,
-    set_enabled_handler,
-    set_scopes,
+    run_app,
 )
 
 APP = FastAPI()
@@ -93,13 +88,10 @@ def enabled_handler(enabled: bool, nc: NextcloudApp) -> str:
     return ""
 
 
-@APP.on_event("startup")
-def initialization():
-    set_enabled_handler(APP, enabled_handler)
-    set_scopes(APP, {"required": [ApiScope.DAV], "optional": [ApiScope.NOTIFICATIONS]})
-    enable_heartbeat(APP)
-
-
 if __name__ == "__main__":
-    urllib3.disable_warnings()
-    uvicorn.run("main:APP", host=environ.get("APP_HOST", "127.0.0.1"), port=int(environ["APP_PORT"]), log_level="trace")
+    run_app(
+        APP,
+        enabled_handler,
+        "main:APP",
+        log_level="trace",
+    )
diff --git a/nc_py_api/ex_app/__init__.py b/nc_py_api/ex_app/__init__.py
index d072023b..d681cf0f 100644
--- a/nc_py_api/ex_app/__init__.py
+++ b/nc_py_api/ex_app/__init__.py
@@ -1,9 +1,5 @@
 """All possible ExApp stuff for NextcloudApp that can be used."""
 from .defs import ApiScope, LogLvl
-from .integration_fastapi import (
-    enable_heartbeat,
-    nc_app,
-    set_enabled_handler,
-    set_scopes,
-)
+from .integration_fastapi import nc_app
 from .ui.files import UiActionFileInfo, UiFileActionHandlerInfo
+from .uvicorn_fastapi import run_app
diff --git a/nc_py_api/ex_app/defs.py b/nc_py_api/ex_app/defs.py
index f219405c..dcadc605 100644
--- a/nc_py_api/ex_app/defs.py
+++ b/nc_py_api/ex_app/defs.py
@@ -1,7 +1,6 @@
 """Additional definitions for NextcloudApp."""
 
 import enum
-import typing
 
 
 class LogLvl(enum.IntEnum):
@@ -24,22 +23,15 @@ class ApiScope(enum.IntEnum):
 
     SYSTEM = 2
     """Allows access to the System APIs."""
-    DAV = 3
+    FILES = 10
     """Allows access to the Nextcloud file base."""
-    USER_INFO = 10
+    FILES_SHARING = 11
+    """Allows access to APIs that provide File Sharing."""
+    USER_INFO = 30
     """Allows access to APIs that work with users."""
-    USER_STATUS = 11
+    USER_STATUS = 31
     """Allows access to APIs that work with users statuses."""
-    NOTIFICATIONS = 12
+    NOTIFICATIONS = 32
     """Allows access to APIs that provide Notifications."""
-    WEATHER_STATUS = 13
+    WEATHER_STATUS = 33
     """Allows access to APIs that provide Weather status."""
-    FILES_SHARING = 14
-    """Allows access to APIs that provide File Sharing."""
-
-
-class ApiScopesStruct(typing.TypedDict):
-    """Reply of the Nextcloud App with the desired scopes."""
-
-    required: list[int]
-    optional: list[int]
diff --git a/nc_py_api/ex_app/integration_fastapi.py b/nc_py_api/ex_app/integration_fastapi.py
index 52a40daa..d8993951 100644
--- a/nc_py_api/ex_app/integration_fastapi.py
+++ b/nc_py_api/ex_app/integration_fastapi.py
@@ -6,7 +6,6 @@
 from fastapi.responses import JSONResponse
 
 from ..nextcloud import NextcloudApp
-from .defs import ApiScopesStruct
 
 
 def nc_app(request: Request) -> NextcloudApp:
@@ -20,16 +19,6 @@ def nc_app(request: Request) -> NextcloudApp:
     return nextcloud_app
 
 
-def set_scopes(fast_api_app: FastAPI, desired_scopes: ApiScopesStruct):
-    """Defines the required and optional API scopes needed for the application."""
-
-    @fast_api_app.get("/scopes")
-    def scopes_handler(
-        _nc: Annotated[NextcloudApp, Depends(nc_app)],
-    ):
-        return JSONResponse(content=desired_scopes, status_code=200)
-
-
 def set_enabled_handler(fast_api_app: FastAPI, callback: Callable[[bool, NextcloudApp], str]):
     """Sets ``enabled``/``disabled`` applications handlers."""
 
diff --git a/nc_py_api/ex_app/uvicorn_fastapi.py b/nc_py_api/ex_app/uvicorn_fastapi.py
new file mode 100644
index 00000000..a0e7ee19
--- /dev/null
+++ b/nc_py_api/ex_app/uvicorn_fastapi.py
@@ -0,0 +1,27 @@
+"""Uvicorn wrappers to run the external application."""
+import typing
+from os import environ
+
+from fastapi import FastAPI
+from uvicorn import run
+from uvicorn.config import ASGIApplication
+
+from ..nextcloud import NextcloudApp
+from .integration_fastapi import enable_heartbeat, set_enabled_handler
+
+
+def run_app(
+    fast_api_app: FastAPI,
+    enabled_handler: typing.Callable[[bool, NextcloudApp], str],
+    uvicorn_app: typing.Union["ASGIApplication", typing.Callable, str],
+    heartbeat_handler: typing.Optional[typing.Callable[[], str]] = None,
+    **kwargs,
+) -> None:
+    """Runs the application."""
+
+    @fast_api_app.on_event("startup")
+    def initialization():
+        set_enabled_handler(fast_api_app, enabled_handler)
+        enable_heartbeat(fast_api_app, heartbeat_handler)
+
+    run(uvicorn_app, host=environ.get("APP_HOST", "127.0.0.1"), port=int(environ["APP_PORT"]), **kwargs)
diff --git a/nc_py_api/talk.py b/nc_py_api/talk.py
deleted file mode 100644
index 44dff980..00000000
--- a/nc_py_api/talk.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""Nextcloud API for Talk."""
-
-# /ocs/v2.php/apps/spreed/api/v4
diff --git a/scripts/dev_register.sh b/scripts/dev_register.sh
index ccbd14c1..e63cba1f 100644
--- a/scripts/dev_register.sh
+++ b/scripts/dev_register.sh
@@ -13,7 +13,7 @@ NEXTCLOUD_URL="http://$2" APP_PORT=9009 APP_ID="nc_py_api" APP_SECRET="12345" AP
 echo $! > /tmp/_install.pid
 python3 tests/_install_wait.py "http://localhost:9009/heartbeat" "\"status\":\"ok\"" 15 0.5
 docker exec "$1" sudo -u www-data php occ app_ecosystem_v2:app:register nc_py_api manual_install --json-info \
-  "{\"appid\":\"nc_py_api\",\"name\":\"nc_py_api\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9009,\"protocol\":\"http\",\"system_app\":1}" \
+  "{\"appid\":\"nc_py_api\",\"name\":\"nc_py_api\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":9009,\"protocol\":\"http\",\"system_app\":1}" \
   -e --force-scopes
 cat /tmp/_install.pid
 kill -15 "$(cat /tmp/_install.pid)"
diff --git a/tests/_install.py b/tests/_install.py
index a058a478..07c343f6 100644
--- a/tests/_install.py
+++ b/tests/_install.py
@@ -1,7 +1,5 @@
-from os import environ
 from typing import Annotated
 
-import uvicorn
 from fastapi import Depends, FastAPI
 from fastapi.responses import JSONResponse
 
@@ -33,28 +31,5 @@ def heartbeat_callback():
     return "ok"
 
 
-@APP.on_event("startup")
-def initialization():
-    ex_app.set_enabled_handler(APP, enabled_handler)
-    ex_app.set_scopes(
-        APP,
-        {
-            "required": [
-                ex_app.ApiScope.SYSTEM,
-                ex_app.ApiScope.DAV,
-                ex_app.ApiScope.USER_INFO,
-                ex_app.ApiScope.USER_STATUS,
-                ex_app.ApiScope.NOTIFICATIONS,
-                ex_app.ApiScope.WEATHER_STATUS,
-                ex_app.ApiScope.FILES_SHARING,
-            ],
-            "optional": [],
-        },
-    )
-    ex_app.enable_heartbeat(APP, heartbeat_callback)
-
-
 if __name__ == "__main__":
-    uvicorn.run(
-        "_install:APP", host=environ.get("APP_HOST", "127.0.0.1"), port=int(environ["APP_PORT"]), log_level="trace"
-    )
+    ex_app.run_app(APP, enabled_handler, "_install:APP", heartbeat_callback, log_level="trace")
diff --git a/tests/_install_only_enabled_handler.py b/tests/_install_only_enabled_handler.py
index d748e0ee..0fb57a79 100644
--- a/tests/_install_only_enabled_handler.py
+++ b/tests/_install_only_enabled_handler.py
@@ -1,6 +1,3 @@
-from os import environ
-
-import uvicorn
 from fastapi import FastAPI
 
 from nc_py_api import NextcloudApp, ex_app
@@ -12,16 +9,5 @@ def enabled_handler(_enabled: bool, _nc: NextcloudApp) -> str:
     return ""
 
 
-@APP.on_event("startup")
-def initialization():
-    ex_app.set_enabled_handler(APP, enabled_handler)
-    ex_app.enable_heartbeat(APP)
-
-
 if __name__ == "__main__":
-    uvicorn.run(
-        "_install_only_enabled_handler:APP",
-        host=environ.get("APP_HOST", "127.0.0.1"),
-        port=int(environ.get("APP_PORT", 9009)),
-        log_level="warning",
-    )
+    ex_app.run_app(APP, enabled_handler, "_install_only_enabled_handler:APP", log_level="warning")