Skip to content

fix(talk_bot): remove the dead appconfig_ex bot-secret fallback #435

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

Open
oleksandr-nc wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −10
Open

fix(talk_bot): remove the dead appconfig_ex bot-secret fallback #435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 2 additions & 10 deletions nc_py_api/talk_bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,24 +357,16 @@ def __get_bot_secret(callback_url: str) -> str:


def get_bot_secret(callback_url: str) -> bytes | None:
"""Returns the bot's secret from an environment variable or from the application's configuration on the server."""
"""Returns the bot's secret from the environment variable populated when the bot was registered."""
secret_key = __get_bot_secret(callback_url)
if secret_key in os.environ:
return os.environ[secret_key].encode("UTF-8")
secret_value = NextcloudApp().appconfig_ex.get_value(secret_key)
if secret_value is not None:
os.environ[secret_key] = secret_value
return secret_value.encode("UTF-8")
return None


async def aget_bot_secret(callback_url: str) -> bytes | None:
"""Returns the bot's secret from an environment variable or from the application's configuration on the server."""
"""Returns the bot's secret from the environment variable populated when the bot was registered."""
secret_key = __get_bot_secret(callback_url)
if secret_key in os.environ:
return os.environ[secret_key].encode("UTF-8")
secret_value = await AsyncNextcloudApp().appconfig_ex.get_value(secret_key)
if secret_value is not None:
os.environ[secret_key] = secret_value
return secret_value.encode("UTF-8")
return None
Loading