From 0a9e9b625ecfe89b9852eac744ba09942ff1290f Mon Sep 17 00:00:00 2001
From: Alexander Piskun <bigcat88@icloud.com>
Date: Thu, 25 Jan 2024 12:24:09 +0300
Subject: [PATCH 1/2] AppAPI 2.0 prepare

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
---
 .run/Skeleton (27).run.xml                   |  5 +-
 CHANGELOG.md                                 |  4 +-
 docs/NextcloudApp.rst                        |  7 +-
 docs/NextcloudTalkBot.rst                    | 10 +--
 examples/as_app/skeleton/Makefile            |  6 +-
 examples/as_app/skeleton/appinfo/info.xml    |  1 -
 examples/as_app/talk_bot/Makefile            |  6 +-
 examples/as_app/talk_bot/appinfo/info.xml    |  1 -
 examples/as_app/talk_bot/lib/main.py         |  5 +-
 examples/as_app/talk_bot_ai/Makefile         |  4 +-
 examples/as_app/talk_bot_ai/appinfo/info.xml |  1 -
 examples/as_app/talk_bot_ai/lib/main.py      | 11 ++-
 examples/as_app/to_gif/Makefile              |  6 +-
 examples/as_app/to_gif/appinfo/info.xml      |  1 -
 examples/as_app/ui_example/Makefile          |  6 +-
 examples/as_app/ui_example/appinfo/info.xml  |  1 -
 nc_py_api/_version.py                        |  2 +-
 nc_py_api/ex_app/__init__.py                 |  4 +-
 nc_py_api/ex_app/integration_fastapi.py      | 24 ++-----
 nc_py_api/files/__init__.py                  |  2 +-
 nc_py_api/talk_bot.py                        |  2 +-
 scripts/ci_register.sh                       |  4 +-
 scripts/dev_register.sh                      | 12 +---
 tests/_talk_bot.py                           | 21 ++----
 tests/_talk_bot_async.py                     |  7 +-
 tests/actual_tests/talk_bot_test.py          | 75 ++++++++++----------
 26 files changed, 101 insertions(+), 127 deletions(-)

diff --git a/.run/Skeleton (27).run.xml b/.run/Skeleton (27).run.xml
index 702963d5..f5fb8015 100644
--- a/.run/Skeleton (27).run.xml	
+++ b/.run/Skeleton (27).run.xml	
@@ -1,16 +1,17 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Skeleton (27)" type="PythonConfigurationType" factoryName="Python">
     <module name="nc_py_api" />
+    <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
+      <env name="APP_HOST" value="127.0.0.1" />
       <env name="APP_ID" value="skeleton" />
-      <env name="APP_PORT" value="9030" />
+      <env name="APP_PORT" value="23745" />
       <env name="APP_SECRET" value="12345" />
       <env name="APP_VERSION" value="1.0.0" />
       <env name="NEXTCLOUD_URL" value="http://stable27.local/index.php" />
       <env name="PYTHONUNBUFFERED" value="1" />
-      <env name="APP_HOST" value="0.0.0.0" />
     </envs>
     <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/examples/as_app/skeleton/lib" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 043ec236..11bebaf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.8.1 - 2024-01-xx]
+## [0.9.0 - 2024-01-25]
 
 ### Added
 
@@ -12,7 +12,9 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
+- **large amount of incompatible changes** for `AppAPI 2.0`, see PR for description. #212
 - class `Share`.raw_data marked as deprecated and changed to `_raw_data`. #206
+- `ex_app.talk_bot_app`/`ex_app.atalk_bot_app` renamed to `ex_app.talk_bot_msg`/`ex_app.atalk_bot_msg`.
 
 ## [0.8.0 - 2024-01-12]
 
diff --git a/docs/NextcloudApp.rst b/docs/NextcloudApp.rst
index 294ef7d3..35557d55 100644
--- a/docs/NextcloudApp.rst
+++ b/docs/NextcloudApp.rst
@@ -66,7 +66,7 @@ First register ``manual_install`` daemon:
 
 .. code-block:: shell
 
-    php occ app_api:daemon:register manual_install "Manual Install" manual-install 0 0 0
+    php occ app_api:daemon:register manual_install "Manual Install" manual-install http host.docker.internal 0
 
 Then, launch your application. Since this is a manual deployment, it's your responsibility to set minimum of the environment variables.
 Here they are:
@@ -86,7 +86,7 @@ After launching your application, execute the following command in the Nextcloud
 .. code-block:: shell
 
     php occ app_api:app:register YOUR_APP_ID manual_install --json-info \
-        "{\"appid\":\"YOUR_APP_ID\",\"name\":\"YOUR_APP_DISPLAY_NAME\",\"daemon_config_name\":\"manual_install\",\"version\":\"YOU_APP_VERSION\",\"secret\":\"YOUR_APP_SECRET\",\"host\":\"host.docker.internal\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":SELECTED_PORT,\"protocol\":\"http\",\"system_app\":0}" \
+        "{\"appid\":\"YOUR_APP_ID\",\"name\":\"YOUR_APP_DISPLAY_NAME\",\"daemon_config_name\":\"manual_install\",\"version\":\"YOU_APP_VERSION\",\"secret\":\"YOUR_APP_SECRET\",\"scopes\":{\"required\":[\"ALL\"],\"optional\":[]},\"port\":SELECTED_PORT,\"system_app\":0}" \
         --force-scopes --wait-finish
 
 You can see how **nc_py_api** registers in ``scripts/dev_register.sh``.
@@ -226,8 +226,7 @@ and since this is not directly related to working with NextCloud, we will skip t
 Using AppAPIAuthMiddleware
 --------------------------
 
-If your application does not implement `Talk Bot` functionality and you most often do not need
-the ``NextcloudApp`` class returned after standard authentication with `Depends`:
+If in your application in most cases you don't really need the ``NextcloudApp`` class returned after standard authentication using `Depends`:
 
 .. code-block:: python
 
diff --git a/docs/NextcloudTalkBot.rst b/docs/NextcloudTalkBot.rst
index 48214817..7a874f1a 100644
--- a/docs/NextcloudTalkBot.rst
+++ b/docs/NextcloudTalkBot.rst
@@ -40,16 +40,18 @@ Afterward, using FastAPI, you can define endpoints that will be invoked by Talk:
 
     @APP.post("/currency_talk_bot")
     async def currency_talk_bot(
-        message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_app)],
+        _nc: Annotated[NextcloudApp, Depends(nc_app)],
+        message: Annotated[talk_bot.TalkBotMessage, Depends(atalk_bot_msg)],
         background_tasks: BackgroundTasks,
     ):
         return Response()
 
 .. note::
-    You must include to each endpoint your bot provides the **Depends(talk_bot_app)**.
-    **message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_app)]**
+    You must include to each endpoint your bot provides the **Depends(nc_app)**.
 
-Depending on **talk_bot_app** serves as an automatic authentication handler for messages from the cloud, which returns the received message from Nextcloud upon successful authentication.
+    Depending on **nc_app** serves as an automatic authentication handler for messages from the cloud.
+
+**message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_app)]** - returns the received message from Nextcloud upon successful authentication.
 
 Additionally, if your bot can provide quick and fixed execution times, you may not need to create background tasks.
 However, in most cases, it's recommended to segregate functionality and perform operations in the background, while promptly returning an empty response to Nextcloud.
diff --git a/examples/as_app/skeleton/Makefile b/examples/as_app/skeleton/Makefile
index 55c6b9d0..b7dfa358 100644
--- a/examples/as_app/skeleton/Makefile
+++ b/examples/as_app/skeleton/Makefile
@@ -69,19 +69,19 @@ run:
 register27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister skeleton --silent --force || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register skeleton manual_install --json-info \
-  "{\"appid\":\"skeleton\",\"name\":\"App Skeleton\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9030,\"scopes\":{\"required\":[],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"skeleton\",\"name\":\"App Skeleton\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9030,\"scopes\":{\"required\":[],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
 
 .PHONY: register28
 register28:
 	docker exec master-stable28-1 sudo -u www-data php occ app_api:app:unregister skeleton --silent --force || true
 	docker exec master-stable28-1 sudo -u www-data php occ app_api:app:register skeleton manual_install --json-info \
-  "{\"appid\":\"skeleton\",\"name\":\"App Skeleton\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9030,\"scopes\":{\"required\":[],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"skeleton\",\"name\":\"App Skeleton\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9030,\"scopes\":{\"required\":[],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
 
 .PHONY: register
 register:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister skeleton --silent --force || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register skeleton manual_install --json-info \
-  "{\"appid\":\"skeleton\",\"name\":\"App Skeleton\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9030,\"scopes\":{\"required\":[],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"skeleton\",\"name\":\"App Skeleton\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9030,\"scopes\":{\"required\":[],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
diff --git a/examples/as_app/skeleton/appinfo/info.xml b/examples/as_app/skeleton/appinfo/info.xml
index 47675d98..9b503aaf 100644
--- a/examples/as_app/skeleton/appinfo/info.xml
+++ b/examples/as_app/skeleton/appinfo/info.xml
@@ -30,7 +30,6 @@
 			<optional>
 			</optional>
 		</scopes>
-		<protocol>http</protocol>
 		<system>false</system>
 	</external-app>
 </info>
diff --git a/examples/as_app/talk_bot/Makefile b/examples/as_app/talk_bot/Makefile
index 960b1dfc..511c606f 100644
--- a/examples/as_app/talk_bot/Makefile
+++ b/examples/as_app/talk_bot/Makefile
@@ -54,12 +54,12 @@ run27:
 register:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot --silent --force || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register talk_bot manual_install --json-info \
-  "{\"appid\":\"talk_bot\",\"name\":\"TalkBot\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9032,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"talk_bot\",\"name\":\"TalkBot\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9032,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
 
 .PHONY: register27
 register27:
-	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister talk_bot --silent --force || true
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister talk_bot --force || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register talk_bot manual_install --json-info \
-  "{\"appid\":\"talk_bot\",\"name\":\"TalkBot\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9032,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"talk_bot\",\"name\":\"TalkBot\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9032,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
diff --git a/examples/as_app/talk_bot/appinfo/info.xml b/examples/as_app/talk_bot/appinfo/info.xml
index 0c680cb2..dd92abe7 100644
--- a/examples/as_app/talk_bot/appinfo/info.xml
+++ b/examples/as_app/talk_bot/appinfo/info.xml
@@ -32,7 +32,6 @@
 			<optional>
 			</optional>
 		</scopes>
-		<protocol>http</protocol>
 		<system>false</system>
 	</external-app>
 </info>
diff --git a/examples/as_app/talk_bot/lib/main.py b/examples/as_app/talk_bot/lib/main.py
index 769bccbe..830a28a1 100644
--- a/examples/as_app/talk_bot/lib/main.py
+++ b/examples/as_app/talk_bot/lib/main.py
@@ -8,7 +8,7 @@
 from fastapi import BackgroundTasks, Depends, FastAPI, Response
 
 from nc_py_api import NextcloudApp, talk_bot
-from nc_py_api.ex_app import run_app, set_handlers, talk_bot_app
+from nc_py_api.ex_app import atalk_bot_msg, nc_app, run_app, set_handlers
 
 
 # The same stuff as for usual External Applications
@@ -66,7 +66,8 @@ def currency_talk_bot_process_request(message: talk_bot.TalkBotMessage):
 
 @APP.post("/currency_talk_bot")
 async def currency_talk_bot(
-    message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_app)],
+    _nc: Annotated[NextcloudApp, Depends(nc_app)],
+    message: Annotated[talk_bot.TalkBotMessage, Depends(atalk_bot_msg)],
     background_tasks: BackgroundTasks,
 ):
     # As during converting, we do not process converting locally, we perform this in background, in the background task.
diff --git a/examples/as_app/talk_bot_ai/Makefile b/examples/as_app/talk_bot_ai/Makefile
index 444773e9..f5991fdd 100644
--- a/examples/as_app/talk_bot_ai/Makefile
+++ b/examples/as_app/talk_bot_ai/Makefile
@@ -54,12 +54,12 @@ run27:
 register:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister talk_bot_ai --silent --force || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register talk_bot_ai manual_install --json-info \
-  "{\"appid\":\"talk_bot_ai\",\"name\":\"TalkBotAI\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9034,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"talk_bot_ai\",\"name\":\"TalkBotAI\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9034,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
 
 .PHONY: register27
 register27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister talk_bot_ai --silent --force || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register talk_bot_ai manual_install --json-info \
-  "{\"appid\":\"talk_bot_ai\",\"name\":\"TalkBotAI\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9034,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"talk_bot_ai\",\"name\":\"TalkBotAI\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9034,\"scopes\":{\"required\":[\"TALK\", \"TALK_BOT\"],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
diff --git a/examples/as_app/talk_bot_ai/appinfo/info.xml b/examples/as_app/talk_bot_ai/appinfo/info.xml
index c1ddb3ba..a613bac2 100644
--- a/examples/as_app/talk_bot_ai/appinfo/info.xml
+++ b/examples/as_app/talk_bot_ai/appinfo/info.xml
@@ -32,7 +32,6 @@
 			<optional>
 			</optional>
 		</scopes>
-		<protocol>http</protocol>
 		<system>false</system>
 	</external-app>
 </info>
diff --git a/examples/as_app/talk_bot_ai/lib/main.py b/examples/as_app/talk_bot_ai/lib/main.py
index 14ab0920..f9ca72b9 100644
--- a/examples/as_app/talk_bot_ai/lib/main.py
+++ b/examples/as_app/talk_bot_ai/lib/main.py
@@ -9,7 +9,13 @@
 from transformers import pipeline
 
 from nc_py_api import NextcloudApp, talk_bot
-from nc_py_api.ex_app import get_model_path, run_app, set_handlers, talk_bot_app
+from nc_py_api.ex_app import (
+    atalk_bot_msg,
+    get_model_path,
+    nc_app,
+    run_app,
+    set_handlers,
+)
 
 
 @asynccontextmanager
@@ -34,7 +40,8 @@ def ai_talk_bot_process_request(message: talk_bot.TalkBotMessage):
 
 @APP.post("/ai_talk_bot")
 async def ai_talk_bot(
-    message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_app)],
+    _nc: Annotated[NextcloudApp, Depends(nc_app)],
+    message: Annotated[talk_bot.TalkBotMessage, Depends(atalk_bot_msg)],
     background_tasks: BackgroundTasks,
 ):
     if message.object_name == "message":
diff --git a/examples/as_app/to_gif/Makefile b/examples/as_app/to_gif/Makefile
index f9c59a32..aee1f4c6 100644
--- a/examples/as_app/to_gif/Makefile
+++ b/examples/as_app/to_gif/Makefile
@@ -69,19 +69,19 @@ run:
 register27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister to_gif --silent --force || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api: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\":9031,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"to_gif\",\"name\":\"to_gif\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9031,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
 
 .PHONY: register28
 register28:
 	docker exec master-stable28-1 sudo -u www-data php occ app_api:app:unregister to_gif --silent --force || true
 	docker exec master-stable28-1 sudo -u www-data php occ app_api: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\":9031,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"to_gif\",\"name\":\"to_gif\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9031,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
 
 .PHONY: register
 register:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister to_gif --silent --force || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api: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\":9031,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"to_gif\",\"name\":\"to_gif\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9031,\"scopes\":{\"required\":[\"FILES\", \"NOTIFICATIONS\"],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
diff --git a/examples/as_app/to_gif/appinfo/info.xml b/examples/as_app/to_gif/appinfo/info.xml
index e3315411..850eddc1 100644
--- a/examples/as_app/to_gif/appinfo/info.xml
+++ b/examples/as_app/to_gif/appinfo/info.xml
@@ -32,7 +32,6 @@
 			<optional>
 			</optional>
 		</scopes>
-		<protocol>http</protocol>
 		<system>false</system>
 	</external-app>
 </info>
diff --git a/examples/as_app/ui_example/Makefile b/examples/as_app/ui_example/Makefile
index c31f4593..a4aabc3e 100644
--- a/examples/as_app/ui_example/Makefile
+++ b/examples/as_app/ui_example/Makefile
@@ -69,19 +69,19 @@ run:
 register27:
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:unregister ui_example --silent --force || true
 	docker exec master-stable27-1 sudo -u www-data php occ app_api:app:register ui_example manual_install --json-info \
-  "{\"appid\":\"ui_example\",\"name\":\"UI Example\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9035,\"scopes\":{\"required\":[],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"ui_example\",\"name\":\"UI Example\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9035,\"scopes\":{\"required\":[],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
 
 .PHONY: register28
 register28:
 	docker exec master-stable28-1 sudo -u www-data php occ app_api:app:unregister ui_example --silent --force || true
 	docker exec master-stable28-1 sudo -u www-data php occ app_api:app:register ui_example manual_install --json-info \
-  "{\"appid\":\"ui_example\",\"name\":\"UI Example\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9035,\"scopes\":{\"required\":[],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"ui_example\",\"name\":\"UI Example\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9035,\"scopes\":{\"required\":[],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
 
 .PHONY: register
 register:
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister ui_example --silent --force || true
 	docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register ui_example manual_install --json-info \
-  "{\"appid\":\"ui_example\",\"name\":\"UI Example\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"host\":\"host.docker.internal\",\"port\":9035,\"scopes\":{\"required\":[],\"optional\":[]},\"protocol\":\"http\",\"system_app\":0}" \
+  "{\"appid\":\"ui_example\",\"name\":\"UI Example\",\"daemon_config_name\":\"manual_install\",\"version\":\"1.0.0\",\"secret\":\"12345\",\"port\":9035,\"scopes\":{\"required\":[],\"optional\":[]},\"system_app\":0}" \
   --force-scopes --wait-finish
diff --git a/examples/as_app/ui_example/appinfo/info.xml b/examples/as_app/ui_example/appinfo/info.xml
index 3a95c326..f3664398 100644
--- a/examples/as_app/ui_example/appinfo/info.xml
+++ b/examples/as_app/ui_example/appinfo/info.xml
@@ -30,7 +30,6 @@
 			<optional>
 			</optional>
 		</scopes>
-		<protocol>http</protocol>
 		<system>false</system>
 	</external-app>
 </info>
diff --git a/nc_py_api/_version.py b/nc_py_api/_version.py
index 60c7bc57..31e2a53b 100644
--- a/nc_py_api/_version.py
+++ b/nc_py_api/_version.py
@@ -1,3 +1,3 @@
 """Version of nc_py_api."""
 
-__version__ = "0.8.1.dev0"
+__version__ = "0.9.0.dev0"
diff --git a/nc_py_api/ex_app/__init__.py b/nc_py_api/ex_app/__init__.py
index e31c9864..6cfc3324 100644
--- a/nc_py_api/ex_app/__init__.py
+++ b/nc_py_api/ex_app/__init__.py
@@ -4,10 +4,10 @@
 from .integration_fastapi import (
     AppAPIAuthMiddleware,
     anc_app,
-    atalk_bot_app,
+    atalk_bot_msg,
     nc_app,
     set_handlers,
-    talk_bot_app,
+    talk_bot_msg,
 )
 from .misc import get_model_path, persistent_storage, verify_version
 from .ui.files_actions import UiActionFileInfo
diff --git a/nc_py_api/ex_app/integration_fastapi.py b/nc_py_api/ex_app/integration_fastapi.py
index 90976233..bea643d1 100644
--- a/nc_py_api/ex_app/integration_fastapi.py
+++ b/nc_py_api/ex_app/integration_fastapi.py
@@ -1,8 +1,6 @@
 """FastAPI directly related stuff."""
 
 import asyncio
-import hashlib
-import hmac
 import json
 import os
 import typing
@@ -21,7 +19,7 @@
 
 from .._misc import get_username_secret_from_headers
 from ..nextcloud import AsyncNextcloudApp, NextcloudApp
-from ..talk_bot import TalkBotMessage, aget_bot_secret, get_bot_secret
+from ..talk_bot import TalkBotMessage
 from .misc import persistent_storage
 
 
@@ -49,26 +47,14 @@ def anc_app(request: HTTPConnection) -> AsyncNextcloudApp:
     return nextcloud_app
 
 
-def __talk_bot_app(secret: bytes | None, request: Request, body: bytes) -> TalkBotMessage:
-    if not secret:
-        raise HTTPException(status_code=status.HTTP_500_INTERNAL_SERVER_ERROR)
-    hmac_sign = hmac.new(
-        secret, request.headers.get("X-NEXTCLOUD-TALK-RANDOM", "").encode("UTF-8"), digestmod=hashlib.sha256
-    )
-    hmac_sign.update(body)
-    if request.headers["X-NEXTCLOUD-TALK-SIGNATURE"] != hmac_sign.hexdigest():
-        raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
-    return TalkBotMessage(json.loads(body))
-
-
-def talk_bot_app(request: Request) -> TalkBotMessage:
+def talk_bot_msg(request: Request) -> TalkBotMessage:
     """Authentication handler for bot requests from Nextcloud Talk to the application."""
-    return __talk_bot_app(get_bot_secret(request.url.components.path), request, asyncio.run(request.body()))
+    return TalkBotMessage(json.loads(asyncio.run(request.body())))
 
 
-async def atalk_bot_app(request: Request) -> TalkBotMessage:
+async def atalk_bot_msg(request: Request) -> TalkBotMessage:
     """Async Authentication handler for bot requests from Nextcloud Talk to the application."""
-    return __talk_bot_app(await aget_bot_secret(request.url.components.path), request, await request.body())
+    return TalkBotMessage(json.loads(await request.body()))
 
 
 def set_handlers(
diff --git a/nc_py_api/files/__init__.py b/nc_py_api/files/__init__.py
index 86ec4737..2a8ca812 100644
--- a/nc_py_api/files/__init__.py
+++ b/nc_py_api/files/__init__.py
@@ -305,7 +305,7 @@ def __init__(self, raw_data: dict):
     def __getattr__(self, name):
         if name == "raw_data":
             warnings.warn(
-                f"{name} is deprecated and will be removed in 0.9.0 version.", DeprecationWarning, stacklevel=2
+                f"{name} is deprecated and will be removed in 0.10.0 version.", DeprecationWarning, stacklevel=2
             )
             return self._raw_data
         return getattr(self, name)
diff --git a/nc_py_api/talk_bot.py b/nc_py_api/talk_bot.py
index 1eca6fde..afd0c868 100644
--- a/nc_py_api/talk_bot.py
+++ b/nc_py_api/talk_bot.py
@@ -94,7 +94,7 @@ def __init__(self, callback_url: str, display_name: str, description: str = ""):
         :param display_name: The display name of the bot that is shown as author when it posts a message or reaction.
         :param description: Description of the bot helping moderators to decide if they want to enable this bot.
         """
-        self.callback_url = callback_url
+        self.callback_url = callback_url.lstrip("/")
         self.display_name = display_name
         self.description = description
 
diff --git a/scripts/ci_register.sh b/scripts/ci_register.sh
index 61a4879c..c307b7d4 100755
--- a/scripts/ci_register.sh
+++ b/scripts/ci_register.sh
@@ -3,7 +3,7 @@
 # Parameters:
 # APP_ID, VERSION, SECRET, HOST, PORT
 
-php occ app_api:daemon:register manual_install "Manual Install" manual-install 0 0 0
+php occ app_api:daemon:register manual_install "Manual Install" manual-install http "$4" 0
 php occ app_api:app:register "$1" manual_install --json-info \
-  "{\"appid\":\"$1\",\"name\":\"$1\",\"daemon_config_name\":\"manual_install\",\"version\":\"$2\",\"secret\":\"$3\",\"host\":\"$4\",\"scopes\":{\"required\":[\"ALL\"],\"optional\":[]},\"port\":$5,\"protocol\":\"http\",\"system_app\":1}" \
+  "{\"appid\":\"$1\",\"name\":\"$1\",\"daemon_config_name\":\"manual_install\",\"version\":\"$2\",\"secret\":\"$3\",\"scopes\":{\"required\":[\"ALL\"],\"optional\":[]},\"port\":$5,\"system_app\":1}" \
   --force-scopes --wait-finish
diff --git a/scripts/dev_register.sh b/scripts/dev_register.sh
index 8b014355..40f74822 100644
--- a/scripts/dev_register.sh
+++ b/scripts/dev_register.sh
@@ -1,20 +1,12 @@
 #!/bin/bash
 
-echo "removing 'manual_install' deploy daemon for $1 container"
-docker exec "$1" sudo -u www-data php occ app_api:daemon:unregister manual_install || true
 echo "creating 'manual_install' deploy daemon for $1 container"
 docker exec "$1" sudo -u www-data php occ app_api:daemon:register \
-  manual_install "Manual Install" manual-install 0 0 0
+  manual_install "Manual Install" manual-install http host.docker.internal 0
 echo "unregistering nc_py_api as an app for $1 container"
 docker exec "$1" sudo -u www-data php occ app_api:app:unregister nc_py_api --silent --force || true
 echo "registering nc_py_api as an app for $1 container"
-NEXTCLOUD_URL="http://$2" APP_PORT=9009 APP_ID="nc_py_api" APP_SECRET="12345" APP_VERSION="1.0.0" \
-  python3 tests/_install.py > /dev/null 2>&1 &
-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_api: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\",\"scopes\":{\"required\":[\"ALL\"],\"optional\":[]},\"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\",\"scopes\":{\"required\":[\"ALL\"],\"optional\":[]},\"port\":9009,\"system_app\":1}" \
   --force-scopes --wait-finish
-cat /tmp/_install.pid
-kill -15 "$(cat /tmp/_install.pid)"
 echo "nc_py_api for $1 is ready to use"
diff --git a/tests/_talk_bot.py b/tests/_talk_bot.py
index 93361fe5..8873cf13 100644
--- a/tests/_talk_bot.py
+++ b/tests/_talk_bot.py
@@ -3,11 +3,10 @@
 
 import gfixture_set_env  # noqa
 import pytest
-from fastapi import BackgroundTasks, Depends, FastAPI, HTTPException, Request, Response
-from starlette.datastructures import URL
+from fastapi import BackgroundTasks, Depends, FastAPI, Request, Response
 
-from nc_py_api import talk_bot
-from nc_py_api.ex_app import run_app, talk_bot_app
+from nc_py_api import NextcloudApp, talk_bot
+from nc_py_api.ex_app import nc_app, run_app, talk_bot_msg
 
 APP = FastAPI()
 COVERAGE_BOT = talk_bot.TalkBot("/talk_bot_coverage", "Coverage bot", "Desc")
@@ -31,23 +30,13 @@ def coverage_talk_bot_process_request(message: talk_bot.TalkBotMessage, request:
         COVERAGE_BOT.delete_reaction(message.object_id, "🥳")
     with pytest.raises(ValueError):
         COVERAGE_BOT.send_message("🥳", message.object_id)
-    with pytest.raises(HTTPException) as e:
-        headers = dict(request.scope["headers"])
-        headers[b"x-nextcloud-talk-signature"] = b"122112442412"
-        request.scope["headers"] = list(headers.items())
-        del request._headers  # noqa
-        talk_bot_app(request)
-    assert e.value.status_code == 401
-    with pytest.raises(HTTPException) as e:
-        request._url = URL("sample_url")
-        talk_bot_app(request)
-    assert e.value.status_code == 500
 
 
 @APP.post("/talk_bot_coverage")
 def talk_bot_coverage(
     request: Request,
-    message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_app)],
+    _nc: Annotated[NextcloudApp, Depends(nc_app)],
+    message: Annotated[talk_bot.TalkBotMessage, Depends(talk_bot_msg)],
     background_tasks: BackgroundTasks,
 ):
     background_tasks.add_task(coverage_talk_bot_process_request, message, request)
diff --git a/tests/_talk_bot_async.py b/tests/_talk_bot_async.py
index 716711df..face078b 100644
--- a/tests/_talk_bot_async.py
+++ b/tests/_talk_bot_async.py
@@ -5,8 +5,8 @@
 import pytest
 from fastapi import BackgroundTasks, Depends, FastAPI, Request, Response
 
-from nc_py_api import talk_bot
-from nc_py_api.ex_app import atalk_bot_app, run_app
+from nc_py_api import AsyncNextcloudApp, talk_bot
+from nc_py_api.ex_app import anc_app, atalk_bot_msg, run_app
 
 APP = FastAPI()
 COVERAGE_BOT = talk_bot.AsyncTalkBot("/talk_bot_coverage", "Coverage bot", "Desc")
@@ -35,7 +35,8 @@ async def coverage_talk_bot_process_request(message: talk_bot.TalkBotMessage, re
 @APP.post("/talk_bot_coverage")
 async def talk_bot_coverage(
     request: Request,
-    message: Annotated[talk_bot.TalkBotMessage, Depends(atalk_bot_app)],
+    _nc: Annotated[AsyncNextcloudApp, Depends(anc_app)],
+    message: Annotated[talk_bot.TalkBotMessage, Depends(atalk_bot_msg)],
     background_tasks: BackgroundTasks,
 ):
     background_tasks.add_task(coverage_talk_bot_process_request, message, request)
diff --git a/tests/actual_tests/talk_bot_test.py b/tests/actual_tests/talk_bot_test.py
index c1277166..99d695ae 100644
--- a/tests/actual_tests/talk_bot_test.py
+++ b/tests/actual_tests/talk_bot_test.py
@@ -83,97 +83,96 @@ async def test_list_bots_async(anc, anc_app):
         await anc.talk.delete_conversation(conversation.token)
 
 
-# We're testing the async bot first, since it doesn't have invalid auth tests that triggers brute-force protection.
-@pytest.mark.asyncio(scope="session")
 @pytest.mark.skipif(environ.get("CI", None) is None, reason="run only on GitHub")
 @pytest.mark.require_nc(major=27, minor=1)
-async def test_chat_bot_receive_message_async(anc_app):
-    if await anc_app.talk.bots_available is False:
+def test_chat_bot_receive_message(nc_app):
+    if nc_app.talk.bots_available is False:
         pytest.skip("Need Talk bots support")
     httpx.delete(f"{'http'}://{environ.get('APP_HOST', '127.0.0.1')}:{environ['APP_PORT']}/reset_bot_secret")
-    talk_bot_inst = talk_bot.AsyncTalkBot("/talk_bot_coverage", "Coverage bot", "Desc")
-    await talk_bot_inst.enabled_handler(True, anc_app)
-    conversation = await anc_app.talk.create_conversation(talk.ConversationType.GROUP, "admin")
+    talk_bot_inst = talk_bot.TalkBot("/talk_bot_coverage", "Coverage bot", "Desc")
+    talk_bot_inst.enabled_handler(True, nc_app)
+    conversation = nc_app.talk.create_conversation(talk.ConversationType.GROUP, "admin")
     try:
-        coverage_bot = next(i for i in await anc_app.talk.list_bots() if i.url.endswith("/talk_bot_coverage"))
+        coverage_bot = next(i for i in nc_app.talk.list_bots() if i.url.endswith("/talk_bot_coverage"))
         c_bot_info = next(
-            i for i in await anc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
+            i for i in nc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
         )
         assert c_bot_info.state == 0
-        await anc_app.talk.enable_bot(conversation, coverage_bot)
+        nc_app.talk.enable_bot(conversation, coverage_bot)
         c_bot_info = next(
-            i for i in await anc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
+            i for i in nc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
         )
         assert c_bot_info.state == 1
         with pytest.raises(ValueError):
-            await anc_app.talk.send_message("Here are the msg!")
-        await anc_app.talk.send_message("Here are the msg!", conversation)
+            nc_app.talk.send_message("Here are the msg!")
+        nc_app.talk.send_message("Here are the msg!", conversation)
         msg_from_bot = None
         for _ in range(40):
-            messages = await anc_app.talk.receive_messages(conversation, look_in_future=True, timeout=1)
+            messages = nc_app.talk.receive_messages(conversation, look_in_future=True, timeout=1)
             if messages[-1].message == "Hello from bot!":
                 msg_from_bot = messages[-1]
                 break
         assert msg_from_bot
         c_bot_info = next(
-            i for i in await anc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
+            i for i in nc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
         )
         assert c_bot_info.state == 1
-        await anc_app.talk.disable_bot(conversation, coverage_bot)
+        nc_app.talk.disable_bot(conversation, coverage_bot)
         c_bot_info = next(
-            i for i in await anc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
+            i for i in nc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
         )
         assert c_bot_info.state == 0
     finally:
-        await anc_app.talk.delete_conversation(conversation.token)
-        await talk_bot_inst.enabled_handler(False, anc_app)
+        nc_app.talk.delete_conversation(conversation.token)
+        talk_bot_inst.enabled_handler(False, nc_app)
     talk_bot_inst.callback_url = "invalid_url"
     with pytest.raises(RuntimeError):
-        await talk_bot_inst.send_message("message", 999999, token="sometoken")
+        talk_bot_inst.send_message("message", 999999, token="sometoken")
 
 
+@pytest.mark.asyncio(scope="session")
 @pytest.mark.skipif(environ.get("CI", None) is None, reason="run only on GitHub")
 @pytest.mark.require_nc(major=27, minor=1)
-def test_chat_bot_receive_message(nc_app):
-    if nc_app.talk.bots_available is False:
+async def test_chat_bot_receive_message_async(anc_app):
+    if await anc_app.talk.bots_available is False:
         pytest.skip("Need Talk bots support")
     httpx.delete(f"{'http'}://{environ.get('APP_HOST', '127.0.0.1')}:{environ['APP_PORT']}/reset_bot_secret")
-    talk_bot_inst = talk_bot.TalkBot("/talk_bot_coverage", "Coverage bot", "Desc")
-    talk_bot_inst.enabled_handler(True, nc_app)
-    conversation = nc_app.talk.create_conversation(talk.ConversationType.GROUP, "admin")
+    talk_bot_inst = talk_bot.AsyncTalkBot("/talk_bot_coverage", "Coverage bot", "Desc")
+    await talk_bot_inst.enabled_handler(True, anc_app)
+    conversation = await anc_app.talk.create_conversation(talk.ConversationType.GROUP, "admin")
     try:
-        coverage_bot = next(i for i in nc_app.talk.list_bots() if i.url.endswith("/talk_bot_coverage"))
+        coverage_bot = next(i for i in await anc_app.talk.list_bots() if i.url.endswith("/talk_bot_coverage"))
         c_bot_info = next(
-            i for i in nc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
+            i for i in await anc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
         )
         assert c_bot_info.state == 0
-        nc_app.talk.enable_bot(conversation, coverage_bot)
+        await anc_app.talk.enable_bot(conversation, coverage_bot)
         c_bot_info = next(
-            i for i in nc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
+            i for i in await anc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
         )
         assert c_bot_info.state == 1
         with pytest.raises(ValueError):
-            nc_app.talk.send_message("Here are the msg!")
-        nc_app.talk.send_message("Here are the msg!", conversation)
+            await anc_app.talk.send_message("Here are the msg!")
+        await anc_app.talk.send_message("Here are the msg!", conversation)
         msg_from_bot = None
         for _ in range(40):
-            messages = nc_app.talk.receive_messages(conversation, look_in_future=True, timeout=1)
+            messages = await anc_app.talk.receive_messages(conversation, look_in_future=True, timeout=1)
             if messages[-1].message == "Hello from bot!":
                 msg_from_bot = messages[-1]
                 break
         assert msg_from_bot
         c_bot_info = next(
-            i for i in nc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
+            i for i in await anc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
         )
         assert c_bot_info.state == 1
-        nc_app.talk.disable_bot(conversation, coverage_bot)
+        await anc_app.talk.disable_bot(conversation, coverage_bot)
         c_bot_info = next(
-            i for i in nc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
+            i for i in await anc_app.talk.conversation_list_bots(conversation) if i.bot_id == coverage_bot.bot_id
         )
         assert c_bot_info.state == 0
     finally:
-        nc_app.talk.delete_conversation(conversation.token)
-        talk_bot_inst.enabled_handler(False, nc_app)
+        await anc_app.talk.delete_conversation(conversation.token)
+        await talk_bot_inst.enabled_handler(False, anc_app)
     talk_bot_inst.callback_url = "invalid_url"
     with pytest.raises(RuntimeError):
-        talk_bot_inst.send_message("message", 999999, token="sometoken")
+        await talk_bot_inst.send_message("message", 999999, token="sometoken")

From 473eef02475931db2a6c3fe81d13e429de362030 Mon Sep 17 00:00:00 2001
From: Alexander Piskun <bigcat88@icloud.com>
Date: Thu, 25 Jan 2024 12:50:26 +0300
Subject: [PATCH 2/2] fixed typo errors [ci skip]

Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
---
 .run/Skeleton (27).run.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.run/Skeleton (27).run.xml b/.run/Skeleton (27).run.xml
index f5fb8015..fa7e1ce8 100644
--- a/.run/Skeleton (27).run.xml	
+++ b/.run/Skeleton (27).run.xml	
@@ -5,9 +5,9 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="APP_HOST" value="127.0.0.1" />
+      <env name="APP_HOST" value="0.0.0.0" />
       <env name="APP_ID" value="skeleton" />
-      <env name="APP_PORT" value="23745" />
+      <env name="APP_PORT" value="9030" />
       <env name="APP_SECRET" value="12345" />
       <env name="APP_VERSION" value="1.0.0" />
       <env name="NEXTCLOUD_URL" value="http://stable27.local/index.php" />