+ {getText()}
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% if not auth.enabled or auth.username is not none %}
+
+
+
+
+ {% endif %}
+
+
+
+ {% if autorefresh_intervals %}
+
+
+
+
+
+
+
+
+ {% endif %}
+ | + | package base | +version | +packages | +groups | +licenses | +packager | +last update | +status | +
|---|
+
+
+
+ {% if auth.enabled %}
+ {% include "build-status/login-modal.jinja2" %}
+ {% endif %}
+
+ {% include "build-status/alerts.jinja2" %}
+
+ {% include "build-status/dashboard.jinja2" %}
+ {% include "build-status/package-add-modal.jinja2" %}
+ {% include "build-status/package-rebuild-modal.jinja2" %}
+ {% include "build-status/key-import-modal.jinja2" %}
+
+ {% include "build-status/package-info-modal.jinja2" %}
+
+ {% include "build-status/table.jinja2" %}
+
+
+
+
diff --git a/package/share/ahriman/templates/build-status.jinja2 b/package/share/ahriman/templates/build-status.jinja2
index a1a62940..ca129012 100644
--- a/package/share/ahriman/templates/build-status.jinja2
+++ b/package/share/ahriman/templates/build-status.jinja2
@@ -1,191 +1,16 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {% if not auth.enabled or auth.username is not none %}
-
-
-
-
- {% endif %}
-
-
-
- {% if autorefresh_intervals %}
-
-
-
-
-
-
-
-
- {% endif %}
- | - | package base | -version | -packages | -groups | -licenses | -packager | -last update | -status | -
|---|
-
-
-
- {% if auth.enabled %}
- {% include "build-status/login-modal.jinja2" %}
- {% endif %}
-
- {% include "build-status/alerts.jinja2" %}
-
- {% include "build-status/dashboard.jinja2" %}
- {% include "build-status/package-add-modal.jinja2" %}
- {% include "build-status/package-rebuild-modal.jinja2" %}
- {% include "build-status/key-import-modal.jinja2" %}
-
- {% include "build-status/package-info-modal.jinja2" %}
-
- {% include "build-status/table.jinja2" %}
-
-
+
+
diff --git a/pyproject.toml b/pyproject.toml
index dc82e6ca..aae0ba62 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -118,11 +118,14 @@ include = [
"CONTRIBUTING.md",
"SECURITY.md",
"package",
+ "frontend",
"subpackages.py",
"web.png",
]
exclude = [
"package/archlinux",
+ "frontend/node_modules",
+ "frontend/package-lock.json",
]
[tool.flit.external-data]
diff --git a/recipes/oauth/service.ini b/recipes/oauth/service.ini
index 96003669..b4767c35 100644
--- a/recipes/oauth/service.ini
+++ b/recipes/oauth/service.ini
@@ -3,7 +3,6 @@ target = oauth
client_id = $AHRIMAN_OAUTH_CLIENT_ID
client_secret = $AHRIMAN_OAUTH_CLIENT_SECRET
-oauth_icon = github
oauth_provider = GithubClient
oauth_scopes = read:user
diff --git a/src/ahriman/core/auth/auth.py b/src/ahriman/core/auth/auth.py
index 21bf458a..19f78efd 100644
--- a/src/ahriman/core/auth/auth.py
+++ b/src/ahriman/core/auth/auth.py
@@ -60,6 +60,16 @@ class Auth(LazyLogging):
"""
return """"""
+ @property
+ def is_external(self) -> bool:
+ """
+ check if the provider is external (e.g. OAuth)
+
+ Returns:
+ bool: ``True`` in case if external provider is used and ``False`` otherwise
+ """
+ return False
+
@staticmethod
def load(configuration: Configuration, database: SQLite) -> Auth:
"""
diff --git a/src/ahriman/core/auth/oauth.py b/src/ahriman/core/auth/oauth.py
index 8172e29a..e14355de 100644
--- a/src/ahriman/core/auth/oauth.py
+++ b/src/ahriman/core/auth/oauth.py
@@ -36,7 +36,6 @@ class OAuth(Mapping):
Attributes:
client_id(str): application client id
client_secret(str): application client secret key
- icon(str): icon to be used in login control
provider(aioauth_client.OAuth2Client): provider class, should be one of aiohttp-client provided classes
redirect_uri(str): redirect URI registered in provider
scopes(str): list of scopes required by the application
@@ -59,7 +58,6 @@ class OAuth(Mapping):
self.provider = self.get_provider(configuration.get("auth", "oauth_provider"))
# it is list, but we will have to convert to string it anyway
self.scopes = configuration.get("auth", "oauth_scopes")
- self.icon = configuration.get("auth", "oauth_icon", fallback="google")
@property
def auth_control(self) -> str:
@@ -69,8 +67,17 @@ class OAuth(Mapping):
Returns:
str: login control as html code to insert
"""
- return f" login"
+ return " login"
+
+ @property
+ def is_external(self) -> bool:
+ """
+ check if the provider is external (e.g. OAuth)
+
+ Returns:
+ bool: ``True`` in case if external provider is used and ``False`` otherwise
+ """
+ return True
@staticmethod
def get_provider(name: str) -> type[aioauth_client.OAuth2Client]:
diff --git a/src/ahriman/core/configuration/schema.py b/src/ahriman/core/configuration/schema.py
index d1284915..13551a1d 100644
--- a/src/ahriman/core/configuration/schema.py
+++ b/src/ahriman/core/configuration/schema.py
@@ -161,10 +161,6 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = {
"coerce": "integer",
"min": 0,
},
- "oauth_icon": {
- "type": "string",
- "empty": False,
- },
"oauth_provider": {
"type": "string",
"empty": False,
@@ -398,6 +394,10 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = {
"path_exists": True,
"path_type": "dir",
},
+ "template": {
+ "type": "string",
+ "empty": False,
+ },
"templates": {
"type": "list",
"coerce": "list",
diff --git a/src/ahriman/core/utils.py b/src/ahriman/core/utils.py
index 6ac48ce8..79b71424 100644
--- a/src/ahriman/core/utils.py
+++ b/src/ahriman/core/utils.py
@@ -35,7 +35,7 @@ from enum import Enum
from filelock import FileLock
from pathlib import Path
from pwd import getpwuid
-from typing import Any, IO, TypeVar
+from typing import Any, IO, TypeVar, cast
from ahriman.core.exceptions import CalledProcessError, OptionError, UnsafeRunError
from ahriman.core.types import Comparable
@@ -285,16 +285,17 @@ def filelock(path: Path) -> Iterator[FileLock]:
lock_path.unlink(missing_ok=True)
-def filter_json(source: dict[str, Any], known_fields: Iterable[str]) -> dict[str, Any]:
+def filter_json(source: T, known_fields: Iterable[str] | None = None) -> T:
"""
- filter json object by fields used for json-to-object conversion
+ recursively filter json object removing ``None`` values and optionally filtering by known fields
Args:
- source(dict[str, Any]): raw json object
- known_fields(Iterable[str]): list of fields which have to be known for the target object
+ source(T): raw json object (dict, list, or scalar)
+ known_fields(Iterable[str] | None, optional): list of fields which have to be known for the target object
+ (Default value = None)
Returns:
- dict[str, Any]: json object without unknown and empty fields
+ T: json without ``None`` values
Examples:
This wrapper is mainly used for the dataclasses, thus the flow must be something like this::
@@ -306,7 +307,15 @@ def filter_json(source: dict[str, Any], known_fields: Iterable[str]) -> dict[str
>>> properties = filter_json(dump, known_fields)
>>> package = Package(**properties)
"""
- return {key: value for key, value in source.items() if key in known_fields and value is not None}
+ if isinstance(source, dict):
+ return cast(T, {
+ key: filter_json(value)
+ for key, value in source.items()
+ if value is not None and (known_fields is None or key in known_fields)
+ })
+ if isinstance(source, list):
+ return cast(T, [filter_json(value) for value in source])
+ return source
def full_version(epoch: str | int | None, pkgver: str, pkgrel: str) -> str:
diff --git a/src/ahriman/web/schemas/__init__.py b/src/ahriman/web/schemas/__init__.py
index 2710f174..b04d2621 100644
--- a/src/ahriman/web/schemas/__init__.py
+++ b/src/ahriman/web/schemas/__init__.py
@@ -19,7 +19,9 @@
#
from ahriman.web.schemas.any_schema import AnySchema
from ahriman.web.schemas.aur_package_schema import AURPackageSchema
+from ahriman.web.schemas.auth_info_schema import AuthInfoSchema
from ahriman.web.schemas.auth_schema import AuthSchema
+from ahriman.web.schemas.auto_refresh_interval_schema import AutoRefreshIntervalSchema
from ahriman.web.schemas.build_options_schema import BuildOptionsSchema
from ahriman.web.schemas.changes_schema import ChangesSchema
from ahriman.web.schemas.configuration_schema import ConfigurationSchema
@@ -30,6 +32,7 @@ from ahriman.web.schemas.event_schema import EventSchema
from ahriman.web.schemas.event_search_schema import EventSearchSchema
from ahriman.web.schemas.file_schema import FileSchema
from ahriman.web.schemas.info_schema import InfoSchema
+from ahriman.web.schemas.info_v2_schema import InfoV2Schema
from ahriman.web.schemas.internal_status_schema import InternalStatusSchema
from ahriman.web.schemas.log_schema import LogSchema
from ahriman.web.schemas.login_schema import LoginSchema
diff --git a/src/ahriman/web/schemas/auth_info_schema.py b/src/ahriman/web/schemas/auth_info_schema.py
new file mode 100644
index 00000000..7a3de497
--- /dev/null
+++ b/src/ahriman/web/schemas/auth_info_schema.py
@@ -0,0 +1,39 @@
+#
+# Copyright (c) 2021-2026 ahriman team.
+#
+# This file is part of ahriman
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see