From 1721325ed4fba420ccce0b322be3ba1b22dcfb8d Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 28 Feb 2024 21:25:24 +0100
Subject: [PATCH 001/324] decockpize: remove DevServerWrapper

---
 web/src/DevServerWrapper.jsx      | 129 ------------------------------
 web/src/DevServerWrapper.test.jsx | 119 ---------------------------
 web/src/index.js                  |  53 +++++-------
 3 files changed, 21 insertions(+), 280 deletions(-)
 delete mode 100644 web/src/DevServerWrapper.jsx
 delete mode 100644 web/src/DevServerWrapper.test.jsx

diff --git a/web/src/DevServerWrapper.jsx b/web/src/DevServerWrapper.jsx
deleted file mode 100644
index 456b9c24f1..0000000000
--- a/web/src/DevServerWrapper.jsx
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React, { useEffect, useRef, useState } from "react";
-import {
-  Button,
-  Text,
-  EmptyState, EmptyStateBody, EmptyStateFooter, EmptyStateHeader, EmptyStateIcon
-} from "@patternfly/react-core";
-import { Center, Icon, Loading } from "~/components/layout";
-import { _ } from "~/i18n";
-
-// path to any internal Cockpit component to force displaying the login dialog
-const loginPath = "/cockpit/@localhost/system/terminal.html";
-// id of the password field in the login dialog
-const loginId = "login-password-input";
-
-const ErrorIcon = () => <Icon name="error" className="icon-xxxl" />;
-
-/**
- * This is a helper wrapper used in the development server only. It displays
- * the Cockpit login page if the user is not authenticated. After successful
- * authentication the Agama page is displayed.
- *
- * @param {React.ReactNode} [props.children] - content to display within the wrapper
- *
-*/
-export default function DevServerWrapper({ children }) {
-  const [isLoading, setIsLoading] = useState(true);
-  const [isAuthenticated, setIsAuthenticated] = useState(null);
-  const [isError, setIsError] = useState(false);
-  const iframeRef = useRef(null);
-
-  useEffect(() => {
-    if (!isLoading) return;
-
-    // get the current login state by querying the "/cockpit/login" path
-    const xhr = new XMLHttpRequest();
-    xhr.ontimeout = () => {
-      setIsError(true);
-      setIsLoading(false);
-    };
-    xhr.onloadend = () => {
-      // 200 = OK
-      if (xhr.status === 200)
-        setIsAuthenticated(true);
-      // 401 = Authentication failed
-      else if (xhr.status === 401)
-        setIsAuthenticated(false);
-      else
-        setIsError(true);
-
-      setIsLoading(false);
-    };
-    xhr.timeout = 5000;
-    xhr.open("GET", "/cockpit/login");
-    xhr.send();
-  }, [isLoading]);
-
-  if (isLoading) return <Loading />;
-
-  if (isError) {
-    // TRANSLATORS: error message, %s is replaced by the server URL
-    const [msg1, msg2] = _("The server at %s is not reachable.").split("%s");
-    return (
-      <Center>
-        <EmptyState variant="xl">
-          <EmptyStateHeader
-            // TRANSLATORS: error message
-            titleText={_("Cannot connect to the Cockpit server")}
-            headingLevel="h2"
-            icon={<EmptyStateIcon icon={ErrorIcon} />}
-          />
-          <EmptyStateBody>
-            <Text>
-              {msg1} {" "}
-              <Button isInline variant="link" component="a" href={COCKPIT_TARGET_URL} target="_blank">
-                {COCKPIT_TARGET_URL}
-              </Button>
-              {" "} {msg2}
-            </Text>
-          </EmptyStateBody>
-          <EmptyStateFooter>
-            <Button variant="primary" onClick={() => { setIsLoading(true); setIsError(false) }}>
-              {/* TRANSLATORS: button label */}
-              {_("Try Again")}
-            </Button>
-          </EmptyStateFooter>
-        </EmptyState>
-      </Center>
-    );
-  }
-
-  if (isAuthenticated) {
-    // just display the wrapped content
-    return children;
-  } else {
-    // handle updating the iframe with the login form
-    const onFrameLoad = () => {
-      // have a full screen login form
-      document.getElementById("root").style.maxInlineSize = "none";
-
-      const passwordInput = iframeRef.current.contentWindow.document.getElementById(loginId);
-      // reload the window so the manifests.js file referenced from the
-      // index.html file is also loaded again
-      if (!passwordInput) window.location.reload();
-    };
-
-    return <iframe ref={iframeRef} onLoad={onFrameLoad} src={loginPath} className="full-size" />;
-  }
-}
diff --git a/web/src/DevServerWrapper.test.jsx b/web/src/DevServerWrapper.test.jsx
deleted file mode 100644
index 4f42362c83..0000000000
--- a/web/src/DevServerWrapper.test.jsx
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { render, screen, waitFor } from "@testing-library/react";
-import { act } from "react-dom/test-utils";
-
-import DevServerWrapper from "~/DevServerWrapper";
-
-// mock XMLHttpRequest object
-const xhrMock = {
-  open: jest.fn(),
-  send: jest.fn(),
-};
-
-describe("DevServerWrapper", () => {
-  it("displays loading content at the beginning and starts a request", async () => {
-    jest.spyOn(window, 'XMLHttpRequest').mockImplementation(() => xhrMock);
-
-    render(<DevServerWrapper />);
-    screen.getByText(/Loading installation environment/);
-
-    expect(xhrMock.open).toBeCalledWith("GET", "/cockpit/login");
-    expect(xhrMock.send).toHaveBeenCalled();
-  });
-
-  describe("when user is not authenticated", () => {
-    const xhrMockNotAuth = {
-      status: 401,
-      ...xhrMock
-    };
-
-    beforeEach(() => {
-      jest.spyOn(window, 'XMLHttpRequest').mockImplementation(() => xhrMockNotAuth);
-    });
-
-    it("displays the login dialog", async () => {
-      const { container } = render(<DevServerWrapper />);
-      // wait until the XHR finish handler is set up
-      await waitFor(() => expect(xhrMockNotAuth.onloadend).toBeDefined());
-      act(() => xhrMockNotAuth.onloadend());
-
-      // an iframe with Cockpit terminal application is used for logging in
-      const iframe = container.querySelector("iframe");
-      expect(iframe.src).toMatch(/cockpit\/@localhost\/system\/terminal.html$/);
-    });
-  });
-
-  describe("when user is already authenticated", () => {
-    const xhrMockAuth = {
-      status: 200,
-      ...xhrMock
-    };
-
-    beforeEach(() => {
-      jest.spyOn(window, 'XMLHttpRequest').mockImplementation(() => xhrMockAuth);
-    });
-
-    it("displays the children content", async () => {
-      render(<DevServerWrapper>Testing content</DevServerWrapper>);
-      // wait until the XHR finish handler is set up
-      await waitFor(() => expect(xhrMockAuth.onloadend).toBeDefined());
-      act(() => xhrMockAuth.onloadend());
-      // children are displayed
-      await screen.findByText("Testing content");
-    });
-  });
-
-  describe("when authentication status request fails", () => {
-    const xhrMockError = {
-      status: 500,
-      ...xhrMock
-    };
-
-    beforeEach(() => {
-      jest.spyOn(window, 'XMLHttpRequest').mockImplementation(() => xhrMockError);
-    });
-
-    it("displays an error message", async () => {
-      render(<DevServerWrapper />);
-      // wait until the XHR finish handler is set up
-      await waitFor(() => expect(xhrMockError.onloadend).toBeDefined());
-      act(() => xhrMockError.onloadend());
-      await screen.findByText("Cannot connect to the Cockpit server");
-    });
-  });
-
-  describe("when authentication status request times out", () => {
-    beforeEach(() => {
-      jest.spyOn(window, 'XMLHttpRequest').mockImplementation(() => xhrMock);
-    });
-
-    it("displays an error message", async () => {
-      render(<DevServerWrapper />);
-      // wait until the XHR finish handler is set up
-      await waitFor(() => expect(xhrMock.ontimeout).toBeDefined());
-      act(() => xhrMock.ontimeout());
-      await screen.findByText("Cannot connect to the Cockpit server");
-    });
-  });
-});
diff --git a/web/src/index.js b/web/src/index.js
index 1762013289..4a0d97ab2e 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -33,7 +33,6 @@ import "@patternfly/patternfly/patternfly-base.scss";
 
 import App from "~/App";
 import Main from "~/Main";
-import DevServerWrapper from "~/DevServerWrapper";
 import { OverviewPage } from "~/components/overview";
 import { ProductPage, ProductSelectionPage } from "~/components/product";
 import { SoftwarePage } from "~/components/software";
@@ -54,40 +53,30 @@ import { NetworkPage } from "~/components/network";
  */
 import "~/assets/styles/index.scss";
 
-/**
- * When running in the development server add a special login wrapper which
- * checks whether the user is authenticated. When building the code outside
- * the development server an empty fragment (<></>) is used which is no-op.
- * In the production builds the DevServerWrapper code is completely omitted.
- */
-const LoginWrapper = (process.env.WEBPACK_SERVE) ? DevServerWrapper : React.Fragment;
-
 const container = document.getElementById("root");
 const root = createRoot(container);
 
 root.render(
-  <LoginWrapper>
-    <AgamaProviders>
-      <HashRouter>
-        <Routes>
-          <Route path="/" element={<App />}>
-            <Route path="/" element={<Main />}>
-              <Route index element={<OverviewPage />} />
-              <Route path="/overview" element={<OverviewPage />} />
-              <Route path="/product" element={<ProductPage />} />
-              <Route path="/l10n" element={<L10nPage />} />
-              <Route path="/software" element={<SoftwarePage />} />
-              <Route path="/storage" element={<StoragePage />} />
-              <Route path="/storage/iscsi" element={<ISCSIPage />} />
-              <Route path="/storage/dasd" element={<DASDPage />} />
-              <Route path="/storage/zfcp" element={<ZFCPPage />} />
-              <Route path="/network" element={<NetworkPage />} />
-              <Route path="/users" element={<UsersPage />} />
-            </Route>
-            <Route path="products" element={<ProductSelectionPage />} />
+  <AgamaProviders>
+    <HashRouter>
+      <Routes>
+        <Route path="/" element={<App />}>
+          <Route path="/" element={<Main />}>
+            <Route index element={<OverviewPage />} />
+            <Route path="/overview" element={<OverviewPage />} />
+            <Route path="/product" element={<ProductPage />} />
+            <Route path="/l10n" element={<L10nPage />} />
+            <Route path="/software" element={<SoftwarePage />} />
+            <Route path="/storage" element={<StoragePage />} />
+            <Route path="/storage/iscsi" element={<ISCSIPage />} />
+            <Route path="/storage/dasd" element={<DASDPage />} />
+            <Route path="/storage/zfcp" element={<ZFCPPage />} />
+            <Route path="/network" element={<NetworkPage />} />
+            <Route path="/users" element={<UsersPage />} />
           </Route>
-        </Routes>
-      </HashRouter>
-    </AgamaProviders>
-  </LoginWrapper>
+          <Route path="products" element={<ProductSelectionPage />} />
+        </Route>
+      </Routes>
+    </HashRouter>
+  </AgamaProviders>
 );

From 0b9d94880e533f4c7155a8d7526602c7f8fac7d1 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 28 Feb 2024 21:45:45 +0100
Subject: [PATCH 002/324] remove cockpit po handler

---
 web/src/lib/webpack-po-handler.js | 33 -------------------------------
 web/webpack.config.js             |  7 -------
 2 files changed, 40 deletions(-)
 delete mode 100644 web/src/lib/webpack-po-handler.js

diff --git a/web/src/lib/webpack-po-handler.js b/web/src/lib/webpack-po-handler.js
deleted file mode 100644
index 78a26f216a..0000000000
--- a/web/src/lib/webpack-po-handler.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-// Cockpit internally returns the "po.<LANG>.js" file content for the
-// "po.js" request, reimplement it with a simple redirection (the JS file
-// only exists in the webpack memory, we cannot read it from disk)
-//
-// This function processes the webpack HTTP request.
-//
-// @param req HTTP request
-// @param res HTTP response
-module.exports = function (req, res) {
-  // the regexp was taken from the original Cockpit code :-)
-  const language = req.headers.cookie.replace(/(?:(?:^|.*;\s*)CockpitLang\s*=\s*([^;]*).*$)|^.*$/, "$1") || "";
-  // the cookie uses "pt-br" format while the PO file is "pt_BR" :-/
-  let [lang, country] = language.split("-");
-  country = country?.toUpperCase();
-
-  // first check the full locale ("pt_BR") PO file
-  if (fs.existsSync(path.join(__dirname, "..", "..", "po", `${lang}_${country}.po`))) {
-    res.redirect(`/po.${lang}_${country}.js`);
-  } else {
-    // then check the language part only ("pt") PO file
-    if (fs.existsSync(path.join(__dirname, "..", "..", "po", `${lang}.po`))) {
-      res.redirect(`/po.${lang}.js`);
-    } else {
-      if (lang !== "en") console.log(`translation "${language}" not found`);
-      // Cockpit returns an empty script if the translation file is missing
-      res.set("Content-Type", "application/javascript");
-      res.send("");
-    }
-  }
-};
diff --git a/web/webpack.config.js b/web/webpack.config.js
index 593383066d..0bfba9def7 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -14,7 +14,6 @@ const StylelintPlugin = require('stylelint-webpack-plugin');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 const webpack = require('webpack');
-const po_handler = require("./src/lib/webpack-po-handler");
 const manifests_handler = require("./src/lib/webpack-manifests-handler");
 
 /* A standard nodejs and webpack pattern */
@@ -126,12 +125,6 @@ module.exports = {
     // hot replacement does not support wss:// transport when running over https://,
     // as a workaround use sockjs (which uses standard https:// protocol)
     webSocketServer: "sockjs",
-
-    // Cockpit handles the "po.js" requests specially
-    setupMiddlewares: (middlewares, devServer) => {
-      devServer.app.get("/po.js", po_handler);
-      return middlewares;
-    }
   },
   devtool: "source-map",
   stats: "errors-warnings",

From 24d0a1064ef80ef490f1d5ae049ce7009795b974 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 28 Feb 2024 22:58:47 +0100
Subject: [PATCH 003/324] drop COCKPIT_TARGET_URL

---
 web/.eslintrc.json                            |  3 +-
 web/jest.config.js                            |  1 -
 web/src/components/core/DevelopmentInfo.jsx   | 58 -----------------
 .../components/core/DevelopmentInfo.test.jsx  | 63 -------------------
 web/src/components/core/Sidebar.jsx           |  2 -
 web/src/components/core/Sidebar.test.jsx      |  2 -
 web/src/components/core/index.js              |  1 -
 web/src/utils.js                              |  4 +-
 web/webpack.config.js                         |  7 ---
 9 files changed, 2 insertions(+), 139 deletions(-)
 delete mode 100644 web/src/components/core/DevelopmentInfo.jsx
 delete mode 100644 web/src/components/core/DevelopmentInfo.test.jsx

diff --git a/web/.eslintrc.json b/web/.eslintrc.json
index d86feed6d9..0414e890f6 100644
--- a/web/.eslintrc.json
+++ b/web/.eslintrc.json
@@ -78,7 +78,6 @@
     ],
     "globals": {
         "require": false,
-        "module": false,
-        "COCKPIT_TARGET_URL": "readonly"
+        "module": false
     }
 }
diff --git a/web/jest.config.js b/web/jest.config.js
index 87ae020f0d..18ded77fa3 100644
--- a/web/jest.config.js
+++ b/web/jest.config.js
@@ -67,7 +67,6 @@ module.exports = {
 
   // A set of global variables that need to be available in all test environments
   globals: {
-    COCKPIT_TARGET_URL: "https://localhost:9090",
   },
 
   // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
diff --git a/web/src/components/core/DevelopmentInfo.jsx b/web/src/components/core/DevelopmentInfo.jsx
deleted file mode 100644
index d1738577cb..0000000000
--- a/web/src/components/core/DevelopmentInfo.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { _ } from "~/i18n";
-
-/**
- * Displays additional info when running in a development server
- * @component
- */
-export default function DevelopmentInfo () {
-  if (!process.env.WEBPACK_SERVE) return;
-
-  let cockpitServer = COCKPIT_TARGET_URL;
-
-  if (COCKPIT_TARGET_URL.includes("localhost") && window.location.hostname !== "localhost") {
-    const urlTarget = new URL(COCKPIT_TARGET_URL);
-    const url = new URL(window.location);
-    url.port = urlTarget.port;
-    url.pathname = "/";
-    url.search = "";
-    url.hash = "";
-    cockpitServer = url;
-  }
-
-  /* NOTE: Using rel="noreferrer" below just for pleasing eslint, since all major browser already uses noreferrer
-   * implicitly when using target="_blank"
-   *
-   * https://html.spec.whatwg.org/multipage/links.html#link-type-noreferrer
-   * https://chromestatus.com/feature/6140064063029248
-   * https://blog.mozilla.org/security/2021/03/22/firefox-87-trims-http-referrers-by-default-to-protect-user-privacy/
-   */
-  return (
-    // TRANSLATORS: label for the Cockpit web user interface, used only in
-    // development mode. See https://documentation.suse.com/alp/dolomite/html/cockpit-alp-dolomite/index.html
-    <p>
-      {_("Cockpit server")}: <a href={cockpitServer} target="_blank" rel="noreferrer">{cockpitServer}</a>
-    </p>
-  );
-}
diff --git a/web/src/components/core/DevelopmentInfo.test.jsx b/web/src/components/core/DevelopmentInfo.test.jsx
deleted file mode 100644
index 65dd5007ca..0000000000
--- a/web/src/components/core/DevelopmentInfo.test.jsx
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { screen } from "@testing-library/react";
-import { plainRender } from "~/test-utils";
-import { DevelopmentInfo } from "~/components/core";
-
-const originalEnv = process.env;
-
-describe("DevelopmentInfo", () => {
-  afterEach(() => {
-    process.env = originalEnv;
-  });
-
-  describe("when not running in development mode", () => {
-    beforeEach(() => {
-      process.env = {
-        ...originalEnv,
-        WEBPACK_SERVE: false
-      };
-    });
-
-    it("renders nothing", () => {
-      const { container } = plainRender(<DevelopmentInfo />);
-      expect(container).toBeEmptyDOMElement();
-    });
-  });
-
-  describe("when running in development mode", () => {
-    beforeEach(() => {
-      process.env = {
-        ...originalEnv,
-        WEBPACK_SERVE: true
-      };
-    });
-
-    it("renders Cockpit server url", () => {
-      plainRender(<DevelopmentInfo />);
-      screen.getByText("Cockpit server:");
-    });
-
-    // TODO: write tests checking the right url is rendered
-  });
-});
diff --git a/web/src/components/core/Sidebar.jsx b/web/src/components/core/Sidebar.jsx
index 2c499c0183..e094b2c2d3 100644
--- a/web/src/components/core/Sidebar.jsx
+++ b/web/src/components/core/Sidebar.jsx
@@ -24,7 +24,6 @@ import { Icon } from "~/components/layout";
 import { InstallerKeymapSwitcher, InstallerLocaleSwitcher } from "~/components/l10n";
 import {
   About,
-  DevelopmentInfo,
   Disclosure,
   // FIXME: unify names here by renaming LogsButton -> LogButton or ShowLogButton -> ShowLogsButton
   LogsButton,
@@ -157,7 +156,6 @@ export default function Sidebar ({ children, isOpen, onClose = noop }) {
           {_("Close")}
           <Icon name="menu_open" size="xxs" data-variant="flip-X" />
         </a>
-        <DevelopmentInfo />
       </footer>
     </aside>
   );
diff --git a/web/src/components/core/Sidebar.test.jsx b/web/src/components/core/Sidebar.test.jsx
index 5d714ea32d..f2a9c26c2a 100644
--- a/web/src/components/core/Sidebar.test.jsx
+++ b/web/src/components/core/Sidebar.test.jsx
@@ -26,7 +26,6 @@ import { If, Sidebar } from "~/components/core";
 
 // Mock some components
 jest.mock("~/components/core/About", () => () => <div>About link mock</div>);
-jest.mock("~/components/core/DevelopmentInfo", () => () => <div>DevelopmentInfo mock</div>);
 jest.mock("~/components/core/LogsButton", () => () => <div>LogsButton mock</div>);
 jest.mock("~/components/core/ShowLogButton", () => () => <div>ShowLogButton mock</div>);
 jest.mock("~/components/core/ShowTerminalButton", () => () => <div>ShowTerminalButton mock</div>);
@@ -55,7 +54,6 @@ it("renders expected options", () => {
   screen.getByText("ShowLogButton mock");
   screen.getByText("ShowTerminalButton mock");
   screen.getByText("About link mock");
-  screen.getByText("DevelopmentInfo mock");
 });
 
 it("renders given children", () => {
diff --git a/web/src/components/core/index.js b/web/src/components/core/index.js
index 0213c66215..0861fc5217 100644
--- a/web/src/components/core/index.js
+++ b/web/src/components/core/index.js
@@ -54,6 +54,5 @@ export { default as Tip } from "./Tip";
 export { default as ShowTerminalButton } from "./ShowTerminalButton";
 export { default as NumericTextInput } from "./NumericTextInput";
 export { default as PasswordInput } from "./PasswordInput";
-export { default as DevelopmentInfo } from "./DevelopmentInfo";
 export { default as Selector } from "./Selector";
 export { default as OptionsPicker } from "./OptionsPicker";
diff --git a/web/src/utils.js b/web/src/utils.js
index 5969268cf1..5197d8ee1f 100644
--- a/web/src/utils.js
+++ b/web/src/utils.js
@@ -284,9 +284,7 @@ const localConnection = (location = window.location) => {
   // forced local behavior
   if (process.env.LOCAL_CONNECTION === "1") return true;
 
-  // when running in a development server use the COCKPIT_TARGET_URL value
-  // (a proxy is used) otherwise use the page URL from the browser
-  const hostname = process.env.WEBPACK_SERVE ? (new URL(COCKPIT_TARGET_URL)).hostname : location.hostname;
+  const hostname = location.hostname;
 
   // using the loopback device? (hostname or IP address)
   return hostname === "localhost" || hostname.startsWith("127.");
diff --git a/web/webpack.config.js b/web/webpack.config.js
index 0bfba9def7..c40d590b27 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -8,7 +8,6 @@ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const HtmlMinimizerPlugin = require("html-minimizer-webpack-plugin");
 const CompressionPlugin = require("compression-webpack-plugin");
 const ESLintPlugin = require('eslint-webpack-plugin');
-const CockpitPoPlugin = require("./src/lib/cockpit-po-plugin");
 const CockpitRsyncPlugin = require("./src/lib/cockpit-rsync-plugin");
 const StylelintPlugin = require('stylelint-webpack-plugin');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
@@ -45,7 +44,6 @@ const copy_files = [
 const plugins = [
   new Copy({ patterns: copy_files }),
   new Extract({ filename: "[name].css" }),
-  new CockpitPoPlugin(),
   new CockpitRsyncPlugin({ dest: packageJson.name }),
   development && new ReactRefreshWebpackPlugin({ overlay: false }),
   // replace the "process.env.WEBPACK_SERVE" text in the source code by
@@ -53,11 +51,6 @@ const plugins = [
   // "true" when running the development server ("npm run server")
   // https://webpack.js.org/plugins/environment-plugin/
   new webpack.EnvironmentPlugin({ WEBPACK_SERVE: null, LOCAL_CONNECTION: null }),
-  // similarly for a non-environment value
-  // https://webpack.js.org/plugins/define-plugin/
-  // but because ESlint runs *before* the DefinePlugin we need to
-  // add it as a global variable in .eslintrc.json config file
-  new webpack.DefinePlugin({ COCKPIT_TARGET_URL: JSON.stringify(cockpitTarget) }),
 ].filter(Boolean);
 
 if (eslint) {

From 3a2879e964449710aac8303c59474188b550fb84 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 29 Feb 2024 12:14:23 +0100
Subject: [PATCH 004/324] remove Makefile for cockpit

---
 web/Makefile  | 200 --------------------------------------------------
 web/README.md |  27 +------
 2 files changed, 2 insertions(+), 225 deletions(-)
 delete mode 100644 web/Makefile

diff --git a/web/Makefile b/web/Makefile
deleted file mode 100644
index 07b3cb7f84..0000000000
--- a/web/Makefile
+++ /dev/null
@@ -1,200 +0,0 @@
-# extract name from package.json
-PACKAGE_NAME := $(shell awk '/"name":/ {gsub(/[",]/, "", $$2); print $$2}' package.json)
-RPM_NAME := cockpit-$(PACKAGE_NAME)
-VERSION := $(shell T=$$(git describe 2>/dev/null) || T=1; echo $$T | tr '-' '.')
-ifeq ($(TEST_OS),)
-TEST_OS = centos-8-stream
-endif
-export TEST_OS
-TARFILE=$(RPM_NAME)-$(VERSION).tar.xz
-NODE_CACHE=$(RPM_NAME)-node-$(VERSION).tar.xz
-APPSTREAMFILE=org.opensuse.$(PACKAGE_NAME).metainfo.xml
-VM_IMAGE=$(CURDIR)/test/images/$(TEST_OS)
-# stamp file to check if/when npm install ran
-NODE_MODULES_TEST=node_modules
-# one example file in dist/ from webpack to check if that already ran
-WEBPACK_TEST=dist/manifest.json
-# one example file in src/lib to check if it was already checked out
-LIB_TEST=src/lib/cockpit-po-plugin.js
-# common arguments for tar, mostly to make the generated tarballs reproducible
-TAR_ARGS = --sort=name --mtime "@$(shell git show --no-patch --format='%at')" --mode=go=rX,u+rw,a-s --numeric-owner --owner=0 --group=0
-
-all: $(WEBPACK_TEST)
-
-#
-# i18n
-#
-
-LINGUAS=$(basename $(notdir $(wildcard po/*.po)))
-
-po/$(PACKAGE_NAME).js.pot:
-	xgettext --default-domain=$(PACKAGE_NAME) --output=$@ --language=C --keyword= \
-		--keyword=_:1,1t --keyword=_:1c,2,2t --keyword=C_:1c,2 \
-		--keyword=N_ --keyword=NC_:1c,2 \
-		--keyword=gettext:1,1t --keyword=gettext:1c,2,2t \
-		--keyword=ngettext:1,2,3t --keyword=ngettext:1c,2,3,4t \
-		--keyword=gettextCatalog.getString:1,3c --keyword=gettextCatalog.getPlural:2,3,4c \
-		--from-code=UTF-8 $$(find src/ \( -name '*.js' -o -name '*.jsx' \) \! -path 'src/lib/*')
-
-po/$(PACKAGE_NAME).html.pot: $(NODE_MODULES_TEST)
-	po/html2po -o $@ $$(find src -name '*.html' \! -path 'src/lib/*')
-
-po/$(PACKAGE_NAME).manifest.pot: $(NODE_MODULES_TEST)
-	po/manifest2po src/manifest.json -o $@
-
-po/$(PACKAGE_NAME).metainfo.pot: $(APPSTREAMFILE)
-	xgettext --default-domain=$(PACKAGE_NAME) --output=$@ $<
-
-po/$(PACKAGE_NAME).pot: po/$(PACKAGE_NAME).html.pot po/$(PACKAGE_NAME).js.pot po/$(PACKAGE_NAME).manifest.pot po/$(PACKAGE_NAME).metainfo.pot
-	msgcat --sort-output --output-file=$@ $^
-
-po/LINGUAS:
-	echo $(LINGUAS) | tr ' ' '\n' > $@
-
-# Update translations against current PO template
-update-po: po/$(PACKAGE_NAME).pot
-	for lang in $(LINGUAS); do \
-		msgmerge --output-file=po/$$lang.po po/$$lang.po $<; \
-	done
-
-#
-# Build/Install/dist
-#
-
-%.spec: packaging/%.spec.in
-	sed -e 's/%{VERSION}/$(VERSION)/g' $< > $@
-
-$(WEBPACK_TEST): $(NODE_MODULES_TEST) $(LIB_TEST) $(shell find src/ -type f) package.json webpack.config.js
-	NODE_ENV=$(NODE_ENV) node_modules/.bin/webpack
-
-watch:
-	NODE_ENV=$(NODE_ENV) node_modules/.bin/webpack --watch
-
-clean:
-	rm -rf dist/
-	rm -f po/LINGUAS
-
-clean_all: clean
-	rm -rf node_modules/
-
-install: $(WEBPACK_TEST) po/LINGUAS
-	mkdir -p $(DESTDIR)/usr/share/cockpit/$(PACKAGE_NAME)
-	cp -r dist/* $(DESTDIR)/usr/share/cockpit/$(PACKAGE_NAME)
-	mkdir -p $(DESTDIR)/usr/share/metainfo/
-	msgfmt --xml -d po \
-		--template $(APPSTREAMFILE) \
-		-o $(DESTDIR)/usr/share/metainfo/$(APPSTREAMFILE)
-
-# this requires a built source tree and avoids having to install anything system-wide
-devel-install: $(WEBPACK_TEST)
-	mkdir -p ~/.local/share/cockpit
-	rm -f ~/.local/share/cockpit/$(PACKAGE_NAME)
-	ln -s `pwd`/dist ~/.local/share/cockpit/$(PACKAGE_NAME)
-
-# assumes that there was symlink set up using the above devel-install target,
-# and removes it
-devel-uninstall:
-	rm -f ~/.local/share/cockpit/$(PACKAGE_NAME)
-
-print-version:
-	@echo "$(VERSION)"
-
-dist: $(TARFILE)
-	@ls -1 $(TARFILE)
-
-# when building a distribution tarball, call webpack with a 'production' environment
-# we don't ship node_modules for license and compactness reasons; we ship a
-# pre-built dist/ (so it's not necessary) and ship packge-lock.json (so that
-# node_modules/ can be reconstructed if necessary)
-$(TARFILE): export NODE_ENV=production
-$(TARFILE): $(WEBPACK_TEST)
-	if type appstream-util >/dev/null 2>&1; then appstream-util validate-relax --nonet *.metainfo.xml; fi
-	touch -r package.json $(NODE_MODULES_TEST)
-	touch dist/*
-	tar --xz $(TAR_ARGS) -cf $(TARFILE) --transform 's,^,$(RPM_NAME)/,' \
-		--exclude node_modules \
-		$$(git ls-files) src/lib package-lock.json dist/
-
-$(NODE_CACHE): $(NODE_MODULES_TEST)
-	tar --xz $(TAR_ARGS) -cf $@ node_modules
-
-node-cache: $(NODE_CACHE)
-
-# convenience target for developers
-srpm: $(TARFILE) $(NODE_CACHE)
-	rpmbuild -bs \
-	  --define "_sourcedir `pwd`" \
-	  --define "_srcrpmdir `pwd`"
-
-# convenience target for developers
-rpm: $(TARFILE) $(NODE_CACHE)
-	mkdir -p "`pwd`/output"
-	mkdir -p "`pwd`/rpmbuild"
-	rpmbuild -bb \
-	  --define "_sourcedir `pwd`" \
-	  --define "_specdir `pwd`" \
-	  --define "_builddir `pwd`/rpmbuild" \
-	  --define "_srcrpmdir `pwd`" \
-	  --define "_rpmdir `pwd`/output" \
-	  --define "_buildrootdir `pwd`/build"
-	find `pwd`/output -name '*.rpm' -printf '%f\n' -exec mv {} . \;
-	rm -r "`pwd`/rpmbuild"
-	rm -r "`pwd`/output" "`pwd`/build"
-
-# build a VM with locally built distro pkgs installed
-# disable networking, VM images have mock/pbuilder with the common build dependencies pre-installed
-$(VM_IMAGE): $(TARFILE) $(NODE_CACHE) bots test/vm.install
-	bots/image-customize --no-network --fresh \
-		--upload $(NODE_CACHE):/var/tmp/ --build $(TARFILE) \
-		--script $(CURDIR)/test/vm.install $(TEST_OS)
-
-# convenience target for the above
-vm: $(VM_IMAGE)
-	echo $(VM_IMAGE)
-
-# convenience target to print the filename of the test image
-print-vm:
-	echo $(VM_IMAGE)
-
-# convenience target to setup all the bits needed for the integration tests
-# without actually running them
-prepare-check: $(NODE_MODULES_TEST) $(VM_IMAGE) test/common
-
-# run the browser integration tests; skip check for SELinux denials
-# this will run all tests/check-* and format them as TAP
-check: prepare-check
-	TEST_AUDIT_NO_SELINUX=1 test/common/run-tests
-
-# checkout Cockpit's bots for standard test VM images and API to launch them
-# must be from main, as only that has current and existing images; but testvm.py API is stable
-# support CI testing against a bots change
-bots:
-	git clone --quiet --reference-if-able $${XDG_CACHE_HOME:-$$HOME/.cache}/cockpit-project/bots https://github.com/cockpit-project/bots.git
-	if [ -n "$$COCKPIT_BOTS_REF" ]; then git -C bots fetch --quiet --depth=1 origin "$$COCKPIT_BOTS_REF"; git -C bots checkout --quiet FETCH_HEAD; fi
-	@echo "checked out bots/ ref $$(git -C bots rev-parse HEAD)"
-
-# checkout Cockpit's test API; this has no API stability guarantee, so check out a stable tag
-# when you start a new project, use the latest release, and update it from time to time
-test/common:
-	flock Makefile sh -ec '\
-	    git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 309; \
-	    git checkout --force FETCH_HEAD -- test/common; \
-	    git reset test/common'
-
-# checkout Cockpit's PF/React/build library; again this has no API stability guarantee, so check out a stable tag
-# TODO: replace the commit with the tag 309 once it is released, which includes cockpit.js as a ES6 module in lib/.
-$(LIB_TEST):
-	flock Makefile sh -ec '\
-	    git fetch --depth=1 https://github.com/cockpit-project/cockpit.git 309; \
-	    git checkout --force FETCH_HEAD -- ../pkg/lib; \
-	    git reset -- ../pkg/lib'
-	mv ../pkg/lib src/ && rmdir ../pkg
-
-# run 'npm install' if node_modules is missing
-# or whenever package.json changes afterwards
-$(NODE_MODULES_TEST): package.json
-	# unset NODE_ENV, skips devDependencies otherwise
-	env -u NODE_ENV npm install
-	env -u NODE_ENV npm prune
-
-.PHONY: all clean install devel-install print-version dist node-cache rpm check vm update-po print-vm devel-uninstall
diff --git a/web/README.md b/web/README.md
index d981a61d77..200ff95e26 100644
--- a/web/README.md
+++ b/web/README.md
@@ -6,6 +6,7 @@ This Cockpit modules offers a UI to the [Agama service](file:../service). The co
 
 ## Development
 
+TODO: update when new way is clear how to do
 There are basically two ways how to develop the Agama fronted. You can
 override the original Cockpit plugins with your own code in your `$HOME` directory
 or you can run a development server which works as a proxy and sends the Cockpit
@@ -16,33 +17,9 @@ The advantage of using the development server is that you can use the
 feature for automatically updating the code and stylesheet in the browser
 without reloading the page.
 
-### Overriding the Cockpit Plugin
-
-Cockpit searches for modules in the `$HOME/.local/share/cockpit` directory of the logged in user,
-which is really handy when working on a module. To make the module available to Cockpit, you can
-link your build folder (`dist`) or just rely on the `devel-install` task:
-
-```
-    make devel-install
-```
-
-Then you can visit the Agama module through the following URL:
-
-http://localhost:9090/cockpit/@localhost/agama/index.html.
-
-Bear in mind that if something goes wrong while building the application (e.g., the linter fails),
-the link will not be created.
-
-To automatically rebuild the sources after any change you can run
-
-```
-    npm run watch
-```
-
-*But do not forget that you have to reload the code in your browser manually after each change!*
-
 ### Using a development server
 
+TODO: update when new way is clear how to do
 To start the [webpack-dev-server](https://github.com/webpack/webpack-dev-server)
 use this command:
 

From f7650e4472f1b5c5160c24afb3795d17d90236e4 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 29 Feb 2024 12:35:35 +0100
Subject: [PATCH 005/324] drop cockpit terminal

---
 .../components/core/ShowTerminalButton.jsx    |  5 +-
 .../core/ShowTerminalButton.test.jsx          |  6 +-
 web/src/components/core/Terminal.jsx          | 52 -----------------
 web/src/components/core/Terminal.test.jsx     | 57 -------------------
 web/src/components/core/index.js              |  1 -
 5 files changed, 3 insertions(+), 118 deletions(-)
 delete mode 100644 web/src/components/core/Terminal.jsx
 delete mode 100644 web/src/components/core/Terminal.test.jsx

diff --git a/web/src/components/core/ShowTerminalButton.jsx b/web/src/components/core/ShowTerminalButton.jsx
index 8747605557..3334af849e 100644
--- a/web/src/components/core/ShowTerminalButton.jsx
+++ b/web/src/components/core/ShowTerminalButton.jsx
@@ -22,7 +22,6 @@
 import React, { useState } from "react";
 import { Button } from "@patternfly/react-core";
 
-import { Terminal } from "~/components/core";
 import { Icon } from "~/components/layout";
 import { _ } from "~/i18n";
 
@@ -34,7 +33,6 @@ const ShowTerminalButton = () => {
   const [isTermDisplayed, setIsTermDisplayed] = useState(false);
 
   const onClick = () => setIsTermDisplayed(true);
-  const onClose = () => setIsTermDisplayed(false);
 
   return (
     <>
@@ -48,8 +46,7 @@ const ShowTerminalButton = () => {
         {_("Open Terminal")}
       </Button>
 
-      { isTermDisplayed &&
-        <Terminal onCloseCallback={onClose} /> }
+      { isTermDisplayed && "TODO" }
     </>
   );
 };
diff --git a/web/src/components/core/ShowTerminalButton.test.jsx b/web/src/components/core/ShowTerminalButton.test.jsx
index 0463d86a55..90cb617638 100644
--- a/web/src/components/core/ShowTerminalButton.test.jsx
+++ b/web/src/components/core/ShowTerminalButton.test.jsx
@@ -24,18 +24,16 @@ import { screen } from "@testing-library/react";
 import { plainRender } from "~/test-utils";
 import { ShowTerminalButton } from "~/components/core";
 
-jest.mock("~/components/core/Terminal", () => () => <div>Terminal Mock</div>);
-
 describe("ShowTerminalButton", () => {
   it("renders a button that displays <Terminal> after clicking", async () => {
     const { user } = plainRender(<ShowTerminalButton />);
     const button = screen.getByRole("button", "Terminal");
 
     // no terminal displayed just after the render
-    expect(screen.queryByText(/Terminal Mock/)).not.toBeInTheDocument();
+    expect(screen.queryByText(/TODO/)).not.toBeInTheDocument();
 
     await user.click(button);
     // it is displayed after clicking the button
-    screen.getByText(/Terminal Mock/);
+    screen.getByText(/TODO/);
   });
 });
diff --git a/web/src/components/core/Terminal.jsx b/web/src/components/core/Terminal.jsx
deleted file mode 100644
index c07e26ad2d..0000000000
--- a/web/src/components/core/Terminal.jsx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React, { useState } from "react";
-import { Popup } from "~/components/core";
-import { _ } from "~/i18n";
-
-export default function Terminal({ onCloseCallback }) {
-  // the popup is visible
-  const [isOpen, setIsOpen] = useState(true);
-
-  const close = () => {
-    setIsOpen(false);
-    if (onCloseCallback) onCloseCallback();
-  };
-
-  // embed the cockpit terminal into an iframe, see
-  // https://cockpit-project.org/guide/latest/embedding.html#embedding-components
-  // https://cockpit-project.org/guide/latest/api-terminal-html.html
-  return (
-    <Popup
-      isOpen={isOpen}
-      className="large"
-      aria-label="terminal popup"
-    >
-
-      <iframe className="vertically-centered" src="/cockpit/@localhost/system/terminal.html" />
-
-      <Popup.Actions>
-        <Popup.Confirm onClick={close} autoFocus>{_("Close")}</Popup.Confirm>
-      </Popup.Actions>
-    </Popup>
-  );
-}
diff --git a/web/src/components/core/Terminal.test.jsx b/web/src/components/core/Terminal.test.jsx
deleted file mode 100644
index 3e25a76f0c..0000000000
--- a/web/src/components/core/Terminal.test.jsx
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-
-import { screen, waitFor, within } from "@testing-library/react";
-import { plainRender } from "~/test-utils";
-import { Terminal } from "~/components/core";
-
-describe("Terminal", () => {
-  it("displays the cockpit terminal in an iframe", async () => {
-    plainRender(<Terminal />);
-    const dialog = await screen.findByRole("dialog");
-    const iframe = dialog.querySelector("iframe");
-    expect(iframe.src).toMatch(/cockpit\/@localhost\/system\/terminal.html/);
-  });
-
-  it("closes the popup after clicking the close button", async () => {
-    const { user } = plainRender(<Terminal />);
-    const dialog = await screen.findByRole("dialog");
-    const closeButton = within(dialog).getByRole("button", { name: /Close/i });
-
-    await user.click(closeButton);
-    await waitFor(() => {
-      expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
-    });
-  });
-
-  it("triggers the onCloseCallback after clicking the close button", async () => {
-    const callback = jest.fn();
-    const { user } = plainRender(<Terminal onCloseCallback={callback} />);
-    const dialog = await screen.findByRole("dialog");
-    const closeButton = within(dialog).getByRole("button", { name: /Close/i });
-
-    await user.click(closeButton);
-
-    expect(callback).toHaveBeenCalled();
-  });
-});
diff --git a/web/src/components/core/index.js b/web/src/components/core/index.js
index 0861fc5217..ee024a4417 100644
--- a/web/src/components/core/index.js
+++ b/web/src/components/core/index.js
@@ -49,7 +49,6 @@ export { default as Popup } from "./Popup";
 export { default as ProgressReport } from "./ProgressReport";
 export { default as ProgressText } from "./ProgressText";
 export { default as ValidationErrors } from "./ValidationErrors";
-export { default as Terminal } from "./Terminal";
 export { default as Tip } from "./Tip";
 export { default as ShowTerminalButton } from "./ShowTerminalButton";
 export { default as NumericTextInput } from "./NumericTextInput";

From 5fa79e0a9d23682d091edde003fc9bf9c9d6b26c Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 29 Feb 2024 22:13:56 +0100
Subject: [PATCH 006/324] remove cockpit-rsync-plugin as it is used mainly for
 cockpit plugin developement

---
 rust/agama-lib/src/software/store.rs |  4 ++++
 web/src/lib/cockpit-rsync-plugin.js  | 32 ----------------------------
 web/webpack.config.js                | 11 +---------
 3 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100644 web/src/lib/cockpit-rsync-plugin.js

diff --git a/rust/agama-lib/src/software/store.rs b/rust/agama-lib/src/software/store.rs
index 66b6f6b092..02b1b4e10c 100644
--- a/rust/agama-lib/src/software/store.rs
+++ b/rust/agama-lib/src/software/store.rs
@@ -18,6 +18,10 @@ impl<'a> SoftwareStore<'a> {
 
     pub async fn load(&self) -> Result<SoftwareSettings, ServiceError> {
         let patterns = self.software_client.user_selected_patterns().await?;
+        a = Some(Ok(1));
+if let Some(b) = a && let Ok(c) = b {
+    eprint!(c);
+}
         Ok(SoftwareSettings { patterns })
     }
 
diff --git a/web/src/lib/cockpit-rsync-plugin.js b/web/src/lib/cockpit-rsync-plugin.js
deleted file mode 100644
index 507c0176c8..0000000000
--- a/web/src/lib/cockpit-rsync-plugin.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const child_process = require("child_process");
-
-module.exports = class {
-    constructor(options) {
-        if (!options)
-            options = {};
-        this.dest = options.dest || "";
-        this.source = options.source || "dist/";
-
-        // ensure the target directory exists
-        if (process.env.RSYNC)
-            child_process.spawnSync("ssh", [process.env.RSYNC, "mkdir", "-p", "/usr/local/share/cockpit/"], { stdio: "inherit" });
-    }
-
-    apply(compiler) {
-        compiler.hooks.afterEmit.tapAsync('WebpackHookPlugin', (compilation, callback) => {
-            if (process.env.RSYNC) {
-                const proc = child_process.spawn("rsync", ["--recursive", "--info=PROGRESS2", "--delete",
-                    this.source, process.env.RSYNC + ":/usr/local/share/cockpit/" + this.dest], { stdio: "inherit" });
-                proc.on('close', (code) => {
-                    if (code !== 0) {
-                        process.exit(1);
-                    } else {
-                        callback();
-                    }
-                });
-            } else {
-                callback();
-            }
-        });
-    }
-};
diff --git a/web/webpack.config.js b/web/webpack.config.js
index c40d590b27..cf50d696a0 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -8,7 +8,6 @@ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const HtmlMinimizerPlugin = require("html-minimizer-webpack-plugin");
 const CompressionPlugin = require("compression-webpack-plugin");
 const ESLintPlugin = require('eslint-webpack-plugin');
-const CockpitRsyncPlugin = require("./src/lib/cockpit-rsync-plugin");
 const StylelintPlugin = require('stylelint-webpack-plugin');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
@@ -44,7 +43,6 @@ const copy_files = [
 const plugins = [
   new Copy({ patterns: copy_files }),
   new Extract({ filename: "[name].css" }),
-  new CockpitRsyncPlugin({ dest: packageJson.name }),
   development && new ReactRefreshWebpackPlugin({ overlay: false }),
   // replace the "process.env.WEBPACK_SERVE" text in the source code by
   // the current value of the environment variable, that variable is set to
@@ -94,14 +92,7 @@ module.exports = {
     // additionally watch these files for changes
     watchFiles: ["./src/manifest.json", "./po/*.po"],
     proxy: {
-      // forward all cockpit connections to a real Cockpit instance
-      "/cockpit": {
-        target: cockpitTarget,
-        // redirect also the websocket connections
-        ws: true,
-        // ignore SSL problems (self-signed certificate)
-        secure: false,
-      },
+      // TODO: modify it to not depend on cockpit
       // forward the manifests.js request and patch the response with the
       // current Agama manifest from the ./src/manifest.json file
       "/manifests.js": {

From dc83f67a0856c37315242a346e43c17dbb13e349 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Sun, 3 Mar 2024 10:54:09 +0100
Subject: [PATCH 007/324] comment out CI as it cannot work now without cockpit
 without adaptation

---
 .github/workflows/ci-web.yml | 70 ++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/ci-web.yml b/.github/workflows/ci-web.yml
index f003997225..4878e021f3 100644
--- a/.github/workflows/ci-web.yml
+++ b/.github/workflows/ci-web.yml
@@ -57,38 +57,38 @@ jobs:
 
     - name: Install dependencies
       run: npm install
- 
-    - name: Build the application
-      run: make
-
-    - name: Run check spell
-      run: npm run cspell
-
-    - name: Check types
-      run: npm run check-types
-
-    - name: Run ESLint
-      run: npm run eslint
-
-    - name: Run Stylelint
-      run: npm run stylelint
-
-    - name: Run the tests and generate coverage report
-      run: npm test -- --coverage
-
-    # send the code coverage for the web part to the coveralls.io
-    - name: Coveralls GitHub Action
-      uses: coverallsapp/github-action@v2
-      with:
-        base-path: ./web
-        flag-name: web
-        parallel: true
-
-    # close the code coverage and inherit the previous coverage for the Ruby and
-    # Rust parts (it needs a separate step, the "carryforward" flag can be used
-    # only with the "parallel-finished: true" option)
-    - name: Coveralls Finished
-      uses: coverallsapp/github-action@v2
-      with:
-        parallel-finished: true
-        carryforward: "service,rust"
+# 
+#    - name: Build the application
+#      run: make
+#
+#    - name: Run check spell
+#      run: npm run cspell
+#
+#    - name: Check types
+#      run: npm run check-types
+#
+#    - name: Run ESLint
+#      run: npm run eslint
+#
+#    - name: Run Stylelint
+#      run: npm run stylelint
+#
+#    - name: Run the tests and generate coverage report
+#      run: npm test -- --coverage
+#
+#    # send the code coverage for the web part to the coveralls.io
+#    - name: Coveralls GitHub Action
+#      uses: coverallsapp/github-action@v2
+#      with:
+#        base-path: ./web
+#        flag-name: web
+#        parallel: true
+#
+#    # close the code coverage and inherit the previous coverage for the Ruby and
+#    # Rust parts (it needs a separate step, the "carryforward" flag can be used
+#    # only with the "parallel-finished: true" option)
+#    - name: Coveralls Finished
+#      uses: coverallsapp/github-action@v2
+#      with:
+#        parallel-finished: true
+#        carryforward: "service,rust"

From a1978ae3849999d4cfab608edec8f73ac18382c4 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Sun, 3 Mar 2024 11:10:10 +0100
Subject: [PATCH 008/324] rename web ui

---
 web/package/_service                                   |  4 ++--
 .../{cockpit-agama.changes => agama-web-ui.changes}    |  0
 web/package/{cockpit-agama.spec => agama-web-ui.spec}  | 10 +++-------
 3 files changed, 5 insertions(+), 9 deletions(-)
 rename web/package/{cockpit-agama.changes => agama-web-ui.changes} (100%)
 rename web/package/{cockpit-agama.spec => agama-web-ui.spec} (86%)

diff --git a/web/package/_service b/web/package/_service
index 6d9bafb227..b6815b5ab4 100644
--- a/web/package/_service
+++ b/web/package/_service
@@ -8,8 +8,8 @@
     <param name="subdir">web</param>
     <param name="without-version">enable</param>
     <param name="extract">package-lock.json</param>
-    <param name="extract">package/cockpit-agama.changes</param>
-    <param name="extract">package/cockpit-agama.spec</param>
+    <param name="extract">package/agama-web-ui.changes</param>
+    <param name="extract">package/agama-web-ui.spec</param>
   </service>
   <service name="node_modules" mode="manual">
     <param name="cpio">node_modules.obscpio</param>
diff --git a/web/package/cockpit-agama.changes b/web/package/agama-web-ui.changes
similarity index 100%
rename from web/package/cockpit-agama.changes
rename to web/package/agama-web-ui.changes
diff --git a/web/package/cockpit-agama.spec b/web/package/agama-web-ui.spec
similarity index 86%
rename from web/package/cockpit-agama.spec
rename to web/package/agama-web-ui.spec
index 382cdeb1eb..77b855c522 100644
--- a/web/package/cockpit-agama.spec
+++ b/web/package/agama-web-ui.spec
@@ -16,10 +16,10 @@
 #
 
 
-Name:           cockpit-agama
+Name:           agama-web-ui
 Version:        0
 Release:        0
-Summary:        Cockpit module for Agama
+Summary:        Web UI for Agama installer
 License:        GPL-2.0-only
 URL:            https://github.com/openSUSE/agama
 # source_validator insists that if obscpio has no version then
@@ -30,14 +30,11 @@ Source11:       node_modules.spec.inc
 Source12:       node_modules.sums
 %include %_sourcedir/node_modules.spec.inc
 BuildArch:      noarch
-Requires:       cockpit
-BuildRequires:  cockpit
-BuildRequires:  cockpit-devel >= 243
 BuildRequires:  local-npm-registry
 BuildRequires:  appstream-glib
 
 %description
-Cockpit module for the experimental Agama installer.
+Agama web UI for the experimental Agama installer.
 
 %prep
 %autosetup -p1 -n agama
@@ -45,7 +42,6 @@ rm -f package-lock.json
 local-npm-registry %{_sourcedir} install --with=dev --legacy-peer-deps || ( find ~/.npm/_logs -name '*-debug.log' -print0 | xargs -0 cat; false)
 
 %build
-# cp -r %{_datadir}/cockpit/devel/lib src/lib
 NODE_ENV="production" npm run build
 
 %install

From 825d3f1aee9e3be07eaf4f4709220420ec73ceb7 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Mon, 4 Mar 2024 09:57:22 +0100
Subject: [PATCH 009/324] remove leftover code

---
 rust/agama-lib/src/software/store.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rust/agama-lib/src/software/store.rs b/rust/agama-lib/src/software/store.rs
index 02b1b4e10c..66b6f6b092 100644
--- a/rust/agama-lib/src/software/store.rs
+++ b/rust/agama-lib/src/software/store.rs
@@ -18,10 +18,6 @@ impl<'a> SoftwareStore<'a> {
 
     pub async fn load(&self) -> Result<SoftwareSettings, ServiceError> {
         let patterns = self.software_client.user_selected_patterns().await?;
-        a = Some(Ok(1));
-if let Some(b) = a && let Ok(c) = b {
-    eprint!(c);
-}
         Ok(SoftwareSettings { patterns })
     }
 

From a26c0db33f02371684ab90d3fa2eb01aaa71f54a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 5 Mar 2024 17:19:01 +0000
Subject: [PATCH 010/324] feat(web): use a proxy to access the Agama server
 from webpack

---
 web/README.md         | 45 ++++++++++++++++---------------------------
 web/webpack.config.js | 30 ++++++++++++++++-------------
 2 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/web/README.md b/web/README.md
index 200ff95e26..e8bc7327f8 100644
--- a/web/README.md
+++ b/web/README.md
@@ -1,25 +1,18 @@
-# Agama Web-Based UI
+# Agama Web UI
 
-This Cockpit modules offers a UI to the [Agama service](file:../service). The code is based on
-[Cockpit's Starter Kit
-(b2379f7)](https://github.com/cockpit-project/starter-kit/tree/b2379f78e203aab0028d8548b39f5f0bd2b27d2a).
+The Agama web user interface is a React-based application that offers a user
+interface to the [Agama service](file:../service).
 
 ## Development
 
-TODO: update when new way is clear how to do
-There are basically two ways how to develop the Agama fronted. You can
-override the original Cockpit plugins with your own code in your `$HOME` directory
-or you can run a development server which works as a proxy and sends the Cockpit
-requests to a real Cockpit server.
-
-The advantage of using the development server is that you can use the
-[Hot Module Replacement](https://webpack.js.org/concepts/hot-module-replacement/)
-feature for automatically updating the code and stylesheet in the browser
-without reloading the page.
+The easiest way to work on the Agama Web UI is to the development server to
+serve the code. The advantage is that you can use the [Hot Module Replacement]
+(https://webpack.js.org/concepts/hot-module-replacement/) feature for
+automatically updating the code and stylesheet in the browser without reloading
+the page.
 
 ### Using a development server
 
-TODO: update when new way is clear how to do
 To start the [webpack-dev-server](https://github.com/webpack/webpack-dev-server)
 use this command:
 
@@ -29,28 +22,25 @@ use this command:
 
 The extra `--open` option automatically opens the server page in your default
 web browser. In this case the server will use the `https://localhost:8080` URL
-and expects a running Cockpit instance at `https://localhost:9090`.
-
-At the first start the development server generates a self-signed SSL
-certificate, you have to accept it in the browser. The certificate is saved to
-disk and is used in the next runs so you do not have to accept it again.
+and expects a running `agama-web-server` at `https://localhost:9090`.
 
 This can work also remotely, with a Agama instance running in a different
 machine (a virtual machine as well). In that case run
 
 ```
-    COCKPIT_TARGET=<IP> npm run server -- --open
+    AGAMA_SERVER=<IP> npm run server -- --open
 ```
 
-Where  `COCKPIT_TARGET` is the IP address or hostname of the running Agama
-instance. This is especially useful if you use the Live ISO which does not contain
-any development tools, you can develop the web frontend easily from your workstation.
+Where  `AGAMA_SERVER` is the IP address, the hostname or the full URL of the
+running Agama server instance. This is especially useful if you use the Live ISO
+which does not contain any development tools, you can develop the web frontend
+easily from your workstation.
 
 ### Special Environment Variables
 
-`COCKPIT_TARGET` - When running the development server set up a proxy to the
-specified Cockpit server. See the [using a development
-server](#using-a-development-server) section above.
+`AGAMA_SERVER` - When running the development server set up a proxy to
+the specified Agama web server. See the [using a development server]
+(#using-a-development-server) section above.
 
 `LOCAL_CONNECTION` - Force behaving as in a local connection, useful for
 development or testing some Agama features. For example the keyboard layout
@@ -89,7 +79,6 @@ you want a JavaScript file to be type-checked, please add a `// @ts-check` comme
 
 ### Links
 
-- [Cockpit developer documentation](https://cockpit-project.org/guide/latest/development)
 - [Webpack documentation](https://webpack.js.org/configuration/)
 - [PatternFly documentation](https://www.patternfly.org)
 - [Material Symbols (aka icons)](https://fonts.google.com/icons)
diff --git a/web/webpack.config.js b/web/webpack.config.js
index cf50d696a0..7edbd96bff 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -24,10 +24,11 @@ const eslint = process.env.ESLINT !== '0';
 /* Default to disable csslint for faster production builds */
 const stylelint = process.env.STYLELINT ? (process.env.STYLELINT !== '0') : development;
 
-// Cockpit target managed by the development server,
-// by default connect to a locally running Cockpit
-let cockpitTarget = process.env.COCKPIT_TARGET || "localhost:9090";
-cockpitTarget = "https://" + cockpitTarget;
+// Agama API server. By default it connects to a local development server.
+let agamaServer= process.env.AGAMA_SERVER || "localhost:3000";
+if (!agamaServer.startsWith("http")) {
+  agamaServer = "http://" + agamaServer;
+}
 
 // Obtain package name from package.json
 const packageJson = JSON.parse(fs.readFileSync('package.json'));
@@ -95,17 +96,20 @@ module.exports = {
       // TODO: modify it to not depend on cockpit
       // forward the manifests.js request and patch the response with the
       // current Agama manifest from the ./src/manifest.json file
-      "/manifests.js": {
-        target: cockpitTarget + "/cockpit/@localhost/",
-        // ignore SSL problems (self-signed certificate)
+      // "/manifests.js": {
+      //   target: cockpitTarget + "/cockpit/@localhost/",
+      //   // ignore SSL problems (self-signed certificate)
+      //   secure: false,
+      //   // the response is modified by the onProxyRes handler
+      //   selfHandleResponse : true,
+      //   onProxyRes: manifests_handler,
+      // },
+      "/api": {
+        target: agamaServer,
         secure: false,
-        // the response is modified by the onProxyRes handler
-        selfHandleResponse : true,
-        onProxyRes: manifests_handler,
-      },
+      }
     },
-    // use https so Cockpit uses wss:// when connecting to the backend
-    server: "https",
+    server: "http",
     // hot replacement does not support wss:// transport when running over https://,
     // as a workaround use sockjs (which uses standard https:// protocol)
     webSocketServer: "sockjs",

From 7bea7f8c8a1a67a613a7a5e948720ac9c629c90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 6 Mar 2024 07:13:07 +0000
Subject: [PATCH 011/324] feat(rust): serve the web UI at '/'

---
 rust/Cargo.lock                           | 31 ++++++++++++++
 rust/agama-server/Cargo.toml              |  2 +-
 rust/agama-server/src/agama-web-server.rs | 24 ++++++++++-
 rust/agama-server/src/web.rs              | 15 +++++--
 rust/agama-server/src/web/service.rs      | 50 +++++++++++++++++++----
 rust/agama-server/tests/service.rs        | 26 ++++++++----
 6 files changed, 125 insertions(+), 23 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 7d48a4957c..95bba7a93a 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -1418,6 +1418,12 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "http-range-header"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe"
+
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -1794,6 +1800,16 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
+[[package]]
+name = "mime_guess"
+version = "2.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -3119,9 +3135,15 @@ dependencies = [
  "bitflags 2.4.1",
  "bytes",
  "futures-core",
+ "futures-util",
  "http",
  "http-body",
  "http-body-util",
+ "http-range-header",
+ "httpdate",
+ "mime",
+ "mime_guess",
+ "percent-encoding",
  "pin-project-lite",
  "tokio",
  "tokio-util",
@@ -3253,6 +3275,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "unicase"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.14"
diff --git a/rust/agama-server/Cargo.toml b/rust/agama-server/Cargo.toml
index def882c4a2..cb99449cfd 100644
--- a/rust/agama-server/Cargo.toml
+++ b/rust/agama-server/Cargo.toml
@@ -29,7 +29,7 @@ macaddr = "1.0"
 async-trait = "0.1.75"
 axum = { version = "0.7.4", features = ["ws"] }
 serde_json = "1.0.113"
-tower-http = { version = "0.5.1", features = ["compression-br", "trace"] }
+tower-http = { version = "0.5.1", features = ["compression-br", "fs", "trace"] }
 tracing-subscriber = "0.3.18"
 tracing-journald = "0.3.0"
 tracing = "0.1.40"
diff --git a/rust/agama-server/src/agama-web-server.rs b/rust/agama-server/src/agama-web-server.rs
index 53f1e217c1..46c14797d0 100644
--- a/rust/agama-server/src/agama-web-server.rs
+++ b/rust/agama-server/src/agama-web-server.rs
@@ -1,4 +1,7 @@
-use std::process::{ExitCode, Termination};
+use std::{
+    path::{Path, PathBuf},
+    process::{ExitCode, Termination},
+};
 
 use agama_lib::connection_to;
 use agama_server::{
@@ -10,6 +13,8 @@ use tokio::sync::broadcast::channel;
 use tracing_subscriber::prelude::*;
 use utoipa::OpenApi;
 
+const DEFAULT_WEB_UI_DIR: &'static str = "/usr/share/agama/web_ui";
+
 #[derive(Subcommand, Debug)]
 enum Commands {
     /// Start the API server.
@@ -27,6 +32,9 @@ pub struct ServeArgs {
     // Agama D-Bus address
     #[arg(long, default_value = "unix:path=/run/agama/bus")]
     dbus_address: String,
+    // Directory containing the web UI code.
+    #[arg(long)]
+    web_ui_dir: Option<PathBuf>,
 }
 
 #[derive(Parser, Debug)]
@@ -39,6 +47,17 @@ struct Cli {
     pub command: Commands,
 }
 
+fn find_web_ui_dir() -> PathBuf {
+    if let Ok(home) = std::env::var("HOME") {
+        let path = Path::new(&home).join(".local/share/agama");
+        if path.exists() {
+            return path;
+        }
+    }
+
+    Path::new(DEFAULT_WEB_UI_DIR).into()
+}
+
 /// Start serving the API.
 ///
 /// `args`: command-line arguments.
@@ -55,7 +74,8 @@ async fn serve_command(args: ServeArgs) -> anyhow::Result<()> {
 
     let config = web::ServiceConfig::load()?;
     let dbus = connection_to(&args.dbus_address).await?;
-    let service = web::service(config, tx, dbus).await?;
+    let web_ui_dir = args.web_ui_dir.unwrap_or(find_web_ui_dir());
+    let service = web::service(config, tx, dbus, web_ui_dir).await?;
     axum::serve(listener, service)
         .await
         .expect("could not mount app on listener");
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index b088528589..8a26f1793c 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -28,18 +28,25 @@ pub use config::ServiceConfig;
 pub use docs::ApiDoc;
 pub use event::{Event, EventsReceiver, EventsSender};
 pub use service::MainServiceBuilder;
+use std::path::Path;
 use tokio_stream::StreamExt;
 
 /// Returns a service that implements the web-based Agama API.
 ///
 /// * `config`: service configuration.
-/// * `events`: D-Bus connection.
-pub async fn service(
+/// * `events`: channel to send the events through the WebSocket.
+/// * `dbus`: D-Bus connection.
+/// * `web_ui_dir`: public directory containing the web UI.
+pub async fn service<P>(
     config: ServiceConfig,
     events: EventsSender,
     dbus: zbus::Connection,
-) -> Result<Router, ServiceError> {
-    let router = MainServiceBuilder::new(events.clone())
+    web_ui_dir: P,
+) -> Result<Router, ServiceError>
+where
+    P: AsRef<Path>,
+{
+    let router = MainServiceBuilder::new(events.clone(), web_ui_dir)
         .add_service("/l10n", l10n_service(events.clone()))
         .add_service("/software", software_service(dbus).await?)
         .with_config(config)
diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index d2590bc688..cf58665cc0 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -6,25 +6,46 @@ use axum::{
     routing::{get, post},
     Router,
 };
-use std::convert::Infallible;
+use std::{
+    convert::Infallible,
+    path::{Path, PathBuf},
+};
 use tower::Service;
-use tower_http::{compression::CompressionLayer, trace::TraceLayer};
+use tower_http::{compression::CompressionLayer, services::ServeDir, trace::TraceLayer};
 
+/// Builder for Agama main service.
+///
+/// It is responsible for building an axum service which includes:
+///
+/// * A static assets directory (`public_dir`).
+/// * A websocket at the `/ws` path.
+/// * An authentication endpointg at `/authenticate`.
+/// * A 'ping' endpoint at '/ping'.
+/// * A number of authenticated services that are added using the `add_service` function.
 pub struct MainServiceBuilder {
     config: ServiceConfig,
     events: EventsSender,
-    router: Router<ServiceState>,
+    api_router: Router<ServiceState>,
+    public_dir: PathBuf,
 }
 
 impl MainServiceBuilder {
-    pub fn new(events: EventsSender) -> Self {
-        let router = Router::new().route("/ws", get(super::ws::ws_handler));
+    /// Returns a new service builder.
+    ///
+    /// * `events`: channel to send events through the WebSocket.
+    /// * `public_dir`: path to the public directory.
+    pub fn new<P>(events: EventsSender, public_dir: P) -> Self
+    where
+        P: AsRef<Path>,
+    {
+        let api_router = Router::new().route("/ws", get(super::ws::ws_handler));
         let config = ServiceConfig::default();
 
         Self {
             events,
-            router,
+            api_router,
             config,
+            public_dir: PathBuf::from(public_dir.as_ref()),
         }
     }
 
@@ -32,6 +53,10 @@ impl MainServiceBuilder {
         Self { config, ..self }
     }
 
+    /// Add an authenticated service.
+    ///
+    /// * `path`: Path to mount the service under `/api`.
+    /// * `service`: Service to mount on the given `path`.
     pub fn add_service<T>(self, path: &str, service: T) -> Self
     where
         T: Service<Request, Error = Infallible> + Clone + Send + 'static,
@@ -39,7 +64,7 @@ impl MainServiceBuilder {
         T::Future: Send + 'static,
     {
         Self {
-            router: self.router.nest_service(path, service),
+            api_router: self.api_router.nest_service(path, service),
             ..self
         }
     }
@@ -49,12 +74,19 @@ impl MainServiceBuilder {
             config: self.config,
             events: self.events,
         };
-        self.router
+
+        let api_router = self
+            .api_router
             .route_layer(middleware::from_extractor_with_state::<TokenClaims, _>(
                 state.clone(),
             ))
             .route("/ping", get(super::http::ping))
-            .route("/authenticate", post(super::http::authenticate))
+            .route("/authenticate", post(super::http::authenticate));
+
+        let serve = ServeDir::new(self.public_dir);
+        Router::new()
+            .nest_service("/", serve)
+            .nest("/api", api_router)
             .layer(TraceLayer::new_for_http())
             .layer(CompressionLayer::new().br(true))
             .with_state(state)
diff --git a/rust/agama-server/tests/service.rs b/rust/agama-server/tests/service.rs
index daa453af02..c4e48cdf55 100644
--- a/rust/agama-server/tests/service.rs
+++ b/rust/agama-server/tests/service.rs
@@ -12,22 +12,34 @@ use axum::{
     Router,
 };
 use common::{body_to_string, DBusServer};
-use std::error::Error;
+use std::{error::Error, path::PathBuf};
 use tokio::{sync::broadcast::channel, test};
 use tower::ServiceExt;
 
 async fn build_service() -> Router {
     let (tx, _) = channel(16);
     let server = DBusServer::new().start().await.unwrap();
-    service(ServiceConfig::default(), tx, server.connection())
-        .await
-        .unwrap()
+    service(
+        ServiceConfig::default(),
+        tx,
+        server.connection(),
+        public_dir(),
+    )
+    .await
+    .unwrap()
+}
+
+fn public_dir() -> PathBuf {
+    std::env::current_dir().unwrap().join("public")
 }
 
 #[test]
 async fn test_ping() -> Result<(), Box<dyn Error>> {
     let web_service = build_service().await;
-    let request = Request::builder().uri("/ping").body(Body::empty()).unwrap();
+    let request = Request::builder()
+        .uri("/api/ping")
+        .body(Body::empty())
+        .unwrap();
 
     let response = web_service.oneshot(request).await.unwrap();
     assert_eq!(response.status(), StatusCode::OK);
@@ -46,13 +58,13 @@ async fn access_protected_route(token: &str, jwt_secret: &str) -> Response {
         jwt_secret: jwt_secret.to_string(),
     };
     let (tx, _) = channel(16);
-    let web_service = MainServiceBuilder::new(tx)
+    let web_service = MainServiceBuilder::new(tx, public_dir())
         .add_service("/protected", get(protected))
         .with_config(config)
         .build();
 
     let request = Request::builder()
-        .uri("/protected")
+        .uri("/api/protected")
         .method(Method::GET)
         .header("Authorization", format!("Bearer {}", token))
         .body(Body::empty())

From 4fd32c524f889c22345cd9f9e940f61c4a47fe7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 6 Mar 2024 12:01:19 +0000
Subject: [PATCH 012/324] Update from code review

---
 web/README.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/README.md b/web/README.md
index e8bc7327f8..e903923adc 100644
--- a/web/README.md
+++ b/web/README.md
@@ -5,11 +5,10 @@ interface to the [Agama service](file:../service).
 
 ## Development
 
-The easiest way to work on the Agama Web UI is to the development server to
-serve the code. The advantage is that you can use the [Hot Module Replacement]
-(https://webpack.js.org/concepts/hot-module-replacement/) feature for
-automatically updating the code and stylesheet in the browser without reloading
-the page.
+The easiest way to work on the Agama Web UI is to use the development server.
+The advantage is that you can use the [Hot Module Replacement] (https://
+webpack.js.org/concepts/hot-module-replacement/) feature for automatically
+updating the code and stylesheet in the browser without reloading the page.
 
 ### Using a development server
 

From 08c8700dc6cfcca0b03b1cc33980b7e6d975bd22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 6 Mar 2024 12:07:47 +0000
Subject: [PATCH 013/324] Fix a typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David Díaz <1691872+dgdavid@users.noreply.github.com>
---
 rust/agama-server/src/web/service.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index cf58665cc0..3af07c6fe9 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -19,7 +19,7 @@ use tower_http::{compression::CompressionLayer, services::ServeDir, trace::Trace
 ///
 /// * A static assets directory (`public_dir`).
 /// * A websocket at the `/ws` path.
-/// * An authentication endpointg at `/authenticate`.
+/// * An authentication endpoint at `/authenticate`.
 /// * A 'ping' endpoint at '/ping'.
 /// * A number of authenticated services that are added using the `add_service` function.
 pub struct MainServiceBuilder {

From 57be84b11681a0786074f05024aaf103ed2f65cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 7 Mar 2024 06:57:38 +0000
Subject: [PATCH 014/324] Set a cookie with the token after authentication

---
 rust/agama-server/src/web/auth.rs | 22 +++++++++++++++++-----
 rust/agama-server/src/web/http.rs | 22 +++++++++++++++++++---
 2 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/rust/agama-server/src/web/auth.rs b/rust/agama-server/src/web/auth.rs
index 5674bdc753..cdb3eba495 100644
--- a/rust/agama-server/src/web/auth.rs
+++ b/rust/agama-server/src/web/auth.rs
@@ -9,7 +9,7 @@ use axum::{
     Json, RequestPartsExt,
 };
 use axum_extra::{
-    headers::{authorization::Bearer, Authorization},
+    headers::{self, authorization::Bearer},
     TypedHeader,
 };
 use chrono::{Duration, Utc};
@@ -67,13 +67,25 @@ impl FromRequestParts<ServiceState> for TokenClaims {
         parts: &mut request::Parts,
         state: &ServiceState,
     ) -> Result<Self, Self::Rejection> {
-        let TypedHeader(Authorization(bearer)) = parts
-            .extract::<TypedHeader<Authorization<Bearer>>>()
+        let token = match parts
+            .extract::<TypedHeader<headers::Authorization<Bearer>>>()
             .await
-            .map_err(|_| AuthError::MissingToken)?;
+        {
+            Ok(TypedHeader(headers::Authorization(bearer))) => bearer.token().to_owned(),
+            Err(_) => {
+                let cookie = parts
+                    .extract::<TypedHeader<headers::Cookie>>()
+                    .await
+                    .map_err(|_| AuthError::MissingToken)?;
+                cookie
+                    .get("token")
+                    .ok_or(AuthError::MissingToken)?
+                    .to_owned()
+            }
+        };
 
         let decoding = DecodingKey::from_secret(state.config.jwt_secret.as_ref());
-        let token_data = jsonwebtoken::decode(bearer.token(), &decoding, &Validation::default())?;
+        let token_data = jsonwebtoken::decode(&token, &decoding, &Validation::default())?;
 
         Ok(token_data.claims)
     }
diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index 54da54a3ae..71d255abee 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -4,7 +4,12 @@ use super::{
     auth::{generate_token, AuthError},
     state::ServiceState,
 };
-use axum::{extract::State, Json};
+use axum::{
+    extract::State,
+    http::{header::SET_COOKIE, HeaderMap},
+    response::IntoResponse,
+    Json,
+};
 use pam::Client;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
@@ -42,7 +47,7 @@ pub struct LoginRequest {
 pub async fn authenticate(
     State(state): State<ServiceState>,
     Json(login): Json<LoginRequest>,
-) -> Result<Json<AuthResponse>, AuthError> {
+) -> Result<impl IntoResponse, AuthError> {
     let mut pam_client = Client::with_password("agama")?;
     pam_client
         .conversation_mut()
@@ -50,5 +55,16 @@ pub async fn authenticate(
     pam_client.authenticate()?;
 
     let token = generate_token(&state.config.jwt_secret);
-    Ok(Json(AuthResponse { token }))
+    let content = Json(AuthResponse {
+        token: token.to_owned(),
+    });
+
+    let mut headers = HeaderMap::new();
+    let cookie = format!("token={}; HttpOnly", &token);
+    headers.insert(
+        SET_COOKIE,
+        cookie.parse().expect("could not build a valid cookie"),
+    );
+
+    Ok((headers, content))
 }

From 78ce73966e3ccdbccab8270ce8ddccc64afbbb05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 7 Mar 2024 14:39:15 +0000
Subject: [PATCH 015/324] Add an endpoint to check if the user is authenticated

---
 rust/agama-server/src/web/http.rs    | 9 ++++++++-
 rust/agama-server/src/web/service.rs | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index 71d255abee..ea232e05d3 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -1,7 +1,7 @@
 //! Implements the handlers for the HTTP-based API.
 
 use super::{
-    auth::{generate_token, AuthError},
+    auth::{generate_token, AuthError, TokenClaims},
     state::ServiceState,
 };
 use axum::{
@@ -68,3 +68,10 @@ pub async fn authenticate(
 
     Ok((headers, content))
 }
+
+#[utoipa::path(get, path = "/authenticate", responses(
+    (status = 200, description = "Check whether the user is authenticated")
+))]
+pub async fn show_authenticate(_claims: TokenClaims) -> Result<(), AuthError> {
+    Ok(())
+}
diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index cf58665cc0..d98944b192 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -81,7 +81,10 @@ impl MainServiceBuilder {
                 state.clone(),
             ))
             .route("/ping", get(super::http::ping))
-            .route("/authenticate", post(super::http::authenticate));
+            .route(
+                "/authenticate",
+                post(super::http::authenticate).get(super::http::show_authenticate),
+            );
 
         let serve = ServeDir::new(self.public_dir);
         Router::new()

From 07b69cba5f60a383dc5508ec272ae37d25aa2b3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 7 Mar 2024 14:39:53 +0000
Subject: [PATCH 016/324] Fix the /authenticate documentation

---
 rust/agama-server/src/web/http.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index ea232e05d3..9155d64e06 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -41,7 +41,7 @@ pub struct LoginRequest {
     pub password: String,
 }
 
-#[utoipa::path(get, path = "/authenticate", responses(
+#[utoipa::path(post, path = "/authenticate", responses(
     (status = 200, description = "The user have been successfully authenticated", body = AuthResponse)
 ))]
 pub async fn authenticate(

From d1a77270686fb7dca57eff773e784b549f7388c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 7 Mar 2024 16:05:46 +0000
Subject: [PATCH 017/324] Add a log in form to the web UI

* It is (working) a proof-of-concept.
* Providers have been reorganized.
* The only way to logout is by removing the cookie. You can
  remove them, for instance, using your browser's developer
  tools.
---
 web/src/Protected.jsx                   | 40 +++++++++++++
 web/src/components/core/LoginPage.jsx   | 74 +++++++++++++++++++++++++
 web/src/components/core/index.js        |  1 +
 web/src/context/app.jsx                 | 49 ++++++++++++++++
 web/src/context/auth.jsx                | 73 ++++++++++++++++++++++++
 web/src/context/{agama.jsx => root.jsx} | 18 ++----
 web/src/index.js                        | 39 +++++++------
 7 files changed, 265 insertions(+), 29 deletions(-)
 create mode 100644 web/src/Protected.jsx
 create mode 100644 web/src/components/core/LoginPage.jsx
 create mode 100644 web/src/context/app.jsx
 create mode 100644 web/src/context/auth.jsx
 rename web/src/context/{agama.jsx => root.jsx} (74%)

diff --git a/web/src/Protected.jsx b/web/src/Protected.jsx
new file mode 100644
index 0000000000..535986000e
--- /dev/null
+++ b/web/src/Protected.jsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * 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, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { Navigate, Outlet } from "react-router-dom";
+import { useAuth } from "./context/auth";
+import { AppProviders } from "./context/app";
+
+export default function Protected() {
+  const { isAuthenticated } = useAuth();
+
+  console.log("authenticated", isAuthenticated);
+  if (isAuthenticated !== true) {
+    return <Navigate to="/login" />;
+  }
+
+  return (
+    <AppProviders>
+      <Outlet />
+    </AppProviders>
+  );
+}
diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
new file mode 100644
index 0000000000..0b4130dc8e
--- /dev/null
+++ b/web/src/components/core/LoginPage.jsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * 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, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React, { useState } from "react";
+import {
+  ActionGroup,
+  Button,
+  Form,
+  FormGroup,
+  TextInput,
+} from "@patternfly/react-core";
+import { Navigate } from "react-router-dom";
+import PasswordInput from "./PasswordInput";
+import { _ } from "~/i18n";
+import { useAuth } from "~/context/auth";
+
+export default function LoginPage() {
+  const [password, setPassword] = useState("");
+  const { isAuthenticated, login: loginFn } = useAuth();
+
+  const login = async (e) => {
+    e.preventDefault();
+    await loginFn(password);
+  };
+
+  if (isAuthenticated) {
+    return <Navigate to="/" />;
+  }
+
+  return (
+    <Form id="login" onSubmit={login}>
+      <FormGroup fieldId="username">
+        <TextInput
+          id="username"
+          name="username"
+          label="Username"
+          value="root"
+          disabled
+        />
+      </FormGroup>
+
+      <FormGroup fieldId="password">
+        <PasswordInput
+          id="password"
+          name="password"
+          value={password}
+          onChange={(_, v) => setPassword(v)}
+        />
+      </FormGroup>
+
+      <ActionGroup>
+        <Button type="submit" variant="primary">{_("Log in")}</Button>
+      </ActionGroup>
+    </Form>
+  );
+}
diff --git a/web/src/components/core/index.js b/web/src/components/core/index.js
index ee024a4417..3b35412f43 100644
--- a/web/src/components/core/index.js
+++ b/web/src/components/core/index.js
@@ -39,6 +39,7 @@ export { default as InstallButton } from "./InstallButton";
 export { default as IssuesDialog } from "./IssuesDialog";
 export { default as SectionSkeleton } from "./SectionSkeleton";
 export { default as ListSearch } from "./ListSearch";
+export { default as LoginPage } from "./LoginPage";
 export { default as LogsButton } from "./LogsButton";
 export { default as FileViewer } from "./FileViewer";
 export { default as RowActions } from "./RowActions";
diff --git a/web/src/context/app.jsx b/web/src/context/app.jsx
new file mode 100644
index 0000000000..c7a9ec9721
--- /dev/null
+++ b/web/src/context/app.jsx
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * 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, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+import React from "react";
+import { InstallerL10nProvider } from "./installerL10n";
+import { L10nProvider } from "./l10n";
+import { ProductProvider } from "./product";
+
+/**
+ * Combines all application providers.
+ *
+ * @param {object} props
+ * @param {React.ReactNode} [props.children] - content to display within the provider.
+ */
+function AppProviders({ children }) {
+  return (
+    <InstallerL10nProvider>
+      <L10nProvider>
+        <ProductProvider>
+          {children}
+        </ProductProvider>
+      </L10nProvider>
+    </InstallerL10nProvider>
+  );
+}
+
+export {
+  AppProviders
+};
diff --git a/web/src/context/auth.jsx b/web/src/context/auth.jsx
new file mode 100644
index 0000000000..f06e4b15ed
--- /dev/null
+++ b/web/src/context/auth.jsx
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * 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, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+import React, { useCallback, useEffect, useState } from "react";
+
+const AuthContext = React.createContext(null);
+
+/**
+ * Returns the authentication functions
+ */
+function useAuth() {
+  const context = React.useContext(AuthContext);
+  if (context === undefined) {
+    throw new Error("useAuth must be used within a AuthProvider");
+  }
+
+  return context;
+}
+
+/**
+ * @param {object} props
+ * @param {React.ReactNode} [props.children] - content to display within the provider
+ */
+function AuthProvider({ children }) {
+  const [isAuthenticated, setIsAuthenticated] = useState(false);
+
+  const login = useCallback(async (password) => {
+    const response = await fetch("/api/authenticate", {
+      method: "POST",
+      body: JSON.stringify({ password }),
+      headers: { "Content-Type": "application/json" },
+    });
+    setIsAuthenticated(response.status === 200);
+  }, []);
+
+  useEffect(() => {
+    fetch("/api/authenticate", {
+      headers: { "Content-Type": "application/json" },
+    })
+      .then((response) => {
+        setIsAuthenticated(response.status === 200);
+      })
+      .catch(() => setIsAuthenticated(false));
+  }, []);
+
+  return (
+    <AuthContext.Provider value={{ login, isAuthenticated }}>
+      {children}
+    </AuthContext.Provider>
+  );
+}
+
+export { AuthProvider, useAuth };
diff --git a/web/src/context/agama.jsx b/web/src/context/root.jsx
similarity index 74%
rename from web/src/context/agama.jsx
rename to web/src/context/root.jsx
index c17f6a8803..c375fecedf 100644
--- a/web/src/context/agama.jsx
+++ b/web/src/context/root.jsx
@@ -23,9 +23,7 @@
 
 import React from "react";
 import { InstallerClientProvider } from "./installer";
-import { InstallerL10nProvider } from "./installerL10n";
-import { L10nProvider } from "./l10n";
-import { ProductProvider } from "./product";
+import { AuthProvider } from "./auth";
 
 /**
  * Combines all application providers.
@@ -33,20 +31,16 @@ import { ProductProvider } from "./product";
  * @param {object} props
  * @param {React.ReactNode} [props.children] - content to display within the provider.
  */
-function AgamaProviders({ children }) {
+function RootProviders({ children }) {
   return (
     <InstallerClientProvider>
-      <InstallerL10nProvider>
-        <L10nProvider>
-          <ProductProvider>
-            {children}
-          </ProductProvider>
-        </L10nProvider>
-      </InstallerL10nProvider>
+      <AuthProvider>
+        {children}
+      </AuthProvider>
     </InstallerClientProvider>
   );
 }
 
 export {
-  AgamaProviders
+  RootProviders
 };
diff --git a/web/src/index.js b/web/src/index.js
index 4a0d97ab2e..bb8a60b6e5 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -23,7 +23,7 @@ import React from "react";
 import { createRoot } from "react-dom/client";
 
 import { HashRouter, Routes, Route } from "react-router-dom";
-import { AgamaProviders } from "~/context/agama";
+import { RootProviders } from "~/context/root";
 
 /**
  * Import PF base styles before any JSX since components coming from PF may
@@ -33,12 +33,14 @@ import "@patternfly/patternfly/patternfly-base.scss";
 
 import App from "~/App";
 import Main from "~/Main";
+import Protected from "~/Protected";
 import { OverviewPage } from "~/components/overview";
 import { ProductPage, ProductSelectionPage } from "~/components/product";
 import { SoftwarePage } from "~/components/software";
 import { ProposalPage as StoragePage, ISCSIPage, DASDPage, ZFCPPage } from "~/components/storage";
 import { UsersPage } from "~/components/users";
 import { L10nPage } from "~/components/l10n";
+import { LoginPage } from "./components/core";
 import { NetworkPage } from "~/components/network";
 
 /**
@@ -57,26 +59,29 @@ const container = document.getElementById("root");
 const root = createRoot(container);
 
 root.render(
-  <AgamaProviders>
+  <RootProviders>
     <HashRouter>
       <Routes>
-        <Route path="/" element={<App />}>
-          <Route path="/" element={<Main />}>
-            <Route index element={<OverviewPage />} />
-            <Route path="/overview" element={<OverviewPage />} />
-            <Route path="/product" element={<ProductPage />} />
-            <Route path="/l10n" element={<L10nPage />} />
-            <Route path="/software" element={<SoftwarePage />} />
-            <Route path="/storage" element={<StoragePage />} />
-            <Route path="/storage/iscsi" element={<ISCSIPage />} />
-            <Route path="/storage/dasd" element={<DASDPage />} />
-            <Route path="/storage/zfcp" element={<ZFCPPage />} />
-            <Route path="/network" element={<NetworkPage />} />
-            <Route path="/users" element={<UsersPage />} />
+        <Route path="/login" exact element={<LoginPage />} />
+        <Route path="/" element={<Protected />}>
+          <Route path="/" element={<App />}>
+            <Route path="/" element={<Main />}>
+              <Route index element={<OverviewPage />} />
+              <Route path="/overview" element={<OverviewPage />} />
+              <Route path="/product" element={<ProductPage />} />
+              <Route path="/l10n" element={<L10nPage />} />
+              <Route path="/software" element={<SoftwarePage />} />
+              <Route path="/storage" element={<StoragePage />} />
+              <Route path="/storage/iscsi" element={<ISCSIPage />} />
+              <Route path="/storage/dasd" element={<DASDPage />} />
+              <Route path="/storage/zfcp" element={<ZFCPPage />} />
+              <Route path="/network" element={<NetworkPage />} />
+              <Route path="/users" element={<UsersPage />} />
+            </Route>
+            <Route path="products" element={<ProductSelectionPage />} />
           </Route>
-          <Route path="products" element={<ProductSelectionPage />} />
         </Route>
       </Routes>
     </HashRouter>
-  </AgamaProviders>
+  </RootProviders>
 );

From 9ee81a4dd77af26995d38d4d236bbe27ce9b35b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Thu, 7 Mar 2024 17:51:25 +0000
Subject: [PATCH 018/324] Add some props for making core/About more flexible

Needed in the context of the login page to been able to influence the
full look&feel of the button. It allows a better integration outside of the
core/Sidebar.
---
 web/src/components/core/About.jsx      | 24 +++++++++++++++++----
 web/src/components/core/About.test.jsx | 29 ++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/web/src/components/core/About.jsx b/web/src/components/core/About.jsx
index be97bd7892..746a3fe83f 100644
--- a/web/src/components/core/About.jsx
+++ b/web/src/components/core/About.jsx
@@ -27,7 +27,23 @@ import { Icon } from "~/components/layout";
 import { Popup } from "~/components/core";
 import { _ } from "~/i18n";
 
-export default function About() {
+/**
+ * Renders a button and a dialog to allow user read about what Agama is
+ * @component
+ *
+ * @param {object} props
+ * @param {boolean} [props.showIcon=true] - Whether render a "help" icon into the button.
+ * @param {string} [props.iconSize="s"] - The size for the button icon.
+ * @param {string} [props.buttonText="About Agama"] - The text for the button.
+ * @param {string} [props.buttonVariant="link"] - The button variant.
+ *   See {@link https://www.patternfly.org/components/button#variant-examples PF/Button}.
+ */
+export default function About({
+  showIcon = true,
+  iconSize = "s",
+  buttonText = _("About Agama"),
+  buttonVariant = "link"
+}) {
   const [isOpen, setIsOpen] = useState(false);
 
   const open = () => setIsOpen(true);
@@ -36,11 +52,11 @@ export default function About() {
   return (
     <>
       <Button
-        variant="link"
-        icon={<Icon name="help" size="s" />}
+        variant={buttonVariant}
+        icon={showIcon && <Icon name="help" size={iconSize} />}
         onClick={open}
       >
-        {_("About Agama")}
+        { buttonText }
       </Button>
 
       <Popup
diff --git a/web/src/components/core/About.test.jsx b/web/src/components/core/About.test.jsx
index c3061d0431..75194561c2 100644
--- a/web/src/components/core/About.test.jsx
+++ b/web/src/components/core/About.test.jsx
@@ -27,6 +27,35 @@ import { plainRender } from "~/test-utils";
 import About from "./About";
 
 describe("About", () => {
+  it("renders a help icon inside the button by default", () => {
+    const { container } = plainRender(<About />);
+    const icon = container.querySelector('svg');
+    expect(icon).toHaveAttribute("data-icon-name", "help");
+  });
+
+  it("does not render a help icon inside the button if showIcon=false", () => {
+    const { container } = plainRender(<About showIcon={false} />);
+    const icon = container.querySelector('svg');
+    expect(icon).toBeNull();
+  });
+
+  it("allows setting its icon size", () => {
+    const { container } = plainRender(<About iconSize="xxs" />);
+    const icon = container.querySelector('svg');
+    expect(icon.classList.contains("icon-xxs")).toBe(true);
+  });
+
+  it("allows setting its button text", () => {
+    plainRender(<About buttonText="What is this?"/>);
+    screen.getByRole("button", { name: "What is this?" });
+  });
+
+  it("allows setting its button variant", () => {
+    plainRender(<About buttonVariant="tertiary"/>);
+    const button = screen.getByRole("button", { name: "About Agama" });
+    expect(button.classList.contains("pf-m-tertiary")).toBe(true);
+  });
+
   it("allows user to read 'About Agama'", async () => {
     const { user } = plainRender(<About />);
 

From 1b602a6c4a177900468d19ec3c2c7afad9a67c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Thu, 7 Mar 2024 18:41:20 +0000
Subject: [PATCH 019/324] Allow core/Page to be mounted without sidebar

To make possible use it for the login page too, since core/Sidebar
mounts components that depends on pieces that are not available before
login into the system.
---
 web/src/components/core/Page.jsx      | 36 +++++++++++++++++++--------
 web/src/components/core/Page.test.jsx | 12 +++++++--
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/web/src/components/core/Page.jsx b/web/src/components/core/Page.jsx
index 8d57e1ea85..d0ac310d24 100644
--- a/web/src/components/core/Page.jsx
+++ b/web/src/components/core/Page.jsx
@@ -152,10 +152,16 @@ const BackAction = () => {
  * @param {string} [props.icon] - The icon for the page.
  * @param {string} [props.title="Agama"] - The title for the page. By default it
  *   uses the name of the tool, do not mark it for translation.
+ * @param {boolean} [props.mountSidebar=true] - Whether include the core/Sidebar component.
  * @param {JSX.Element} [props.children] - The page content.
  *
  */
-const Page = ({ icon, title = "Agama", children }) => {
+const Page = ({
+  icon,
+  title = "Agama",
+  mountSidebar = true,
+  children
+}) => {
   const [sidebarOpen, setSidebarOpen] = useState(false);
 
   /**
@@ -195,15 +201,20 @@ const Page = ({ icon, title = "Agama", children }) => {
         </h1>
         <div data-type="agama/header-actions">
           { menu }
-          <button
-            onClick={openSidebar}
-            className="plain-control"
-            aria-label={_("Show global options")}
-            aria-controls="global-options"
-            aria-expanded={sidebarOpen}
-          >
-            <Icon name="menu" />
-          </button>
+          <If
+            condition={mountSidebar}
+            then={
+              <button
+                onClick={openSidebar}
+                className="plain-control"
+                aria-label={_("Show global options")}
+                aria-controls="global-options"
+                aria-expanded={sidebarOpen}
+              >
+                <Icon name="menu" />
+              </button>
+            }
+          />
         </div>
       </header>
 
@@ -218,7 +229,10 @@ const Page = ({ icon, title = "Agama", children }) => {
         <img src={logoUrl} alt="Logo of SUSE" />
       </footer>
 
-      <Sidebar isOpen={sidebarOpen} onClose={closeSidebar} />
+      <If
+        condition={mountSidebar}
+        then={<Sidebar isOpen={sidebarOpen} onClose={closeSidebar} />}
+      />
     </div>
   );
 };
diff --git a/web/src/components/core/Page.test.jsx b/web/src/components/core/Page.test.jsx
index 36949c1a1c..6b9b7397f3 100644
--- a/web/src/components/core/Page.test.jsx
+++ b/web/src/components/core/Page.test.jsx
@@ -120,14 +120,22 @@ describe("Page", () => {
     screen.getByRole("button", { name: "Back" });
   });
 
-  it("renders the Agama sidebar", async () => {
+  it("renders the Agama sidebar by default", async () => {
     const { user } = installerRender(<Page />, { withL10n: true });
-
     const openSidebarButton = screen.getByRole("button", { name: "Show global options" });
 
     await user.click(openSidebarButton);
+
     screen.getByRole("complementary", { name: /options/i });
   });
+
+  it("does not render the Agama sidebar when mountSidebar=false", () => {
+    installerRender(<Page mountSidebar={false} />, { withL10n: true });
+    const openSidebarButton = screen.queryByRole("button", { name: "Show global options" });
+    const sidebar = screen.queryByRole("complementary", { name: /options/i, hidden: true });
+    expect(openSidebarButton).toBeNull();
+    expect(sidebar).toBeNull();
+  });
 });
 
 describe("Page.Actions", () => {

From 9da555c7e9c42989c31515ee4746367d7c2fab6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Thu, 7 Mar 2024 23:27:35 +0000
Subject: [PATCH 020/324] Improve login page

Mainly by wrapping its content in with core/Page component to make it
looks like the rest of Agama pages.

Texts and buttons might be subject to be changed before merging into
master.
---
 .../assets/styles/patternfly-overrides.scss   |  5 +-
 web/src/components/core/LoginPage.jsx         | 73 +++++++++------
 web/src/components/core/LoginPage.test.jsx    | 90 +++++++++++++++++++
 3 files changed, 142 insertions(+), 26 deletions(-)
 create mode 100644 web/src/components/core/LoginPage.test.jsx

diff --git a/web/src/assets/styles/patternfly-overrides.scss b/web/src/assets/styles/patternfly-overrides.scss
index 9127b55a5b..607f945e0e 100644
--- a/web/src/assets/styles/patternfly-overrides.scss
+++ b/web/src/assets/styles/patternfly-overrides.scss
@@ -90,7 +90,6 @@ table td > .pf-v5-c-empty-state {
   padding-block: var(--pf-v5-c-modal-box__body--PaddingTop);
 }
 
-.pf-v5-c-form__actions,
 .pf-v5-c-modal-box__footer {
   // We prefer buttons placed at the right
   flex-direction: row-reverse;
@@ -225,6 +224,10 @@ table td > .pf-v5-c-empty-state {
   }
 }
 
+.pf-v5-c-form__group.pf-m-action {
+  --pf-v5-c-form__group--m-action--MarginTop: var(--spacer-small);
+}
+
 .pf-v5-c-form__group-label-help {
   margin: 0;
   padding: 0;
diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
index 0b4130dc8e..a01e2f1ad5 100644
--- a/web/src/components/core/LoginPage.jsx
+++ b/web/src/components/core/LoginPage.jsx
@@ -20,18 +20,26 @@
  */
 
 import React, { useState } from "react";
+import { Navigate } from "react-router-dom";
 import {
   ActionGroup,
   Button,
   Form,
   FormGroup,
-  TextInput,
 } from "@patternfly/react-core";
-import { Navigate } from "react-router-dom";
-import PasswordInput from "./PasswordInput";
+import { sprintf } from "sprintf-js";
 import { _ } from "~/i18n";
 import { useAuth } from "~/context/auth";
+import { About, Page, PasswordInput, Section } from "~/components/core";
+import { Center } from "~/components/layout";
+
+// @ts-check
 
+/**
+ * Renders the UI that lets the user log into the system.
+ * @component
+ *
+ */
 export default function LoginPage() {
   const [password, setPassword] = useState("");
   const { isAuthenticated, login: loginFn } = useAuth();
@@ -45,30 +53,45 @@ export default function LoginPage() {
     return <Navigate to="/" />;
   }
 
+  // TRANSLATORS: Title for a form to provide the password for the root user. %s
+  // will be replaced by "root"
+  const sectionTitle = sprintf(_("Login as %s"), "root");
   return (
-    <Form id="login" onSubmit={login}>
-      <FormGroup fieldId="username">
-        <TextInput
-          id="username"
-          name="username"
-          label="Username"
-          value="root"
-          disabled
-        />
-      </FormGroup>
+    <Page mountSidebar={false} title="Agama">
+      <Center>
+        <Section title={sectionTitle}>
+          <p
+            dangerouslySetInnerHTML={{
+              __html: sprintf(
+                _("The installer requires %s user privileges. Please, provide its password to log into the system."),
+                "<b>root</b>"
+              )
+            }}
+          />
+
+          <Form id="login" onSubmit={login} aria-label={_("Login form")}>
+            <FormGroup fieldId="password">
+              <PasswordInput
+                id="password"
+                name="password"
+                value={password}
+                aria-label={_("Password input")}
+                onChange={(_, v) => setPassword(v)}
+              />
+            </FormGroup>
 
-      <FormGroup fieldId="password">
-        <PasswordInput
-          id="password"
-          name="password"
-          value={password}
-          onChange={(_, v) => setPassword(v)}
-        />
-      </FormGroup>
+            <ActionGroup>
+              <Button type="submit" variant="primary">
+                {_("Log in")}
+              </Button>
+            </ActionGroup>
+          </Form>
+        </Section>
+      </Center>
 
-      <ActionGroup>
-        <Button type="submit" variant="primary">{_("Log in")}</Button>
-      </ActionGroup>
-    </Form>
+      <Page.Actions>
+        <About showIcon={false} iconSize="xs" buttonText={_("What is this?")} buttonVariant="link" />
+      </Page.Actions>
+    </Page>
   );
 }
diff --git a/web/src/components/core/LoginPage.test.jsx b/web/src/components/core/LoginPage.test.jsx
new file mode 100644
index 0000000000..4f781cba4c
--- /dev/null
+++ b/web/src/components/core/LoginPage.test.jsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * 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, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+import React from "react";
+import { screen, within } from "@testing-library/react";
+import { plainRender } from "~/test-utils";
+import { LoginPage } from "~/components/core";
+
+let mockIsAuthenticated;
+const mockLoginFn = jest.fn();
+
+jest.mock("~/context/auth", () => ({
+  ...jest.requireActual("~/context/auth"),
+  useAuth: () => {
+    return {
+      isAuthenticated: mockIsAuthenticated,
+      login: mockLoginFn
+    };
+  }
+}));
+
+describe("LoginPage", () => {
+  beforeAll(() => {
+    mockIsAuthenticated = false;
+    jest.spyOn(console, "error").mockImplementation();
+  });
+
+  afterAll(() => {
+    console.error.mockRestore();
+  });
+
+  describe("when user is not authenticated", () => {
+    it("renders reference to root", () => {
+      plainRender(<LoginPage />);
+      screen.getAllByText(/root/);
+    });
+
+    it("allows entering a password", async () => {
+      const { user } = plainRender(<LoginPage />);
+      const form = screen.getByRole("form", { name: "Login form" });
+      const passwordInput = within(form).getByLabelText("Password input");
+      const loginButton = within(form).getByRole("button", { name: "Log in" });
+
+      await user.type(passwordInput, "s3cr3t");
+      await user.click(loginButton);
+
+      expect(mockLoginFn).toHaveBeenCalledWith("s3cr3t");
+    });
+
+    it("renders a button to know more about the project", async () => {
+      const { user } = plainRender(<LoginPage />);
+      const button = screen.getByRole("button", { name: "What is this?" });
+
+      await user.click(button);
+
+      const dialog = await screen.findByRole("dialog");
+      within(dialog).getByText(/About/);
+    });
+  });
+
+  describe("when user is already authenticated", () => {
+    beforeEach(() => {
+      mockIsAuthenticated = true;
+    });
+
+    it("redirects to root route", async () => {
+      plainRender(<LoginPage />);
+      // react-router-dom Navigate is mocked. See test-utils for more details.
+      await screen.findByText("Navigating to /");
+    });
+  });
+});

From 2b9364efbc2d44c30ad28c09b546e5004cd80b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Fri, 8 Mar 2024 13:20:13 +0000
Subject: [PATCH 021/324] Please linters and improve type checking

For all components touched for creating the core/LoginPage.
---
 web/src/components/core/About.jsx         | 11 ++--
 web/src/components/core/About.test.jsx    |  4 +-
 web/src/components/core/If.jsx            |  2 +-
 web/src/components/core/LoginPage.jsx     |  2 +
 web/src/components/core/Page.jsx          | 33 +++++++-----
 web/src/components/core/PasswordInput.jsx | 28 +++++-----
 web/src/components/core/Popup.jsx         | 63 +++++++++++------------
 web/src/components/core/Section.jsx       |  2 +-
 web/src/components/core/Sidebar.jsx       | 10 ++--
 web/src/components/layout/Center.jsx      |  5 +-
 10 files changed, 91 insertions(+), 69 deletions(-)

diff --git a/web/src/components/core/About.jsx b/web/src/components/core/About.jsx
index 746a3fe83f..75b77808bd 100644
--- a/web/src/components/core/About.jsx
+++ b/web/src/components/core/About.jsx
@@ -19,13 +19,18 @@
  * find current contact information at www.suse.com.
  */
 
+// @ts-check
+
 import React, { useState } from "react";
 import { Button, Text } from "@patternfly/react-core";
+import { _ } from "~/i18n";
 import { sprintf } from "sprintf-js";
-
 import { Icon } from "~/components/layout";
 import { Popup } from "~/components/core";
-import { _ } from "~/i18n";
+
+/**
+ * @typedef {import("@patternfly/react-core").ButtonProps} ButtonProps
+ */
 
 /**
  * Renders a button and a dialog to allow user read about what Agama is
@@ -35,7 +40,7 @@ import { _ } from "~/i18n";
  * @param {boolean} [props.showIcon=true] - Whether render a "help" icon into the button.
  * @param {string} [props.iconSize="s"] - The size for the button icon.
  * @param {string} [props.buttonText="About Agama"] - The text for the button.
- * @param {string} [props.buttonVariant="link"] - The button variant.
+ * @param {ButtonProps["variant"]} [props.buttonVariant="link"] - The button variant.
  *   See {@link https://www.patternfly.org/components/button#variant-examples PF/Button}.
  */
 export default function About({
diff --git a/web/src/components/core/About.test.jsx b/web/src/components/core/About.test.jsx
index 75194561c2..fdb5da6fc5 100644
--- a/web/src/components/core/About.test.jsx
+++ b/web/src/components/core/About.test.jsx
@@ -46,12 +46,12 @@ describe("About", () => {
   });
 
   it("allows setting its button text", () => {
-    plainRender(<About buttonText="What is this?"/>);
+    plainRender(<About buttonText="What is this?" />);
     screen.getByRole("button", { name: "What is this?" });
   });
 
   it("allows setting its button variant", () => {
-    plainRender(<About buttonVariant="tertiary"/>);
+    plainRender(<About buttonVariant="tertiary" />);
     const button = screen.getByRole("button", { name: "About Agama" });
     expect(button.classList.contains("pf-m-tertiary")).toBe(true);
   });
diff --git a/web/src/components/core/If.jsx b/web/src/components/core/If.jsx
index c53991d1f8..a4a0d1bdd2 100644
--- a/web/src/components/core/If.jsx
+++ b/web/src/components/core/If.jsx
@@ -59,7 +59,7 @@
  *   ...
  *
  * @param {object} props
- * @param {boolean} props.condition
+ * @param {truthy} props.condition
  * @param {JSX.Element} [props.then=null] - the content to be rendered when the condition is true
  * @param {JSX.Element} [props.else=null] - the content to be rendered when the condition is false
  */
diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
index a01e2f1ad5..47f2f882af 100644
--- a/web/src/components/core/LoginPage.jsx
+++ b/web/src/components/core/LoginPage.jsx
@@ -19,6 +19,8 @@
  * find current contact information at www.suse.com.
  */
 
+// @ts-check
+
 import React, { useState } from "react";
 import { Navigate } from "react-router-dom";
 import {
diff --git a/web/src/components/core/Page.jsx b/web/src/components/core/Page.jsx
index d0ac310d24..e425ca5757 100644
--- a/web/src/components/core/Page.jsx
+++ b/web/src/components/core/Page.jsx
@@ -19,16 +19,22 @@
  * find current contact information at www.suse.com.
  */
 
+// @ts-check
+
 import React, { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { Button } from "@patternfly/react-core";
-
 import { _ } from "~/i18n";
 import { partition } from "~/utils";
 import { Icon } from "~/components/layout";
 import { If, PageMenu, Sidebar } from "~/components/core";
+// @ts-ignore
 import logoUrl from "~/assets/suse-horizontal-logo.svg";
 
+/**
+ * @typedef {import("@patternfly/react-core").ButtonProps} ButtonProps
+ */
+
 /**
  * Wrapper component for holding Page actions
  *
@@ -37,8 +43,8 @@ import logoUrl from "~/assets/suse-horizontal-logo.svg";
  *
  * @see Page examples.
  *
- * @param {object} [props] - component props
- * @param {React.ReactNode} [props.children] - components to be rendered as actions
+ * @param {object} props - Component props.
+ * @param {React.ReactNode} props.children - Components to be rendered as actions.
  */
 const Actions = ({ children }) => <>{children}</>;
 
@@ -59,17 +65,20 @@ const Menu = PageMenu;
  *
  * @see Page examples.
  *
- * @param {object} [props] - Component props.
- * @param {function} [props.onClick] - Callback to be triggered when action is clicked.
- * @param {string} [props.navigateTo] - Route to navigate after triggering the onClick callback, if given.
- * @param {React.ReactNode} props.children - Content of the action.
- * @param {object} [props.props] - other props passed down to the internal PF/Button. See {@link https://www.patternfly.org/components/button/#button}.
+ * @typedef {object} ActionProps
+ * @property {string} [navigateTo]
+ *
+ * @typedef {ActionProps & ButtonProps} PageActionProps
+ *
+ * @param {PageActionProps} props
  */
-const Action = ({ navigateTo, onClick, children, ...props }) => {
+const Action = ({ navigateTo, children, ...props }) => {
   const navigate = useNavigate();
 
-  props.onClick = () => {
-    if (typeof onClick === "function") onClick();
+  const onClickFn = props.onClick;
+
+  props.onClick = (e) => {
+    if (typeof onClickFn === "function") onClickFn(e);
     if (navigateTo) navigate(navigateTo);
   };
 
@@ -153,7 +162,7 @@ const BackAction = () => {
  * @param {string} [props.title="Agama"] - The title for the page. By default it
  *   uses the name of the tool, do not mark it for translation.
  * @param {boolean} [props.mountSidebar=true] - Whether include the core/Sidebar component.
- * @param {JSX.Element} [props.children] - The page content.
+ * @param {JSX.Element[]} [props.children] - The page content.
  *
  */
 const Page = ({
diff --git a/web/src/components/core/PasswordInput.jsx b/web/src/components/core/PasswordInput.jsx
index 3e641e4f98..23f95f4b14 100644
--- a/web/src/components/core/PasswordInput.jsx
+++ b/web/src/components/core/PasswordInput.jsx
@@ -19,24 +19,28 @@
  * find current contact information at www.suse.com.
  */
 
+// @ts-check
+
+import React, { useState } from "react";
+import { Button, InputGroup, TextInput } from "@patternfly/react-core";
+import { _ } from "~/i18n";
+import { Icon } from "~/components/layout";
+
+/**
+ * @typedef {import("@patternfly/react-core").TextInputProps} TextInputProps
+ *
+ * Props matching the {@link https://www.patternfly.org/components/forms/text-input PF/TextInput},
+ * except `type` that will be forced to 'password'.
+ * @typedef {Omit<TextInputProps, 'type'>} PasswordInputProps
+ */
+
 /**
  * Renders a password input field and a toggle button that can be used to reveal
  * and hide the password
  * @component
  *
- * @param {string} id - the identifier for the field.
- * @param {Object} props - props matching the {@link https://www.patternfly.org/components/forms/text-input PF/TextInput},
- *                         except `type` that will be ignored.
+ * @param {PasswordInputProps} props
  */
-import React, { useState } from "react";
-import {
-  Button,
-  InputGroup,
-  TextInput
-} from "@patternfly/react-core";
-import { Icon } from "~/components/layout";
-import { _ } from "~/i18n";
-
 export default function PasswordInput({ id, ...props }) {
   const [showPassword, setShowPassword] = useState(false);
   const visibilityIconName = showPassword ? "visibility_off" : "visibility";
diff --git a/web/src/components/core/Popup.jsx b/web/src/components/core/Popup.jsx
index 78cdca2e8b..4c60cc01b0 100644
--- a/web/src/components/core/Popup.jsx
+++ b/web/src/components/core/Popup.jsx
@@ -19,12 +19,19 @@
  * find current contact information at www.suse.com.
  */
 
+// @ts-check
+
 import React from "react";
 import { Button, Modal } from "@patternfly/react-core";
-
 import { _ } from "~/i18n";
 import { partition } from "~/utils";
 
+/**
+ * @typedef {import("@patternfly/react-core").ModalProps} ModalProps
+ * @typedef {import("@patternfly/react-core").ButtonProps} ButtonProps
+ * @typedef {Omit<ButtonProps, 'variant'>} ButtonWithoutVariantProps
+ */
+
 /**
  * Wrapper component for holding Popup actions
  *
@@ -33,6 +40,7 @@ import { partition } from "~/utils";
  *
  * @see Popup examples.
  *
+ * @param {object} props
  * @param {React.ReactNode} [props.children] - a collection of Action components
  */
 const Actions = ({ children }) => <>{children}</>;
@@ -42,13 +50,10 @@ const Actions = ({ children }) => <>{children}</>;
  *
  * Built on top of {@link https://www.patternfly.org/components/button PF/Button}
  *
- * @see Popup examples.
- *
- * @param {React.ReactNode} props.children - content of the action
- * @param {object} [props] - PF/Button props, see {@link https://www.patternfly.org/components/button#props}
+ * @param {ButtonProps} props
  */
-const Action = ({ children, ...props }) => (
-  <Button { ...props }>
+const Action = ({ children, ...buttonProps }) => (
+  <Button { ...buttonProps }>
     {children}
   </Button>
 );
@@ -68,11 +73,10 @@ const Action = ({ children, ...props }) => (
  *     <Text>Upload</Text>
  *   </PrimaryAction>
  *
- * @param {React.ReactNode} props.children - content of the action
- * @param {object} [props] - {@link Action} props
+ * @param {ButtonWithoutVariantProps} props
  */
-const PrimaryAction = ({ children, ...props }) => (
-  <Action { ...props } variant="primary">{ children }</Action>
+const PrimaryAction = ({ children, ...actionProps }) => (
+  <Action { ...actionProps } variant="primary">{ children }</Action>
 );
 
 /**
@@ -84,11 +88,10 @@ const PrimaryAction = ({ children, ...props }) => (
  * @example <caption>Using it with a custom text</caption>
  *   <Confirm onClick={accept}>Accept</Confirm>
  *
- * @param {React.ReactNode} [props.children="confirm"] - content of the action
- * @param {object} [props] - {@link Action} props
+ * @param {ButtonWithoutVariantProps} props
  */
-const Confirm = ({ children = _("Confirm"), ...props }) => (
-  <PrimaryAction key="confirm" { ...props }>{ children }</PrimaryAction>
+const Confirm = ({ children = _("Confirm"), ...actionProps }) => (
+  <PrimaryAction key="confirm" { ...actionProps }>{ children }</PrimaryAction>
 );
 
 /**
@@ -106,11 +109,10 @@ const Confirm = ({ children = _("Confirm"), ...props }) => (
  *     <Text>Dismiss</Text>
  *   </SecondaryAction>
  *
- * @param {React.ReactNode} props.children - content of the action
- * @param {object} [props] - {@link Action} props
+ * @param {ButtonWithoutVariantProps} props
  */
-const SecondaryAction = ({ children, ...props }) => (
-  <Action { ...props } variant="secondary">{ children }</Action>
+const SecondaryAction = ({ children, ...actionProps }) => (
+  <Action { ...actionProps } variant="secondary">{ children }</Action>
 );
 
 /**
@@ -122,11 +124,10 @@ const SecondaryAction = ({ children, ...props }) => (
  * @example <caption>Using it with a custom text</caption>
  *   <Cancel onClick={dismiss}>Dismiss</Confirm>
  *
- * @param {React.ReactNode} [props.children="Cancel"] - content of the action
- * @param {object} [props] - {@link Action} props
+ * @param {ButtonWithoutVariantProps} props
  */
-const Cancel = ({ children = _("Cancel"), ...props }) => (
-  <SecondaryAction key="cancel" { ...props }>{ children }</SecondaryAction>
+const Cancel = ({ children = _("Cancel"), ...actionProps }) => (
+  <SecondaryAction key="cancel" { ...actionProps }>{ children }</SecondaryAction>
 );
 
 /**
@@ -144,11 +145,10 @@ const Cancel = ({ children = _("Cancel"), ...props }) => (
  *     <Text>Do not set</Text>
  *   </AncillaryAction>
  *
- * @param {React.ReactNode} props.children - content of the action
- * @param {object} [props] - {@link Action} props
+ * @param {ButtonWithoutVariantProps} props
  */
-const AncillaryAction = ({ children, ...props }) => (
-  <Action { ...props } variant="link">{ children }</Action>
+const AncillaryAction = ({ children, ...actionsProps }) => (
+  <Action { ...actionsProps } variant="link">{ children }</Action>
 );
 
 /**
@@ -187,13 +187,7 @@ const AncillaryAction = ({ children, ...props }) => (
  *     </Popup.Actions>
  *   </Popup>
  *
- * @param {object} props - component props
- * @param {boolean} [props.isOpen=false] - whether the popup is displayed or not
- * @param {boolean} [props.showClose=false] - whether the popup should include a "X" action for closing it
- * @param {string} [props.variant="small"] - the popup size, based on PF/Modal `variant` prop
- * @param {React.ReactNode} props.children - the popup content and actions
- * @param {object} [pfModalProps] - PF/Modal props, See {@link https://www.patternfly.org/components/modal#props}
- *
+ * @param {ModalProps} props
  */
 const Popup = ({
   isOpen = false,
@@ -205,6 +199,7 @@ const Popup = ({
   const [actions, content] = partition(React.Children.toArray(children), child => child.type === Actions);
 
   return (
+    /** @ts-ignore */
     <Modal
       { ...pfModalProps }
       isOpen={isOpen}
diff --git a/web/src/components/core/Section.jsx b/web/src/components/core/Section.jsx
index c1954b7d4e..f57d77965a 100644
--- a/web/src/components/core/Section.jsx
+++ b/web/src/components/core/Section.jsx
@@ -56,7 +56,7 @@ import { If, ValidationErrors } from "~/components/core";
  * @property {string} [className] - Class name for section html tag.
  * @property {string} [id] - Id of the section ("software", "product", "storage", "storage-actions", ...)
  * @property {import("~/client/mixins").ValidationError[]} [props.errors] - Validation errors to be shown before the title.
- * @property {React.ReactElement} [children] - The section content.
+ * @property {JSX.Element[]} [children] - The section content.
  * @property {string} [aria-label] - aria-label attribute, required if title if not given
  *
  * @param { SectionProps } props
diff --git a/web/src/components/core/Sidebar.jsx b/web/src/components/core/Sidebar.jsx
index e094b2c2d3..c7ed29c3a2 100644
--- a/web/src/components/core/Sidebar.jsx
+++ b/web/src/components/core/Sidebar.jsx
@@ -40,10 +40,14 @@ import useNodeSiblings from "~/hooks/useNodeSiblings";
  *
  * A component intended for placing things exclusively related to Agama.
  *
- * @param {object} props
- * @param {React.ReactElement} props.children
+ * @typedef {object} SidebarProps
+ * @property {boolean} [isOpen] - Whether the sidebar is open or not.
+ * @property {() => void} [onClose] - A callback to be called when sidebar is closed.
+ * @property {React.ReactNode} [props.children]
+ *
+ * @param {SidebarProps}
  */
-export default function Sidebar ({ children, isOpen, onClose = noop }) {
+export default function Sidebar ({ isOpen, onClose = noop, children }) {
   const asideRef = useRef(null);
   const closeButtonRef = useRef(null);
   const [addAttribute, removeAttribute] = useNodeSiblings(asideRef.current);
diff --git a/web/src/components/layout/Center.jsx b/web/src/components/layout/Center.jsx
index 2005592682..f94d6b2c8d 100644
--- a/web/src/components/layout/Center.jsx
+++ b/web/src/components/layout/Center.jsx
@@ -19,6 +19,8 @@
  * find current contact information at www.suse.com.
  */
 
+// @ts-check
+
 import React from "react";
 
 /**
@@ -42,7 +44,8 @@ import React from "react";
  *     - https://www.w3.org/TR/selectors-4/#relational
  *     - https://ishadeed.com/article/css-has-parent-selector/
  *
- * @param {React.ReactNode} [props.children]
+ * @param {object} props
+ * @param {React.ReactNode} props.children
  */
 const Center = ({ children }) => (
   <div className="vertically-centered">

From 032bbfcc022b556f93243156567dedc67677ad4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 12:11:56 +0000
Subject: [PATCH 022/324] Add an HTTPClient for the agama-server API

---
 web/src/client/http.js | 157 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 web/src/client/http.js

diff --git a/web/src/client/http.js b/web/src/client/http.js
new file mode 100644
index 0000000000..4ef569a591
--- /dev/null
+++ b/web/src/client/http.js
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) [2024] SUSE LLC
+ *
+ * All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as published
+ * by the Free Software Foundation.
+ *
+ * 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, contact SUSE LLC.
+ *
+ * To contact SUSE LLC about this file by physical or electronic mail, you may
+ * find current contact information at www.suse.com.
+ */
+
+// @ts-check
+
+/**
+ * @callback RemoveFn
+ * @return {void}
+ */
+
+/**
+ * Agama WebSocket client.
+ *
+ * Connects to the Agama WebSocket server and reacts on the events.
+ * This class is not expected to be used directly, but through the
+ * HTTPClient API.
+ */
+class WSClient {
+  /**
+   * @param {URL} url - Websocket URL.
+   */
+  constructor(url) {
+    this.client = new WebSocket(url.toString());
+    this.client.onmessage = (event) => {
+      this.dispatchEvent(event);
+    };
+    this.handlers = [];
+  }
+
+  /**
+   * Registers a handler for events.
+   *
+   * The handler is executer for all the events. It is up to the callback to
+   * filter the relevant events.
+   *
+   * @param {(object) => void} func - Handler function to register.
+   * @return {RemoveFn}
+   */
+  onEvent(func) {
+    this.handlers.push(func);
+    return () => {
+      const position = this.handlers.indexOf(func);
+      if (position > -1) this.handlers.splice(position, 1);
+    };
+  }
+
+  /**
+   * @private
+   *
+   * Dispatchs an event by running all the handlers.
+   *
+   * @param {object} event - Event object, which is basically a websocket message.
+   */
+  dispatchEvent(event) {
+    const eventObject = JSON.parse(event.data);
+    this.handlers.forEach((f) => f(eventObject));
+  }
+}
+
+/**
+ * Agama HTTP API client.
+ */
+class HTTPClient {
+  /**
+   * @param {URL} url - URL of the HTTP API.
+   */
+  constructor(url) {
+    const httpUrl = new URL(url.toString());
+    httpUrl.pathname = url.pathname.concat("api");
+    this.baseUrl = httpUrl.toString();
+
+    const wsUrl = new URL(url);
+    wsUrl.pathname = wsUrl.pathname.concat("api/ws");
+    wsUrl.protocol = (url.protocol === "http:") ? "ws" : "wss";
+    this.ws = new WSClient(wsUrl);
+  }
+
+  /**
+   * @param {string} url - Endpoint URL (e.g., "/l10n/config").
+   * @return {Promise<object>} Server response.
+   */
+  async get(url) {
+    const response = await fetch(`${this.baseUrl}/${url}`, {
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+    return await response.json();
+  }
+
+  /**
+   * @param {string} url - Endpoint URL (e.g., "/l10n/config").
+   * @param {object} data - Data to submit
+   * @return {Promise<object>} Server response.
+   */
+  async post(url, data) {
+    const response = await fetch(`${this.baseUrl}/${url}`, {
+      method: "POST",
+      body: JSON.stringify(data),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+    return await response.json();
+  }
+
+  /**
+   * @param {string} url - Endpoint URL (e.g., "/l10n/config").
+   * @param {object} data - Data to submit
+   * @return {Promise<object>} Server response.
+   */
+  async put(url, data) {
+    const response = await fetch(`${this.baseUrl}/${url}`, {
+      method: "PUT",
+      body: JSON.stringify(data),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+    return await response.json();
+  }
+
+  /**
+   * Registers a handler for a given type of events.
+   *
+   * @param {string} type - Event type (e.g., "LocaleChanged").
+   * @param {(object) => void} func - Handler function to register.
+   * @return {RemoveFn} - Function to remove the handler.
+   */
+  onEvent(type, func) {
+    return this.ws.onEvent((event) => {
+      if (event.type === type) {
+        func(event);
+      }
+    });
+  }
+}
+
+export { HTTPClient };

From 54bf258907ef31e0bd35ed711b373dcf18eb84ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 12:14:13 +0000
Subject: [PATCH 023/324] Adapt the L10nClient to the HTTPClient

---
 web/src/client/l10n.js | 148 ++++++++++++++++++++++-------------------
 1 file changed, 81 insertions(+), 67 deletions(-)

diff --git a/web/src/client/l10n.js b/web/src/client/l10n.js
index dfab3001ce..9a1b25654a 100644
--- a/web/src/client/l10n.js
+++ b/web/src/client/l10n.js
@@ -20,13 +20,8 @@
  */
 
 // @ts-check
-import DBusClient from "./dbus";
 import { timezoneUTCOffset } from "~/utils";
 
-const LOCALE_SERVICE = "org.opensuse.Agama1";
-const LOCALE_IFACE = "org.opensuse.Agama1.Locale";
-const LOCALE_PATH = "/org/opensuse/Agama1/Locale";
-
 /**
  * @typedef {object} Timezone
  * @property {string} id - Timezone id (e.g., "Atlantic/Canary").
@@ -53,10 +48,10 @@ const LOCALE_PATH = "/org/opensuse/Agama1/Locale";
  */
 class L10nClient {
   /**
-   * @param {string|undefined} address - D-Bus address; if it is undefined, it uses the system bus.
+   * @param {import("./http").HTTPClient} client - HTTP client.
    */
-  constructor(address = undefined) {
-    this.client = new DBusClient(LOCALE_SERVICE, address);
+  constructor(client) {
+    this.client = client;
   }
 
   /**
@@ -65,8 +60,8 @@ class L10nClient {
    * @return {Promise<String>} Locale id.
    */
   async getUILocale() {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    return proxy.UILocale;
+    const config = await this.client.get("/l10n/config");
+    return config.ui_locale;
   }
 
   /**
@@ -76,8 +71,7 @@ class L10nClient {
    * @return {Promise<void>}
    */
   async setUILocale(id) {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    proxy.UILocale = id;
+    return this.client.put("/l10n/config", { ui_locale: id });
   }
 
   /**
@@ -86,9 +80,7 @@ class L10nClient {
    * @return {Promise<Array<Timezone>>}
    */
   async timezones() {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    const timezones = await proxy.ListTimezones();
-
+    const timezones = await this.client.get("/l10n/timezones");
     return timezones.map(this.buildTimezone);
   }
 
@@ -98,8 +90,8 @@ class L10nClient {
    * @return {Promise<String>} Id of the timezone.
    */
   async getTimezone() {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    return proxy.Timezone;
+    const config = await this.getConfig();
+    return config.timezone;
   }
 
   /**
@@ -109,19 +101,18 @@ class L10nClient {
    * @return {Promise<void>}
    */
   async setTimezone(id) {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    proxy.Timezone = id;
+    this.setConfig({ timezone: id });
   }
 
   /**
    * Available locales to install in the target system.
    *
+   * TODO: find a better name because it is rather confusing (e.g., 'locales'  and 'getLocales').
+   *
    * @return {Promise<Array<Locale>>}
    */
   async locales() {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    const locales = await proxy.ListLocales();
-
+    const locales = await this.client.get("/l10n/locales");
     return locales.map(this.buildLocale);
   }
 
@@ -131,8 +122,8 @@ class L10nClient {
    * @return {Promise<Array<String>>} Ids of the locales.
    */
   async getLocales() {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    return proxy.Locales;
+    const config = await this.getConfig();
+    return config.locales;
   }
 
   /**
@@ -142,8 +133,7 @@ class L10nClient {
    * @return {Promise<void>}
    */
   async setLocales(ids) {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    proxy.Locales = ids;
+    this.setConfig({ locales: ids });
   }
 
   /**
@@ -155,9 +145,7 @@ class L10nClient {
    * @return {Promise<Array<Keymap>>}
    */
   async keymaps() {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    const keymaps = await proxy.ListKeymaps();
-
+    const keymaps = await this.client.get("/l10n/keymaps");
     return keymaps.map(this.buildKeymap);
   }
 
@@ -167,8 +155,8 @@ class L10nClient {
    * @return {Promise<String>} Id of the keymap.
    */
   async getKeymap() {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-    return proxy.Keymap;
+    const config = await this.getConfig();
+    return config.keymap;
   }
 
   /**
@@ -178,86 +166,112 @@ class L10nClient {
    * @return {Promise<void>}
    */
   async setKeymap(id) {
-    const proxy = await this.client.proxy(LOCALE_IFACE);
-
-    proxy.Keymap = id;
+    this.setConfig({ keymap: id });
   }
 
   /**
-   * Register a callback to run when Timezone D-Bus property changes.
+   * Register a callback to run when the timezone configuration changes.
    *
    * @param {(timezone: string) => void} handler - Function to call when Timezone changes.
-   * @return {import ("./dbus").RemoveFn} Function to disable the callback.
+   * @return {import ("./http").RemoveFn} Function to disable the callback.
    */
   onTimezoneChange(handler) {
-    return this.client.onObjectChanged(LOCALE_PATH, LOCALE_IFACE, changes => {
-      if ("Timezone" in changes) {
-        const id = changes.Timezone.v;
-        handler(id);
+    return this.client.onEvent("L10nConfigChanged", ({ timezone }) => {
+      if (timezone) {
+        handler(timezone);
       }
     });
   }
 
   /**
-   * Register a callback to run when Locales D-Bus property changes.
+   * Register a callback to run when the locales configuration changes.
    *
-   * @param {(language: string) => void} handler - Function to call when Locales changes.
-   * @return {import ("./dbus").RemoveFn} Function to disable the callback.
+   * @param {(locales: string[]) => void} handler - Function to call when Locales changes.
+   * @return {import ("./http").RemoveFn} Function to disable the callback.
    */
   onLocalesChange(handler) {
-    return this.client.onObjectChanged(LOCALE_PATH, LOCALE_IFACE, changes => {
-      if ("Locales" in changes) {
-        const selectedIds = changes.Locales.v;
-        handler(selectedIds);
+    return this.client.onEvent("L10nConfigChanged", ({ locales }) => {
+      if (locales) {
+        handler(locales);
       }
     });
   }
 
   /**
-   * Register a callback to run when Keymap D-Bus property changes.
+   * Register a callback to run when the keymap configuration changes.
    *
-   * @param {(language: string) => void} handler - Function to call when Keymap changes.
-   * @return {import ("./dbus").RemoveFn} Function to disable the callback.
+   * @param {(keymap: string) => void} handler - Function to call when Keymap changes.
+   * @return {import ("./http").RemoveFn} Function to disable the callback.
    */
   onKeymapChange(handler) {
-    return this.client.onObjectChanged(LOCALE_PATH, LOCALE_IFACE, changes => {
-      if ("Keymap" in changes) {
-        const id = changes.Keymap.v;
-        handler(id);
+    return this.client.onEvent("L10nConfigChanged", ({ keymap }) => {
+      if (keymap) {
+        handler(keymap);
       }
     });
   }
 
+  /**
+   * @private
+   * Convenience method to get l10n the configuration.
+   *
+   * @return {Promise<object>} Localization configuration.
+   */
+  async getConfig() {
+    const config = await this.client.get("/l10n/config");
+    return config.json();
+  }
+
+  /**
+   * @private
+   *
+   * Convenience method to set l10n the configuration.
+   *
+   * @param {object} data - Configuration to update. It can just part of the configuration.
+   * @return {Promise<object>}
+   */
+  async setConfig(data) {
+    return this.client.put("/l10n/config", data);
+  }
+
   /**
    * @private
    *
-   * @param {[string, Array<string>, string]} dbusTimezone
-   * @returns {Timezone}
+   * @param {object} timezone - Timezone data.
+   * @param {string} timezone.code - Timezone identifier.
+   * @param {Array<string>} timezone.parts - Localized parts of the timezone identifier.
+   * @param {string} timezone.country - Timezone country.
+   * @return {Timezone}
    */
-  buildTimezone([id, parts, country]) {
-    const utcOffset = timezoneUTCOffset(id);
+  buildTimezone({ code, parts, country }) {
+    const utcOffset = timezoneUTCOffset(code);
 
-    return ({ id, parts, country, utcOffset });
+    return ({ id: code, parts, country, utcOffset });
   }
 
   /**
    * @private
    *
-   * @param {[string, string, string]} dbusLocale
-   * @returns {Locale}
+   * @param {object} locale - Locale data.
+   * @param {string} locale.code - Identifier.
+   * @param {string} locale.name - Name.
+   * @param {string} locale.territory - Territory.
+   * @return {Locale}
    */
-  buildLocale([id, name, territory]) {
-    return ({ id, name, territory });
+  buildLocale({ code, name, territory }) {
+    return ({ id: code, name, territory });
   }
 
   /**
    * @private
    *
-   * @param {[string, string]} dbusKeymap
-   * @returns {Keymap}
+   * @param {object} keymap - Keymap data
+   * @param {string} keymap.id - Id (e.g., "us").
+   * @param {string} keymap.description - Keymap description (e.g., "English (US)").
+   * @return {Keymap}
    */
-  buildKeymap([id, name]) {
-    return ({ id, name });
+  buildKeymap({ id, description }) {
+    return ({ id, name: description });
   }
 }
 

From 805c34af160218413ded37d125e6999a583fec02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 12:14:23 +0000
Subject: [PATCH 024/324] Adapt the client factories to use the HTTPClient

* Quite some code is temporarily commented.
---
 web/src/client/index.js | 97 +++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 42 deletions(-)

diff --git a/web/src/client/index.js b/web/src/client/index.js
index 0f64ac1bcb..a0c4ee2edc 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -31,9 +31,7 @@ import phase from "./phase";
 import { QuestionsClient } from "./questions";
 import { NetworkClient } from "./network";
 import cockpit from "../lib/cockpit";
-
-const BUS_ADDRESS_FILE = "/run/agama/bus.address";
-const MANAGER_SERVICE = "org.opensuse.Agama.Manager1";
+import { HTTPClient } from "./http";
 
 /**
  * @typedef {object} InstallerClient
@@ -63,22 +61,25 @@ const MANAGER_SERVICE = "org.opensuse.Agama.Manager1";
  * @property {Issue[]} [software] - Issues from software.
  *
  * @typedef {(issues: Issues) => void} IssuesHandler
-*/
+ */
 
 /**
  * Creates the Agama client
  *
+ * @param {URL} url - URL of the HTTP API.
  * @return {InstallerClient}
  */
-const createClient = (address = "unix:path=/run/agama/bus") => {
-  const l10n = new L10nClient(address);
-  const manager = new ManagerClient(address);
-  const monitor = new Monitor(address, MANAGER_SERVICE);
-  const network = new NetworkClient(address);
-  const software = new SoftwareClient(address);
-  const storage = new StorageClient(address);
-  const users = new UsersClient(address);
-  const questions = new QuestionsClient(address);
+const createClient = (url) => {
+  const client = new HTTPClient(url);
+  console.log("client", client);
+  const l10n = new L10nClient(client);
+  // const manager = new ManagerClient(address);
+  // const monitor = new Monitor(address, MANAGER_SERVICE);
+  // const network = new NetworkClient(address);
+  // const software = new SoftwareClient(address);
+  // const storage = new StorageClient(address);
+  // const users = new UsersClient(address);
+  // const questions = new QuestionsClient(address);
 
   /**
    * Gets all issues, grouping them by context.
@@ -88,13 +89,13 @@ const createClient = (address = "unix:path=/run/agama/bus") => {
    *
    * @returns {Promise<Issues>}
    */
-  const issues = async () => {
-    return {
-      product: await software.product.getIssues(),
-      storage: await storage.getIssues(),
-      software: await software.getIssues()
-    };
-  };
+  // const issues = async () => {
+  //   return {
+  //     product: await software.product.getIssues(),
+  //     storage: await storage.getIssues(),
+  //     software: await software.getIssues(),
+  //   };
+  // };
 
   /**
    * Registers a callback to be executed when issues change.
@@ -105,42 +106,54 @@ const createClient = (address = "unix:path=/run/agama/bus") => {
   const onIssuesChange = (handler) => {
     const unsubscribeCallbacks = [];
 
-    unsubscribeCallbacks.push(software.product.onIssuesChange(i => handler({ product: i })));
-    unsubscribeCallbacks.push(storage.onIssuesChange(i => handler({ storage: i })));
-    unsubscribeCallbacks.push(software.onIssuesChange(i => handler({ software: i })));
+    // unsubscribeCallbacks.push(
+    //   software.product.onIssuesChange((i) => handler({ product: i })),
+    // );
+    // unsubscribeCallbacks.push(
+    //   storage.onIssuesChange((i) => handler({ storage: i })),
+    // );
+    // unsubscribeCallbacks.push(
+    //   software.onIssuesChange((i) => handler({ software: i })),
+    // );
 
-    return () => { unsubscribeCallbacks.forEach(cb => cb()) };
+    return () => {
+      unsubscribeCallbacks.forEach((cb) => cb());
+    };
   };
 
   const isConnected = async () => {
-    try {
-      await manager.getStatus();
-      return true;
-    } catch (e) {
-      return false;
-    }
+    // try {
+    //   await manager.getStatus();
+    //   return true;
+    // } catch (e) {
+    //   return false;
+    // }
+    return true;
   };
 
   return {
     l10n,
-    manager,
-    monitor,
-    network,
-    software,
-    storage,
-    users,
-    questions,
-    issues,
+    // manager,
+    // monitor,
+    // network,
+    // software,
+    // storage,
+    // users,
+    // questions,
+    // issues,
     onIssuesChange,
     isConnected,
-    onDisconnect: (handler) => monitor.onDisconnect(handler)
+    onDisconnect: (handler) => {
+      return () => {};
+    },
+    // onDisconnect: (handler) => monitor.onDisconnect(handler),
   };
 };
 
 const createDefaultClient = async () => {
-  const file = cockpit.file(BUS_ADDRESS_FILE);
-  const address = await file.read();
-  return (address) ? createClient(address) : createClient();
+  const httpUrl = new URL(window.location.toString());
+  httpUrl.hash = "";
+  return createClient(httpUrl);
 };
 
 export { createClient, createDefaultClient, phase };

From bbb00e7c08f3fc32551205b311d69029dcebc6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 13:05:29 +0000
Subject: [PATCH 025/324] Reorganize and extend the authentication API

* All the operations are now under /api/auth.
* Add an operation to allow to log out, although
  it is only relevant for the cookies.
* Adapt the web UI.
---
 rust/agama-server/src/web/http.rs     | 21 +++++++++++++++++----
 rust/agama-server/src/web/service.rs  |  8 +++-----
 web/src/Protected.jsx                 |  5 ++---
 web/src/components/core/LoginPage.jsx |  5 ++---
 web/src/context/auth.jsx              | 21 ++++++++++++++-------
 5 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index 9155d64e06..9a4c0067db 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -41,10 +41,10 @@ pub struct LoginRequest {
     pub password: String,
 }
 
-#[utoipa::path(post, path = "/authenticate", responses(
+#[utoipa::path(post, path = "/auth", responses(
     (status = 200, description = "The user have been successfully authenticated", body = AuthResponse)
 ))]
-pub async fn authenticate(
+pub async fn login(
     State(state): State<ServiceState>,
     Json(login): Json<LoginRequest>,
 ) -> Result<impl IntoResponse, AuthError> {
@@ -69,9 +69,22 @@ pub async fn authenticate(
     Ok((headers, content))
 }
 
-#[utoipa::path(get, path = "/authenticate", responses(
+#[utoipa::path(delete, path = "/auth", responses(
+    (status = 204, description = "The user have been logged out")
+))]
+pub async fn logout(_claims: TokenClaims) -> Result<impl IntoResponse, AuthError> {
+    let mut headers = HeaderMap::new();
+    let cookie = "token=deleted; HttpOnly; Expires=Thu, 01 Jan 1970 00:00:00 GMT".to_string();
+    headers.insert(
+        SET_COOKIE,
+        cookie.parse().expect("could not build a valid cookie"),
+    );
+    Ok(headers)
+}
+
+#[utoipa::path(get, path = "/auth", responses(
     (status = 200, description = "Check whether the user is authenticated")
 ))]
-pub async fn show_authenticate(_claims: TokenClaims) -> Result<(), AuthError> {
+pub async fn session(_claims: TokenClaims) -> Result<(), AuthError> {
     Ok(())
 }
diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index d98944b192..d28ebd3c7d 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -1,3 +1,4 @@
+use super::http::{login, logout, session};
 use super::{auth::TokenClaims, config::ServiceConfig, state::ServiceState, EventsSender};
 use axum::{
     extract::Request,
@@ -19,7 +20,7 @@ use tower_http::{compression::CompressionLayer, services::ServeDir, trace::Trace
 ///
 /// * A static assets directory (`public_dir`).
 /// * A websocket at the `/ws` path.
-/// * An authentication endpointg at `/authenticate`.
+/// * An authentication endpoint at `/auth`.
 /// * A 'ping' endpoint at '/ping'.
 /// * A number of authenticated services that are added using the `add_service` function.
 pub struct MainServiceBuilder {
@@ -81,10 +82,7 @@ impl MainServiceBuilder {
                 state.clone(),
             ))
             .route("/ping", get(super::http::ping))
-            .route(
-                "/authenticate",
-                post(super::http::authenticate).get(super::http::show_authenticate),
-            );
+            .route("/auth", post(login).get(session).delete(logout));
 
         let serve = ServeDir::new(self.public_dir);
         Router::new()
diff --git a/web/src/Protected.jsx b/web/src/Protected.jsx
index 535986000e..0b2a9c5f99 100644
--- a/web/src/Protected.jsx
+++ b/web/src/Protected.jsx
@@ -25,10 +25,9 @@ import { useAuth } from "./context/auth";
 import { AppProviders } from "./context/app";
 
 export default function Protected() {
-  const { isAuthenticated } = useAuth();
+  const { isLoggedIn } = useAuth();
 
-  console.log("authenticated", isAuthenticated);
-  if (isAuthenticated !== true) {
+  if (isLoggedIn !== true) {
     return <Navigate to="/login" />;
   }
 
diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
index 47f2f882af..c64283db11 100644
--- a/web/src/components/core/LoginPage.jsx
+++ b/web/src/components/core/LoginPage.jsx
@@ -40,18 +40,17 @@ import { Center } from "~/components/layout";
 /**
  * Renders the UI that lets the user log into the system.
  * @component
- *
  */
 export default function LoginPage() {
   const [password, setPassword] = useState("");
-  const { isAuthenticated, login: loginFn } = useAuth();
+  const { isLoggedIn, login: loginFn } = useAuth();
 
   const login = async (e) => {
     e.preventDefault();
     await loginFn(password);
   };
 
-  if (isAuthenticated) {
+  if (isLoggedIn) {
     return <Navigate to="/" />;
   }
 
diff --git a/web/src/context/auth.jsx b/web/src/context/auth.jsx
index f06e4b15ed..4b9e2f8c59 100644
--- a/web/src/context/auth.jsx
+++ b/web/src/context/auth.jsx
@@ -42,29 +42,36 @@ function useAuth() {
  * @param {React.ReactNode} [props.children] - content to display within the provider
  */
 function AuthProvider({ children }) {
-  const [isAuthenticated, setIsAuthenticated] = useState(false);
+  const [isLoggedIn, setIsLoggedIn] = useState(false);
 
   const login = useCallback(async (password) => {
-    const response = await fetch("/api/authenticate", {
+    const response = await fetch("/api/auth", {
       method: "POST",
       body: JSON.stringify({ password }),
       headers: { "Content-Type": "application/json" },
     });
-    setIsAuthenticated(response.status === 200);
+    setIsLoggedIn(response.status === 200);
+  }, []);
+
+  const logout = useCallback(async () => {
+    await fetch("/api/auth", {
+      method: "DELETE",
+    });
+    setIsLoggedIn(false);
   }, []);
 
   useEffect(() => {
-    fetch("/api/authenticate", {
+    fetch("/api/auth", {
       headers: { "Content-Type": "application/json" },
     })
       .then((response) => {
-        setIsAuthenticated(response.status === 200);
+        setIsLoggedIn(response.status === 200);
       })
-      .catch(() => setIsAuthenticated(false));
+      .catch(() => setIsLoggedIn(false));
   }, []);
 
   return (
-    <AuthContext.Provider value={{ login, isAuthenticated }}>
+    <AuthContext.Provider value={{ login, logout, isLoggedIn }}>
       {children}
     </AuthContext.Provider>
   );

From 78ec08f210357c357610523cfcce0ae45af909d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 13:21:16 +0000
Subject: [PATCH 026/324] Add a L10nConfigChanged event

* It is not finished because it sends all the
  attributes, no matter if they changed or not.
---
 rust/agama-server/src/l10n.rs      |  8 +++++---
 rust/agama-server/src/l10n/web.rs  | 11 ++++++++++-
 rust/agama-server/src/web/event.rs |  2 ++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/rust/agama-server/src/l10n.rs b/rust/agama-server/src/l10n.rs
index a5ebb08fe9..18ea03fa71 100644
--- a/rust/agama-server/src/l10n.rs
+++ b/rust/agama-server/src/l10n.rs
@@ -7,15 +7,17 @@ pub mod web;
 use crate::error::Error;
 use agama_locale_data::{KeymapId, LocaleCode};
 use anyhow::Context;
-pub use keyboard::Keymap;
 use keyboard::KeymapsDatabase;
-pub use locale::LocaleEntry;
 use locale::LocalesDatabase;
 use std::process::Command;
-pub use timezone::TimezoneEntry;
 use timezone::TimezonesDatabase;
 use zbus::{dbus_interface, Connection};
 
+pub use keyboard::Keymap;
+pub use locale::LocaleEntry;
+pub use timezone::TimezoneEntry;
+pub use web::LocaleConfig;
+
 pub struct Locale {
     timezone: String,
     timezones_db: TimezonesDatabase,
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index 1f84f4d437..f76464ff28 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -74,7 +74,7 @@ async fn locales(State(state): State<LocaleState>) -> Json<Vec<LocaleEntry>> {
     Json(locales)
 }
 
-#[derive(Serialize, Deserialize, utoipa::ToSchema)]
+#[derive(Clone, Default, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct LocaleConfig {
     /// Locales to install in the target system
     locales: Option<Vec<String>>,
@@ -104,6 +104,8 @@ async fn keymaps(State(state): State<LocaleState>) -> Json<Vec<Keymap>> {
     Json(keymaps)
 }
 
+// TODO: update all or nothing
+// TODO: send only the attributes that have changed
 #[utoipa::path(put, path = "/l10n/config", responses(
     (status = 200, description = "Set the locale configuration", body = LocaleConfig)
 ))]
@@ -112,6 +114,7 @@ async fn set_config(
     Json(value): Json<LocaleConfig>,
 ) -> Result<Json<()>, LocaleError> {
     let mut data = state.locale.write().unwrap();
+    let mut changes = LocaleConfig::default();
 
     if let Some(locales) = &value.locales {
         for loc in locales {
@@ -120,6 +123,7 @@ async fn set_config(
             }
         }
         data.locales = locales.clone();
+        changes.locales = Some(data.locales.clone());
     }
 
     if let Some(timezone) = &value.timezone {
@@ -127,10 +131,12 @@ async fn set_config(
             return Err(LocaleError::UnknownTimezone(timezone.to_string()));
         }
         data.timezone = timezone.to_owned();
+        changes.timezone = Some(data.timezone.clone());
     }
 
     if let Some(keymap_id) = &value.keymap {
         data.keymap = keymap_id.parse()?;
+        changes.keymap = Some(keymap_id.clone());
     }
 
     if let Some(ui_locale) = &value.ui_locale {
@@ -141,11 +147,14 @@ async fn set_config(
 
         helpers::set_service_locale(&locale);
         data.translate(&locale)?;
+        changes.ui_locale = Some(locale.to_string());
         _ = state.events.send(Event::LocaleChanged {
             locale: locale.to_string(),
         });
     }
 
+    _ = state.events.send(Event::L10nConfigChanged(changes));
+
     Ok(Json(()))
 }
 
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index a84956c2f3..c94c3e42f6 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -1,3 +1,4 @@
+use crate::l10n::web::LocaleConfig;
 use agama_lib::{progress::Progress, software::SelectedBy};
 use serde::Serialize;
 use std::collections::HashMap;
@@ -6,6 +7,7 @@ use tokio::sync::broadcast::{Receiver, Sender};
 #[derive(Clone, Serialize)]
 #[serde(tag = "type")]
 pub enum Event {
+    L10nConfigChanged(LocaleConfig),
     LocaleChanged { locale: String },
     Progress(Progress),
     ProductChanged { id: String },

From df7cdd8b559cef334b90eaad2387cd5c609da8ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 13:26:33 +0000
Subject: [PATCH 027/324] Postpone the installer client initialization

---
 web/src/context/app.jsx  | 21 +++++++++++----------
 web/src/context/root.jsx | 13 ++++---------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/web/src/context/app.jsx b/web/src/context/app.jsx
index c7a9ec9721..761ebd8385 100644
--- a/web/src/context/app.jsx
+++ b/web/src/context/app.jsx
@@ -22,6 +22,7 @@
 // @ts-check
 
 import React from "react";
+import { InstallerClientProvider } from "./installer";
 import { InstallerL10nProvider } from "./installerL10n";
 import { L10nProvider } from "./l10n";
 import { ProductProvider } from "./product";
@@ -34,16 +35,16 @@ import { ProductProvider } from "./product";
  */
 function AppProviders({ children }) {
   return (
-    <InstallerL10nProvider>
-      <L10nProvider>
-        <ProductProvider>
-          {children}
-        </ProductProvider>
-      </L10nProvider>
-    </InstallerL10nProvider>
+    <InstallerClientProvider>
+      <InstallerL10nProvider>
+        <L10nProvider>
+          <ProductProvider>
+            {children}
+          </ProductProvider>
+        </L10nProvider>
+      </InstallerL10nProvider>
+    </InstallerClientProvider>
   );
 }
 
-export {
-  AppProviders
-};
+export { AppProviders };
diff --git a/web/src/context/root.jsx b/web/src/context/root.jsx
index c375fecedf..dc2f4eb170 100644
--- a/web/src/context/root.jsx
+++ b/web/src/context/root.jsx
@@ -22,7 +22,6 @@
 // @ts-check
 
 import React from "react";
-import { InstallerClientProvider } from "./installer";
 import { AuthProvider } from "./auth";
 
 /**
@@ -33,14 +32,10 @@ import { AuthProvider } from "./auth";
  */
 function RootProviders({ children }) {
   return (
-    <InstallerClientProvider>
-      <AuthProvider>
-        {children}
-      </AuthProvider>
-    </InstallerClientProvider>
+    <AuthProvider>
+      {children}
+    </AuthProvider>
   );
 }
 
-export {
-  RootProviders
-};
+export { RootProviders };

From df04f5b02949fc1ca1670e5a3e60723b21f7e6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 13:33:09 +0000
Subject: [PATCH 028/324] Proxy /api/ws to Agama WebSocket in webpack

---
 web/webpack.config.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web/webpack.config.js b/web/webpack.config.js
index 7edbd96bff..342f4d9fad 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -104,10 +104,15 @@ module.exports = {
       //   selfHandleResponse : true,
       //   onProxyRes: manifests_handler,
       // },
+      "/api/ws": {
+        target: agamaServer.replace(/^http/, "ws"),
+        ws: true,
+        secure: false,
+      },
       "/api": {
         target: agamaServer,
         secure: false,
-      }
+      },
     },
     server: "http",
     // hot replacement does not support wss:// transport when running over https://,

From 306f37032374455dc6c51fb71a2246241d462567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 16:41:38 +0000
Subject: [PATCH 029/324] Returns null instead of "" when no product is
 selected

---
 rust/agama-server/src/software/web.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index d8575a3339..a5fc089377 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -220,10 +220,15 @@ async fn get_config(
     State(state): State<SoftwareState<'_>>,
 ) -> Result<Json<SoftwareConfig>, SoftwareError> {
     let product = state.product.product().await?;
+    let product = if product.is_empty() {
+        None
+    } else {
+        Some(product)
+    };
     let patterns = state.software.user_selected_patterns().await?;
     let config = SoftwareConfig {
         patterns: Some(patterns),
-        product: Some(product),
+        product: product,
     };
     Ok(Json(config))
 }

From e3bf58119babb8c6c183768434deff578e829044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 16:40:42 +0000
Subject: [PATCH 030/324] Fix L10nClient#getConfig method

---
 web/src/client/l10n.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/src/client/l10n.js b/web/src/client/l10n.js
index 9a1b25654a..6fa54d4407 100644
--- a/web/src/client/l10n.js
+++ b/web/src/client/l10n.js
@@ -218,8 +218,7 @@ class L10nClient {
    * @return {Promise<object>} Localization configuration.
    */
   async getConfig() {
-    const config = await this.client.get("/l10n/config");
-    return config.json();
+    return await this.client.get("/l10n/config");
   }
 
   /**

From d3c4c1d7f1af33eb5dbc616ec151fea780d77be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 16:44:44 +0000
Subject: [PATCH 031/324] Add a ProductClient that works with the HTTP API

---
 web/src/client/index.js    |  6 +++-
 web/src/client/software.js | 62 +++++++++++++++++++++++++++++++++++---
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/web/src/client/index.js b/web/src/client/index.js
index a0c4ee2edc..46b042e656 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -27,6 +27,7 @@ import { Monitor } from "./monitor";
 import { SoftwareClient } from "./software";
 import { StorageClient } from "./storage";
 import { UsersClient } from "./users";
+import { ProductClient } from "./software";
 import phase from "./phase";
 import { QuestionsClient } from "./questions";
 import { NetworkClient } from "./network";
@@ -39,6 +40,7 @@ import { HTTPClient } from "./http";
  * @property {ManagerClient} manager - manager client.
  * @property {Monitor} monitor - service monitor.
  * @property {NetworkClient} network - network client.
+ * @property {ProductClient} product - product client.
  * @property {SoftwareClient} software - software client.
  * @property {StorageClient} storage - storage client.
  * @property {UsersClient} users - users client.
@@ -71,8 +73,9 @@ import { HTTPClient } from "./http";
  */
 const createClient = (url) => {
   const client = new HTTPClient(url);
-  console.log("client", client);
   const l10n = new L10nClient(client);
+  // TODO: unify with the manager client
+  const product = new ProductClient(client);
   // const manager = new ManagerClient(address);
   // const monitor = new Monitor(address, MANAGER_SERVICE);
   // const network = new NetworkClient(address);
@@ -133,6 +136,7 @@ const createClient = (url) => {
 
   return {
     l10n,
+    product,
     // manager,
     // monitor,
     // network,
diff --git a/web/src/client/software.js b/web/src/client/software.js
index 56ca3578a8..b8d8b1eb1f 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -297,8 +297,62 @@ class SoftwareBaseClient {
  */
 class SoftwareClient extends WithIssues(
   WithProgress(
-    WithStatus(SoftwareBaseClient, SOFTWARE_PATH), SOFTWARE_PATH
-  ), SOFTWARE_PATH
-) { }
+    WithStatus(SoftwareBaseClient, SOFTWARE_PATH),
+    SOFTWARE_PATH,
+  ),
+  SOFTWARE_PATH,
+) {}
 
-export { SoftwareClient };
+class ProductClient {
+  /**
+   * @param {import("./http").HTTPClient} client - HTTP client.
+   */
+  constructor(client) {
+    this.client = client;
+  }
+
+  /**
+   * Returns the list of available products.
+   *
+   * @return {Promise<Array<Product>>}
+   */
+  async getAll() {
+    const products = await this.client.get("/software/products");
+    return products;
+  }
+
+  /**
+   * Returns the identifier of the selected product.
+   *
+   * @return {Promise<string>} Selected identifier.
+   */
+  async getSelected() {
+    const config = await this.client.get("/software/config");
+    return config.product;
+  }
+
+  /**
+   * Selects a product for installation.
+   *
+   * @param {string} id - Product ID.
+   */
+  async select(id) {
+    await this.client.put("/software/config", { product: id });
+  }
+
+  /**
+   * Registers a callback to run when the select product changes.
+   *
+   * @param {(id: string) => void} handler - Callback function.
+   * @return {import ("./http").RemoveFn} Function to remove the callback.
+   */
+  onChange(handler) {
+    return this.client.onEvent("ProductChanged", ({ id }) => {
+      if (id) {
+        handler(id);
+      }
+    });
+  }
+}
+
+export { ProductClient, SoftwareClient };

From 90dd55c39722fe393a3ad5aaff7933a25929b357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 8 Mar 2024 16:49:01 +0000
Subject: [PATCH 032/324] Make it possible to reach the product selection page

* It temporarily comments some stuff in the App,
  Main and ProductSelectionPage components and
  the Product context too.
---
 web/src/App.jsx                               | 23 +++++++++------
 web/src/Main.jsx                              | 16 ++++++-----
 .../product/ProductSelectionPage.jsx          | 11 ++++----
 web/src/context/product.jsx                   | 28 +++++++++----------
 4 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/web/src/App.jsx b/web/src/App.jsx
index 8a333563a3..6ab2d45fba 100644
--- a/web/src/App.jsx
+++ b/web/src/App.jsx
@@ -24,8 +24,8 @@ import { Outlet } from "react-router-dom";
 
 import { useInstallerClient, useInstallerClientStatus } from "~/context/installer";
 import { useProduct } from "./context/product";
-import { STARTUP, INSTALL } from "~/client/phase";
-import { BUSY } from "~/client/status";
+import { CONFIG, INSTALL, STARTUP } from "~/client/phase";
+import { BUSY, IDLE } from "~/client/status";
 
 import { DBusError, If, Installation } from "~/components/core";
 import { Loading } from "./components/layout";
@@ -51,22 +51,29 @@ function App() {
 
   useEffect(() => {
     if (client) {
-      return client.manager.onPhaseChange(setPhase);
+      // FIXME: adapt to the new API
+      // return client.manager.onPhaseChange(setPhase);
+      setPhase(CONFIG);
     }
   }, [client, setPhase]);
 
   useEffect(() => {
     if (client) {
-      return client.manager.onStatusChange(setStatus);
+      setStatus(IDLE);
+      // FIXME: adapt to the new API
+      // return client.manager.onStatusChange(setStatus);
     }
   }, [client, setStatus]);
 
   useEffect(() => {
     const loadPhase = async () => {
-      const phase = await client.manager.getPhase();
-      const status = await client.manager.getStatus();
-      setPhase(phase);
-      setStatus(status);
+      setPhase(CONFIG);
+      setStatus(IDLE);
+      // FIXME: adapt to the new API
+      // const phase = await client.manager.getPhase();
+      // const status = await client.manager.getStatus();
+      // setPhase(phase);
+      // setStatus(status);
     };
 
     if (client) {
diff --git a/web/src/Main.jsx b/web/src/Main.jsx
index da74af2da1..92be6efc29 100644
--- a/web/src/Main.jsx
+++ b/web/src/Main.jsx
@@ -21,15 +21,17 @@
 
 import React from "react";
 import { Outlet } from "react-router-dom";
-import { Questions } from "~/components/questions";
+// import { Questions } from "~/components/questions";
 
 function Main() {
-  return (
-    <>
-      <Questions />
-      <Outlet />
-    </>
-  );
+  // FIXME: adapt to the new API
+  // return (
+  //   <>
+  //     <Questions />
+  //     <Outlet />
+  //   </>
+  // );
+  return <Outlet />;
 }
 
 export default Main;
diff --git a/web/src/components/product/ProductSelectionPage.jsx b/web/src/components/product/ProductSelectionPage.jsx
index 90a902b3bd..e2ff2858e4 100644
--- a/web/src/components/product/ProductSelectionPage.jsx
+++ b/web/src/components/product/ProductSelectionPage.jsx
@@ -31,7 +31,7 @@ import { useInstallerClient } from "~/context/installer";
 import { useProduct } from "~/context/product";
 
 function ProductSelectionPage() {
-  const { manager, software } = useInstallerClient();
+  const { manager, product } = useInstallerClient();
   const navigate = useNavigate();
   const { products, selectedProduct } = useProduct();
   const [newProductId, setNewProductId] = useState(selectedProduct?.id);
@@ -39,16 +39,17 @@ function ProductSelectionPage() {
   useEffect(() => {
     // TODO: display a notification in the UI to emphasizes that
     // selected product has changed
-    return software.product.onChange(() => navigate("/"));
-  }, [software, navigate]);
+    return product.onChange(() => navigate("/"));
+  }, [product, navigate]);
 
   const onSubmit = async (e) => {
     e.preventDefault();
 
     if (newProductId !== selectedProduct?.id) {
       // TODO: handle errors
-      await software.product.select(newProductId);
-      manager.startProbing();
+      await product.select(newProductId);
+      // FIXME: adapt to the new API
+      // manager.startProbing();
     }
 
     navigate("/");
diff --git a/web/src/context/product.jsx b/web/src/context/product.jsx
index c9506924c8..44100931fe 100644
--- a/web/src/context/product.jsx
+++ b/web/src/context/product.jsx
@@ -39,13 +39,13 @@ function ProductProvider({ children }) {
 
   useEffect(() => {
     const load = async () => {
-      const productManager = client.software.product;
-      const available = await cancellablePromise(productManager.getAll());
-      const selected = await cancellablePromise(productManager.getSelected());
-      const registration = await cancellablePromise(productManager.getRegistration());
+      const productClient = client.product;
+      const available = await cancellablePromise(productClient.getAll());
+      const selected = await cancellablePromise(productClient.getSelected());
+      // const registration = await cancellablePromise(productManager.getRegistration());
       setProducts(available);
-      setSelectedId(selected?.id || null);
-      setRegistration(registration);
+      setSelectedId(selected);
+      // setRegistration(registration);
     };
 
     if (client) {
@@ -53,17 +53,17 @@ function ProductProvider({ children }) {
     }
   }, [client, setProducts, setSelectedId, setRegistration, cancellablePromise]);
 
-  useEffect(() => {
-    if (!client) return;
+  // useEffect(() => {
+  //   if (!client) return;
 
-    return client.software.product.onChange(setSelectedId);
-  }, [client, setSelectedId]);
+  //   return client.software.product.onChange(setSelectedId);
+  // }, [client, setSelectedId]);
 
-  useEffect(() => {
-    if (!client) return;
+  // useEffect(() => {
+  //   if (!client) return;
 
-    return client.software.product.onRegistrationChange(setRegistration);
-  }, [client, setRegistration]);
+  //   return client.software.product.onRegistrationChange(setRegistration);
+  // }, [client, setRegistration]);
 
   const value = { products, selectedId, registration };
   return <ProductContext.Provider value={value}>{children}</ProductContext.Provider>;

From aea817f6b019362cc25ed18f5731df53f1aabb36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 11 Mar 2024 11:44:26 +0000
Subject: [PATCH 033/324] Allow setting the keymap in the local installation

---
 rust/agama-locale-data/src/locale.rs |  9 +++++++++
 rust/agama-server/src/l10n.rs        | 25 ++++++++++++++++++++++++-
 rust/agama-server/src/l10n/web.rs    | 21 ++++++++++++++++++++-
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/rust/agama-locale-data/src/locale.rs b/rust/agama-locale-data/src/locale.rs
index f46f5501fd..e1c85c0165 100644
--- a/rust/agama-locale-data/src/locale.rs
+++ b/rust/agama-locale-data/src/locale.rs
@@ -86,6 +86,15 @@ pub struct KeymapId {
     pub variant: Option<String>,
 }
 
+impl Default for KeymapId {
+    fn default() -> Self {
+        Self {
+            layout: "us".to_string(),
+            variant: None,
+        }
+    }
+}
+
 #[derive(Error, Debug, PartialEq)]
 #[error("Invalid keymap ID: {0}")]
 pub struct InvalidKeymap(String);
diff --git a/rust/agama-server/src/l10n.rs b/rust/agama-server/src/l10n.rs
index 18ea03fa71..e1778aa567 100644
--- a/rust/agama-server/src/l10n.rs
+++ b/rust/agama-server/src/l10n.rs
@@ -9,7 +9,8 @@ use agama_locale_data::{KeymapId, LocaleCode};
 use anyhow::Context;
 use keyboard::KeymapsDatabase;
 use locale::LocalesDatabase;
-use std::process::Command;
+use regex::Regex;
+use std::{io, process::Command};
 use timezone::TimezonesDatabase;
 use zbus::{dbus_interface, Connection};
 
@@ -26,6 +27,7 @@ pub struct Locale {
     keymap: KeymapId,
     keymaps_db: KeymapsDatabase,
     ui_locale: LocaleCode,
+    pub ui_keymap: KeymapId,
 }
 
 #[dbus_interface(name = "org.opensuse.Agama1.Locale")]
@@ -213,6 +215,8 @@ impl Locale {
         let mut keymaps_db = KeymapsDatabase::new();
         keymaps_db.read()?;
 
+        let ui_keymap = Self::x11_keymap().unwrap_or("us".to_string());
+
         let locale = Self {
             keymap: "us".parse().unwrap(),
             timezone: default_timezone,
@@ -221,6 +225,7 @@ impl Locale {
             timezones_db,
             keymaps_db,
             ui_locale: ui_locale.clone(),
+            ui_keymap: ui_keymap.parse().unwrap_or_default(),
         };
 
         Ok(locale)
@@ -232,6 +237,24 @@ impl Locale {
         self.ui_locale = locale.clone();
         Ok(())
     }
+
+    fn x11_keymap() -> Result<String, io::Error> {
+        let output = Command::new("setxkbmap")
+            .arg("-query")
+            .env("DISPLAY", ":0")
+            .output()?;
+        let output = String::from_utf8(output.stdout)
+            .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
+
+        let keymap_regexp = Regex::new(r"(?m)^layout: (.+)$").unwrap();
+        let captures = keymap_regexp.captures(&output);
+        let keymap = captures
+            .and_then(|c| c.get(1).map(|e| e.as_str()))
+            .unwrap_or("us")
+            .to_string();
+
+        Ok(keymap)
+    }
 }
 
 pub async fn export_dbus_objects(
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index f76464ff28..6ce89a97e1 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -16,7 +16,10 @@ use axum::{
 };
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use std::sync::{Arc, RwLock};
+use std::{
+    process::Command,
+    sync::{Arc, RwLock},
+};
 use thiserror::Error;
 
 #[derive(Error, Debug)]
@@ -29,6 +32,8 @@ pub enum LocaleError {
     InvalidKeymap(#[from] InvalidKeymap),
     #[error("Cannot translate: {0}")]
     OtherError(#[from] Error),
+    #[error("Cannot change the local keymap: {0}")]
+    CouldNotSetKeymap(#[from] std::io::Error),
 }
 
 impl IntoResponse for LocaleError {
@@ -84,6 +89,8 @@ pub struct LocaleConfig {
     timezone: Option<String>,
     /// User-interface locale. It is actually not related to the `locales` property.
     ui_locale: Option<String>,
+    /// User-interface locale. It is relevant only on local installations.
+    ui_keymap: Option<String>,
 }
 
 #[utoipa::path(get, path = "/l10n/timezones", responses(
@@ -153,6 +160,17 @@ async fn set_config(
         });
     }
 
+    if let Some(ui_keymap) = &value.ui_keymap {
+        data.ui_keymap = ui_keymap.parse()?;
+        Command::new("/usr/bin/localectl")
+            .args(["set-x11-keymap", &ui_keymap])
+            .output()?;
+        Command::new("/usr/bin/setxkbmap")
+            .arg(&ui_keymap)
+            .env("DISPLAY", ":0")
+            .output()?;
+    }
+
     _ = state.events.send(Event::L10nConfigChanged(changes));
 
     Ok(Json(()))
@@ -168,6 +186,7 @@ async fn get_config(State(state): State<LocaleState>) -> Json<LocaleConfig> {
         keymap: Some(data.keymap()),
         timezone: Some(data.timezone().to_string()),
         ui_locale: Some(data.ui_locale().to_string()),
+        ui_keymap: Some(data.ui_keymap.to_string()),
     })
 }
 

From 7719755cbf26d44b87a15d132d0fab0d24993324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 11 Mar 2024 12:13:03 +0000
Subject: [PATCH 034/324] Adapt InstallerL10n provider to use {Set,Get}UIKeymap
 functions

---
 web/src/client/l10n.js            | 28 ++++++++++++++++++++++++++--
 web/src/context/installerL10n.jsx | 26 +++++++-------------------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/web/src/client/l10n.js b/web/src/client/l10n.js
index 6fa54d4407..d1f7e79d12 100644
--- a/web/src/client/l10n.js
+++ b/web/src/client/l10n.js
@@ -57,7 +57,7 @@ class L10nClient {
   /**
    * Selected locale to translate the installer UI.
    *
-   * @return {Promise<String>} Locale id.
+   * @return {Promise<String>} Locale ID.
    */
   async getUILocale() {
     const config = await this.client.get("/l10n/config");
@@ -67,13 +67,37 @@ class L10nClient {
   /**
    * Sets the locale to translate the installer UI.
    *
-   * @param {String} id - Locale id.
+   * @param {String} id - Locale ID.
    * @return {Promise<void>}
    */
   async setUILocale(id) {
     return this.client.put("/l10n/config", { ui_locale: id });
   }
 
+  /**
+   * Selected keymap for the installer.
+   *
+   * This setting is only relevant in the local installation.
+   *
+   * @return {Promise<String>} Keymap ID.
+   */
+  async getUIKeymap() {
+    const config = await this.client.get("/l10n/config");
+    return config.ui_locale;
+  }
+
+  /**
+   * Sets the keymap to use in the installer.
+   *
+   * This setting is only relevant in the local installation.
+   *
+   * @param {String} id - Keymap ID.
+   * @return {Promise<void>}
+   */
+  async setUIKeymap(id) {
+    return this.client.put("/l10n/config", { ui_keymap: id });
+  }
+
   /**
    * All possible timezones for the target system.
    *
diff --git a/web/src/context/installerL10n.jsx b/web/src/context/installerL10n.jsx
index 37aeeb630b..9db8512c8d 100644
--- a/web/src/context/installerL10n.jsx
+++ b/web/src/context/installerL10n.jsx
@@ -183,17 +183,6 @@ function reload(newLanguage) {
   }
 }
 
-/**
- * Extracts the keymap from the `setxkbmap -query` output.
- *
- * @param {string} output
- * @returns {string|undefined}
- */
-function keymapFromX(output) {
-  const matcher = /^layout:\s+(\S.*)$/m;
-  return matcher.exec(output)?.at(1);
-}
-
 /**
  * This provider sets the installer locale. By default, it uses the URL "lang" query parameter or
  * the preferred locale from the browser and synchronizes the UI and the backend locales. To
@@ -258,13 +247,11 @@ function InstallerL10nProvider({ children }) {
   }, [storeInstallerLanguage, setLanguage]);
 
   const changeKeymap = useCallback(async (id) => {
+    if (!client) return;
+
     setKeymap(id);
-    // write the config to file (/etc/X11/xorg.conf.d/00-keyboard.conf),
-    // this also sets the console keyboard!
-    await cockpit.spawn(["localectl", "set-x11-keymap", id]);
-    // set the current X11 keyboard
-    await cockpit.spawn(["setxkbmap", id], { environ: ["DISPLAY=:0"] });
-  }, [setKeymap]);
+    client.l10n.setUIKeymap(id);
+  }, [setKeymap, client]);
 
   useEffect(() => {
     if (!language) changeLanguage();
@@ -278,8 +265,9 @@ function InstallerL10nProvider({ children }) {
   }, [client, language, backendPending, storeInstallerLanguage]);
 
   useEffect(() => {
-    cockpit.spawn(["setxkbmap", "-query"], { environ: ["DISPLAY=:0"] }).then(output => setKeymap(keymapFromX(output)));
-  }, [setKeymap]);
+    if (!client) return;
+    client.l10n.getUIKeymap().then(setKeymap);
+  }, [setKeymap, client]);
 
   const value = { language, changeLanguage, keymap, changeKeymap };
 

From b6304a4d45854f8b88a1830f1137943d6d950bb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 11 Mar 2024 12:15:44 +0000
Subject: [PATCH 035/324] Merge client/software imports

---
 web/src/client/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/src/client/index.js b/web/src/client/index.js
index 46b042e656..be43839529 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -24,10 +24,9 @@
 import { L10nClient } from "./l10n";
 import { ManagerClient } from "./manager";
 import { Monitor } from "./monitor";
-import { SoftwareClient } from "./software";
+import { ProductClient, SoftwareClient } from "./software";
 import { StorageClient } from "./storage";
 import { UsersClient } from "./users";
-import { ProductClient } from "./software";
 import phase from "./phase";
 import { QuestionsClient } from "./questions";
 import { NetworkClient } from "./network";

From fbde394152fc248f8df4aa27f43ad1f3aeada01b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 11:06:22 +0000
Subject: [PATCH 036/324] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David Díaz <1691872+dgdavid@users.noreply.github.com>
---
 web/src/components/core/If.jsx        | 2 +-
 web/src/components/core/LoginPage.jsx | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/src/components/core/If.jsx b/web/src/components/core/If.jsx
index a4a0d1bdd2..3cc73895cf 100644
--- a/web/src/components/core/If.jsx
+++ b/web/src/components/core/If.jsx
@@ -59,7 +59,7 @@
  *   ...
  *
  * @param {object} props
- * @param {truthy} props.condition
+ * @param {any} props.condition
  * @param {JSX.Element} [props.then=null] - the content to be rendered when the condition is true
  * @param {JSX.Element} [props.else=null] - the content to be rendered when the condition is false
  */
diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
index c64283db11..896224007d 100644
--- a/web/src/components/core/LoginPage.jsx
+++ b/web/src/components/core/LoginPage.jsx
@@ -64,6 +64,8 @@ export default function LoginPage() {
           <p
             dangerouslySetInnerHTML={{
               __html: sprintf(
+               // TRANSLATORS: An explanation about required privileges for login into the installer. %s
+               // will be replaced by "root"
                 _("The installer requires %s user privileges. Please, provide its password to log into the system."),
                 "<b>root</b>"
               )

From 06271eb6ed3c5fba0482762ac3541431a6eb8cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 11:31:58 +0000
Subject: [PATCH 037/324] Be consistent when using the URL constructor

---
 web/src/client/http.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/client/http.js b/web/src/client/http.js
index 4ef569a591..a30aaf1eff 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -87,7 +87,7 @@ class HTTPClient {
     httpUrl.pathname = url.pathname.concat("api");
     this.baseUrl = httpUrl.toString();
 
-    const wsUrl = new URL(url);
+    const wsUrl = new URL(url.toString());
     wsUrl.pathname = wsUrl.pathname.concat("api/ws");
     wsUrl.protocol = (url.protocol === "http:") ? "ws" : "wss";
     this.ws = new WSClient(wsUrl);

From 6a402e62b258ba6eee5e7159bd07b282c5471a8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 11:14:18 +0000
Subject: [PATCH 038/324] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Knut Alejandro Anderssen González <kanderssen@suse.de>
---
 rust/WEB-SERVER.md                | 2 +-
 rust/agama-server/src/web/http.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/WEB-SERVER.md b/rust/WEB-SERVER.md
index 4d462e0085..8e91bc671a 100644
--- a/rust/WEB-SERVER.md
+++ b/rust/WEB-SERVER.md
@@ -71,7 +71,7 @@ The web server uses a bearer token for HTTP authentication. You can get the toke
 password to the `/auth` endpoint.
 
 ```
-$ curl http://localhost:3000/auth \
+$ curl http://localhost:3000/api/auth \
     -H "Content-Type: application/json" \
     -d '{"password": "your-password"}' 
 {"token":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDg1MTA5MzB9.3HmKAC5u4H_FigMqEa9e74OFAq40UldjlaExrOGqE0U"}⏎
diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index 9a4c0067db..d3e43780db 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -70,7 +70,7 @@ pub async fn login(
 }
 
 #[utoipa::path(delete, path = "/auth", responses(
-    (status = 204, description = "The user have been logged out")
+    (status = 204, description = "The user has been logged out")
 ))]
 pub async fn logout(_claims: TokenClaims) -> Result<impl IntoResponse, AuthError> {
     let mut headers = HeaderMap::new();

From 6bf968dfd5fad842f95e468c982f6527437d5c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 11:15:04 +0000
Subject: [PATCH 039/324] Updates from code review

---
 rust/agama-server/src/web/http.rs | 14 ++++++++------
 web/src/client/http.js            |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index d3e43780db..bbb71966c9 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -41,8 +41,8 @@ pub struct LoginRequest {
     pub password: String,
 }
 
-#[utoipa::path(post, path = "/auth", responses(
-    (status = 200, description = "The user have been successfully authenticated", body = AuthResponse)
+#[utoipa::path(post, path = "/api/auth", responses(
+    (status = 200, description = "The user has been successfully authenticated.", body = AuthResponse)
 ))]
 pub async fn login(
     State(state): State<ServiceState>,
@@ -69,8 +69,8 @@ pub async fn login(
     Ok((headers, content))
 }
 
-#[utoipa::path(delete, path = "/auth", responses(
-    (status = 204, description = "The user has been logged out")
+#[utoipa::path(delete, path = "/api/auth", responses(
+    (status = 204, description = "The user has been logged out.")
 ))]
 pub async fn logout(_claims: TokenClaims) -> Result<impl IntoResponse, AuthError> {
     let mut headers = HeaderMap::new();
@@ -82,8 +82,10 @@ pub async fn logout(_claims: TokenClaims) -> Result<impl IntoResponse, AuthError
     Ok(headers)
 }
 
-#[utoipa::path(get, path = "/auth", responses(
-    (status = 200, description = "Check whether the user is authenticated")
+/// Check whether the user is authenticated.
+#[utoipa::path(get, path = "/api/auth", responses(
+    (status = 200, description = "The user is authenticated."),
+    (status = 400, description = "The user is not authenticated.")
 ))]
 pub async fn session(_claims: TokenClaims) -> Result<(), AuthError> {
     Ok(())
diff --git a/web/src/client/http.js b/web/src/client/http.js
index a30aaf1eff..99a63bc571 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -48,7 +48,7 @@ class WSClient {
   /**
    * Registers a handler for events.
    *
-   * The handler is executer for all the events. It is up to the callback to
+   * The handler is executed for all the events. It is up to the callback to
    * filter the relevant events.
    *
    * @param {(object) => void} func - Handler function to register.

From eacd06d595607bb4e2d93050b35de9f7144d1439 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 06:17:10 +0000
Subject: [PATCH 040/324] Extend ManagerClient documentation

---
 rust/agama-lib/src/manager.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rust/agama-lib/src/manager.rs b/rust/agama-lib/src/manager.rs
index 52ad830024..6c9efe38a5 100644
--- a/rust/agama-lib/src/manager.rs
+++ b/rust/agama-lib/src/manager.rs
@@ -23,23 +23,28 @@ impl<'a> ManagerClient<'a> {
         })
     }
 
+    /// Returns the list of busy services.
     pub async fn busy_services(&self) -> Result<Vec<String>, ServiceError> {
         Ok(self.manager_proxy.busy_services().await?)
     }
 
+    /// Starts the probing process.
     pub async fn probe(&self) -> Result<(), ServiceError> {
         self.wait().await?;
         Ok(self.manager_proxy.probe().await?)
     }
 
+    /// Starts the installation.
     pub async fn install(&self) -> Result<(), ServiceError> {
         Ok(self.manager_proxy.commit().await?)
     }
 
+    /// Determines whether it is possible to start the installation.
     pub async fn can_install(&self) -> Result<bool, ServiceError> {
         Ok(self.manager_proxy.can_install().await?)
     }
 
+    /// Returns the current progress.
     pub async fn progress(&self) -> zbus::Result<Progress> {
         Progress::from_proxy(&self.progress_proxy).await
     }

From f3a95438a4b0f307ea4a4a5666f203edcd15f79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 06:18:12 +0000
Subject: [PATCH 041/324] Extend ManagerClient API

---
 rust/agama-lib/src/error.rs   |  2 ++
 rust/agama-lib/src/manager.rs | 37 +++++++++++++++++++++++++++++++++++
 rust/agama-lib/src/proxies.rs |  3 +++
 3 files changed, 42 insertions(+)

diff --git a/rust/agama-lib/src/error.rs b/rust/agama-lib/src/error.rs
index 03106ccde4..b1df6b842e 100644
--- a/rust/agama-lib/src/error.rs
+++ b/rust/agama-lib/src/error.rs
@@ -22,6 +22,8 @@ pub enum ServiceError {
     UnknownPatterns(Vec<String>),
     #[error("Could not perform action '{0}'")]
     UnsuccessfulAction(String),
+    #[error("Unknown installation phase: '{0}")]
+    UnknownInstallationPhase(u32),
 }
 
 #[derive(Error, Debug)]
diff --git a/rust/agama-lib/src/manager.rs b/rust/agama-lib/src/manager.rs
index 6c9efe38a5..8343a29956 100644
--- a/rust/agama-lib/src/manager.rs
+++ b/rust/agama-lib/src/manager.rs
@@ -4,16 +4,42 @@ use crate::{
     progress::Progress,
     proxies::{ManagerProxy, ProgressProxy},
 };
+use serde::Serialize;
 use tokio_stream::StreamExt;
 use zbus::Connection;
 
 /// D-Bus client for the manager service
+#[derive(Clone)]
 pub struct ManagerClient<'a> {
     manager_proxy: ManagerProxy<'a>,
     progress_proxy: ProgressProxy<'a>,
     status_proxy: ServiceStatusProxy<'a>,
 }
 
+/// Represents the installation phase.
+#[derive(Serialize)]
+pub enum InstallationPhase {
+    /// Start up phase.
+    Startup,
+    /// Configuration phase.
+    Config,
+    /// Installation phase.
+    Install,
+}
+
+impl TryFrom<u32> for InstallationPhase {
+    type Error = ServiceError;
+
+    fn try_from(value: u32) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(Self::Startup),
+            1 => Ok(Self::Config),
+            2 => Ok(Self::Install),
+            _ => Err(ServiceError::UnknownInstallationPhase(value)),
+        }
+    }
+}
+
 impl<'a> ManagerClient<'a> {
     pub async fn new(connection: Connection) -> zbus::Result<ManagerClient<'a>> {
         Ok(Self {
@@ -28,6 +54,12 @@ impl<'a> ManagerClient<'a> {
         Ok(self.manager_proxy.busy_services().await?)
     }
 
+    /// Returns the current installation phase.
+    pub async fn current_installation_phase(&self) -> Result<InstallationPhase, ServiceError> {
+        let phase = self.manager_proxy.current_installation_phase().await?;
+        Ok(phase.try_into()?)
+    }
+
     /// Starts the probing process.
     pub async fn probe(&self) -> Result<(), ServiceError> {
         self.wait().await?;
@@ -39,6 +71,11 @@ impl<'a> ManagerClient<'a> {
         Ok(self.manager_proxy.commit().await?)
     }
 
+    /// Executes the after installation tasks.
+    pub async fn finish(&self) -> Result<(), ServiceError> {
+        Ok(self.manager_proxy.finish().await?)
+    }
+
     /// Determines whether it is possible to start the installation.
     pub async fn can_install(&self) -> Result<bool, ServiceError> {
         Ok(self.manager_proxy.can_install().await?)
diff --git a/rust/agama-lib/src/proxies.rs b/rust/agama-lib/src/proxies.rs
index a2d8673835..5389a2d81e 100644
--- a/rust/agama-lib/src/proxies.rs
+++ b/rust/agama-lib/src/proxies.rs
@@ -57,6 +57,9 @@ trait Manager {
     /// Commit method
     fn commit(&self) -> zbus::Result<()>;
 
+    /// Finish method
+    fn finish(&self) -> zbus::Result<()>;
+
     /// Probe method
     fn probe(&self) -> zbus::Result<()>;
 

From 68ce8a14f2f5612425e4cc59e41aa61f1723d275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 06:30:53 +0000
Subject: [PATCH 042/324] Add an HTTP/JSON API for the Manager service

---
 rust/agama-lib/src/manager.rs        |  4 +-
 rust/agama-server/src/lib.rs         |  1 +
 rust/agama-server/src/manager.rs     |  2 +
 rust/agama-server/src/manager/web.rs | 94 ++++++++++++++++++++++++++++
 rust/agama-server/src/web.rs         |  2 +
 rust/agama-server/src/web/docs.rs    |  3 +
 6 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 rust/agama-server/src/manager.rs
 create mode 100644 rust/agama-server/src/manager/web.rs

diff --git a/rust/agama-lib/src/manager.rs b/rust/agama-lib/src/manager.rs
index 8343a29956..26855b922d 100644
--- a/rust/agama-lib/src/manager.rs
+++ b/rust/agama-lib/src/manager.rs
@@ -1,3 +1,5 @@
+//! This module implements the web API for the manager module.
+
 use crate::error::ServiceError;
 use crate::proxies::ServiceStatusProxy;
 use crate::{
@@ -17,7 +19,7 @@ pub struct ManagerClient<'a> {
 }
 
 /// Represents the installation phase.
-#[derive(Serialize)]
+#[derive(Serialize, utoipa::ToSchema)]
 pub enum InstallationPhase {
     /// Start up phase.
     Startup,
diff --git a/rust/agama-server/src/lib.rs b/rust/agama-server/src/lib.rs
index 1a5c30c1a2..3cb0e78344 100644
--- a/rust/agama-server/src/lib.rs
+++ b/rust/agama-server/src/lib.rs
@@ -1,5 +1,6 @@
 pub mod error;
 pub mod l10n;
+pub mod manager;
 pub mod network;
 pub mod questions;
 pub mod software;
diff --git a/rust/agama-server/src/manager.rs b/rust/agama-server/src/manager.rs
new file mode 100644
index 0000000000..033981d28b
--- /dev/null
+++ b/rust/agama-server/src/manager.rs
@@ -0,0 +1,2 @@
+pub mod web;
+pub use web::manager_service;
diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
new file mode 100644
index 0000000000..89cfa3676c
--- /dev/null
+++ b/rust/agama-server/src/manager/web.rs
@@ -0,0 +1,94 @@
+use agama_lib::{
+    error::ServiceError,
+    manager::{InstallationPhase, ManagerClient},
+};
+use axum::{
+    extract::State,
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    routing::{get, post},
+    Json, Router,
+};
+use serde::Serialize;
+use serde_json::json;
+use thiserror::Error;
+
+#[derive(Clone)]
+pub struct ManagerState<'a> {
+    manager: ManagerClient<'a>,
+}
+
+#[derive(Error, Debug)]
+pub enum ManagerError {
+    #[error("Manager service error: {0}")]
+    Error(#[from] ServiceError),
+}
+
+impl IntoResponse for ManagerError {
+    fn into_response(self) -> Response {
+        let body = json!({});
+        (StatusCode::BAD_REQUEST, Json(body)).into_response()
+    }
+}
+
+/// Holds information about the manager's status.
+#[derive(Serialize, utoipa::ToSchema)]
+pub struct ManagerStatus {
+    /// Current installation phase.
+    phase: InstallationPhase,
+    /// List of busy services.
+    busy: Vec<String>,
+}
+
+/// Sets up and returns the axum service for the manager module
+pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
+    let manager = ManagerClient::new(dbus).await?;
+    let state = ManagerState { manager };
+    Ok(Router::new()
+        .route("/probe", post(probe_action))
+        .route("/install", post(install_action))
+        .route("/finish", post(finish_action))
+        .route("/status", get(status))
+        .with_state(state))
+}
+
+/// Starts the probing process.
+#[utoipa::path(get, path = "/api/manager/probe", responses(
+  (status = 200, description = "The probing process was started.")
+))]
+async fn probe_action(State(state): State<ManagerState<'_>>) -> Result<(), ManagerError> {
+    state.manager.probe().await?;
+    Ok(())
+}
+
+/// Starts the probing process.
+#[utoipa::path(get, path = "/api/manager/install", responses(
+  (status = 200, description = "The installation process was started.")
+))]
+async fn install_action(State(state): State<ManagerState<'_>>) -> Result<(), ManagerError> {
+    state.manager.install().await?;
+    Ok(())
+}
+
+/// Executes the post installation tasks (e.g., rebooting the system).
+#[utoipa::path(get, path = "/api/manager/install", responses(
+  (status = 200, description = "The installation tasks are executed.")
+))]
+async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), ManagerError> {
+    state.manager.finish().await?;
+    Ok(())
+}
+
+/// Returns the manager status.
+#[utoipa::path(get, path = "/api/manager/status", responses(
+  (status = 200, description = "Manager status.", body = ManagerStatus)
+))]
+async fn status(
+    State(state): State<ManagerState<'_>>,
+) -> Result<Json<ManagerStatus>, ManagerError> {
+    let status = ManagerStatus {
+        phase: state.manager.current_installation_phase().await?,
+        busy: state.manager.busy_services().await?,
+    };
+    Ok(Json(status))
+}
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 8a26f1793c..d4ce9ca18f 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -8,6 +8,7 @@ use self::progress::EventsProgressPresenter;
 use crate::{
     error::Error,
     l10n::web::l10n_service,
+    manager::web::manager_service,
     software::web::{software_service, software_stream},
 };
 use axum::Router;
@@ -48,6 +49,7 @@ where
 {
     let router = MainServiceBuilder::new(events.clone(), web_ui_dir)
         .add_service("/l10n", l10n_service(events.clone()))
+        .add_service("/manager", manager_service(dbus.clone()).await?)
         .add_service("/software", software_service(dbus).await?)
         .with_config(config)
         .build();
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index d5e1249e1c..25312bf0d3 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -13,11 +13,13 @@ use utoipa::OpenApi;
         crate::software::web::patterns,
         crate::software::web::patterns,
         crate::software::web::set_config,
+        crate::manager::web::probe_action,
         super::http::ping,
     ),
     components(
         schemas(agama_lib::product::Product),
         schemas(agama_lib::software::Pattern),
+        schemas(agama_lib::manager::InstallationPhase),
         schemas(crate::l10n::Keymap),
         schemas(crate::l10n::LocaleEntry),
         schemas(crate::l10n::TimezoneEntry),
@@ -25,6 +27,7 @@ use utoipa::OpenApi;
         schemas(crate::software::web::PatternEntry),
         schemas(crate::software::web::SoftwareConfig),
         schemas(crate::software::web::SoftwareProposal),
+        schemas(crate::manager::web::ManagerStatus),
         schemas(super::http::PingResponse),
     )
 )]

From a6c8f8f7e75b2ba77a36de63ef8503afeeec2d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 07:00:20 +0000
Subject: [PATCH 043/324] Minor improvements to the software API documentation

---
 rust/agama-server/src/software/web.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index a5fc089377..dbbfb8bc19 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -1,4 +1,4 @@
-//! This module implements the web API for the software module.
+//! This module implements the web API for the software service.
 //!
 //! The module offers two public functions:
 //!
@@ -56,6 +56,8 @@ impl IntoResponse for SoftwareError {
 
 /// Returns an stream that emits software related events coming from D-Bus.
 ///
+/// It emits the Event::ProductChanged and Event::PatternsChanged events.
+///
 /// * `connection`: D-Bus connection to listen for events.
 pub async fn software_stream(dbus: zbus::Connection) -> Result<impl Stream<Item = Event>, Error> {
     Ok(StreamExt::merge(

From 404a9dc53d64394e3ed6272a1077916ea565eea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 07:00:31 +0000
Subject: [PATCH 044/324] Emit Manager events

---
 rust/agama-lib/src/manager.rs        |  2 +-
 rust/agama-server/src/l10n/web.rs    |  2 +-
 rust/agama-server/src/manager/web.rs | 69 +++++++++++++++++++++++++++-
 rust/agama-server/src/web.rs         |  7 ++-
 rust/agama-server/src/web/event.rs   |  6 ++-
 5 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/rust/agama-lib/src/manager.rs b/rust/agama-lib/src/manager.rs
index 26855b922d..6d5acc5547 100644
--- a/rust/agama-lib/src/manager.rs
+++ b/rust/agama-lib/src/manager.rs
@@ -19,7 +19,7 @@ pub struct ManagerClient<'a> {
 }
 
 /// Represents the installation phase.
-#[derive(Serialize, utoipa::ToSchema)]
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, utoipa::ToSchema)]
 pub enum InstallationPhase {
     /// Start up phase.
     Startup,
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index 6ce89a97e1..b78300b39c 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -79,7 +79,7 @@ async fn locales(State(state): State<LocaleState>) -> Json<Vec<LocaleEntry>> {
     Json(locales)
 }
 
-#[derive(Clone, Default, Serialize, Deserialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct LocaleConfig {
     /// Locales to install in the target system
     locales: Option<Vec<String>>,
diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index 89cfa3676c..a5cd413d4b 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -1,6 +1,14 @@
+//! This module implements the web API for the manager service.
+//!
+//! The module offers two public functions:
+//!
+//! * `manager_service` which returns the Axum service.
+//! * `manager_stream` which offers an stream that emits the manager events coming from D-Bus.
+
 use agama_lib::{
     error::ServiceError,
     manager::{InstallationPhase, ManagerClient},
+    proxies::ManagerProxy,
 };
 use axum::{
     extract::State,
@@ -12,6 +20,9 @@ use axum::{
 use serde::Serialize;
 use serde_json::json;
 use thiserror::Error;
+use tokio_stream::{Stream, StreamExt};
+
+use crate::{error::Error, web::Event};
 
 #[derive(Clone)]
 pub struct ManagerState<'a> {
@@ -32,7 +43,7 @@ impl IntoResponse for ManagerError {
 }
 
 /// Holds information about the manager's status.
-#[derive(Serialize, utoipa::ToSchema)]
+#[derive(Clone, Serialize, utoipa::ToSchema)]
 pub struct ManagerStatus {
     /// Current installation phase.
     phase: InstallationPhase,
@@ -40,6 +51,62 @@ pub struct ManagerStatus {
     busy: Vec<String>,
 }
 
+/// Returns a stream that emits manager related events coming from D-Bus.
+///
+/// It emits the Event::BusyServicesChanged and Event::InstallationPhaseChanged events.
+///
+/// * `connection`: D-Bus connection to listen for events.
+pub async fn manager_stream(dbus: zbus::Connection) -> Result<impl Stream<Item = Event>, Error> {
+    Ok(StreamExt::merge(
+        busy_services_changed_stream(dbus.clone()).await?,
+        installation_phase_changed_stream(dbus.clone()).await?,
+    ))
+}
+
+pub async fn busy_services_changed_stream(
+    dbus: zbus::Connection,
+) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = ManagerProxy::new(&dbus).await?;
+    let stream = proxy
+        .receive_busy_services_changed()
+        .await
+        .then(|change| async move {
+            if let Ok(busy_services) = change.get().await {
+                Some(Event::BusyServicesChanged {
+                    services: busy_services,
+                })
+            } else {
+                None
+            }
+        })
+        .filter_map(|e| e);
+    Ok(stream)
+}
+
+pub async fn installation_phase_changed_stream(
+    dbus: zbus::Connection,
+) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = ManagerProxy::new(&dbus).await?;
+    let stream = proxy
+        .receive_current_installation_phase_changed()
+        .await
+        .then(|change| async move {
+            if let Ok(phase) = change.get().await {
+                match InstallationPhase::try_from(phase) {
+                    Ok(phase) => Some(Event::InstallationPhaseChanged { phase }),
+                    Err(error) => {
+                        log::warn!("Ignoring the installation phase change. Error: {}", error);
+                        None
+                    }
+                }
+            } else {
+                None
+            }
+        })
+        .filter_map(|e| e);
+    Ok(stream)
+}
+
 /// Sets up and returns the axum service for the manager module
 pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
     let manager = ManagerClient::new(dbus).await?;
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index d4ce9ca18f..0d4a3a67ff 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -8,7 +8,7 @@ use self::progress::EventsProgressPresenter;
 use crate::{
     error::Error,
     l10n::web::l10n_service,
-    manager::web::manager_service,
+    manager::web::{manager_service, manager_stream},
     software::web::{software_service, software_stream},
 };
 use axum::Router;
@@ -80,7 +80,10 @@ pub async fn run_monitor(events: EventsSender) -> Result<(), ServiceError> {
 /// * `connection`: D-Bus connection.
 /// * `events`: channel to send the events to.
 pub async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Result<(), Error> {
-    let stream = software_stream(dbus).await?;
+    let stream = StreamExt::merge(
+        manager_stream(dbus.clone()).await?,
+        software_stream(dbus).await?,
+    );
     tokio::pin!(stream);
     let e = events.clone();
     while let Some(event) = stream.next().await {
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index c94c3e42f6..35c7687c66 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -1,10 +1,10 @@
 use crate::l10n::web::LocaleConfig;
-use agama_lib::{progress::Progress, software::SelectedBy};
+use agama_lib::{manager::InstallationPhase, progress::Progress, software::SelectedBy};
 use serde::Serialize;
 use std::collections::HashMap;
 use tokio::sync::broadcast::{Receiver, Sender};
 
-#[derive(Clone, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 #[serde(tag = "type")]
 pub enum Event {
     L10nConfigChanged(LocaleConfig),
@@ -12,6 +12,8 @@ pub enum Event {
     Progress(Progress),
     ProductChanged { id: String },
     PatternsChanged(HashMap<String, SelectedBy>),
+    InstallationPhaseChanged { phase: InstallationPhase },
+    BusyServicesChanged { services: Vec<String> },
 }
 
 pub type EventsSender = Sender<Event>;

From 293e2dde551ba3a298ac9d2339ec1542b62c7ce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 12:02:41 +0000
Subject: [PATCH 045/324] Add missing items to the OpenAPI documentation

---
 rust/agama-server/src/web/docs.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 25312bf0d3..350e344fac 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -14,6 +14,9 @@ use utoipa::OpenApi;
         crate::software::web::patterns,
         crate::software::web::set_config,
         crate::manager::web::probe_action,
+        crate::manager::web::install_action,
+        crate::manager::web::finish_action,
+        crate::manager::web::status,
         super::http::ping,
     ),
     components(

From 32cd7817aac7b5bc1d76db63e13e7b4b8add0d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 13:33:18 +0000
Subject: [PATCH 046/324] Update the Manage1 proxy

---
 rust/agama-lib/src/manager.rs        | 6 +++---
 rust/agama-lib/src/proxies.rs        | 8 ++++++--
 rust/agama-server/src/manager/web.rs | 6 +++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/rust/agama-lib/src/manager.rs b/rust/agama-lib/src/manager.rs
index 6d5acc5547..f341c4d66f 100644
--- a/rust/agama-lib/src/manager.rs
+++ b/rust/agama-lib/src/manager.rs
@@ -4,7 +4,7 @@ use crate::error::ServiceError;
 use crate::proxies::ServiceStatusProxy;
 use crate::{
     progress::Progress,
-    proxies::{ManagerProxy, ProgressProxy},
+    proxies::{Manager1Proxy, ProgressProxy},
 };
 use serde::Serialize;
 use tokio_stream::StreamExt;
@@ -13,7 +13,7 @@ use zbus::Connection;
 /// D-Bus client for the manager service
 #[derive(Clone)]
 pub struct ManagerClient<'a> {
-    manager_proxy: ManagerProxy<'a>,
+    manager_proxy: Manager1Proxy<'a>,
     progress_proxy: ProgressProxy<'a>,
     status_proxy: ServiceStatusProxy<'a>,
 }
@@ -45,7 +45,7 @@ impl TryFrom<u32> for InstallationPhase {
 impl<'a> ManagerClient<'a> {
     pub async fn new(connection: Connection) -> zbus::Result<ManagerClient<'a>> {
         Ok(Self {
-            manager_proxy: ManagerProxy::new(&connection).await?,
+            manager_proxy: Manager1Proxy::new(&connection).await?,
             progress_proxy: ProgressProxy::new(&connection).await?,
             status_proxy: ServiceStatusProxy::new(&connection).await?,
         })
diff --git a/rust/agama-lib/src/proxies.rs b/rust/agama-lib/src/proxies.rs
index 5389a2d81e..d460e88548 100644
--- a/rust/agama-lib/src/proxies.rs
+++ b/rust/agama-lib/src/proxies.rs
@@ -47,12 +47,12 @@ trait ServiceStatus {
     default_service = "org.opensuse.Agama.Manager1",
     default_path = "/org/opensuse/Agama/Manager1"
 )]
-trait Manager {
+trait Manager1 {
     /// CanInstall method
     fn can_install(&self) -> zbus::Result<bool>;
 
     /// CollectLogs method
-    fn collect_logs(&self, user: &str) -> zbus::Result<String>;
+    fn collect_logs(&self) -> zbus::Result<String>;
 
     /// Commit method
     fn commit(&self) -> zbus::Result<()>;
@@ -71,6 +71,10 @@ trait Manager {
     #[dbus_proxy(property)]
     fn current_installation_phase(&self) -> zbus::Result<u32>;
 
+    /// IguanaBackend property
+    #[dbus_proxy(property)]
+    fn iguana_backend(&self) -> zbus::Result<bool>;
+
     /// InstallationPhases property
     #[dbus_proxy(property)]
     fn installation_phases(
diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index a5cd413d4b..2b30b91aaa 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -8,7 +8,7 @@
 use agama_lib::{
     error::ServiceError,
     manager::{InstallationPhase, ManagerClient},
-    proxies::ManagerProxy,
+    proxies::Manager1Proxy,
 };
 use axum::{
     extract::State,
@@ -66,7 +66,7 @@ pub async fn manager_stream(dbus: zbus::Connection) -> Result<impl Stream<Item =
 pub async fn busy_services_changed_stream(
     dbus: zbus::Connection,
 ) -> Result<impl Stream<Item = Event>, Error> {
-    let proxy = ManagerProxy::new(&dbus).await?;
+    let proxy = Manager1Proxy::new(&dbus).await?;
     let stream = proxy
         .receive_busy_services_changed()
         .await
@@ -86,7 +86,7 @@ pub async fn busy_services_changed_stream(
 pub async fn installation_phase_changed_stream(
     dbus: zbus::Connection,
 ) -> Result<impl Stream<Item = Event>, Error> {
-    let proxy = ManagerProxy::new(&dbus).await?;
+    let proxy = Manager1Proxy::new(&dbus).await?;
     let stream = proxy
         .receive_current_installation_phase_changed()
         .await

From 0b77b00bef435d03fecf354276588972ddcef94d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 12 Mar 2024 13:49:41 +0000
Subject: [PATCH 047/324] Move /status to /installer

* Expose CanInstall and IguanaBackend too.
---
 rust/agama-lib/src/manager.rs        |  5 +++++
 rust/agama-server/src/manager/web.rs | 20 +++++++++++++-------
 rust/agama-server/src/web/docs.rs    |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/rust/agama-lib/src/manager.rs b/rust/agama-lib/src/manager.rs
index f341c4d66f..4596f18845 100644
--- a/rust/agama-lib/src/manager.rs
+++ b/rust/agama-lib/src/manager.rs
@@ -83,6 +83,11 @@ impl<'a> ManagerClient<'a> {
         Ok(self.manager_proxy.can_install().await?)
     }
 
+    /// Determines whether the installer is running on Iguana.
+    pub async fn use_iguana(&self) -> Result<bool, ServiceError> {
+        Ok(self.manager_proxy.iguana_backend().await?)
+    }
+
     /// Returns the current progress.
     pub async fn progress(&self) -> zbus::Result<Progress> {
         Progress::from_proxy(&self.progress_proxy).await
diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index 2b30b91aaa..fdf3c7a435 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -44,11 +44,15 @@ impl IntoResponse for ManagerError {
 
 /// Holds information about the manager's status.
 #[derive(Clone, Serialize, utoipa::ToSchema)]
-pub struct ManagerStatus {
+pub struct InstallerStatus {
     /// Current installation phase.
     phase: InstallationPhase,
     /// List of busy services.
     busy: Vec<String>,
+    /// Whether Agama is running on Iguana.
+    iguana: bool,
+    /// Whether it is possible to start the installation.
+    can_install: bool,
 }
 
 /// Returns a stream that emits manager related events coming from D-Bus.
@@ -115,7 +119,7 @@ pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
         .route("/probe", post(probe_action))
         .route("/install", post(install_action))
         .route("/finish", post(finish_action))
-        .route("/status", get(status))
+        .route("/installer", get(installer_status))
         .with_state(state))
 }
 
@@ -147,15 +151,17 @@ async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), Mana
 }
 
 /// Returns the manager status.
-#[utoipa::path(get, path = "/api/manager/status", responses(
-  (status = 200, description = "Manager status.", body = ManagerStatus)
+#[utoipa::path(get, path = "/api/manager/installer", responses(
+  (status = 200, description = "Installation status.", body = ManagerStatus)
 ))]
-async fn status(
+async fn installer_status(
     State(state): State<ManagerState<'_>>,
-) -> Result<Json<ManagerStatus>, ManagerError> {
-    let status = ManagerStatus {
+) -> Result<Json<InstallerStatus>, ManagerError> {
+    let status = InstallerStatus {
         phase: state.manager.current_installation_phase().await?,
         busy: state.manager.busy_services().await?,
+        can_install: state.manager.can_install().await?,
+        iguana: state.manager.use_iguana().await?,
     };
     Ok(Json(status))
 }
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 350e344fac..72ef8fb68c 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -30,7 +30,7 @@ use utoipa::OpenApi;
         schemas(crate::software::web::PatternEntry),
         schemas(crate::software::web::SoftwareConfig),
         schemas(crate::software::web::SoftwareProposal),
-        schemas(crate::manager::web::ManagerStatus),
+        schemas(crate::manager::web::InstallerStatus),
         schemas(super::http::PingResponse),
     )
 )]

From 3442298db6b62119afbb80cf2cbf53f7d69f3be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 07:23:38 +0000
Subject: [PATCH 048/324] Add functions to expose the ServiceStatus API

---
 rust/Cargo.lock                     |  36 ++++++++++
 rust/agama-server/Cargo.toml        |   1 +
 rust/agama-server/src/web.rs        |   1 +
 rust/agama-server/src/web/common.rs | 103 ++++++++++++++++++++++++++++
 rust/agama-server/src/web/event.rs  |   1 +
 5 files changed, 142 insertions(+)
 create mode 100644 rust/agama-server/src/web/common.rs

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 95bba7a93a..87d2ca5210 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -118,6 +118,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
+ "tokio-test",
  "tower",
  "tower-http",
  "tracing",
@@ -385,6 +386,28 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "async-stream"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "async-task"
 version = "4.5.0"
@@ -3038,6 +3061,19 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-test"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719"
+dependencies = [
+ "async-stream",
+ "bytes",
+ "futures-core",
+ "tokio",
+ "tokio-stream",
+]
+
 [[package]]
 name = "tokio-tungstenite"
 version = "0.21.0"
diff --git a/rust/agama-server/Cargo.toml b/rust/agama-server/Cargo.toml
index cb99449cfd..d03ff59cc7 100644
--- a/rust/agama-server/Cargo.toml
+++ b/rust/agama-server/Cargo.toml
@@ -59,3 +59,4 @@ path = "src/agama-web-server.rs"
 
 [dev-dependencies]
 http-body-util = "0.1.0"
+tokio-test = "0.4.3"
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 0d4a3a67ff..34fc364d2e 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -14,6 +14,7 @@ use crate::{
 use axum::Router;
 
 mod auth;
+pub mod common;
 mod config;
 mod docs;
 mod event;
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
new file mode 100644
index 0000000000..3dc7ef7a84
--- /dev/null
+++ b/rust/agama-server/src/web/common.rs
@@ -0,0 +1,103 @@
+//! This module defines functions to be used accross all services.
+
+use agama_lib::{error::ServiceError, proxies::ServiceStatusProxy};
+use axum::{extract::State, routing::get, Json, Router};
+use serde::Serialize;
+use tokio_stream::{Stream, StreamExt};
+
+use crate::error::Error;
+
+use super::Event;
+
+/// Builds a router to the `org.opensuse.Agama1.ServiceStatus`
+/// interface of the given D-Bus object.
+///
+/// ```no_run
+/// # use axum::{extract::State, routing::get, Json, Router};
+/// # use agama_lib::connection;
+/// # use agama_server::web::common::service_status_router;
+/// # use tokio_test;
+///
+/// # tokio_test::block_on(async {
+/// async fn hello(state: State<HelloWorldState>) {};
+///
+/// #[derive(Clone)]
+/// struct HelloWorldState {};
+///
+/// let dbus = connection().await.unwrap();
+/// let status_router = service_status_router(
+///   &dbus, "org.opensuse.HelloWorld", "/org/opensuse/hello"
+/// ).await.unwrap();
+/// let router: Router<HelloWorldState> = Router::new()
+///   .route("/hello", get(hello))
+///   .merge(status_router)
+///   .with_state(HelloWorldState {});
+/// });
+/// ```
+///
+/// * `dbus`: D-Bus connection.
+/// * `destination`: D-Bus service name.
+/// * `path`: D-Bus object path.
+pub async fn service_status_router<T>(
+    dbus: &zbus::Connection,
+    destination: &str,
+    path: &str,
+) -> Result<Router<T>, ServiceError> {
+    let proxy = build_service_status_proxy(dbus, destination, path).await?;
+    let state = ServiceStatusState { proxy };
+    Ok(Router::new()
+        .route("/status", get(service_status))
+        .with_state(state))
+}
+
+async fn service_status(State(state): State<ServiceStatusState<'_>>) -> Json<ServiceStatus> {
+    Json(ServiceStatus {
+        current: state.proxy.current().await.unwrap(),
+    })
+}
+
+#[derive(Clone)]
+struct ServiceStatusState<'a> {
+    proxy: ServiceStatusProxy<'a>,
+}
+
+#[derive(Clone, Serialize)]
+struct ServiceStatus {
+    /// Current service status.
+    current: u32,
+}
+
+/// Builds a stream of the changes in the the `org.opensuse.Agama1.ServiceStatus`
+/// interface of the given D-Bus object.
+pub async fn service_status_stream(
+    dbus: zbus::Connection,
+    destination: &str,
+    path: &str,
+) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = build_service_status_proxy(&dbus, destination, path).await?;
+    let stream = proxy
+        .receive_current_changed()
+        .await
+        .then(|change| async move {
+            if let Ok(status) = change.get().await {
+                Some(Event::StatusChanged { status })
+            } else {
+                None
+            }
+        })
+        .filter_map(|e| e);
+    Ok(stream)
+}
+
+async fn build_service_status_proxy<'a>(
+    dbus: &zbus::Connection,
+    destination: &str,
+    path: &str,
+) -> Result<ServiceStatusProxy<'a>, zbus::Error> {
+    let proxy = ServiceStatusProxy::builder(&dbus)
+        .destination(destination.to_string())?
+        .path(path.to_string())?
+        .build()
+        .await?;
+    Ok(proxy)
+}
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 35c7687c66..e8bd87aa8a 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -14,6 +14,7 @@ pub enum Event {
     PatternsChanged(HashMap<String, SelectedBy>),
     InstallationPhaseChanged { phase: InstallationPhase },
     BusyServicesChanged { services: Vec<String> },
+    StatusChanged { status: u32 },
 }
 
 pub type EventsSender = Sender<Event>;

From db14e4aadebb17621ded2680b5fba434e5761bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 07:25:59 +0000
Subject: [PATCH 049/324] Expose the Manager ServiceStatus over HTTP

---
 rust/agama-server/src/manager/web.rs | 27 ++++++++++++++++++++++++---
 rust/agama-server/src/web/common.rs  | 15 +++++++++++----
 rust/agama-server/src/web/docs.rs    |  1 -
 rust/agama-server/src/web/event.rs   |  2 +-
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index fdf3c7a435..86c3739537 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -22,7 +22,13 @@ use serde_json::json;
 use thiserror::Error;
 use tokio_stream::{Stream, StreamExt};
 
-use crate::{error::Error, web::Event};
+use crate::{
+    error::Error,
+    web::{
+        common::{service_status_router, service_status_stream},
+        Event,
+    },
+};
 
 #[derive(Clone)]
 pub struct ManagerState<'a> {
@@ -62,8 +68,16 @@ pub struct InstallerStatus {
 /// * `connection`: D-Bus connection to listen for events.
 pub async fn manager_stream(dbus: zbus::Connection) -> Result<impl Stream<Item = Event>, Error> {
     Ok(StreamExt::merge(
-        busy_services_changed_stream(dbus.clone()).await?,
-        installation_phase_changed_stream(dbus.clone()).await?,
+        StreamExt::merge(
+            busy_services_changed_stream(dbus.clone()).await?,
+            installation_phase_changed_stream(dbus.clone()).await?,
+        ),
+        service_status_stream(
+            dbus,
+            "org.opensuse.Agama.Manager1",
+            "/org/opensuse/Agama/Manager1",
+        )
+        .await?,
     ))
 }
 
@@ -113,6 +127,12 @@ pub async fn installation_phase_changed_stream(
 
 /// Sets up and returns the axum service for the manager module
 pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
+    let status_route = service_status_router(
+        &dbus,
+        "org.opensuse.Agama.Manager1",
+        "/org/opensuse/Agama/Manager1",
+    )
+    .await?;
     let manager = ManagerClient::new(dbus).await?;
     let state = ManagerState { manager };
     Ok(Router::new()
@@ -120,6 +140,7 @@ pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
         .route("/install", post(install_action))
         .route("/finish", post(finish_action))
         .route("/installer", get(installer_status))
+        .merge(status_route)
         .with_state(state))
 }
 
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 3dc7ef7a84..f11ffea274 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -69,18 +69,25 @@ struct ServiceStatus {
 
 /// Builds a stream of the changes in the the `org.opensuse.Agama1.ServiceStatus`
 /// interface of the given D-Bus object.
+///
+/// * `dbus`: D-Bus connection.
+/// * `destination`: D-Bus service name.
+/// * `path`: D-Bus object path.
 pub async fn service_status_stream(
     dbus: zbus::Connection,
-    destination: &str,
-    path: &str,
+    destination: &'static str,
+    path: &'static str,
 ) -> Result<impl Stream<Item = Event>, Error> {
     let proxy = build_service_status_proxy(&dbus, destination, path).await?;
     let stream = proxy
         .receive_current_changed()
         .await
-        .then(|change| async move {
+        .then(move |change| async move {
             if let Ok(status) = change.get().await {
-                Some(Event::StatusChanged { status })
+                Some(Event::ServiceStatusChanged {
+                    service: destination.to_string(),
+                    status,
+                })
             } else {
                 None
             }
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 72ef8fb68c..386a190c25 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -1,5 +1,4 @@
 use utoipa::OpenApi;
-
 #[derive(OpenApi)]
 #[openapi(
     info(description = "Agama web API description"),
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index e8bd87aa8a..a67317cdd0 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -14,7 +14,7 @@ pub enum Event {
     PatternsChanged(HashMap<String, SelectedBy>),
     InstallationPhaseChanged { phase: InstallationPhase },
     BusyServicesChanged { services: Vec<String> },
-    StatusChanged { status: u32 },
+    ServiceStatusChanged { service: String, status: u32 },
 }
 
 pub type EventsSender = Sender<Event>;

From 108c741b7a736bb9e49eb728b41721e540254e24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 07:26:08 +0000
Subject: [PATCH 050/324] Fix OpenAPI documentation

---
 rust/agama-server/src/web/docs.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 386a190c25..34ded88acf 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -15,7 +15,7 @@ use utoipa::OpenApi;
         crate::manager::web::probe_action,
         crate::manager::web::install_action,
         crate::manager::web::finish_action,
-        crate::manager::web::status,
+        crate::manager::web::installer_status,
         super::http::ping,
     ),
     components(

From cf8ce2e9350694791f7bb86ec71b71aa40d43e12 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 13 Mar 2024 16:52:40 +0100
Subject: [PATCH 051/324] first draft of questions API in http

---
 rust/agama-lib/src/proxies.rs          |   2 +-
 rust/agama-server/src/questions.rs     |   3 +-
 rust/agama-server/src/questions/web.rs | 151 +++++++++++++++++++++++++
 rust/agama-server/src/web.rs           |   1 +
 rust/agama-server/src/web/event.rs     |   1 +
 5 files changed, 156 insertions(+), 2 deletions(-)
 create mode 100644 rust/agama-server/src/questions/web.rs

diff --git a/rust/agama-lib/src/proxies.rs b/rust/agama-lib/src/proxies.rs
index a2d8673835..aefea02df9 100644
--- a/rust/agama-lib/src/proxies.rs
+++ b/rust/agama-lib/src/proxies.rs
@@ -89,7 +89,7 @@ trait Questions1 {
 
     /// New method
     #[dbus_proxy(name = "New")]
-    fn new_quetion(
+    fn new_question(
         &self,
         class: &str,
         text: &str,
diff --git a/rust/agama-server/src/questions.rs b/rust/agama-server/src/questions.rs
index fda860bf6d..8b4e6eb148 100644
--- a/rust/agama-server/src/questions.rs
+++ b/rust/agama-server/src/questions.rs
@@ -6,6 +6,7 @@ use log;
 use zbus::{dbus_interface, fdo::ObjectManager, zvariant::ObjectPath, Connection};
 
 mod answers;
+pub mod web;
 
 #[derive(Clone, Debug)]
 struct GenericQuestionObject(questions::GenericQuestion);
@@ -94,7 +95,7 @@ trait AnswerStrategy {
     ///
     /// I gets as argument the question to answer. Returned value is pair
     /// of `answer` and `password` properties. If `None` is used in any
-    /// position it means that this object does not respond to given property.
+    /// position it means thatpam-devel this object does not respond to given property.
     ///
     /// It is object responsibility to provide correct pair. For example if
     /// possible answer can be "Ok" and "Cancel". Then for `Ok` password value
diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
new file mode 100644
index 0000000000..73639814a4
--- /dev/null
+++ b/rust/agama-server/src/questions/web.rs
@@ -0,0 +1,151 @@
+//! This module implements the web API for the software module.
+//!
+//! The module offers two public functions:
+//!
+//! * `questions_service` which returns the Axum service.
+//! * `questions_stream` which offers an stream that emits questions related signals.
+
+use std::collections::HashMap;
+use crate::{error::Error, web::Event};
+use agama_lib::{
+    error::ServiceError, proxies::Questions1Proxy,
+};
+use axum::{
+    extract::{State, Path},
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    routing::{get, put},
+    Json, Router,
+};
+use tokio_stream::{Stream, StreamExt};
+use zbus::fdo::ObjectManagerProxy;
+use thiserror::Error;
+use serde::{Deserialize, Serialize};
+use serde_json::json;
+
+// TODO: move to lib
+#[derive(Clone)]
+struct QuestionsClient<'a> {
+    connection: zbus::Connection,
+    questions_proxy: Questions1Proxy<'a>,
+    objects_proxy: ObjectManagerProxy<'a>,
+}
+
+impl<'a> QuestionsClient<'a> {
+    pub async fn new(dbus: zbus::Connection) -> Result<Self, zbus::Error> {
+        Ok(Self {
+            connection: dbus.clone(),
+            questions_proxy: Questions1Proxy::new(&dbus).await?,
+            objects_proxy: ObjectManagerProxy::new(&dbus).await?
+        })
+    }
+
+    pub async fn questions(self) -> Result<Vec<Question>, ServiceError> {
+        // TODO: real call to dbus
+        Ok(vec![])
+    }
+}
+
+#[derive(Error, Debug)]
+pub enum QuestionsError {
+    #[error("Question service error: {0}")]
+    Error(#[from] ServiceError),
+}
+
+impl IntoResponse for QuestionsError {
+    fn into_response(self) -> Response {
+        let body = json!({
+            "error": self.to_string()
+        });
+        (StatusCode::BAD_REQUEST, Json(body)).into_response()
+    }
+}
+
+#[derive(Clone)]
+struct QuestionsState<'a> {
+    questions: QuestionsClient<'a>,
+}
+
+#[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Question {
+    generic: GenericQuestion,
+    with_password: Option<QuestionWithPassword>,
+}
+
+/// Facade of agama_lib::questions::GenericQuestion
+/// For fields details see it.
+#[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct GenericQuestion {
+    id: u32,
+    class: String,
+    text: String,
+    options: Vec<String>,
+    default_option: String,
+    data: HashMap<String, String>
+}
+
+/// Facade of agama_lib::questions::WithPassword
+/// For fields details see it.
+#[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct QuestionWithPassword {
+    password: String
+}
+
+#[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Answer {
+    generic: GenericAnswer,
+    with_password: Option<PasswordAnswer>,
+}
+
+/// Answer needed for GenericQuestion
+#[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct GenericAnswer {
+    answer: String
+}
+
+/// Answer needed for Password specific questions.
+#[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct PasswordAnswer {
+    password: String
+}
+/// Sets up and returns the axum service for the questions module.
+pub async fn questions_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
+    let questions = QuestionsClient::new(dbus.clone()).await?;
+    let state = QuestionsState { questions };
+    let router = Router::new()
+        .route("/questions", get(list_questions))
+        .route("/questions/:id/answer", put(answer))
+        .with_state(state);
+    Ok(router)
+}
+
+pub async fn questions_stream(dbus: zbus::Connection) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = ObjectManagerProxy::new(&dbus).await?;
+    let add_stream = proxy
+        .receive_interfaces_added()
+        .await?
+        .then(|_| async move {
+            Event::QuestionsChanged
+        });
+    let remove_stream = proxy
+        .receive_interfaces_removed()
+        .await?
+        .then(|_| async move {
+            Event::QuestionsChanged
+        });
+    Ok(StreamExt::merge(add_stream, remove_stream))
+}
+
+async fn list_questions(State(state): State<QuestionsState<'_>>
+    ) -> Result<Json<Vec<Question>>, QuestionsError> {
+  Ok(Json(state.questions.questions().await?))
+}
+
+async fn answer(
+State(state): State<QuestionsState<'_>>,
+Path(question_id): Path<u32>,
+Json(answer): Json<Answer>
+) -> Result<(), QuestionsError> {
+    //TODO: real answer
+    Ok(())
+}
\ No newline at end of file
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index b088528589..c5e754df4e 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -9,6 +9,7 @@ use crate::{
     error::Error,
     l10n::web::l10n_service,
     software::web::{software_service, software_stream},
+    questions::web::{questions_service, questions_stream}
 };
 use axum::Router;
 
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index a84956c2f3..9ccac0209e 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -10,6 +10,7 @@ pub enum Event {
     Progress(Progress),
     ProductChanged { id: String },
     PatternsChanged(HashMap<String, SelectedBy>),
+    QuestionsChanged
 }
 
 pub type EventsSender = Sender<Event>;

From 967aef347878b388def5677dc211d3e3a7cfedd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 14:43:35 +0000
Subject: [PATCH 052/324] Use consts in the manager_service function

---
 rust/agama-server/src/manager/web.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index 86c3739537..fb5b1ebf73 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -127,12 +127,11 @@ pub async fn installation_phase_changed_stream(
 
 /// Sets up and returns the axum service for the manager module
 pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
-    let status_route = service_status_router(
-        &dbus,
-        "org.opensuse.Agama.Manager1",
-        "/org/opensuse/Agama/Manager1",
-    )
-    .await?;
+    const DBUS_SERVICE: &'static str = "org.opensuse.Agama.Manager1";
+    const DBUS_PATH: &'static str = "/org/opensuse/Agama/Manager1";
+
+    let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+    let progress_router = progress_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let manager = ManagerClient::new(dbus).await?;
     let state = ManagerState { manager };
     Ok(Router::new()

From 44cf3bf8c7e33fa0da792878a1750fa8264dc465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 16:11:17 +0000
Subject: [PATCH 053/324] Add support to expose the Progress API

---
 rust/Cargo.lock                     |   9 +-
 rust/agama-lib/src/progress.rs      |  13 +++
 rust/agama-server/Cargo.toml        |   1 +
 rust/agama-server/src/web/common.rs | 127 +++++++++++++++++++++++++++-
 rust/agama-server/src/web/event.rs  |  27 ++++--
 5 files changed, 166 insertions(+), 11 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 87d2ca5210..1a7deead07 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -107,6 +107,7 @@ dependencies = [
  "macaddr",
  "once_cell",
  "pam",
+ "pin-project",
  "rand",
  "regex",
  "serde",
@@ -2276,18 +2277,18 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.4"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/rust/agama-lib/src/progress.rs b/rust/agama-lib/src/progress.rs
index b79db61195..ab9bd5aa89 100644
--- a/rust/agama-lib/src/progress.rs
+++ b/rust/agama-lib/src/progress.rs
@@ -78,6 +78,19 @@ impl Progress {
             finished: finished?,
         })
     }
+
+    pub fn from_cached_proxy(proxy: &crate::proxies::ProgressProxy<'_>) -> Option<Progress> {
+        let (current_step, current_title) = proxy.cached_current_step().ok()??;
+        let max_steps = proxy.cached_total_steps().ok()??;
+        let finished = proxy.cached_finished().ok()??;
+
+        Some(Progress {
+            current_step,
+            current_title,
+            max_steps,
+            finished,
+        })
+    }
 }
 
 /// Monitorizes and reports the progress of Agama's current operation.
diff --git a/rust/agama-server/Cargo.toml b/rust/agama-server/Cargo.toml
index d03ff59cc7..1e6cd6652f 100644
--- a/rust/agama-server/Cargo.toml
+++ b/rust/agama-server/Cargo.toml
@@ -48,6 +48,7 @@ chrono = { version = "0.4.34", default-features = false, features = [
 ] }
 pam = "0.8.0"
 serde_with = "3.6.1"
+pin-project = "1.1.5"
 
 [[bin]]
 name = "agama-dbus-server"
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index f11ffea274..c5dfccfbc9 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -1,9 +1,17 @@
 //! This module defines functions to be used accross all services.
 
-use agama_lib::{error::ServiceError, proxies::ServiceStatusProxy};
+use std::task::Poll;
+
+use agama_lib::{
+    error::ServiceError,
+    progress::Progress,
+    proxies::{ProgressProxy, ServiceStatusProxy},
+};
 use axum::{extract::State, routing::get, Json, Router};
+use pin_project::pin_project;
 use serde::Serialize;
 use tokio_stream::{Stream, StreamExt};
+use zbus::PropertyStream;
 
 use crate::error::Error;
 
@@ -108,3 +116,120 @@ async fn build_service_status_proxy<'a>(
         .await?;
     Ok(proxy)
 }
+
+/// Builds a router to the `org.opensuse.Agama1.Progress`
+/// interface of the given D-Bus object.
+///
+/// ```no_run
+/// # use axum::{extract::State, routing::get, Json, Router};
+/// # use agama_lib::connection;
+/// # use agama_server::web::common::progress_router;
+/// # use tokio_test;
+///
+/// # tokio_test::block_on(async {
+/// async fn hello(state: State<HelloWorldState>) {};
+///
+/// #[derive(Clone)]
+/// struct HelloWorldState {};
+///
+/// let dbus = connection().await.unwrap();
+/// let progress_router = progress_router(
+///   &dbus, "org.opensuse.HelloWorld", "/org/opensuse/hello"
+/// ).await.unwrap();
+/// let router: Router<HelloWorldState> = Router::new()
+///   .route("/hello", get(hello))
+///   .merge(progress)
+///   .with_state(HelloWorldState {});
+/// });
+/// ```
+///
+/// * `dbus`: D-Bus connection.
+/// * `destination`: D-Bus service name.
+/// * `path`: D-Bus object path.
+pub async fn progress_router<T>(
+    dbus: &zbus::Connection,
+    destination: &str,
+    path: &str,
+) -> Result<Router<T>, ServiceError> {
+    let proxy = build_progress_proxy(dbus, destination, path).await?;
+    let state = ProgressState { proxy };
+    Ok(Router::new()
+        .route("/progress", get(progress))
+        .with_state(state))
+}
+
+#[derive(Clone)]
+struct ProgressState<'a> {
+    proxy: ProgressProxy<'a>,
+}
+
+async fn progress(State(state): State<ProgressState<'_>>) -> Json<Progress> {
+    let proxy = state.proxy;
+    let progress = Progress::from_proxy(&proxy).await.unwrap();
+    Json(progress)
+}
+
+#[pin_project]
+pub struct ProgressStream<'a> {
+    #[pin]
+    inner: PropertyStream<'a, (u32, String)>,
+    proxy: ProgressProxy<'a>,
+}
+
+pub async fn progress_stream<'a>(
+    dbus: zbus::Connection,
+    destination: &'static str,
+    path: &'static str,
+) -> ProgressStream<'a> {
+    let proxy = build_progress_proxy(&dbus, destination, path)
+        .await
+        .unwrap();
+    ProgressStream::new(proxy).await
+}
+
+impl<'a> ProgressStream<'a> {
+    pub async fn new(proxy: ProgressProxy<'a>) -> Self {
+        let stream = proxy.receive_current_step_changed().await;
+        ProgressStream {
+            inner: stream,
+            proxy,
+        }
+    }
+}
+
+impl<'a> Stream for ProgressStream<'a> {
+    type Item = Event;
+
+    fn poll_next(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Option<Self::Item>> {
+        let pinned = self.project();
+        match pinned.inner.poll_next(cx) {
+            Poll::Pending => Poll::Pending,
+            Poll::Ready(_change) => match Progress::from_cached_proxy(&pinned.proxy) {
+                Some(progress) => {
+                    let event = Event::Progress {
+                        progress,
+                        service: pinned.proxy.destination().to_string(),
+                    };
+                    Poll::Ready(Some(event))
+                }
+                _ => Poll::Pending,
+            },
+        }
+    }
+}
+
+async fn build_progress_proxy<'a>(
+    dbus: &zbus::Connection,
+    destination: &str,
+    path: &str,
+) -> Result<ProgressProxy<'a>, zbus::Error> {
+    let proxy = ProgressProxy::builder(&dbus)
+        .destination(destination.to_string())?
+        .path(path.to_string())?
+        .build()
+        .await?;
+    Ok(proxy)
+}
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index a67317cdd0..045d4804ba 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -8,13 +8,28 @@ use tokio::sync::broadcast::{Receiver, Sender};
 #[serde(tag = "type")]
 pub enum Event {
     L10nConfigChanged(LocaleConfig),
-    LocaleChanged { locale: String },
-    Progress(Progress),
-    ProductChanged { id: String },
+    LocaleChanged {
+        locale: String,
+    },
+    Progress {
+        service: String,
+        #[serde(flatten)]
+        progress: Progress,
+    },
+    ProductChanged {
+        id: String,
+    },
     PatternsChanged(HashMap<String, SelectedBy>),
-    InstallationPhaseChanged { phase: InstallationPhase },
-    BusyServicesChanged { services: Vec<String> },
-    ServiceStatusChanged { service: String, status: u32 },
+    InstallationPhaseChanged {
+        phase: InstallationPhase,
+    },
+    BusyServicesChanged {
+        services: Vec<String>,
+    },
+    ServiceStatusChanged {
+        service: String,
+        status: u32,
+    },
 }
 
 pub type EventsSender = Sender<Event>;

From 6a40c3e158d82c0041f915c798aaa1cbebb91bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 16:12:00 +0000
Subject: [PATCH 054/324] Expose the Manager Progress over HTTP

---
 rust/agama-server/src/manager/web.rs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index fb5b1ebf73..58dd72b3a0 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -25,7 +25,7 @@ use tokio_stream::{Stream, StreamExt};
 use crate::{
     error::Error,
     web::{
-        common::{service_status_router, service_status_stream},
+        common::{progress_router, progress_stream, service_status_router, service_status_stream},
         Event,
     },
 };
@@ -69,15 +69,23 @@ pub struct InstallerStatus {
 pub async fn manager_stream(dbus: zbus::Connection) -> Result<impl Stream<Item = Event>, Error> {
     Ok(StreamExt::merge(
         StreamExt::merge(
-            busy_services_changed_stream(dbus.clone()).await?,
-            installation_phase_changed_stream(dbus.clone()).await?,
+            StreamExt::merge(
+                busy_services_changed_stream(dbus.clone()).await?,
+                installation_phase_changed_stream(dbus.clone()).await?,
+            ),
+            service_status_stream(
+                dbus.clone(),
+                "org.opensuse.Agama.Manager1",
+                "/org/opensuse/Agama/Manager1",
+            )
+            .await?,
         ),
-        service_status_stream(
+        progress_stream(
             dbus,
             "org.opensuse.Agama.Manager1",
             "/org/opensuse/Agama/Manager1",
         )
-        .await?,
+        .await,
     ))
 }
 
@@ -139,7 +147,8 @@ pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
         .route("/install", post(install_action))
         .route("/finish", post(finish_action))
         .route("/installer", get(installer_status))
-        .merge(status_route)
+        .merge(status_router)
+        .merge(progress_router)
         .with_state(state))
 }
 

From 81fe8507b8bf08b411befb07a5cc6614d190def1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 16:15:34 +0000
Subject: [PATCH 055/324] Drop the EventsProgressPresenter

* It is replaced by the ProgressStream.
---
 rust/agama-server/src/web.rs          | 13 ++-------
 rust/agama-server/src/web/progress.rs | 40 ---------------------------
 2 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 rust/agama-server/src/web/progress.rs

diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 34fc364d2e..06d4cdd550 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -4,7 +4,6 @@
 //! * Emit relevant events via websocket.
 //! * Serve the code for the web user interface (not implemented yet).
 
-use self::progress::EventsProgressPresenter;
 use crate::{
     error::Error,
     l10n::web::l10n_service,
@@ -19,12 +18,11 @@ mod config;
 mod docs;
 mod event;
 mod http;
-mod progress;
 mod service;
 mod state;
 mod ws;
 
-use agama_lib::{connection, error::ServiceError, progress::ProgressMonitor};
+use agama_lib::{connection, error::ServiceError};
 pub use auth::generate_token;
 pub use config::ServiceConfig;
 pub use docs::ApiDoc;
@@ -63,14 +61,7 @@ where
 ///
 /// * `events`: channel to send the events to.
 pub async fn run_monitor(events: EventsSender) -> Result<(), ServiceError> {
-    let presenter = EventsProgressPresenter::new(events.clone());
     let connection = connection().await?;
-    let mut monitor = ProgressMonitor::new(connection.clone()).await?;
-    tokio::spawn(async move {
-        if let Err(error) = monitor.run(presenter).await {
-            eprintln!("Could not monitor the D-Bus server: {}", error);
-        }
-    });
     tokio::spawn(run_events_monitor(connection, events.clone()));
 
     Ok(())
@@ -80,7 +71,7 @@ pub async fn run_monitor(events: EventsSender) -> Result<(), ServiceError> {
 ///
 /// * `connection`: D-Bus connection.
 /// * `events`: channel to send the events to.
-pub async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Result<(), Error> {
+async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Result<(), Error> {
     let stream = StreamExt::merge(
         manager_stream(dbus.clone()).await?,
         software_stream(dbus).await?,
diff --git a/rust/agama-server/src/web/progress.rs b/rust/agama-server/src/web/progress.rs
deleted file mode 100644
index c892edd8ed..0000000000
--- a/rust/agama-server/src/web/progress.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-//! Implements a mechanism to monitor track service progress.
-
-use super::event::{Event, EventsSender};
-use agama_lib::progress::{Progress, ProgressPresenter};
-use async_trait::async_trait;
-
-// let presenter = EventsProgressPresenter::new(socket);
-// let mut monitor = ProgressMonitor::new(connection).await.unwrap();
-// _ = monitor.run(presenter).await;
-
-/// Experimental ProgressPresenter to emit progress events over a Events.
-pub struct EventsProgressPresenter(EventsSender);
-
-impl EventsProgressPresenter {
-    pub fn new(events: EventsSender) -> Self {
-        Self(events)
-    }
-
-    pub async fn report_progress(&mut self, progress: &Progress) {
-        _ = self.0.send(Event::Progress(progress.clone()))
-        // _ = self.events.send(Message::Text(payload)).await;
-    }
-}
-
-#[async_trait]
-impl ProgressPresenter for EventsProgressPresenter {
-    async fn start(&mut self, progress: &Progress) {
-        self.report_progress(progress).await;
-    }
-
-    async fn update_main(&mut self, progress: &Progress) {
-        self.report_progress(progress).await;
-    }
-
-    async fn update_detail(&mut self, progress: &Progress) {
-        self.report_progress(progress).await;
-    }
-
-    async fn finish(&mut self) {}
-}

From dd88614ddbde57c6a3364da8e9e64342cf60b125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 13 Mar 2024 16:18:35 +0000
Subject: [PATCH 056/324] Expose Software ServiceStatus and Progress APIs

---
 rust/agama-server/src/software/web.rs | 36 ++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index dbbfb8bc19..cb12ec2491 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -5,7 +5,13 @@
 //! * `software_service` which returns the Axum service.
 //! * `software_stream` which offers an stream that emits the software events coming from D-Bus.
 
-use crate::{error::Error, web::Event};
+use crate::{
+    error::Error,
+    web::{
+        common::{progress_router, progress_stream, service_status_router, service_status_stream},
+        Event,
+    },
+};
 use agama_lib::{
     error::ServiceError,
     product::{Product, ProductClient},
@@ -61,8 +67,24 @@ impl IntoResponse for SoftwareError {
 /// * `connection`: D-Bus connection to listen for events.
 pub async fn software_stream(dbus: zbus::Connection) -> Result<impl Stream<Item = Event>, Error> {
     Ok(StreamExt::merge(
-        product_changed_stream(dbus.clone()).await?,
-        patterns_changed_stream(dbus.clone()).await?,
+        StreamExt::merge(
+            StreamExt::merge(
+                product_changed_stream(dbus.clone()).await?,
+                patterns_changed_stream(dbus.clone()).await?,
+            ),
+            service_status_stream(
+                dbus.clone(),
+                "org.opensuse.Agama.Software1",
+                "/org/opensuse/Agama/Software1",
+            )
+            .await?,
+        ),
+        progress_stream(
+            dbus,
+            "org.opensuse.Agama.Software1",
+            "/org/opensuse/Agama/Software1",
+        )
+        .await,
     ))
 }
 
@@ -122,6 +144,12 @@ fn reason_to_selected_by(
 
 /// Sets up and returns the axum service for the software module.
 pub async fn software_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
+    const DBUS_SERVICE: &'static str = "org.opensuse.Agama.Software1";
+    const DBUS_PATH: &'static str = "/org/opensuse/Agama/Software1";
+
+    let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+    let progress_router = progress_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+
     let product = ProductClient::new(dbus.clone()).await?;
     let software = SoftwareClient::new(dbus).await?;
     let state = SoftwareState { product, software };
@@ -131,6 +159,8 @@ pub async fn software_service(dbus: zbus::Connection) -> Result<Router, ServiceE
         .route("/proposal", get(proposal))
         .route("/config", put(set_config).get(get_config))
         .route("/probe", post(probe))
+        .merge(status_router)
+        .merge(progress_router)
         .with_state(state);
     Ok(router)
 }

From 2cbdd5703ce68bc5d55980ba58c956b0ab74d67a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 14:35:56 +0000
Subject: [PATCH 057/324] Avoid chaining StreamExt::merge calls

---
 rust/agama-server/src/manager/web.rs  | 55 ++++-----------------------
 rust/agama-server/src/software/web.rs | 33 +++++-----------
 rust/agama-server/src/web.rs          | 49 +++++++++++++++++++++---
 rust/agama-server/src/web/common.rs   | 10 ++---
 4 files changed, 66 insertions(+), 81 deletions(-)

diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index 58dd72b3a0..8f6bc6b08c 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -5,6 +5,8 @@
 //! * `manager_service` which returns the Axum service.
 //! * `manager_stream` which offers an stream that emits the manager events coming from D-Bus.
 
+use std::pin::Pin;
+
 use agama_lib::{
     error::ServiceError,
     manager::{InstallationPhase, ManagerClient},
@@ -25,7 +27,7 @@ use tokio_stream::{Stream, StreamExt};
 use crate::{
     error::Error,
     web::{
-        common::{progress_router, progress_stream, service_status_router, service_status_stream},
+        common::{progress_router, service_status_router},
         Event,
     },
 };
@@ -63,55 +65,12 @@ pub struct InstallerStatus {
 
 /// Returns a stream that emits manager related events coming from D-Bus.
 ///
-/// It emits the Event::BusyServicesChanged and Event::InstallationPhaseChanged events.
+/// It emits the Event::InstallationPhaseChanged event.
 ///
 /// * `connection`: D-Bus connection to listen for events.
-pub async fn manager_stream(dbus: zbus::Connection) -> Result<impl Stream<Item = Event>, Error> {
-    Ok(StreamExt::merge(
-        StreamExt::merge(
-            StreamExt::merge(
-                busy_services_changed_stream(dbus.clone()).await?,
-                installation_phase_changed_stream(dbus.clone()).await?,
-            ),
-            service_status_stream(
-                dbus.clone(),
-                "org.opensuse.Agama.Manager1",
-                "/org/opensuse/Agama/Manager1",
-            )
-            .await?,
-        ),
-        progress_stream(
-            dbus,
-            "org.opensuse.Agama.Manager1",
-            "/org/opensuse/Agama/Manager1",
-        )
-        .await,
-    ))
-}
-
-pub async fn busy_services_changed_stream(
-    dbus: zbus::Connection,
-) -> Result<impl Stream<Item = Event>, Error> {
-    let proxy = Manager1Proxy::new(&dbus).await?;
-    let stream = proxy
-        .receive_busy_services_changed()
-        .await
-        .then(|change| async move {
-            if let Ok(busy_services) = change.get().await {
-                Some(Event::BusyServicesChanged {
-                    services: busy_services,
-                })
-            } else {
-                None
-            }
-        })
-        .filter_map(|e| e);
-    Ok(stream)
-}
-
-pub async fn installation_phase_changed_stream(
+pub async fn manager_stream(
     dbus: zbus::Connection,
-) -> Result<impl Stream<Item = Event>, Error> {
+) -> Result<Pin<Box<dyn Stream<Item = Event> + Send>>, Error> {
     let proxy = Manager1Proxy::new(&dbus).await?;
     let stream = proxy
         .receive_current_installation_phase_changed()
@@ -130,7 +89,7 @@ pub async fn installation_phase_changed_stream(
             }
         })
         .filter_map(|e| e);
-    Ok(stream)
+    Ok(Box::pin(stream))
 }
 
 /// Sets up and returns the axum service for the manager module
diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index cb12ec2491..de8c599352 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -8,7 +8,7 @@
 use crate::{
     error::Error,
     web::{
-        common::{progress_router, progress_stream, service_status_router, service_status_stream},
+        common::{progress_router, service_status_router},
         Event,
     },
 };
@@ -29,7 +29,7 @@ use axum::{
 };
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use std::collections::HashMap;
+use std::{collections::HashMap, pin::Pin};
 use thiserror::Error;
 use tokio_stream::{Stream, StreamExt};
 
@@ -65,27 +65,14 @@ impl IntoResponse for SoftwareError {
 /// It emits the Event::ProductChanged and Event::PatternsChanged events.
 ///
 /// * `connection`: D-Bus connection to listen for events.
-pub async fn software_stream(dbus: zbus::Connection) -> Result<impl Stream<Item = Event>, Error> {
-    Ok(StreamExt::merge(
-        StreamExt::merge(
-            StreamExt::merge(
-                product_changed_stream(dbus.clone()).await?,
-                patterns_changed_stream(dbus.clone()).await?,
-            ),
-            service_status_stream(
-                dbus.clone(),
-                "org.opensuse.Agama.Software1",
-                "/org/opensuse/Agama/Software1",
-            )
-            .await?,
-        ),
-        progress_stream(
-            dbus,
-            "org.opensuse.Agama.Software1",
-            "/org/opensuse/Agama/Software1",
-        )
-        .await,
-    ))
+pub async fn software_stream(
+    dbus: zbus::Connection,
+) -> Result<Pin<Box<dyn Stream<Item = Event> + Send>>, Error> {
+    let stream = StreamExt::merge(
+        product_changed_stream(dbus.clone()).await?,
+        patterns_changed_stream(dbus.clone()).await?,
+    );
+    Ok(Box::pin(stream))
 }
 
 async fn product_changed_stream(
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 06d4cdd550..580f08b559 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -9,6 +9,7 @@ use crate::{
     l10n::web::l10n_service,
     manager::web::{manager_service, manager_stream},
     software::web::{software_service, software_stream},
+    web::common::{progress_stream, service_status_stream},
 };
 use axum::Router;
 
@@ -29,7 +30,7 @@ pub use docs::ApiDoc;
 pub use event::{Event, EventsReceiver, EventsSender};
 pub use service::MainServiceBuilder;
 use std::path::Path;
-use tokio_stream::StreamExt;
+use tokio_stream::{StreamExt, StreamMap};
 
 /// Returns a service that implements the web-based Agama API.
 ///
@@ -72,13 +73,51 @@ pub async fn run_monitor(events: EventsSender) -> Result<(), ServiceError> {
 /// * `connection`: D-Bus connection.
 /// * `events`: channel to send the events to.
 async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Result<(), Error> {
-    let stream = StreamExt::merge(
-        manager_stream(dbus.clone()).await?,
-        software_stream(dbus).await?,
+    let mut stream = StreamMap::new();
+
+    stream.insert("manager", manager_stream(dbus.clone()).await?);
+    stream.insert(
+        "manager-status",
+        service_status_stream(
+            dbus.clone(),
+            "org.opensuse.Agama.Manager1",
+            "/org/opensuse/Agama/Manager1",
+        )
+        .await?,
+    );
+    stream.insert(
+        "manager-progress",
+        progress_stream(
+            dbus.clone(),
+            "org.opensuse.Agama.Manager1",
+            "/org/opensuse/Agama/Manager1",
+        )
+        .await,
+    );
+
+    stream.insert("software", software_stream(dbus.clone()).await?);
+    stream.insert(
+        "software-status",
+        service_status_stream(
+            dbus.clone(),
+            "org.opensuse.Agama.Software1",
+            "/org/opensuse/Agama/Software1",
+        )
+        .await?,
+    );
+    stream.insert(
+        "software-progress",
+        progress_stream(
+            dbus.clone(),
+            "org.opensuse.Agama.Software1",
+            "/org/opensuse/Agama/Software1",
+        )
+        .await,
     );
+
     tokio::pin!(stream);
     let e = events.clone();
-    while let Some(event) = stream.next().await {
+    while let Some((_, event)) = stream.next().await {
         _ = e.send(event);
     }
     Ok(())
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index c5dfccfbc9..44bb518e4d 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -1,6 +1,6 @@
 //! This module defines functions to be used accross all services.
 
-use std::task::Poll;
+use std::{pin::Pin, task::Poll};
 
 use agama_lib::{
     error::ServiceError,
@@ -85,7 +85,7 @@ pub async fn service_status_stream(
     dbus: zbus::Connection,
     destination: &'static str,
     path: &'static str,
-) -> Result<impl Stream<Item = Event>, Error> {
+) -> Result<Pin<Box<dyn Stream<Item = Event> + Send>>, Error> {
     let proxy = build_service_status_proxy(&dbus, destination, path).await?;
     let stream = proxy
         .receive_current_changed()
@@ -101,7 +101,7 @@ pub async fn service_status_stream(
             }
         })
         .filter_map(|e| e);
-    Ok(stream)
+    Ok(Box::pin(stream))
 }
 
 async fn build_service_status_proxy<'a>(
@@ -180,11 +180,11 @@ pub async fn progress_stream<'a>(
     dbus: zbus::Connection,
     destination: &'static str,
     path: &'static str,
-) -> ProgressStream<'a> {
+) -> Pin<Box<impl Stream<Item = Event> + Send>> {
     let proxy = build_progress_proxy(&dbus, destination, path)
         .await
         .unwrap();
-    ProgressStream::new(proxy).await
+    Box::pin(ProgressStream::new(proxy).await)
 }
 
 impl<'a> ProgressStream<'a> {

From 859617b717e31e51fcfcb960736284ddb99a594a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 16:50:35 +0000
Subject: [PATCH 058/324] Add error handling to the web::common module

---
 rust/agama-server/src/web.rs        |  4 +--
 rust/agama-server/src/web/common.rs | 56 ++++++++++++++++++++++++-----
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 580f08b559..4d7c5c173c 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -92,7 +92,7 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
             "org.opensuse.Agama.Manager1",
             "/org/opensuse/Agama/Manager1",
         )
-        .await,
+        .await?,
     );
 
     stream.insert("software", software_stream(dbus.clone()).await?);
@@ -112,7 +112,7 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
             "org.opensuse.Agama.Software1",
             "/org/opensuse/Agama/Software1",
         )
-        .await,
+        .await?,
     );
 
     tokio::pin!(stream);
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 44bb518e4d..5c927bbe06 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -7,9 +7,17 @@ use agama_lib::{
     progress::Progress,
     proxies::{ProgressProxy, ServiceStatusProxy},
 };
-use axum::{extract::State, routing::get, Json, Router};
+use axum::{
+    extract::State,
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    routing::get,
+    Json, Router,
+};
 use pin_project::pin_project;
 use serde::Serialize;
+use serde_json::json;
+use thiserror::Error;
 use tokio_stream::{Stream, StreamExt};
 use zbus::PropertyStream;
 
@@ -75,6 +83,21 @@ struct ServiceStatus {
     current: u32,
 }
 
+#[derive(Error, Debug)]
+pub enum ServiceStatusError {
+    #[error("Service status error: {0}")]
+    Error(#[from] ServiceError),
+}
+
+impl IntoResponse for ServiceStatusError {
+    fn into_response(self) -> Response {
+        let body = json!({
+            "error": self.to_string()
+        });
+        (StatusCode::BAD_REQUEST, Json(body)).into_response()
+    }
+}
+
 /// Builds a stream of the changes in the the `org.opensuse.Agama1.ServiceStatus`
 /// interface of the given D-Bus object.
 ///
@@ -163,10 +186,27 @@ struct ProgressState<'a> {
     proxy: ProgressProxy<'a>,
 }
 
-async fn progress(State(state): State<ProgressState<'_>>) -> Json<Progress> {
+#[derive(Error, Debug)]
+pub enum ProgressError {
+    #[error("Progress error: {0}")]
+    Error(#[from] ServiceError),
+    #[error("D-Bus error: {0}")]
+    DBusError(#[from] zbus::Error),
+}
+
+impl IntoResponse for ProgressError {
+    fn into_response(self) -> Response {
+        let body = json!({
+            "error": self.to_string()
+        });
+        (StatusCode::BAD_REQUEST, Json(body)).into_response()
+    }
+}
+
+async fn progress(State(state): State<ProgressState<'_>>) -> Result<Json<Progress>, ProgressError> {
     let proxy = state.proxy;
-    let progress = Progress::from_proxy(&proxy).await.unwrap();
-    Json(progress)
+    let progress = Progress::from_proxy(&proxy).await?;
+    Ok(Json(progress))
 }
 
 #[pin_project]
@@ -180,11 +220,9 @@ pub async fn progress_stream<'a>(
     dbus: zbus::Connection,
     destination: &'static str,
     path: &'static str,
-) -> Pin<Box<impl Stream<Item = Event> + Send>> {
-    let proxy = build_progress_proxy(&dbus, destination, path)
-        .await
-        .unwrap();
-    Box::pin(ProgressStream::new(proxy).await)
+) -> Result<Pin<Box<impl Stream<Item = Event> + Send>>, zbus::Error> {
+    let proxy = build_progress_proxy(&dbus, destination, path).await?;
+    Ok(Box::pin(ProgressStream::new(proxy).await))
 }
 
 impl<'a> ProgressStream<'a> {

From 76caa2f3919c8798ae6d65030b4a640d32e6588b Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 15 Mar 2024 09:53:59 +0100
Subject: [PATCH 059/324] add proxies for question interfaces

---
 rust/agama-lib/src/proxies.rs          | 48 ++++++++++++++++++++++++++
 rust/agama-server/src/questions.rs     |  2 +-
 rust/agama-server/src/questions/web.rs | 16 ++++++++-
 3 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/rust/agama-lib/src/proxies.rs b/rust/agama-lib/src/proxies.rs
index aefea02df9..a57711037e 100644
--- a/rust/agama-lib/src/proxies.rs
+++ b/rust/agama-lib/src/proxies.rs
@@ -114,3 +114,51 @@ trait Questions1 {
     #[dbus_proxy(property)]
     fn set_interactive(&self, value: bool) -> zbus::Result<()>;
 }
+
+#[dbus_proxy(
+    interface = "org.opensuse.Agama1.Questions.Generic",
+    assume_defaults = true
+)]
+trait GenericQuestion {
+    /// Answer property
+    #[dbus_proxy(property)]
+    fn answer(&self) -> zbus::Result<String>;
+    #[dbus_proxy(property)]
+    fn set_answer(&self, value: &str) -> zbus::Result<()>;
+
+    /// Class property
+    #[dbus_proxy(property)]
+    fn class(&self) -> zbus::Result<String>;
+
+    /// Data property
+    #[dbus_proxy(property)]
+    fn data(&self) -> zbus::Result<std::collections::HashMap<String, String>>;
+
+    /// DefaultOption property
+    #[dbus_proxy(property)]
+    fn default_option(&self) -> zbus::Result<String>;
+
+    /// Id property
+    #[dbus_proxy(property)]
+    fn id(&self) -> zbus::Result<u32>;
+
+    /// Options property
+    #[dbus_proxy(property)]
+    fn options(&self) -> zbus::Result<Vec<String>>;
+
+    /// Text property
+    #[dbus_proxy(property)]
+    fn text(&self) -> zbus::Result<String>;
+}
+
+#[dbus_proxy(
+    interface = "org.opensuse.Agama1.Questions.WithPassword",
+    assume_defaults = true
+)]
+trait QuestionWithPassword {
+    /// Password property
+    #[dbus_proxy(property)]
+    fn password(&self) -> zbus::Result<String>;
+    #[dbus_proxy(property)]
+    fn set_password(&self, value: &str) -> zbus::Result<()>;
+}
diff --git a/rust/agama-server/src/questions.rs b/rust/agama-server/src/questions.rs
index 8b4e6eb148..bc547b3ae5 100644
--- a/rust/agama-server/src/questions.rs
+++ b/rust/agama-server/src/questions.rs
@@ -95,7 +95,7 @@ trait AnswerStrategy {
     ///
     /// I gets as argument the question to answer. Returned value is pair
     /// of `answer` and `password` properties. If `None` is used in any
-    /// position it means thatpam-devel this object does not respond to given property.
+    /// position it means that this object does not respond to given property.
     ///
     /// It is object responsibility to provide correct pair. For example if
     /// possible answer can be "Ok" and "Cancel". Then for `Ok` password value
diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 73639814a4..74bfb9ea4d 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -1,4 +1,4 @@
-//! This module implements the web API for the software module.
+//! This module implements the web API for the questions module.
 //!
 //! The module offers two public functions:
 //!
@@ -10,6 +10,7 @@ use crate::{error::Error, web::Event};
 use agama_lib::{
     error::ServiceError, proxies::Questions1Proxy,
 };
+use anyhow::Context;
 use axum::{
     extract::{State, Path},
     http::StatusCode,
@@ -19,6 +20,8 @@ use axum::{
 };
 use tokio_stream::{Stream, StreamExt};
 use zbus::fdo::ObjectManagerProxy;
+use zbus::zvariant::OwnedObjectPath;
+use zbus::zvariant::ObjectPath;
 use thiserror::Error;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
@@ -44,6 +47,17 @@ impl<'a> QuestionsClient<'a> {
         // TODO: real call to dbus
         Ok(vec![])
     }
+
+    pub async fn answer(self, id: u32, answer: Answer) -> Result<(), ServiceError> {
+        let objects = self.objects_proxy.get_managed_objects().await
+            .context("failed to get managed object with Object Manager")?;
+        let question_path = OwnedObjectPath::from(
+            ObjectPath::try_from(format!("/org/opensuse/Agama1/Questions/{}", id))
+                .context("Failed to create dbus path")?
+            );
+        let question = objects.get(&question_path);
+        Ok(())
+    }
 }
 
 #[derive(Error, Debug)]

From cfef2af5c19153de926c2ed32b309bfb279b063c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 11:59:38 +0000
Subject: [PATCH 060/324] Rename LocaleCode to LocaleId

---
 rust/agama-locale-data/src/lib.rs     |  2 +-
 rust/agama-locale-data/src/locale.rs  |  8 ++++----
 rust/agama-server/src/l10n.rs         | 16 ++++++++--------
 rust/agama-server/src/l10n/helpers.rs |  8 ++++----
 rust/agama-server/src/l10n/locale.rs  | 20 ++++++++++----------
 rust/agama-server/src/l10n/web.rs     | 16 ++++++++--------
 6 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/rust/agama-locale-data/src/lib.rs b/rust/agama-locale-data/src/lib.rs
index fad38cbe70..669f2eba86 100644
--- a/rust/agama-locale-data/src/lib.rs
+++ b/rust/agama-locale-data/src/lib.rs
@@ -19,7 +19,7 @@ pub mod timezone_part;
 
 use keyboard::xkeyboard;
 
-pub use locale::{InvalidKeymap, InvalidLocaleCode, KeymapId, LocaleCode};
+pub use locale::{InvalidKeymap, InvalidLocaleCode, KeymapId, LocaleId};
 
 fn file_reader(file_path: &str) -> anyhow::Result<impl BufRead> {
     let file = File::open(file_path)
diff --git a/rust/agama-locale-data/src/locale.rs b/rust/agama-locale-data/src/locale.rs
index e1c85c0165..56e51931c7 100644
--- a/rust/agama-locale-data/src/locale.rs
+++ b/rust/agama-locale-data/src/locale.rs
@@ -7,7 +7,7 @@ use std::{fmt::Display, str::FromStr};
 use thiserror::Error;
 
 #[derive(Clone, Debug, PartialEq, Serialize)]
-pub struct LocaleCode {
+pub struct LocaleId {
     // ISO-639
     pub language: String,
     // ISO-3166
@@ -15,7 +15,7 @@ pub struct LocaleCode {
     pub encoding: String,
 }
 
-impl Display for LocaleCode {
+impl Display for LocaleId {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         write!(
             f,
@@ -25,7 +25,7 @@ impl Display for LocaleCode {
     }
 }
 
-impl Default for LocaleCode {
+impl Default for LocaleId {
     fn default() -> Self {
         Self {
             language: "en".to_string(),
@@ -39,7 +39,7 @@ impl Default for LocaleCode {
 #[error("Not a valid locale string: {0}")]
 pub struct InvalidLocaleCode(String);
 
-impl TryFrom<&str> for LocaleCode {
+impl TryFrom<&str> for LocaleId {
     type Error = InvalidLocaleCode;
 
     fn try_from(value: &str) -> Result<Self, Self::Error> {
diff --git a/rust/agama-server/src/l10n.rs b/rust/agama-server/src/l10n.rs
index e1778aa567..10eff942fe 100644
--- a/rust/agama-server/src/l10n.rs
+++ b/rust/agama-server/src/l10n.rs
@@ -5,7 +5,7 @@ mod timezone;
 pub mod web;
 
 use crate::error::Error;
-use agama_locale_data::{KeymapId, LocaleCode};
+use agama_locale_data::{KeymapId, LocaleId};
 use anyhow::Context;
 use keyboard::KeymapsDatabase;
 use locale::LocalesDatabase;
@@ -26,7 +26,7 @@ pub struct Locale {
     pub locales_db: LocalesDatabase,
     keymap: KeymapId,
     keymaps_db: KeymapsDatabase,
-    ui_locale: LocaleCode,
+    ui_locale: LocaleId,
     pub ui_keymap: KeymapId,
 }
 
@@ -48,7 +48,7 @@ impl Locale {
             .iter()
             .map(|l| {
                 (
-                    l.code.to_string(),
+                    l.id.to_string(),
                     l.language.to_string(),
                     l.territory.to_string(),
                 )
@@ -82,7 +82,7 @@ impl Locale {
 
     #[dbus_interface(property, name = "UILocale")]
     fn set_ui_locale(&mut self, locale: &str) -> zbus::fdo::Result<()> {
-        let locale: LocaleCode = locale
+        let locale: LocaleId = locale
             .try_into()
             .map_err(|_e| zbus::fdo::Error::Failed(format!("Invalid locale value '{locale}'")))?;
         helpers::set_service_locale(&locale);
@@ -191,7 +191,7 @@ impl Locale {
 }
 
 impl Locale {
-    pub fn new_with_locale(ui_locale: &LocaleCode) -> Result<Self, Error> {
+    pub fn new_with_locale(ui_locale: &LocaleId) -> Result<Self, Error> {
         const DEFAULT_TIMEZONE: &str = "Europe/Berlin";
 
         let locale = ui_locale.to_string();
@@ -201,7 +201,7 @@ impl Locale {
         let mut default_locale = ui_locale.to_string();
         if !locales_db.exists(locale.as_str()) {
             // TODO: handle the case where the database is empty (not expected!)
-            default_locale = locales_db.entries().first().unwrap().code.to_string();
+            default_locale = locales_db.entries().first().unwrap().id.to_string();
         };
 
         let mut timezones_db = TimezonesDatabase::new();
@@ -231,7 +231,7 @@ impl Locale {
         Ok(locale)
     }
 
-    pub fn translate(&mut self, locale: &LocaleCode) -> Result<(), Error> {
+    pub fn translate(&mut self, locale: &LocaleId) -> Result<(), Error> {
         self.timezones_db.read(&locale.language)?;
         self.locales_db.read(&locale.language)?;
         self.ui_locale = locale.clone();
@@ -259,7 +259,7 @@ impl Locale {
 
 pub async fn export_dbus_objects(
     connection: &Connection,
-    locale: &LocaleCode,
+    locale: &LocaleId,
 ) -> Result<(), Box<dyn std::error::Error>> {
     const PATH: &str = "/org/opensuse/Agama1/Locale";
 
diff --git a/rust/agama-server/src/l10n/helpers.rs b/rust/agama-server/src/l10n/helpers.rs
index 507094cd04..b806ca690e 100644
--- a/rust/agama-server/src/l10n/helpers.rs
+++ b/rust/agama-server/src/l10n/helpers.rs
@@ -2,16 +2,16 @@
 //!
 //! FIXME: find a better place for the localization function
 
-use agama_locale_data::LocaleCode;
+use agama_locale_data::LocaleId;
 use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
 use std::env;
 
 /// Initializes the service locale.
 ///
 /// It returns the used locale. Defaults to `en_US.UTF-8`.
-pub fn init_locale() -> Result<LocaleCode, Box<dyn std::error::Error>> {
+pub fn init_locale() -> Result<LocaleId, Box<dyn std::error::Error>> {
     let lang = env::var("LANG").unwrap_or("en_US.UTF-8".to_string());
-    let locale: LocaleCode = lang.as_str().try_into().unwrap_or_default();
+    let locale: LocaleId = lang.as_str().try_into().unwrap_or_default();
 
     set_service_locale(&locale);
     textdomain("xkeyboard-config")?;
@@ -21,7 +21,7 @@ pub fn init_locale() -> Result<LocaleCode, Box<dyn std::error::Error>> {
 
 /// Sets the service locale.
 ///
-pub fn set_service_locale(locale: &LocaleCode) {
+pub fn set_service_locale(locale: &LocaleId) {
     if setlocale(LocaleCategory::LcAll, locale.to_string()).is_none() {
         log::warn!("Could not set the locale");
     }
diff --git a/rust/agama-server/src/l10n/locale.rs b/rust/agama-server/src/l10n/locale.rs
index 65d76ec1e4..4f38d30abe 100644
--- a/rust/agama-server/src/l10n/locale.rs
+++ b/rust/agama-server/src/l10n/locale.rs
@@ -1,7 +1,7 @@
 //! This module provides support for reading the locales database.
 
 use crate::error::Error;
-use agama_locale_data::{InvalidLocaleCode, LocaleCode};
+use agama_locale_data::{InvalidLocaleCode, LocaleId};
 use anyhow::Context;
 use serde::Serialize;
 use serde_with::{serde_as, DisplayFromStr};
@@ -13,7 +13,7 @@ use std::process::Command;
 pub struct LocaleEntry {
     /// The locale code (e.g., "es_ES.UTF-8").
     #[serde_as(as = "DisplayFromStr")]
-    pub code: LocaleCode,
+    pub id: LocaleId,
     /// Localized language name (e.g., "Spanish", "Español", etc.)
     pub language: String,
     /// Localized territory name (e.g., "Spain", "España", etc.)
@@ -26,7 +26,7 @@ pub struct LocaleEntry {
 /// translations are obtained from the `agama_locale_data` crate.
 #[derive(Default)]
 pub struct LocalesDatabase {
-    known_locales: Vec<LocaleCode>,
+    known_locales: Vec<LocaleId>,
     locales: Vec<LocaleEntry>,
 }
 
@@ -47,7 +47,7 @@ impl LocalesDatabase {
             String::from_utf8(result.stdout).context("Invalid UTF-8 sequence from list-locales")?;
         self.known_locales = output
             .lines()
-            .filter_map(|line| TryInto::<LocaleCode>::try_into(line).ok())
+            .filter_map(|line| TryInto::<LocaleId>::try_into(line).ok())
             .collect();
         self.locales = self.get_locales(ui_language)?;
         Ok(())
@@ -56,10 +56,10 @@ impl LocalesDatabase {
     /// Determines whether a locale exists in the database.
     pub fn exists<T>(&self, locale: T) -> bool
     where
-        T: TryInto<LocaleCode>,
+        T: TryInto<LocaleId>,
         T::Error: Into<InvalidLocaleCode>,
     {
-        if let Ok(locale) = TryInto::<LocaleCode>::try_into(locale) {
+        if let Ok(locale) = TryInto::<LocaleId>::try_into(locale) {
             return self.known_locales.contains(&locale);
         }
 
@@ -101,7 +101,7 @@ impl LocalesDatabase {
                 .unwrap_or(territory.id.to_string());
 
             let entry = LocaleEntry {
-                code: code.clone(),
+                id: code.clone(),
                 language: language_label,
                 territory: territory_label,
             };
@@ -115,15 +115,15 @@ impl LocalesDatabase {
 #[cfg(test)]
 mod tests {
     use super::LocalesDatabase;
-    use agama_locale_data::LocaleCode;
+    use agama_locale_data::LocaleId;
 
     #[test]
     fn test_read_locales() {
         let mut db = LocalesDatabase::new();
         db.read("de").unwrap();
         let found_locales = db.entries();
-        let spanish: LocaleCode = "es_ES".try_into().unwrap();
-        let found = found_locales.iter().find(|l| l.code == spanish).unwrap();
+        let spanish: LocaleId = "es_ES".try_into().unwrap();
+        let found = found_locales.iter().find(|l| l.id == spanish).unwrap();
         assert_eq!(&found.language, "Spanisch");
         assert_eq!(&found.territory, "Spanien");
     }
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index b78300b39c..09bd9d9b10 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -6,7 +6,7 @@ use crate::{
     l10n::helpers,
     web::{Event, EventsSender},
 };
-use agama_locale_data::{InvalidKeymap, LocaleCode};
+use agama_locale_data::{InvalidKeymap, LocaleId};
 use axum::{
     extract::State,
     http::StatusCode,
@@ -55,8 +55,8 @@ struct LocaleState {
 ///
 /// * `events`: channel to send the events to the main service.
 pub fn l10n_service(events: EventsSender) -> Router {
-    let code = LocaleCode::default();
-    let locale = Locale::new_with_locale(&code).unwrap();
+    let id = LocaleId::default();
+    let locale = Locale::new_with_locale(&id).unwrap();
     let state = LocaleState {
         locale: Arc::new(RwLock::new(locale)),
         events,
@@ -147,7 +147,7 @@ async fn set_config(
     }
 
     if let Some(ui_locale) = &value.ui_locale {
-        let locale: LocaleCode = ui_locale
+        let locale: LocaleId = ui_locale
             .as_str()
             .try_into()
             .map_err(|_e| LocaleError::UnknownLocale(ui_locale.to_string()))?;
@@ -193,13 +193,13 @@ async fn get_config(State(state): State<LocaleState>) -> Json<LocaleConfig> {
 #[cfg(test)]
 mod tests {
     use crate::l10n::{web::LocaleState, Locale};
-    use agama_locale_data::{KeymapId, LocaleCode};
+    use agama_locale_data::{KeymapId, LocaleId};
     use std::sync::{Arc, RwLock};
     use tokio::{sync::broadcast::channel, test};
 
     fn build_state() -> LocaleState {
         let (tx, _) = channel(16);
-        let default_code = LocaleCode::default();
+        let default_code = LocaleId::default();
         let locale = Locale::new_with_locale(&default_code).unwrap();
         LocaleState {
             locale: Arc::new(RwLock::new(locale)),
@@ -211,8 +211,8 @@ mod tests {
     async fn test_locales() {
         let state = build_state();
         let response = super::locales(axum::extract::State(state)).await;
-        let default = LocaleCode::default();
-        let found = response.iter().find(|l| l.code == default);
+        let default = LocaleId::default();
+        let found = response.iter().find(|l| l.id == default);
         assert!(found.is_some());
     }
 

From 190249aeea7805443cf57151deb929cb3b2c3706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 12:11:50 +0000
Subject: [PATCH 061/324] Expose the keymap id as a string

---
 rust/agama-server/src/l10n/keyboard.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rust/agama-server/src/l10n/keyboard.rs b/rust/agama-server/src/l10n/keyboard.rs
index aec68657e6..39286f7230 100644
--- a/rust/agama-server/src/l10n/keyboard.rs
+++ b/rust/agama-server/src/l10n/keyboard.rs
@@ -1,12 +1,15 @@
 use agama_locale_data::{get_localectl_keymaps, keyboard::XkbConfigRegistry, KeymapId};
 use gettextrs::*;
 use serde::Serialize;
+use serde_with::{serde_as, DisplayFromStr};
 use std::collections::HashMap;
 
+#[serde_as]
 // Minimal representation of a keymap
 #[derive(Clone, Debug, Serialize, utoipa::ToSchema)]
 pub struct Keymap {
     /// Keymap identifier (e.g., "us")
+    #[serde_as(as = "DisplayFromStr")]
     pub id: KeymapId,
     /// Keymap description
     description: String,

From a106169ad5350adf4182e8325591b24d95b8f42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 12:13:36 +0000
Subject: [PATCH 062/324] Expose the InstallationPhase as a number

---
 rust/Cargo.lock               | 5 +++--
 rust/agama-lib/Cargo.toml     | 1 +
 rust/agama-lib/src/manager.rs | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 1a7deead07..6156aebf8e 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -64,6 +64,7 @@ dependencies = [
  "log",
  "serde",
  "serde_json",
+ "serde_repr",
  "tempfile",
  "thiserror",
  "tokio",
@@ -2647,9 +2648,9 @@ dependencies = [
 
 [[package]]
 name = "serde_repr"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
+checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/rust/agama-lib/Cargo.toml b/rust/agama-lib/Cargo.toml
index 40702e2fde..842c93e38e 100644
--- a/rust/agama-lib/Cargo.toml
+++ b/rust/agama-lib/Cargo.toml
@@ -16,6 +16,7 @@ jsonschema = { version = "0.16.1", default-features = false }
 log = "0.4"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.94"
+serde_repr = "0.1.18"
 tempfile = "3.4.0"
 thiserror = "1.0.39"
 tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] }
diff --git a/rust/agama-lib/src/manager.rs b/rust/agama-lib/src/manager.rs
index 4596f18845..2c4e3e9ada 100644
--- a/rust/agama-lib/src/manager.rs
+++ b/rust/agama-lib/src/manager.rs
@@ -6,7 +6,7 @@ use crate::{
     progress::Progress,
     proxies::{Manager1Proxy, ProgressProxy},
 };
-use serde::Serialize;
+use serde_repr::Serialize_repr;
 use tokio_stream::StreamExt;
 use zbus::Connection;
 
@@ -19,7 +19,9 @@ pub struct ManagerClient<'a> {
 }
 
 /// Represents the installation phase.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize, utoipa::ToSchema)]
+/// NOTE: does this conversion have any value?
+#[derive(Clone, Copy, Debug, PartialEq, Serialize_repr, utoipa::ToSchema)]
+#[repr(u32)]
 pub enum InstallationPhase {
     /// Start up phase.
     Startup,

From e8b80f839cc3de932d541b888626b460a66bc896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 12:19:15 +0000
Subject: [PATCH 063/324] Adapt the ManagerClient to the HTTP/JSON API

---
 web/src/App.jsx           |  23 +++----
 web/src/client/index.js   |   4 +-
 web/src/client/manager.js |  60 +++++++++---------
 web/src/client/mixins.js  | 128 +++++++++++++++++++++-----------------
 4 files changed, 110 insertions(+), 105 deletions(-)

diff --git a/web/src/App.jsx b/web/src/App.jsx
index 6ab2d45fba..a3798d43f7 100644
--- a/web/src/App.jsx
+++ b/web/src/App.jsx
@@ -24,8 +24,8 @@ import { Outlet } from "react-router-dom";
 
 import { useInstallerClient, useInstallerClientStatus } from "~/context/installer";
 import { useProduct } from "./context/product";
-import { CONFIG, INSTALL, STARTUP } from "~/client/phase";
-import { BUSY, IDLE } from "~/client/status";
+import { INSTALL, STARTUP } from "~/client/phase";
+import { BUSY } from "~/client/status";
 
 import { DBusError, If, Installation } from "~/components/core";
 import { Loading } from "./components/layout";
@@ -51,29 +51,22 @@ function App() {
 
   useEffect(() => {
     if (client) {
-      // FIXME: adapt to the new API
-      // return client.manager.onPhaseChange(setPhase);
-      setPhase(CONFIG);
+      return client.manager.onPhaseChange(setPhase);
     }
   }, [client, setPhase]);
 
   useEffect(() => {
     if (client) {
-      setStatus(IDLE);
-      // FIXME: adapt to the new API
-      // return client.manager.onStatusChange(setStatus);
+      return client.manager.onStatusChange(setStatus);
     }
   }, [client, setStatus]);
 
   useEffect(() => {
     const loadPhase = async () => {
-      setPhase(CONFIG);
-      setStatus(IDLE);
-      // FIXME: adapt to the new API
-      // const phase = await client.manager.getPhase();
-      // const status = await client.manager.getStatus();
-      // setPhase(phase);
-      // setStatus(status);
+      const phase = await client.manager.getPhase();
+      const status = await client.manager.getStatus();
+      setPhase(phase);
+      setStatus(status);
     };
 
     if (client) {
diff --git a/web/src/client/index.js b/web/src/client/index.js
index be43839529..206365b695 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -75,7 +75,7 @@ const createClient = (url) => {
   const l10n = new L10nClient(client);
   // TODO: unify with the manager client
   const product = new ProductClient(client);
-  // const manager = new ManagerClient(address);
+  const manager = new ManagerClient(client);
   // const monitor = new Monitor(address, MANAGER_SERVICE);
   // const network = new NetworkClient(address);
   // const software = new SoftwareClient(address);
@@ -136,7 +136,7 @@ const createClient = (url) => {
   return {
     l10n,
     product,
-    // manager,
+    manager,
     // monitor,
     // network,
     // software,
diff --git a/web/src/client/manager.js b/web/src/client/manager.js
index fcd223c505..b4733529ed 100644
--- a/web/src/client/manager.js
+++ b/web/src/client/manager.js
@@ -22,7 +22,7 @@
 // @ts-check
 
 import DBusClient from "./dbus";
-import { WithStatus, WithProgress } from "./mixins";
+import { WithProgress, WithStatus } from "./mixins";
 import cockpit from "../lib/cockpit";
 
 const MANAGER_SERVICE = "org.opensuse.Agama.Manager1";
@@ -36,10 +36,10 @@ const MANAGER_PATH = "/org/opensuse/Agama/Manager1";
  */
 class ManagerBaseClient {
   /**
-   * @param {string|undefined} address - D-Bus address; if it is undefined, it uses the system bus.
+   * @param {import("./http").HTTPClient} client - HTTP client.
    */
-  constructor(address = undefined) {
-    this.client = new DBusClient(MANAGER_SERVICE, address);
+  constructor(client) {
+    this.client = client;
   }
 
   /**
@@ -49,9 +49,8 @@ class ManagerBaseClient {
    *
    * @return {Promise<void>}
    */
-  async startProbing() {
-    const proxy = await this.client.proxy(MANAGER_IFACE);
-    return proxy.Probe();
+  startProbing() {
+    return this.client.post("/manager/probe");
   }
 
   /**
@@ -61,9 +60,8 @@ class ManagerBaseClient {
    *
    * @return {Promise}
    */
-  async startInstallation() {
-    const proxy = await this.client.proxy(MANAGER_IFACE);
-    return proxy.Commit();
+  startInstallation() {
+    return this.client.post("/manager/install");
   }
 
   /**
@@ -75,20 +73,18 @@ class ManagerBaseClient {
    * @return {Promise<boolean>}
    */
   async canInstall() {
-    const proxy = await this.client.proxy(MANAGER_IFACE);
-    return proxy.CanInstall();
+    const installer = await this.client.get("/manager/installer");
+    return installer.can_install;
   }
 
   /**
    * Returns the binary content of the YaST logs file
    *
-   * @return {Promise<Uint8Array>}
+   * @todo Implement a mechanism to get the logs.
+   * @return {Promise<void>}
    */
   async fetchLogs() {
-    const proxy = await this.client.proxy(MANAGER_IFACE);
-    const path = await proxy.CollectLogs();
-    const file = cockpit.file(path, { binary: true });
-    return file.read();
+    // TODO
   }
 
   /**
@@ -97,8 +93,8 @@ class ManagerBaseClient {
    * @return {Promise<number>}
    */
   async getPhase() {
-    const proxy = await this.client.proxy(MANAGER_IFACE);
-    return proxy.CurrentInstallationPhase;
+    const installer = await this.client.get("/manager/installer");
+    return installer.phase;
   }
 
   /**
@@ -108,9 +104,9 @@ class ManagerBaseClient {
    * @return {import ("./dbus").RemoveFn} function to disable the callback
    */
   onPhaseChange(handler) {
-    return this.client.onObjectChanged(MANAGER_PATH, MANAGER_IFACE, (changes) => {
-      if ("CurrentInstallationPhase" in changes) {
-        handler(changes.CurrentInstallationPhase.v);
+    return this.client.onEvent("InstallationPhaseChanged", ({ phase }) => {
+      if (phase) {
+        handler(phase);
       }
     });
   }
@@ -118,23 +114,27 @@ class ManagerBaseClient {
   /**
    * Runs cleanup when installation is done
    */
-  async finishInstallation() {
-    const proxy = await this.client.proxy(MANAGER_IFACE);
-    return proxy.Finish();
+  finishInstallation() {
+    return this.client.post("/manager/install");
   }
 
   /**
    * Returns whether Iguana is used on the system
+   *
+   * @return {Promise<boolean>}
    */
   async useIguana() {
-    const proxy = await this.client.proxy(MANAGER_IFACE);
-    return proxy.IguanaBackend;
+    const installer = await this.client.get("/manager/installer");
+    return installer.iguana;
   }
 }
 
 /**
-  * Client to interact with the Agama manager service
-  */
-class ManagerClient extends WithProgress(WithStatus(ManagerBaseClient, MANAGER_PATH), MANAGER_PATH) { }
+ * Client to interact with the Agama manager service
+ */
+class ManagerClient extends WithProgress(
+  WithStatus(ManagerBaseClient, "/manager/status", "org.opensuse.Agama.Manager1"),
+  MANAGER_PATH,
+) {}
 
 export { ManagerClient };
diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index 30ab4e95bf..a5f42a6937 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -35,6 +35,10 @@ const VALIDATION_IFACE = "org.opensuse.Agama1.Validation";
  * @typedef {GConstructor<{ client: import("./dbus").default }>} WithDBusClient
  */
 
+/**
+ * @typedef {GConstructor<{ client: import("./http").HTTPClient }>} WithHTTPClient
+ */
+
 /**
  * @typedef {GConstructor<{ client: import("./dbus").default, proxies: Object }>} WithDBusProxies
  */
@@ -43,6 +47,11 @@ const VALIDATION_IFACE = "org.opensuse.Agama1.Validation";
  * @typedef {[string, string, number, number]} DBusIssue
  */
 
+/**
+ * @typedef {object} StatusResource
+ * @property {number} current - current status.
+ */
+
 /**
  * @typedef {object} Issue
  * @property {string} description
@@ -136,35 +145,37 @@ const WithIssues = (superclass, object_path) => class extends superclass {
 /**
  * Extends the given class with methods to get and track the progress over D-Bus
  *
- * @template {!WithDBusClient} T
- * @param {string} object_path - object path
+ * @template {!WithHTTPClient} T
+ * @param {string} status_path - status resource path (e.g., "/manager/status").
+ * @param {string} service_name - service name (e.g., "org.opensuse.Agama.Manager1").
  * @param {T} superclass - superclass to extend
  */
-const WithStatus = (superclass, object_path) => class extends superclass {
-  /**
-   * Returns the service status
-   *
-   * @return {Promise<number>} 0 for idle, 1 for busy
-   */
-  async getStatus() {
-    const proxy = await this.client.proxy(STATUS_IFACE, object_path);
-    return proxy.Current;
-  }
+const WithStatus = (superclass, status_path, service_name) =>
+  class extends superclass {
+    /**
+     * Returns the service status
+     *
+     * @return {Promise<number>} 0 for idle, 1 for busy
+     */
+    async getStatus() {
+      const status = await this.client.get(status_path);
+      return status.current;
+    }
 
-  /**
-   * Register a callback to run when the "CurrentInstallationPhase" changes
-   *
-   * @param {function} handler - callback function
-   * @return {function} function to disable the callback
-   */
-  onStatusChange(handler) {
-    return this.client.onObjectChanged(object_path, STATUS_IFACE, (changes) => {
-      if ("Current" in changes) {
-        handler(changes.Current.v);
-      }
-    });
-  }
-};
+    /**
+     * Register a callback to run when the "CurrentInstallationPhase" changes
+     *
+     * @param {function} handler - callback function
+     * @return {function} function to disable the callback
+     */
+    onStatusChange(handler) {
+      return this.client.onEvent("StatusChanged", ({ status, service }) => {
+        if (service === service_name && status) {
+          handler(status);
+        }
+      });
+    }
+  };
 
 /**
  * @typedef {object} Progress
@@ -186,40 +197,41 @@ const WithStatus = (superclass, object_path) => class extends superclass {
  * @param {T} superclass - superclass to extend
  * @template {!WithDBusClient} T
  */
-const WithProgress = (superclass, object_path) => class extends superclass {
-  /**
-   * Returns the service progress
-   *
-   * @return {Promise<Progress>} an object containing the total steps,
-   *   the current step and whether the service finished or not.
-   */
-  async getProgress() {
-    const proxy = await this.client.proxy(PROGRESS_IFACE, object_path);
-    return {
-      total: proxy.TotalSteps,
-      current: proxy.CurrentStep[0],
-      message: proxy.CurrentStep[1],
-      finished: proxy.Finished
-    };
-  }
+const WithProgress = (superclass, object_path) =>
+  class extends superclass {
+    /**
+     * Returns the service progress
+     *
+     * @return {Promise<Progress>} an object containing the total steps,
+     *   the current step and whether the service finished or not.
+     */
+    async getProgress() {
+      const proxy = await this.client.proxy(PROGRESS_IFACE, object_path);
+      return {
+        total: proxy.TotalSteps,
+        current: proxy.CurrentStep[0],
+        message: proxy.CurrentStep[1],
+        finished: proxy.Finished,
+      };
+    }
 
-  /**
-   * Register a callback to run when the progress changes
-   *
-   * @param {ProgressHandler} handler - callback function
-   * @return {import ("./dbus").RemoveFn} function to disable the callback
-   */
-  onProgressChange(handler) {
-    return this.client.onObjectChanged(object_path, PROGRESS_IFACE, (changes) => {
-      const { TotalSteps, CurrentStep, Finished } = changes;
-      if (TotalSteps === undefined && CurrentStep === undefined && Finished === undefined) {
-        return;
-      }
+    /**
+     * Register a callback to run when the progress changes
+     *
+     * @param {ProgressHandler} handler - callback function
+     * @return {import ("./dbus").RemoveFn} function to disable the callback
+     */
+    onProgressChange(handler) {
+      return this.client.onObjectChanged(object_path, PROGRESS_IFACE, (changes) => {
+        const { TotalSteps, CurrentStep, Finished } = changes;
+        if (TotalSteps === undefined && CurrentStep === undefined && Finished === undefined) {
+          return;
+        }
 
-      this.getProgress().then(handler);
-    });
-  }
-};
+        this.getProgress().then(handler);
+      });
+    }
+  };
 
 /**
  * @typedef {object} ValidationError

From bb76407605b3056a0d46ee7941aa5eb58aa96d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 12:21:51 +0000
Subject: [PATCH 064/324] Adjust the L10nClient to the latest HTTP/JSON API
 changes

---
 web/src/client/l10n.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/client/l10n.js b/web/src/client/l10n.js
index d1f7e79d12..37602d6478 100644
--- a/web/src/client/l10n.js
+++ b/web/src/client/l10n.js
@@ -276,13 +276,13 @@ class L10nClient {
    * @private
    *
    * @param {object} locale - Locale data.
-   * @param {string} locale.code - Identifier.
-   * @param {string} locale.name - Name.
+   * @param {string} locale.id - Identifier.
+   * @param {string} locale.language - Name.
    * @param {string} locale.territory - Territory.
    * @return {Locale}
    */
-  buildLocale({ code, name, territory }) {
-    return ({ id: code, name, territory });
+  buildLocale({ id, language, territory }) {
+    return ({ id, name: language, territory });
   }
 
   /**

From 0c129bf1793a88b7f13fb5d28981900ee61444d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 12:22:39 +0000
Subject: [PATCH 065/324] Enable HTTP/JSON API calls in the ProductProvider

* The registration is still disabled.
---
 web/src/context/product.jsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/src/context/product.jsx b/web/src/context/product.jsx
index 44100931fe..173f1a9f6f 100644
--- a/web/src/context/product.jsx
+++ b/web/src/context/product.jsx
@@ -53,17 +53,17 @@ function ProductProvider({ children }) {
     }
   }, [client, setProducts, setSelectedId, setRegistration, cancellablePromise]);
 
-  // useEffect(() => {
-  //   if (!client) return;
+  useEffect(() => {
+    if (!client) return;
 
-  //   return client.software.product.onChange(setSelectedId);
-  // }, [client, setSelectedId]);
+    return client.product.onChange(setSelectedId);
+  }, [client, setSelectedId]);
 
-  // useEffect(() => {
-  //   if (!client) return;
+  useEffect(() => {
+    if (!client) return;
 
-  //   return client.software.product.onRegistrationChange(setRegistration);
-  // }, [client, setRegistration]);
+    // return client.product.onRegistrationChange(setRegistration);
+  }, [client, setRegistration]);
 
   const value = { products, selectedId, registration };
   return <ProductContext.Provider value={value}>{children}</ProductContext.Provider>;

From f549219cbc93e6f33dbae4349e3e8530eb6a63ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 12:23:37 +0000
Subject: [PATCH 066/324] Display product and locales in the overview

* The localization section is working again.
* The rest of sections are temporarily disabled.
---
 web/src/components/overview/L10nSection.jsx   |  2 +-
 web/src/components/overview/OverviewPage.jsx  | 27 +++++++++++++------
 .../components/overview/ProductSection.jsx    |  4 +--
 web/src/context/product.jsx                   |  2 +-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/web/src/components/overview/L10nSection.jsx b/web/src/components/overview/L10nSection.jsx
index fb74076cac..cbdbfeb328 100644
--- a/web/src/components/overview/L10nSection.jsx
+++ b/web/src/components/overview/L10nSection.jsx
@@ -35,7 +35,7 @@ const Content = ({ locales }) => {
 
   return (
     <Text>
-      {msg1}<Em>{`${locale.name} (${locale.territory})`}</Em>{msg2}
+      {msg1}<Em>{`${locale.id} (${locale.territory})`}</Em>{msg2}
     </Text>
   );
 };
diff --git a/web/src/components/overview/OverviewPage.jsx b/web/src/components/overview/OverviewPage.jsx
index b70ead894e..6c18505320 100644
--- a/web/src/components/overview/OverviewPage.jsx
+++ b/web/src/components/overview/OverviewPage.jsx
@@ -41,6 +41,25 @@ export default function OverviewPage() {
     return <Navigate to="/products" />;
   }
 
+  // return (
+  //   <Page
+  //     icon="list_alt"
+  //     // TRANSLATORS: page title
+  //     title={_("Installation Summary")}
+  //   >
+  //     <ProductSection />
+  //     <L10nSection />
+  //     <NetworkSection />
+  //     <StorageSection showErrors />
+  //     <SoftwareSection showErrors />
+  //     <UsersSection showErrors={showErrors} />
+
+  //     <Page.Actions>
+  //       <InstallButton onClick={() => setShowErrors(true)} />
+  //     </Page.Actions>
+  //   </Page>
+  // );
+
   return (
     <Page
       icon="list_alt"
@@ -49,14 +68,6 @@ export default function OverviewPage() {
     >
       <ProductSection />
       <L10nSection />
-      <NetworkSection />
-      <StorageSection showErrors />
-      <SoftwareSection showErrors />
-      <UsersSection showErrors={showErrors} />
-
-      <Page.Actions>
-        <InstallButton onClick={() => setShowErrors(true)} />
-      </Page.Actions>
     </Page>
   );
 }
diff --git a/web/src/components/overview/ProductSection.jsx b/web/src/components/overview/ProductSection.jsx
index ad8481645d..26b54d0ccc 100644
--- a/web/src/components/overview/ProductSection.jsx
+++ b/web/src/components/overview/ProductSection.jsx
@@ -57,8 +57,8 @@ export default function ProductSection() {
   const { cancellablePromise } = useCancellablePromise();
 
   useEffect(() => {
-    cancellablePromise(software.product.getIssues()).then(setIssues);
-    return software.product.onIssuesChange(setIssues);
+    // cancellablePromise(software.product.getIssues()).then(setIssues);
+    // return software.product.onIssuesChange(setIssues);
   }, [cancellablePromise, setIssues, software]);
 
   const isLoading = !selectedProduct;
diff --git a/web/src/context/product.jsx b/web/src/context/product.jsx
index 173f1a9f6f..a293ea5b72 100644
--- a/web/src/context/product.jsx
+++ b/web/src/context/product.jsx
@@ -60,7 +60,7 @@ function ProductProvider({ children }) {
   }, [client, setSelectedId]);
 
   useEffect(() => {
-    if (!client) return;
+    // if (!client) return;
 
     // return client.product.onRegistrationChange(setRegistration);
   }, [client, setRegistration]);

From 43ebc77e2575e6b39b5843bb1daaa3a568bbb36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 14 Mar 2024 12:29:24 +0000
Subject: [PATCH 067/324] Fix indentation in LoginPage

---
 web/src/components/core/LoginPage.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
index 896224007d..d51b014b9e 100644
--- a/web/src/components/core/LoginPage.jsx
+++ b/web/src/components/core/LoginPage.jsx
@@ -64,8 +64,8 @@ export default function LoginPage() {
           <p
             dangerouslySetInnerHTML={{
               __html: sprintf(
-               // TRANSLATORS: An explanation about required privileges for login into the installer. %s
-               // will be replaced by "root"
+                // TRANSLATORS: An explanation about required privileges for login into the installer. %s
+                // will be replaced by "root"
                 _("The installer requires %s user privileges. Please, provide its password to log into the system."),
                 "<b>root</b>"
               )

From 813cd3a3780ee9721b7365fbcf94cbc29d726f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 13:11:30 +0000
Subject: [PATCH 068/324] Handle the case where the API does not return a valid
 JSON response

---
 web/src/client/http.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/web/src/client/http.js b/web/src/client/http.js
index 99a63bc571..4b3a123313 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -119,7 +119,13 @@ class HTTPClient {
         "Content-Type": "application/json",
       },
     });
-    return await response.json();
+
+    try {
+      return await response.json();
+    } catch (e) {
+      console.warn("Expecting a JSON response", e);
+      return response.status === 200;
+    }
   }
 
   /**
@@ -135,7 +141,13 @@ class HTTPClient {
         "Content-Type": "application/json",
       },
     });
-    return await response.json();
+
+    try {
+      return await response.json();
+    } catch (e) {
+      console.warn("Expecting a JSON response", e);
+      return response.status === 200;
+    }
   }
 
   /**

From 82560fa81a65b45d042af8bfde3c8c91ad6bc316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 13:12:14 +0000
Subject: [PATCH 069/324] Enable probing after selecting a product

---
 web/src/components/product/ProductSelectionPage.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/src/components/product/ProductSelectionPage.jsx b/web/src/components/product/ProductSelectionPage.jsx
index e2ff2858e4..d7fa02a6a9 100644
--- a/web/src/components/product/ProductSelectionPage.jsx
+++ b/web/src/components/product/ProductSelectionPage.jsx
@@ -48,8 +48,7 @@ function ProductSelectionPage() {
     if (newProductId !== selectedProduct?.id) {
       // TODO: handle errors
       await product.select(newProductId);
-      // FIXME: adapt to the new API
-      // manager.startProbing();
+      manager.startProbing();
     }
 
     navigate("/");

From a3c226942ea77a636c76017abdcff168a3c0c5db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 13:15:06 +0000
Subject: [PATCH 070/324] Clean-up some unused constants and imports

---
 web/src/client/manager.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/web/src/client/manager.js b/web/src/client/manager.js
index b4733529ed..a96ae9e284 100644
--- a/web/src/client/manager.js
+++ b/web/src/client/manager.js
@@ -21,12 +21,8 @@
 
 // @ts-check
 
-import DBusClient from "./dbus";
 import { WithProgress, WithStatus } from "./mixins";
-import cockpit from "../lib/cockpit";
 
-const MANAGER_SERVICE = "org.opensuse.Agama.Manager1";
-const MANAGER_IFACE = "org.opensuse.Agama.Manager1";
 const MANAGER_PATH = "/org/opensuse/Agama/Manager1";
 
 /**

From e663b983ba6b1c143172d910481d7f80c7b9b18b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 13:28:48 +0000
Subject: [PATCH 071/324] Fix the test_keymaps test

---
 rust/agama-server/tests/l10n.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/tests/l10n.rs b/rust/agama-server/tests/l10n.rs
index 75d0e76109..b175e2814e 100644
--- a/rust/agama-server/tests/l10n.rs
+++ b/rust/agama-server/tests/l10n.rs
@@ -49,7 +49,7 @@ async fn test_keymaps() {
     let response = service.oneshot(request).await.unwrap();
     assert_eq!(response.status(), StatusCode::OK);
     let body = body_to_string(response.into_body()).await;
-    assert!(body.contains(r#""layout":"us""#));
+    assert!(body.contains(r#""id":"us""#));
 }
 
 #[test]

From bdbe02104b64d1688ca91d25c645cab8bc82f692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 14:36:08 +0000
Subject: [PATCH 072/324] Update from code review

---
 web/src/client/manager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/client/manager.js b/web/src/client/manager.js
index a96ae9e284..f3915b4d8b 100644
--- a/web/src/client/manager.js
+++ b/web/src/client/manager.js
@@ -24,6 +24,7 @@
 import { WithProgress, WithStatus } from "./mixins";
 
 const MANAGER_PATH = "/org/opensuse/Agama/Manager1";
+const MANAGER_SERVICE = "org.opensuse.Agama.Manager1";
 
 /**
  * Manager base client
@@ -129,7 +130,7 @@ class ManagerBaseClient {
  * Client to interact with the Agama manager service
  */
 class ManagerClient extends WithProgress(
-  WithStatus(ManagerBaseClient, "/manager/status", "org.opensuse.Agama.Manager1"),
+  WithStatus(ManagerBaseClient, "/manager/status", MANAGER_SERVICE),
   MANAGER_PATH,
 ) {}
 

From f3babaff51eb2383d9f35c18daf993aa740f2f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 11:01:02 +0000
Subject: [PATCH 073/324] Unify some error types that brought no value

---
 rust/agama-server/src/error.rs        | 24 ++++++++++++++
 rust/agama-server/src/manager/web.rs  | 27 +++-------------
 rust/agama-server/src/software/web.rs | 35 ++++----------------
 rust/agama-server/src/web/common.rs   | 46 ++-------------------------
 4 files changed, 39 insertions(+), 93 deletions(-)

diff --git a/rust/agama-server/src/error.rs b/rust/agama-server/src/error.rs
index 926feab063..c8b08c850c 100644
--- a/rust/agama-server/src/error.rs
+++ b/rust/agama-server/src/error.rs
@@ -1,3 +1,10 @@
+use agama_lib::error::ServiceError;
+use axum::{
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    Json,
+};
+use serde_json::json;
 use zbus_macros::DBusError;
 
 #[derive(DBusError, Debug)]
@@ -25,3 +32,20 @@ impl From<Error> for zbus::fdo::Error {
         zbus::fdo::Error::Failed(format!("Localization error: {value}"))
     }
 }
+
+#[derive(Debug, thiserror::Error)]
+pub enum ApiError {
+    #[error("Agama service error: {0}")]
+    Service(#[from] ServiceError),
+    #[error("D-Bus error: {0}")]
+    DBus(#[from] zbus::Error),
+}
+
+impl IntoResponse for ApiError {
+    fn into_response(self) -> Response {
+        let body = json!({
+            "error": self.to_string()
+        });
+        (StatusCode::BAD_REQUEST, Json(body)).into_response()
+    }
+}
diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index 8f6bc6b08c..02c60df493 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -14,18 +14,14 @@ use agama_lib::{
 };
 use axum::{
     extract::State,
-    http::StatusCode,
-    response::{IntoResponse, Response},
     routing::{get, post},
     Json, Router,
 };
 use serde::Serialize;
-use serde_json::json;
-use thiserror::Error;
 use tokio_stream::{Stream, StreamExt};
 
 use crate::{
-    error::Error,
+    error::{ApiError, Error},
     web::{
         common::{progress_router, service_status_router},
         Event,
@@ -37,19 +33,6 @@ pub struct ManagerState<'a> {
     manager: ManagerClient<'a>,
 }
 
-#[derive(Error, Debug)]
-pub enum ManagerError {
-    #[error("Manager service error: {0}")]
-    Error(#[from] ServiceError),
-}
-
-impl IntoResponse for ManagerError {
-    fn into_response(self) -> Response {
-        let body = json!({});
-        (StatusCode::BAD_REQUEST, Json(body)).into_response()
-    }
-}
-
 /// Holds information about the manager's status.
 #[derive(Clone, Serialize, utoipa::ToSchema)]
 pub struct InstallerStatus {
@@ -115,7 +98,7 @@ pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
 #[utoipa::path(get, path = "/api/manager/probe", responses(
   (status = 200, description = "The probing process was started.")
 ))]
-async fn probe_action(State(state): State<ManagerState<'_>>) -> Result<(), ManagerError> {
+async fn probe_action(State(state): State<ManagerState<'_>>) -> Result<(), ApiError> {
     state.manager.probe().await?;
     Ok(())
 }
@@ -124,7 +107,7 @@ async fn probe_action(State(state): State<ManagerState<'_>>) -> Result<(), Manag
 #[utoipa::path(get, path = "/api/manager/install", responses(
   (status = 200, description = "The installation process was started.")
 ))]
-async fn install_action(State(state): State<ManagerState<'_>>) -> Result<(), ManagerError> {
+async fn install_action(State(state): State<ManagerState<'_>>) -> Result<(), ApiError> {
     state.manager.install().await?;
     Ok(())
 }
@@ -133,7 +116,7 @@ async fn install_action(State(state): State<ManagerState<'_>>) -> Result<(), Man
 #[utoipa::path(get, path = "/api/manager/install", responses(
   (status = 200, description = "The installation tasks are executed.")
 ))]
-async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), ManagerError> {
+async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), ApiError> {
     state.manager.finish().await?;
     Ok(())
 }
@@ -144,7 +127,7 @@ async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), Mana
 ))]
 async fn installer_status(
     State(state): State<ManagerState<'_>>,
-) -> Result<Json<InstallerStatus>, ManagerError> {
+) -> Result<Json<InstallerStatus>, ApiError> {
     let status = InstallerStatus {
         phase: state.manager.current_installation_phase().await?,
         busy: state.manager.busy_services().await?,
diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index de8c599352..59d748beea 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -6,7 +6,7 @@
 //! * `software_stream` which offers an stream that emits the software events coming from D-Bus.
 
 use crate::{
-    error::Error,
+    error::{ApiError, Error},
     web::{
         common::{progress_router, service_status_router},
         Event,
@@ -22,15 +22,11 @@ use agama_lib::{
 };
 use axum::{
     extract::State,
-    http::StatusCode,
-    response::{IntoResponse, Response},
     routing::{get, post, put},
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
-use serde_json::json;
 use std::{collections::HashMap, pin::Pin};
-use thiserror::Error;
 use tokio_stream::{Stream, StreamExt};
 
 #[derive(Clone)]
@@ -45,21 +41,6 @@ pub struct SoftwareConfig {
     product: Option<String>,
 }
 
-#[derive(Error, Debug)]
-pub enum SoftwareError {
-    #[error("Software service error: {0}")]
-    Error(#[from] ServiceError),
-}
-
-impl IntoResponse for SoftwareError {
-    fn into_response(self) -> Response {
-        let body = json!({
-            "error": self.to_string()
-        });
-        (StatusCode::BAD_REQUEST, Json(body)).into_response()
-    }
-}
-
 /// Returns an stream that emits software related events coming from D-Bus.
 ///
 /// It emits the Event::ProductChanged and Event::PatternsChanged events.
@@ -159,9 +140,7 @@ pub async fn software_service(dbus: zbus::Connection) -> Result<Router, ServiceE
     (status = 200, description = "List of known products", body = Vec<Product>),
     (status = 400, description = "The D-Bus service could not perform the action")
 ))]
-async fn products(
-    State(state): State<SoftwareState<'_>>,
-) -> Result<Json<Vec<Product>>, SoftwareError> {
+async fn products(State(state): State<SoftwareState<'_>>) -> Result<Json<Vec<Product>>, ApiError> {
     let products = state.product.products().await?;
     Ok(Json(products))
 }
@@ -185,7 +164,7 @@ pub struct PatternEntry {
 ))]
 async fn patterns(
     State(state): State<SoftwareState<'_>>,
-) -> Result<Json<Vec<PatternEntry>>, SoftwareError> {
+) -> Result<Json<Vec<PatternEntry>>, ApiError> {
     let patterns = state.software.patterns(true).await?;
     let selected = state.software.selected_patterns().await?;
     let items = patterns
@@ -216,7 +195,7 @@ async fn patterns(
 async fn set_config(
     State(state): State<SoftwareState<'_>>,
     Json(config): Json<SoftwareConfig>,
-) -> Result<(), SoftwareError> {
+) -> Result<(), ApiError> {
     if let Some(product) = config.product {
         state.product.select_product(&product).await?;
     }
@@ -237,7 +216,7 @@ async fn set_config(
 ))]
 async fn get_config(
     State(state): State<SoftwareState<'_>>,
-) -> Result<Json<SoftwareConfig>, SoftwareError> {
+) -> Result<Json<SoftwareConfig>, ApiError> {
     let product = state.product.product().await?;
     let product = if product.is_empty() {
         None
@@ -269,7 +248,7 @@ pub struct SoftwareProposal {
 ))]
 async fn proposal(
     State(state): State<SoftwareState<'_>>,
-) -> Result<Json<SoftwareProposal>, SoftwareError> {
+) -> Result<Json<SoftwareProposal>, ApiError> {
     let size = state.software.used_disk_space().await?;
     let proposal = SoftwareProposal { size };
     Ok(Json(proposal))
@@ -284,7 +263,7 @@ async fn proposal(
         (status = 400, description = "The D-Bus service could not perform the action
 ")
 ))]
-async fn probe(State(state): State<SoftwareState<'_>>) -> Result<Json<()>, SoftwareError> {
+async fn probe(State(state): State<SoftwareState<'_>>) -> Result<Json<()>, ApiError> {
     state.software.probe().await?;
     Ok(Json(()))
 }
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 5c927bbe06..037e956dc4 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -7,21 +7,13 @@ use agama_lib::{
     progress::Progress,
     proxies::{ProgressProxy, ServiceStatusProxy},
 };
-use axum::{
-    extract::State,
-    http::StatusCode,
-    response::{IntoResponse, Response},
-    routing::get,
-    Json, Router,
-};
+use axum::{extract::State, routing::get, Json, Router};
 use pin_project::pin_project;
 use serde::Serialize;
-use serde_json::json;
-use thiserror::Error;
 use tokio_stream::{Stream, StreamExt};
 use zbus::PropertyStream;
 
-use crate::error::Error;
+use crate::error::{ApiError, Error};
 
 use super::Event;
 
@@ -83,21 +75,6 @@ struct ServiceStatus {
     current: u32,
 }
 
-#[derive(Error, Debug)]
-pub enum ServiceStatusError {
-    #[error("Service status error: {0}")]
-    Error(#[from] ServiceError),
-}
-
-impl IntoResponse for ServiceStatusError {
-    fn into_response(self) -> Response {
-        let body = json!({
-            "error": self.to_string()
-        });
-        (StatusCode::BAD_REQUEST, Json(body)).into_response()
-    }
-}
-
 /// Builds a stream of the changes in the the `org.opensuse.Agama1.ServiceStatus`
 /// interface of the given D-Bus object.
 ///
@@ -186,24 +163,7 @@ struct ProgressState<'a> {
     proxy: ProgressProxy<'a>,
 }
 
-#[derive(Error, Debug)]
-pub enum ProgressError {
-    #[error("Progress error: {0}")]
-    Error(#[from] ServiceError),
-    #[error("D-Bus error: {0}")]
-    DBusError(#[from] zbus::Error),
-}
-
-impl IntoResponse for ProgressError {
-    fn into_response(self) -> Response {
-        let body = json!({
-            "error": self.to_string()
-        });
-        (StatusCode::BAD_REQUEST, Json(body)).into_response()
-    }
-}
-
-async fn progress(State(state): State<ProgressState<'_>>) -> Result<Json<Progress>, ProgressError> {
+async fn progress(State(state): State<ProgressState<'_>>) -> Result<Json<Progress>, ApiError> {
     let proxy = state.proxy;
     let progress = Progress::from_proxy(&proxy).await?;
     Ok(Json(progress))

From f72393e2548aed6cb5761e1ed05b9f949b91b7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 12:05:29 +0000
Subject: [PATCH 074/324] More errors simplification

---
 rust/agama-server/src/error.rs             | 15 ++++++-----
 rust/agama-server/src/questions.rs         | 31 ++++++++++++----------
 rust/agama-server/src/questions/answers.rs | 10 +++----
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/rust/agama-server/src/error.rs b/rust/agama-server/src/error.rs
index c8b08c850c..d3037cd4e2 100644
--- a/rust/agama-server/src/error.rs
+++ b/rust/agama-server/src/error.rs
@@ -5,14 +5,17 @@ use axum::{
     Json,
 };
 use serde_json::json;
-use zbus_macros::DBusError;
 
-#[derive(DBusError, Debug)]
-#[dbus_error(prefix = "org.opensuse.Agama1.Locale")]
+use crate::questions::QuestionsError;
+
+#[derive(thiserror::Error, Debug)]
 pub enum Error {
-    #[dbus_error(zbus_error)]
-    ZBus(zbus::Error),
+    #[error("D-Bus error: {0}")]
+    DBus(#[from] zbus::Error),
+    #[error("Generic error: {0}")]
     Anyhow(String),
+    #[error("Answers handling error: {0}")]
+    Answers(QuestionsError),
 }
 
 // This would be nice, but using it for a return type
@@ -29,7 +32,7 @@ impl From<anyhow::Error> for Error {
 
 impl From<Error> for zbus::fdo::Error {
     fn from(value: Error) -> zbus::fdo::Error {
-        zbus::fdo::Error::Failed(format!("Localization error: {value}"))
+        zbus::fdo::Error::Failed(format!("D-Bus error: {value}"))
     }
 }
 
diff --git a/rust/agama-server/src/questions.rs b/rust/agama-server/src/questions.rs
index fda860bf6d..795029674c 100644
--- a/rust/agama-server/src/questions.rs
+++ b/rust/agama-server/src/questions.rs
@@ -1,12 +1,19 @@
 use std::collections::HashMap;
 
-use crate::error::Error;
 use agama_lib::questions::{self, GenericQuestion, WithPassword};
 use log;
 use zbus::{dbus_interface, fdo::ObjectManager, zvariant::ObjectPath, Connection};
 
 mod answers;
 
+#[derive(thiserror::Error, Debug)]
+pub enum QuestionsError {
+    #[error("Could not read the answers file: {0}")]
+    IO(std::io::Error),
+    #[error("Could not deserialize the answers file: {0}")]
+    Deserialize(serde_yaml::Error),
+}
+
 #[derive(Clone, Debug)]
 struct GenericQuestionObject(questions::GenericQuestion);
 
@@ -48,7 +55,7 @@ impl GenericQuestionObject {
     }
 
     #[dbus_interface(property)]
-    pub fn set_answer(&mut self, value: &str) -> Result<(), zbus::fdo::Error> {
+    pub fn set_answer(&mut self, value: &str) -> zbus::fdo::Result<()> {
         // TODO verify if answer exists in options or if it is valid in other way
         self.0.answer = value.to_string();
 
@@ -143,7 +150,7 @@ impl Questions {
         options: Vec<&str>,
         default_option: &str,
         data: HashMap<String, String>,
-    ) -> Result<ObjectPath, zbus::fdo::Error> {
+    ) -> zbus::fdo::Result<ObjectPath> {
         log::info!("Creating new question with text: {}.", text);
         let id = self.last_id;
         self.last_id += 1; // TODO use some thread safety
@@ -176,7 +183,7 @@ impl Questions {
         options: Vec<&str>,
         default_option: &str,
         data: HashMap<String, String>,
-    ) -> Result<ObjectPath, zbus::fdo::Error> {
+    ) -> zbus::fdo::Result<ObjectPath> {
         log::info!("Creating new question with password with text: {}.", text);
         let id = self.last_id;
         self.last_id += 1; // TODO use some thread safety
@@ -213,7 +220,7 @@ impl Questions {
     }
 
     /// Removes question at given object path
-    async fn delete(&mut self, question: ObjectPath<'_>) -> Result<(), Error> {
+    async fn delete(&mut self, question: ObjectPath<'_>) -> zbus::fdo::Result<()> {
         // TODO: error checking
         let id: u32 = question.rsplit('/').next().unwrap().parse().unwrap();
         let qtype = self.questions.get(&id).unwrap();
@@ -266,16 +273,12 @@ impl Questions {
         }
     }
 
-    fn add_answer_file(&mut self, path: String) -> Result<(), Error> {
+    fn add_answer_file(&mut self, path: String) -> zbus::fdo::Result<()> {
         log::info!("Adding answer file {}", path);
-        let answers = answers::Answers::new_from_file(path.as_str());
-        match answers {
-            Ok(answers) => {
-                self.answer_strategies.push(Box::new(answers));
-                Ok(())
-            }
-            Err(e) => Err(e.into()),
-        }
+        let answers = answers::Answers::new_from_file(path.as_str())
+            .map_err(|e| zbus::fdo::Error::Failed(e.to_string()))?;
+        self.answer_strategies.push(Box::new(answers));
+        Ok(())
     }
 }
 
diff --git a/rust/agama-server/src/questions/answers.rs b/rust/agama-server/src/questions/answers.rs
index 60ade14fa0..c774950f94 100644
--- a/rust/agama-server/src/questions/answers.rs
+++ b/rust/agama-server/src/questions/answers.rs
@@ -1,9 +1,10 @@
 use std::collections::HashMap;
 
 use agama_lib::questions::GenericQuestion;
-use anyhow::Context;
 use serde::{Deserialize, Serialize};
 
+use super::QuestionsError;
+
 /// Data structure for single yaml answer. For variables specification see
 /// corresponding [agama_lib::questions::GenericQuestion] fields.
 /// The *matcher* part is: `class`, `text`, `data`.
@@ -60,10 +61,9 @@ pub struct Answers {
 }
 
 impl Answers {
-    pub fn new_from_file(path: &str) -> anyhow::Result<Self> {
-        let f = std::fs::File::open(path).context(format!("Failed to open {}", path))?;
-        let result: Self =
-            serde_yaml::from_reader(f).context(format!("Failed to parse values at {}", path))?;
+    pub fn new_from_file(path: &str) -> Result<Self, QuestionsError> {
+        let f = std::fs::File::open(path).map_err(QuestionsError::IO)?;
+        let result: Self = serde_yaml::from_reader(f).map_err(QuestionsError::Deserialize)?;
 
         Ok(result)
     }

From c4878b88be2046a13addd296afd6f8911fdda27c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 12:18:30 +0000
Subject: [PATCH 075/324] Remove unneeded code from the localization D-Bus API

---
 rust/agama-server/src/l10n.rs | 83 +++++------------------------------
 1 file changed, 12 insertions(+), 71 deletions(-)

diff --git a/rust/agama-server/src/l10n.rs b/rust/agama-server/src/l10n.rs
index 10eff942fe..e130c01a46 100644
--- a/rust/agama-server/src/l10n.rs
+++ b/rust/agama-server/src/l10n.rs
@@ -6,7 +6,7 @@ pub mod web;
 
 use crate::error::Error;
 use agama_locale_data::{KeymapId, LocaleId};
-use anyhow::Context;
+
 use keyboard::KeymapsDatabase;
 use locale::LocalesDatabase;
 use regex::Regex;
@@ -32,31 +32,6 @@ pub struct Locale {
 
 #[dbus_interface(name = "org.opensuse.Agama1.Locale")]
 impl Locale {
-    /// Gets the supported locales information.
-    ///
-    /// Each element of the list has these parts:
-    ///
-    /// * The locale code (e.g., "es_ES.UTF-8").
-    /// * The name of the language according to the language defined by the
-    ///   UILocale property.
-    /// * The name of the territory according to the language defined by the
-    ///   UILocale property.
-    fn list_locales(&self) -> Result<Vec<(String, String, String)>, Error> {
-        let locales = self
-            .locales_db
-            .entries()
-            .iter()
-            .map(|l| {
-                (
-                    l.id.to_string(),
-                    l.language.to_string(),
-                    l.territory.to_string(),
-                )
-            })
-            .collect::<Vec<_>>();
-        Ok(locales)
-    }
-
     #[dbus_interface(property)]
     fn locales(&self) -> Vec<String> {
         self.locales.to_owned()
@@ -64,6 +39,11 @@ impl Locale {
 
     #[dbus_interface(property)]
     fn set_locales(&mut self, locales: Vec<String>) -> zbus::fdo::Result<()> {
+        if locales.is_empty() {
+            return Err(zbus::fdo::Error::Failed(format!(
+                "The locales list cannot be empty"
+            )));
+        }
         for loc in &locales {
             if !self.locales_db.exists(loc.as_str()) {
                 return Err(zbus::fdo::Error::Failed(format!(
@@ -89,22 +69,6 @@ impl Locale {
         Ok(self.translate(&locale)?)
     }
 
-    /// Returns a list of the supported keymaps.
-    ///
-    /// Each element of the list contains:
-    ///
-    /// * The keymap identifier (e.g., "es" or "es(ast)").
-    /// * The name of the keyboard in language set by the UILocale property.
-    fn list_keymaps(&self) -> Result<Vec<(String, String)>, Error> {
-        let keymaps = self
-            .keymaps_db
-            .entries()
-            .iter()
-            .map(|k| (k.id.to_string(), k.localized_description()))
-            .collect();
-        Ok(keymaps)
-    }
-
     #[dbus_interface(property)]
     fn keymap(&self) -> String {
         self.keymap.to_string()
@@ -125,32 +89,6 @@ impl Locale {
         Ok(())
     }
 
-    /// Returns a list of the supported timezones.
-    ///
-    /// Each element of the list contains:
-    ///
-    /// * The timezone identifier (e.g., "Europe/Berlin").
-    /// * A list containing each part of the name in the language set by the
-    ///   UILocale property.
-    /// * The name, in the language set by UILocale, of the main country
-    ///   associated to the timezone (typically, the name of the city that is
-    ///   part of the identifier) or empty string if there is no country.
-    fn list_timezones(&self) -> Result<Vec<(String, Vec<String>, String)>, Error> {
-        let timezones: Vec<_> = self
-            .timezones_db
-            .entries()
-            .iter()
-            .map(|tz| {
-                (
-                    tz.code.to_string(),
-                    tz.parts.clone(),
-                    tz.country.clone().unwrap_or_default(),
-                )
-            })
-            .collect();
-        Ok(timezones)
-    }
-
     #[dbus_interface(property)]
     fn timezone(&self) -> &str {
         self.timezone.as_str()
@@ -169,22 +107,25 @@ impl Locale {
     }
 
     // TODO: what should be returned value for commit?
-    fn commit(&mut self) -> Result<(), Error> {
+    fn commit(&mut self) -> zbus::fdo::Result<()> {
         const ROOT: &str = "/mnt";
+
         Command::new("/usr/bin/systemd-firstboot")
             .args([
                 "--root",
                 ROOT,
                 "--force",
                 "--locale",
-                self.locales.first().context("missing locale")?.as_str(),
+                self.locales.first().unwrap_or(&"en_US.UTF-8".to_string()),
                 "--keymap",
                 &self.keymap.to_string(),
                 "--timezone",
                 &self.timezone,
             ])
             .status()
-            .context("Failed to execute systemd-firstboot")?;
+            .map_err(|e| {
+                zbus::fdo::Error::Failed(format!("Could not apply the l10n configuration: {e}"))
+            })?;
 
         Ok(())
     }

From f2848d084f6a56722e964002efd051bee613686e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 12:22:50 +0000
Subject: [PATCH 076/324] Unify ApiError and Error

---
 rust/agama-server/src/error.rs        | 12 +++---------
 rust/agama-server/src/manager/web.rs  | 10 +++++-----
 rust/agama-server/src/software/web.rs | 18 +++++++-----------
 rust/agama-server/src/web/common.rs   |  4 ++--
 4 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/rust/agama-server/src/error.rs b/rust/agama-server/src/error.rs
index d3037cd4e2..7f3665b24b 100644
--- a/rust/agama-server/src/error.rs
+++ b/rust/agama-server/src/error.rs
@@ -14,6 +14,8 @@ pub enum Error {
     DBus(#[from] zbus::Error),
     #[error("Generic error: {0}")]
     Anyhow(String),
+    #[error("Agama service error: {0}")]
+    Service(#[from] ServiceError),
     #[error("Answers handling error: {0}")]
     Answers(QuestionsError),
 }
@@ -36,15 +38,7 @@ impl From<Error> for zbus::fdo::Error {
     }
 }
 
-#[derive(Debug, thiserror::Error)]
-pub enum ApiError {
-    #[error("Agama service error: {0}")]
-    Service(#[from] ServiceError),
-    #[error("D-Bus error: {0}")]
-    DBus(#[from] zbus::Error),
-}
-
-impl IntoResponse for ApiError {
+impl IntoResponse for Error {
     fn into_response(self) -> Response {
         let body = json!({
             "error": self.to_string()
diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index 02c60df493..ce3ebe64d5 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -21,7 +21,7 @@ use serde::Serialize;
 use tokio_stream::{Stream, StreamExt};
 
 use crate::{
-    error::{ApiError, Error},
+    error::Error,
     web::{
         common::{progress_router, service_status_router},
         Event,
@@ -98,7 +98,7 @@ pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
 #[utoipa::path(get, path = "/api/manager/probe", responses(
   (status = 200, description = "The probing process was started.")
 ))]
-async fn probe_action(State(state): State<ManagerState<'_>>) -> Result<(), ApiError> {
+async fn probe_action(State(state): State<ManagerState<'_>>) -> Result<(), Error> {
     state.manager.probe().await?;
     Ok(())
 }
@@ -107,7 +107,7 @@ async fn probe_action(State(state): State<ManagerState<'_>>) -> Result<(), ApiEr
 #[utoipa::path(get, path = "/api/manager/install", responses(
   (status = 200, description = "The installation process was started.")
 ))]
-async fn install_action(State(state): State<ManagerState<'_>>) -> Result<(), ApiError> {
+async fn install_action(State(state): State<ManagerState<'_>>) -> Result<(), Error> {
     state.manager.install().await?;
     Ok(())
 }
@@ -116,7 +116,7 @@ async fn install_action(State(state): State<ManagerState<'_>>) -> Result<(), Api
 #[utoipa::path(get, path = "/api/manager/install", responses(
   (status = 200, description = "The installation tasks are executed.")
 ))]
-async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), ApiError> {
+async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), Error> {
     state.manager.finish().await?;
     Ok(())
 }
@@ -127,7 +127,7 @@ async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), ApiE
 ))]
 async fn installer_status(
     State(state): State<ManagerState<'_>>,
-) -> Result<Json<InstallerStatus>, ApiError> {
+) -> Result<Json<InstallerStatus>, Error> {
     let status = InstallerStatus {
         phase: state.manager.current_installation_phase().await?,
         busy: state.manager.busy_services().await?,
diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index 59d748beea..de7e907501 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -6,7 +6,7 @@
 //! * `software_stream` which offers an stream that emits the software events coming from D-Bus.
 
 use crate::{
-    error::{ApiError, Error},
+    error::Error,
     web::{
         common::{progress_router, service_status_router},
         Event,
@@ -140,7 +140,7 @@ pub async fn software_service(dbus: zbus::Connection) -> Result<Router, ServiceE
     (status = 200, description = "List of known products", body = Vec<Product>),
     (status = 400, description = "The D-Bus service could not perform the action")
 ))]
-async fn products(State(state): State<SoftwareState<'_>>) -> Result<Json<Vec<Product>>, ApiError> {
+async fn products(State(state): State<SoftwareState<'_>>) -> Result<Json<Vec<Product>>, Error> {
     let products = state.product.products().await?;
     Ok(Json(products))
 }
@@ -164,7 +164,7 @@ pub struct PatternEntry {
 ))]
 async fn patterns(
     State(state): State<SoftwareState<'_>>,
-) -> Result<Json<Vec<PatternEntry>>, ApiError> {
+) -> Result<Json<Vec<PatternEntry>>, Error> {
     let patterns = state.software.patterns(true).await?;
     let selected = state.software.selected_patterns().await?;
     let items = patterns
@@ -195,7 +195,7 @@ async fn patterns(
 async fn set_config(
     State(state): State<SoftwareState<'_>>,
     Json(config): Json<SoftwareConfig>,
-) -> Result<(), ApiError> {
+) -> Result<(), Error> {
     if let Some(product) = config.product {
         state.product.select_product(&product).await?;
     }
@@ -214,9 +214,7 @@ async fn set_config(
     (status = 200, description = "Software configuration", body = SoftwareConfig),
     (status = 400, description = "The D-Bus service could not perform the action")
 ))]
-async fn get_config(
-    State(state): State<SoftwareState<'_>>,
-) -> Result<Json<SoftwareConfig>, ApiError> {
+async fn get_config(State(state): State<SoftwareState<'_>>) -> Result<Json<SoftwareConfig>, Error> {
     let product = state.product.product().await?;
     let product = if product.is_empty() {
         None
@@ -246,9 +244,7 @@ pub struct SoftwareProposal {
     get, path = "/software/proposal", responses(
         (status = 200, description = "Software proposal", body = SoftwareProposal)
 ))]
-async fn proposal(
-    State(state): State<SoftwareState<'_>>,
-) -> Result<Json<SoftwareProposal>, ApiError> {
+async fn proposal(State(state): State<SoftwareState<'_>>) -> Result<Json<SoftwareProposal>, Error> {
     let size = state.software.used_disk_space().await?;
     let proposal = SoftwareProposal { size };
     Ok(Json(proposal))
@@ -263,7 +259,7 @@ async fn proposal(
         (status = 400, description = "The D-Bus service could not perform the action
 ")
 ))]
-async fn probe(State(state): State<SoftwareState<'_>>) -> Result<Json<()>, ApiError> {
+async fn probe(State(state): State<SoftwareState<'_>>) -> Result<Json<()>, Error> {
     state.software.probe().await?;
     Ok(Json(()))
 }
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 037e956dc4..8739d6795b 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -13,7 +13,7 @@ use serde::Serialize;
 use tokio_stream::{Stream, StreamExt};
 use zbus::PropertyStream;
 
-use crate::error::{ApiError, Error};
+use crate::error::Error;
 
 use super::Event;
 
@@ -163,7 +163,7 @@ struct ProgressState<'a> {
     proxy: ProgressProxy<'a>,
 }
 
-async fn progress(State(state): State<ProgressState<'_>>) -> Result<Json<Progress>, ApiError> {
+async fn progress(State(state): State<ProgressState<'_>>) -> Result<Json<Progress>, Error> {
     let proxy = state.proxy;
     let progress = Progress::from_proxy(&proxy).await?;
     Ok(Json(progress))

From 80ac668d5835b1e0aff2974c31958061a9e8ee43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 15 Mar 2024 12:44:52 +0000
Subject: [PATCH 077/324] Convert LocaleError into Error

---
 rust/agama-server/src/error.rs    |  8 ++++---
 rust/agama-server/src/l10n/web.rs | 38 +++++++++++--------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/rust/agama-server/src/error.rs b/rust/agama-server/src/error.rs
index 7f3665b24b..1c9b7a7847 100644
--- a/rust/agama-server/src/error.rs
+++ b/rust/agama-server/src/error.rs
@@ -6,7 +6,7 @@ use axum::{
 };
 use serde_json::json;
 
-use crate::questions::QuestionsError;
+use crate::{l10n::web::LocaleError, questions::QuestionsError};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -16,8 +16,10 @@ pub enum Error {
     Anyhow(String),
     #[error("Agama service error: {0}")]
     Service(#[from] ServiceError),
-    #[error("Answers handling error: {0}")]
-    Answers(QuestionsError),
+    #[error("Questions service error: {0}")]
+    Questions(QuestionsError),
+    #[error("Software service error: {0}")]
+    Locale(#[from] LocaleError),
 }
 
 // This would be nice, but using it for a return type
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index 09bd9d9b10..5cb2a7f777 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -9,20 +9,16 @@ use crate::{
 use agama_locale_data::{InvalidKeymap, LocaleId};
 use axum::{
     extract::State,
-    http::StatusCode,
-    response::{IntoResponse, Response},
     routing::{get, put},
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
-use serde_json::json;
 use std::{
     process::Command,
     sync::{Arc, RwLock},
 };
-use thiserror::Error;
 
-#[derive(Error, Debug)]
+#[derive(thiserror::Error, Debug)]
 pub enum LocaleError {
     #[error("Unknown locale code: {0}")]
     UnknownLocale(String),
@@ -30,19 +26,8 @@ pub enum LocaleError {
     UnknownTimezone(String),
     #[error("Invalid keymap: {0}")]
     InvalidKeymap(#[from] InvalidKeymap),
-    #[error("Cannot translate: {0}")]
-    OtherError(#[from] Error),
-    #[error("Cannot change the local keymap: {0}")]
-    CouldNotSetKeymap(#[from] std::io::Error),
-}
-
-impl IntoResponse for LocaleError {
-    fn into_response(self) -> Response {
-        let body = json!({
-            "error": self.to_string()
-        });
-        (StatusCode::BAD_REQUEST, Json(body)).into_response()
-    }
+    #[error("Could not apply the changes")]
+    Commit(#[from] std::io::Error),
 }
 
 #[derive(Clone)]
@@ -119,14 +104,14 @@ async fn keymaps(State(state): State<LocaleState>) -> Json<Vec<Keymap>> {
 async fn set_config(
     State(state): State<LocaleState>,
     Json(value): Json<LocaleConfig>,
-) -> Result<Json<()>, LocaleError> {
+) -> Result<Json<()>, Error> {
     let mut data = state.locale.write().unwrap();
     let mut changes = LocaleConfig::default();
 
     if let Some(locales) = &value.locales {
         for loc in locales {
             if !data.locales_db.exists(loc.as_str()) {
-                return Err(LocaleError::UnknownLocale(loc.to_string()));
+                return Err(LocaleError::UnknownLocale(loc.to_string()))?;
             }
         }
         data.locales = locales.clone();
@@ -135,14 +120,14 @@ async fn set_config(
 
     if let Some(timezone) = &value.timezone {
         if !data.timezones_db.exists(timezone) {
-            return Err(LocaleError::UnknownTimezone(timezone.to_string()));
+            return Err(LocaleError::UnknownTimezone(timezone.to_string()))?;
         }
         data.timezone = timezone.to_owned();
         changes.timezone = Some(data.timezone.clone());
     }
 
     if let Some(keymap_id) = &value.keymap {
-        data.keymap = keymap_id.parse()?;
+        data.keymap = keymap_id.parse().map_err(LocaleError::InvalidKeymap)?;
         changes.keymap = Some(keymap_id.clone());
     }
 
@@ -161,14 +146,17 @@ async fn set_config(
     }
 
     if let Some(ui_keymap) = &value.ui_keymap {
-        data.ui_keymap = ui_keymap.parse()?;
+        // data.ui_keymap = ui_keymap.parse().into::<Result<KeymapId, LocaleError>>()?;
+        data.ui_keymap = ui_keymap.parse().map_err(LocaleError::InvalidKeymap)?;
         Command::new("/usr/bin/localectl")
             .args(["set-x11-keymap", &ui_keymap])
-            .output()?;
+            .output()
+            .map_err(LocaleError::Commit)?;
         Command::new("/usr/bin/setxkbmap")
             .arg(&ui_keymap)
             .env("DISPLAY", ":0")
-            .output()?;
+            .output()
+            .map_err(LocaleError::Commit)?;
     }
 
     _ = state.events.send(Event::L10nConfigChanged(changes));

From b84eff90d903f1aa4de1649ed22a9c34767dae14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 18 Mar 2024 09:42:33 +0000
Subject: [PATCH 078/324] Report wrong credentials when logging in

---
 web/src/components/core/LoginPage.jsx | 29 +++++++++++++++++----------
 web/src/context/auth.jsx              |  4 +++-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
index d51b014b9e..643e08783e 100644
--- a/web/src/components/core/LoginPage.jsx
+++ b/web/src/components/core/LoginPage.jsx
@@ -23,16 +23,11 @@
 
 import React, { useState } from "react";
 import { Navigate } from "react-router-dom";
-import {
-  ActionGroup,
-  Button,
-  Form,
-  FormGroup,
-} from "@patternfly/react-core";
+import { ActionGroup, Button, Form, FormGroup } from "@patternfly/react-core";
 import { sprintf } from "sprintf-js";
 import { _ } from "~/i18n";
 import { useAuth } from "~/context/auth";
-import { About, Page, PasswordInput, Section } from "~/components/core";
+import { About, FormValidationError, Page, PasswordInput, Section } from "~/components/core";
 import { Center } from "~/components/layout";
 
 // @ts-check
@@ -43,11 +38,13 @@ import { Center } from "~/components/layout";
  */
 export default function LoginPage() {
   const [password, setPassword] = useState("");
+  const [error, setError] = useState(false);
   const { isLoggedIn, login: loginFn } = useAuth();
 
   const login = async (e) => {
     e.preventDefault();
-    await loginFn(password);
+    const result = await loginFn(password);
+    setError(!result);
   };
 
   if (isLoggedIn) {
@@ -67,8 +64,8 @@ export default function LoginPage() {
                 // TRANSLATORS: An explanation about required privileges for login into the installer. %s
                 // will be replaced by "root"
                 _("The installer requires %s user privileges. Please, provide its password to log into the system."),
-                "<b>root</b>"
-              )
+                "<b>root</b>",
+              ),
             }}
           />
 
@@ -82,6 +79,11 @@ export default function LoginPage() {
                 onChange={(_, v) => setPassword(v)}
               />
             </FormGroup>
+            {error && (
+              <FormValidationError
+                message={_("Could not log in. Please, make sure that the password is correct.")}
+              />
+            )}
 
             <ActionGroup>
               <Button type="submit" variant="primary">
@@ -93,7 +95,12 @@ export default function LoginPage() {
       </Center>
 
       <Page.Actions>
-        <About showIcon={false} iconSize="xs" buttonText={_("What is this?")} buttonVariant="link" />
+        <About
+          showIcon={false}
+          iconSize="xs"
+          buttonText={_("What is this?")}
+          buttonVariant="link"
+        />
       </Page.Actions>
     </Page>
   );
diff --git a/web/src/context/auth.jsx b/web/src/context/auth.jsx
index 4b9e2f8c59..cc4f5389a7 100644
--- a/web/src/context/auth.jsx
+++ b/web/src/context/auth.jsx
@@ -50,7 +50,9 @@ function AuthProvider({ children }) {
       body: JSON.stringify({ password }),
       headers: { "Content-Type": "application/json" },
     });
-    setIsLoggedIn(response.status === 200);
+    const result = response.status === 200;
+    setIsLoggedIn(result);
+    return result;
   }, []);
 
   const logout = useCallback(async () => {

From d50a63a2eeebf64e5522f01c2a0fe1f996430b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 18 Mar 2024 11:17:14 +0000
Subject: [PATCH 079/324] Grammar fixes in the login page

---
 web/src/components/core/LoginPage.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
index 643e08783e..5683b92932 100644
--- a/web/src/components/core/LoginPage.jsx
+++ b/web/src/components/core/LoginPage.jsx
@@ -53,7 +53,7 @@ export default function LoginPage() {
 
   // TRANSLATORS: Title for a form to provide the password for the root user. %s
   // will be replaced by "root"
-  const sectionTitle = sprintf(_("Login as %s"), "root");
+  const sectionTitle = sprintf(_("Log in as %s"), "root");
   return (
     <Page mountSidebar={false} title="Agama">
       <Center>
@@ -63,7 +63,7 @@ export default function LoginPage() {
               __html: sprintf(
                 // TRANSLATORS: An explanation about required privileges for login into the installer. %s
                 // will be replaced by "root"
-                _("The installer requires %s user privileges. Please, provide its password to log into the system."),
+                _("The installer requires %s user privileges. Please, provide its password to log in to the system."),
                 "<b>root</b>",
               ),
             }}

From b1a1a4b883936132cb5261229cec2980ba1c3371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 18 Mar 2024 11:26:37 +0000
Subject: [PATCH 080/324] Use the If component in the LoginPage

---
 web/src/components/core/LoginPage.jsx | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/web/src/components/core/LoginPage.jsx b/web/src/components/core/LoginPage.jsx
index 5683b92932..c04c8301e9 100644
--- a/web/src/components/core/LoginPage.jsx
+++ b/web/src/components/core/LoginPage.jsx
@@ -27,7 +27,7 @@ import { ActionGroup, Button, Form, FormGroup } from "@patternfly/react-core";
 import { sprintf } from "sprintf-js";
 import { _ } from "~/i18n";
 import { useAuth } from "~/context/auth";
-import { About, FormValidationError, Page, PasswordInput, Section } from "~/components/core";
+import { About, FormValidationError, If, Page, PasswordInput, Section } from "~/components/core";
 import { Center } from "~/components/layout";
 
 // @ts-check
@@ -79,11 +79,14 @@ export default function LoginPage() {
                 onChange={(_, v) => setPassword(v)}
               />
             </FormGroup>
-            {error && (
-              <FormValidationError
-                message={_("Could not log in. Please, make sure that the password is correct.")}
-              />
-            )}
+            <If
+              condition={error}
+              then={
+                <FormValidationError
+                  message={_("Could not log in. Please, make sure that the password is correct.")}
+                />
+              }
+            />
 
             <ActionGroup>
               <Button type="submit" variant="primary">

From 89aa784326ab7794a7578f74ddaf27b73b6481e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Sat, 16 Mar 2024 14:45:17 +0000
Subject: [PATCH 081/324] Fix WithStatus documentation

---
 web/src/client/mixins.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index a5f42a6937..9c351af47a 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -143,12 +143,12 @@ const WithIssues = (superclass, object_path) => class extends superclass {
 };
 
 /**
- * Extends the given class with methods to get and track the progress over D-Bus
+ * Extends the given class with methods to get and track the service status
  *
  * @template {!WithHTTPClient} T
+ * @param {T} superclass - superclass to extend
  * @param {string} status_path - status resource path (e.g., "/manager/status").
  * @param {string} service_name - service name (e.g., "org.opensuse.Agama.Manager1").
- * @param {T} superclass - superclass to extend
  */
 const WithStatus = (superclass, status_path, service_name) =>
   class extends superclass {

From 1eada083367b94a9d012741a9cc69355983b4095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Sat, 16 Mar 2024 14:47:07 +0000
Subject: [PATCH 082/324] Adapt WithProress to the HTTP/JSON API

---
 web/src/client/manager.js |  3 ++-
 web/src/client/mixins.js  | 37 ++++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/web/src/client/manager.js b/web/src/client/manager.js
index f3915b4d8b..7276eae326 100644
--- a/web/src/client/manager.js
+++ b/web/src/client/manager.js
@@ -131,7 +131,8 @@ class ManagerBaseClient {
  */
 class ManagerClient extends WithProgress(
   WithStatus(ManagerBaseClient, "/manager/status", MANAGER_SERVICE),
-  MANAGER_PATH,
+  "/manager/progress",
+  MANAGER_SERVICE,
 ) {}
 
 export { ManagerClient };
diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index 9c351af47a..9523cdd40e 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -192,12 +192,14 @@ const WithStatus = (superclass, status_path, service_name) =>
  */
 
 /**
- * Extends the given class with methods to get and track the progress over D-Bus
- * @param {string} object_path - object_path
+ * Extends the given class with methods to get and track the service progress
+ *
+ * @template {!WithHTTPClient} T
  * @param {T} superclass - superclass to extend
- * @template {!WithDBusClient} T
+ * @param {string} progress_path - status resource path (e.g., "/manager/status").
+ * @param {string} service_name - service name (e.g., "org.opensuse.Agama.Manager1").
  */
-const WithProgress = (superclass, object_path) =>
+const WithProgress = (superclass, progress_path, service_name) =>
   class extends superclass {
     /**
      * Returns the service progress
@@ -206,12 +208,14 @@ const WithProgress = (superclass, object_path) =>
      *   the current step and whether the service finished or not.
      */
     async getProgress() {
-      const proxy = await this.client.proxy(PROGRESS_IFACE, object_path);
+      const { current_step, max_steps, current_title, finished } = await this.client.get(
+        progress_path,
+      );
       return {
-        total: proxy.TotalSteps,
-        current: proxy.CurrentStep[0],
-        message: proxy.CurrentStep[1],
-        finished: proxy.Finished,
+        total: max_steps,
+        current: current_step,
+        message: current_title,
+        finished,
       };
     }
 
@@ -222,13 +226,16 @@ const WithProgress = (superclass, object_path) =>
      * @return {import ("./dbus").RemoveFn} function to disable the callback
      */
     onProgressChange(handler) {
-      return this.client.onObjectChanged(object_path, PROGRESS_IFACE, (changes) => {
-        const { TotalSteps, CurrentStep, Finished } = changes;
-        if (TotalSteps === undefined && CurrentStep === undefined && Finished === undefined) {
-          return;
+      return this.client.onEvent("Progress", (progress) => {
+        if (progress?.service === service_name) {
+          const { current_step, max_steps, current_title, finished } = progress;
+          handler({
+            total: max_steps,
+            current: current_step,
+            message: current_title,
+            finished,
+          });
         }
-
-        this.getProgress().then(handler);
       });
     }
   };

From 0bbdef82bbe15e8cabcec95a7b267bcf282deac6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 18 Mar 2024 21:04:03 +0000
Subject: [PATCH 083/324] Fix the default authentication URL

---
 rust/agama-cli/src/auth.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-cli/src/auth.rs b/rust/agama-cli/src/auth.rs
index 0e1c34bf13..2d7321fd89 100644
--- a/rust/agama-cli/src/auth.rs
+++ b/rust/agama-cli/src/auth.rs
@@ -9,7 +9,7 @@ use std::os::unix::fs::PermissionsExt;
 use std::path::{Path, PathBuf};
 
 const DEFAULT_JWT_FILE: &str = ".agama/agama-jwt";
-const DEFAULT_AUTH_URL: &str = "http://localhost:3000/api/authenticate";
+const DEFAULT_AUTH_URL: &str = "http://localhost:3000/api/auth";
 const DEFAULT_FILE_MODE: u32 = 0o600;
 
 #[derive(Subcommand, Debug)]

From 806fedc09edd1edc512350b58fbeff0fc9ecc818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 18 Mar 2024 15:23:51 +0000
Subject: [PATCH 084/324] Add support to expose the Issues API

---
 rust/agama-lib/src/proxies.rs       |   7 ++
 rust/agama-server/src/web/common.rs | 125 +++++++++++++++++++++++++++-
 rust/agama-server/src/web/event.rs  |   5 ++
 3 files changed, 134 insertions(+), 3 deletions(-)

diff --git a/rust/agama-lib/src/proxies.rs b/rust/agama-lib/src/proxies.rs
index d460e88548..74fb587486 100644
--- a/rust/agama-lib/src/proxies.rs
+++ b/rust/agama-lib/src/proxies.rs
@@ -121,3 +121,10 @@ trait Questions1 {
     #[dbus_proxy(property)]
     fn set_interactive(&self, value: bool) -> zbus::Result<()>;
 }
+
+#[dbus_proxy(interface = "org.opensuse.Agama1.Issues", assume_defaults = true)]
+trait Issues {
+    /// All property
+    #[dbus_proxy(property)]
+    fn all(&self) -> zbus::Result<Vec<(String, String, u32, u32)>>;
+}
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 8739d6795b..2397018dff 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -5,7 +5,7 @@ use std::{pin::Pin, task::Poll};
 use agama_lib::{
     error::ServiceError,
     progress::Progress,
-    proxies::{ProgressProxy, ServiceStatusProxy},
+    proxies::{IssuesProxy, ProgressProxy, ServiceStatusProxy},
 };
 use axum::{extract::State, routing::get, Json, Router};
 use pin_project::pin_project;
@@ -17,8 +17,8 @@ use crate::error::Error;
 
 use super::Event;
 
-/// Builds a router to the `org.opensuse.Agama1.ServiceStatus`
-/// interface of the given D-Bus object.
+/// Builds a router to the `org.opensuse.Agama1.ServiceStatus` interface of the
+/// given D-Bus object.
 ///
 /// ```no_run
 /// # use axum::{extract::State, routing::get, Json, Router};
@@ -231,3 +231,122 @@ async fn build_progress_proxy<'a>(
         .await?;
     Ok(proxy)
 }
+
+/// Builds a router to the `org.opensuse.Agama1.Issues` interface of a given
+/// D-Bus object.
+///
+/// ```no_run
+/// # use axum::{extract::State, routing::get, Json, Router};
+/// # use agama_lib::connection;
+/// # use agama_server::web::common::service_status_router;
+/// # use tokio_test;
+///
+/// # tokio_test::block_on(async {
+/// async fn hello(state: State<HelloWorldState>) {};
+///
+/// #[derive(Clone)]
+/// struct HelloWorldState {};
+///
+/// let dbus = connection().await.unwrap();
+/// let issues_router = issues_router(
+///   &dbus, "org.opensuse.HelloWorld", "/org/opensuse/hello"
+/// ).await.unwrap();
+/// let router: Router<HelloWorldState> = Router::new()
+///   .route("/hello", get(hello))
+///   .merge(issues_router)
+///   .with_state(HelloWorldState {});
+/// });
+/// ```
+///
+/// * `dbus`: D-Bus connection.
+/// * `destination`: D-Bus service name.
+/// * `path`: D-Bus object path.
+pub async fn issues_router<T>(
+    dbus: &zbus::Connection,
+    destination: &str,
+    path: &str,
+) -> Result<Router<T>, ServiceError> {
+    let proxy = build_issues_proxy(dbus, destination, path).await?;
+    let state = IssuesState { proxy };
+    Ok(Router::new()
+        .route("/issues", get(issues))
+        .with_state(state))
+}
+
+async fn issues(State(state): State<IssuesState<'_>>) -> Result<Json<Vec<Issue>>, Error> {
+    let issues = state.proxy.all().await?;
+    let issues: Vec<Issue> = issues.into_iter().map(Issue::from_tuple).collect();
+    Ok(Json(issues))
+}
+
+#[derive(Clone)]
+struct IssuesState<'a> {
+    proxy: IssuesProxy<'a>,
+}
+
+#[derive(Clone, Debug, Serialize)]
+pub struct Issue {
+    description: String,
+    details: Option<String>,
+    source: u32,
+    severity: u32,
+}
+
+impl Issue {
+    pub fn from_tuple(
+        (description, details, source, severity): (String, String, u32, u32),
+    ) -> Self {
+        let details = if details.is_empty() {
+            None
+        } else {
+            Some(details)
+        };
+
+        Self {
+            description,
+            details,
+            source,
+            severity,
+        }
+    }
+}
+
+/// Builds a stream of the changes in the the `org.opensuse.Agama1.Issues`
+/// interface of the given D-Bus object.
+///
+/// * `dbus`: D-Bus connection.
+/// * `destination`: D-Bus service name.
+/// * `path`: D-Bus object path.
+pub async fn issues_stream(
+    dbus: zbus::Connection,
+    destination: &'static str,
+    path: &'static str,
+) -> Result<Pin<Box<dyn Stream<Item = Event> + Send>>, Error> {
+    let proxy = build_issues_proxy(&dbus, destination, path).await?;
+    let stream = proxy
+        .receive_all_changed()
+        .await
+        .then(move |change| async move {
+            if let Ok(issues) = change.get().await {
+                let issues = issues.into_iter().map(Issue::from_tuple).collect();
+                Some(Event::IssuesChanged { issues })
+            } else {
+                None
+            }
+        })
+        .filter_map(|e| e);
+    Ok(Box::pin(stream))
+}
+
+async fn build_issues_proxy<'a>(
+    dbus: &zbus::Connection,
+    destination: &str,
+    path: &str,
+) -> Result<IssuesProxy<'a>, zbus::Error> {
+    let proxy = IssuesProxy::builder(&dbus)
+        .destination(destination.to_string())?
+        .path(path.to_string())?
+        .build()
+        .await?;
+    Ok(proxy)
+}
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 045d4804ba..32244c26cd 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -4,6 +4,8 @@ use serde::Serialize;
 use std::collections::HashMap;
 use tokio::sync::broadcast::{Receiver, Sender};
 
+use super::common::Issue;
+
 #[derive(Clone, Debug, Serialize)]
 #[serde(tag = "type")]
 pub enum Event {
@@ -30,6 +32,9 @@ pub enum Event {
         service: String,
         status: u32,
     },
+    IssuesChanged {
+        issues: Vec<Issue>,
+    },
 }
 
 pub type EventsSender = Sender<Event>;

From 470ec1845ade3c0eeda12c13c83234f75093a7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 19 Mar 2024 12:40:44 +0000
Subject: [PATCH 085/324] Support using several Issues interfaces on the same
 service

---
 rust/agama-server/src/web/common.rs | 10 ++++++----
 rust/agama-server/src/web/event.rs  |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 2397018dff..5484111121 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -268,9 +268,7 @@ pub async fn issues_router<T>(
 ) -> Result<Router<T>, ServiceError> {
     let proxy = build_issues_proxy(dbus, destination, path).await?;
     let state = IssuesState { proxy };
-    Ok(Router::new()
-        .route("/issues", get(issues))
-        .with_state(state))
+    Ok(Router::new().route("/", get(issues)).with_state(state))
 }
 
 async fn issues(State(state): State<IssuesState<'_>>) -> Result<Json<Vec<Issue>>, Error> {
@@ -329,7 +327,11 @@ pub async fn issues_stream(
         .then(move |change| async move {
             if let Ok(issues) = change.get().await {
                 let issues = issues.into_iter().map(Issue::from_tuple).collect();
-                Some(Event::IssuesChanged { issues })
+                Some(Event::IssuesChanged {
+                    service: destination.to_string(),
+                    path: path.to_string(),
+                    issues,
+                })
             } else {
                 None
             }
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 32244c26cd..999e4d6619 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -33,6 +33,8 @@ pub enum Event {
         status: u32,
     },
     IssuesChanged {
+        service: String,
+        path: String,
         issues: Vec<Issue>,
     },
 }

From 4be905e4fac33f9859f18bc2ea2ce71a6372ba47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 19 Mar 2024 13:50:18 +0000
Subject: [PATCH 086/324] Expose the issues in the Software service

---
 rust/agama-server/src/software/web.rs |  7 ++++++-
 rust/agama-server/src/web.rs          | 20 +++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index de7e907501..b1d73768e5 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -8,7 +8,7 @@
 use crate::{
     error::Error,
     web::{
-        common::{progress_router, service_status_router},
+        common::{issues_router, progress_router, service_status_router},
         Event,
     },
 };
@@ -117,6 +117,9 @@ pub async fn software_service(dbus: zbus::Connection) -> Result<Router, ServiceE
 
     let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let progress_router = progress_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+    let software_issues = issues_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+    let product_issues =
+        issues_router(&dbus, DBUS_SERVICE, "/org/opensuse/Agama/Software1/Product").await?;
 
     let product = ProductClient::new(dbus.clone()).await?;
     let software = SoftwareClient::new(dbus).await?;
@@ -129,6 +132,8 @@ pub async fn software_service(dbus: zbus::Connection) -> Result<Router, ServiceE
         .route("/probe", post(probe))
         .merge(status_router)
         .merge(progress_router)
+        .nest("/issues/product", product_issues)
+        .nest("/issues/software", software_issues)
         .with_state(state);
     Ok(router)
 }
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 4d7c5c173c..9f941b1326 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -9,7 +9,7 @@ use crate::{
     l10n::web::l10n_service,
     manager::web::{manager_service, manager_stream},
     software::web::{software_service, software_stream},
-    web::common::{progress_stream, service_status_stream},
+    web::common::{issues_stream, progress_stream, service_status_stream},
 };
 use axum::Router;
 
@@ -114,6 +114,24 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
         )
         .await?,
     );
+    stream.insert(
+        "software-issues",
+        issues_stream(
+            dbus.clone(),
+            "org.opensuse.Agama.Software1",
+            "/org/opensuse/Agama/Software1",
+        )
+        .await?,
+    );
+    stream.insert(
+        "software-product-issues",
+        issues_stream(
+            dbus.clone(),
+            "org.opensuse.Agama.Software1",
+            "/org/opensuse/Agama/Software1/Product",
+        )
+        .await?,
+    );
 
     tokio::pin!(stream);
     let e = events.clone();

From 9e2dec02c7dd6d35eeef55fb7239026d22be8bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 19 Mar 2024 11:05:39 +0000
Subject: [PATCH 087/324] Adapt WithIssues to the HTTP/JSON API

---
 web/src/client/mixins.js | 118 +++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 67 deletions(-)

diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index 9523cdd40e..ddbf57db38 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -61,86 +61,70 @@ const VALIDATION_IFACE = "org.opensuse.Agama1.Validation";
  */
 
 /**
-* @callback IssuesHandler
-* @param {Issue[]} issues
-* @return {void}
-*/
-
-/**
- * Builds an issue from a D-Bus issue
- *
- * @param {DBusIssue} dbusIssue
- * @return {Issue}
+ * @callback IssuesHandler
+ * @param {Issue[]} issues
+ * @return {void}
  */
-const buildIssue = (dbusIssue) => {
-  const source = (value) => {
-    switch (value) {
-      case 0: return "unknown";
-      case 1: return "system";
-      case 2: return "config";
-    }
-  };
 
-  const severity = (value) => {
-    return value === 0 ? "warn" : "error";
-  };
+const ISSUES_SOURCES = [
+  "unknown",
+  "system",
+  "config",
+];
 
+const buildIssue = ({ description, details, source, severity }) => {
   return {
-    description: dbusIssue[0],
-    details: dbusIssue[1],
-    source: source(dbusIssue[2]),
-    severity: severity(dbusIssue[3])
+    description,
+    details,
+    source: ISSUES_SOURCES[source],
+    severity: severity === 0 ? "warn" : "error",
   };
 };
 
 /**
  * Extends the given class with methods to get the issues over D-Bus
- * @param {string} object_path - object_path
+ *
+ * @template {!WithHTTPClient} T
  * @param {T} superclass - superclass to extend
- * @template {!WithDBusProxies} T
+ * @param {string} issues_path - validation resource path (e.g., "/manager/issues").
+ * @param {string} dbus_path - service name (e.g., "/org/opensuse/Agama/Software1/product").
  */
-const WithIssues = (superclass, object_path) => class extends superclass {
-  constructor(...args) {
-    super(...args);
-    this.proxies.issues = this.client.proxy(ISSUES_IFACE, object_path);
-  }
-
-  /**
-   * Returns the issues
-   *
-   * @return {Promise<Issue[]>}
-   */
-  async getIssues() {
-    const proxy = await this.proxies.issues;
-    return proxy.All.map(buildIssue);
-  }
+const WithIssues = (superclass, issues_path, dbus_path) =>
+  class extends superclass {
+    /**
+     * Returns the issues
+     *
+     * @return {Promise<Issue[]>}
+     */
+    async getIssues() {
+      const response = await this.client.get(issues_path);
+      return response.issues.map(buildIssue);
+    }
 
-  /**
-   * Gets all issues with error severity
-   *
-   * @return {Promise<Issue[]>}
-   */
-  async getErrors() {
-    const issues = await this.getIssues();
-    return issues.filter(i => i.severity === "error");
-  }
+    /**
+     * Gets all issues with error severity
+     *
+     * @return {Promise<Issue[]>}
+     */
+    async getErrors() {
+      const issues = await this.getIssues();
+      return issues.filter((i) => i.severity === "error");
+    }
 
-  /**
-   * Registers a callback to run when the issues change
-   *
-   * @param {IssuesHandler} handler - callback function
-   * @return {import ("./dbus").RemoveFn} function to disable the callback
-   */
-  onIssuesChange(handler) {
-    return this.client.onObjectChanged(object_path, ISSUES_IFACE, (changes) => {
-      if ("All" in changes) {
-        const dbusIssues = changes.All.v;
-        const issues = dbusIssues.map(buildIssue);
-        handler(issues);
-      }
-    });
-  }
-};
+    /**
+     * Registers a callback to run when the issues change
+     *
+     * @param {IssuesHandler} handler - callback function
+     * @return {import ("./http").RemoveFn} function to disable the callback
+     */
+    onIssuesChange(handler) {
+      return this.client.onEvent("IssuesChanged", ({ path, issues }) => {
+        if (path === dbus_path) {
+          handler(issues.map(buildIssue));
+        }
+      });
+    }
+  };
 
 /**
  * Extends the given class with methods to get and track the service status

From 2a89a6d38dac99b8a29d4d0bc7c9aafad68542fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 19 Mar 2024 11:08:21 +0000
Subject: [PATCH 088/324] Small refactor of WithProgress#onProgressChange

---
 web/src/client/mixins.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index ddbf57db38..144b104337 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -210,8 +210,8 @@ const WithProgress = (superclass, progress_path, service_name) =>
      * @return {import ("./dbus").RemoveFn} function to disable the callback
      */
     onProgressChange(handler) {
-      return this.client.onEvent("Progress", (progress) => {
-        if (progress?.service === service_name) {
+      return this.client.onEvent("Progress", ({ service, ...progress }) => {
+        if (service === service_name) {
           const { current_step, max_steps, current_title, finished } = progress;
           handler({
             total: max_steps,

From 0ec75110f23e37e4963f16a6a27fdd4d687d377a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 19 Mar 2024 12:50:04 +0000
Subject: [PATCH 089/324] Apply the WithIssues mixin to the ProductClient

---
 web/src/client/software.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index b8d8b1eb1f..0a9cbd0b8c 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -303,7 +303,7 @@ class SoftwareClient extends WithIssues(
   SOFTWARE_PATH,
 ) {}
 
-class ProductClient {
+class ProductBaseClient {
   /**
    * @param {import("./http").HTTPClient} client - HTTP client.
    */
@@ -355,4 +355,6 @@ class ProductClient {
   }
 }
 
+class ProductClient extends WithIssues(ProductBaseClient, "/issues/product", PRODUCT_PATH) {}
+
 export { ProductClient, SoftwareClient };

From 157e9302efd2b5ebebb27d7665b6334417fd0b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 19 Mar 2024 13:46:33 +0000
Subject: [PATCH 090/324] Fix handling of status changes in WithStatus

---
 web/src/client/mixins.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index 144b104337..c7a9b28b7d 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -97,8 +97,8 @@ const WithIssues = (superclass, issues_path, dbus_path) =>
      * @return {Promise<Issue[]>}
      */
     async getIssues() {
-      const response = await this.client.get(issues_path);
-      return response.issues.map(buildIssue);
+      const issues = await this.client.get(issues_path);
+      return issues.map(buildIssue);
     }
 
     /**
@@ -153,8 +153,8 @@ const WithStatus = (superclass, status_path, service_name) =>
      * @return {function} function to disable the callback
      */
     onStatusChange(handler) {
-      return this.client.onEvent("StatusChanged", ({ status, service }) => {
-        if (service === service_name && status) {
+      return this.client.onEvent("ServiceStatusChanged", ({ status, service }) => {
+        if (service === service_name) {
           handler(status);
         }
       });

From 29a1d8feed563f8c0bdcecc317b201b3b7057389 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 19 Mar 2024 14:05:58 +0000
Subject: [PATCH 091/324] Use a constant when calling issues_router

---
 rust/agama-server/src/software/web.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index b1d73768e5..f5c7bd6cb5 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -114,12 +114,12 @@ fn reason_to_selected_by(
 pub async fn software_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
     const DBUS_SERVICE: &'static str = "org.opensuse.Agama.Software1";
     const DBUS_PATH: &'static str = "/org/opensuse/Agama/Software1";
+    const DBUS_PRODUCT_PATH: &'static str = "/org/opensuse/Agama/Software1/Product";
 
     let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let progress_router = progress_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let software_issues = issues_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
-    let product_issues =
-        issues_router(&dbus, DBUS_SERVICE, "/org/opensuse/Agama/Software1/Product").await?;
+    let product_issues = issues_router(&dbus, DBUS_SERVICE, DBUS_PRODUCT_PATH).await?;
 
     let product = ProductClient::new(dbus.clone()).await?;
     let software = SoftwareClient::new(dbus).await?;

From 9de4004be0280dbec6439848e06d16e8f0573da5 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 19 Mar 2024 21:29:06 +0100
Subject: [PATCH 092/324] initial implementation of real service without
 attachment

---
 rust/agama-lib/src/proxies.rs          |  6 ++-
 rust/agama-server/src/questions/web.rs | 69 +++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/rust/agama-lib/src/proxies.rs b/rust/agama-lib/src/proxies.rs
index a57711037e..870e281406 100644
--- a/rust/agama-lib/src/proxies.rs
+++ b/rust/agama-lib/src/proxies.rs
@@ -117,7 +117,8 @@ trait Questions1 {
 
 #[dbus_proxy(
     interface = "org.opensuse.Agama1.Questions.Generic",
-    assume_defaults = true
+    default_service = "org.opensuse.Agama1",
+    default_path = "/org/opensuse/Agama1/Questions"
 )]
 trait GenericQuestion {
     /// Answer property
@@ -153,7 +154,8 @@ trait GenericQuestion {
 
 #[dbus_proxy(
     interface = "org.opensuse.Agama1.Questions.WithPassword",
-    assume_defaults = true
+    default_service = "org.opensuse.Agama1",
+    default_path = "/org/opensuse/Agama1/Questions"
 )]
 trait QuestionWithPassword {
     /// Password property
diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 74bfb9ea4d..01f5a38e3c 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -8,7 +8,7 @@
 use std::collections::HashMap;
 use crate::{error::Error, web::Event};
 use agama_lib::{
-    error::ServiceError, proxies::Questions1Proxy,
+    error::ServiceError, proxies::{GenericQuestionProxy, QuestionWithPasswordProxy},
 };
 use anyhow::Context;
 use axum::{
@@ -19,7 +19,7 @@ use axum::{
     Json, Router,
 };
 use tokio_stream::{Stream, StreamExt};
-use zbus::fdo::ObjectManagerProxy;
+use zbus::{fdo::ObjectManagerProxy, names::{InterfaceName, OwnedInterfaceName}};
 use zbus::zvariant::OwnedObjectPath;
 use zbus::zvariant::ObjectPath;
 use thiserror::Error;
@@ -30,7 +30,6 @@ use serde_json::json;
 #[derive(Clone)]
 struct QuestionsClient<'a> {
     connection: zbus::Connection,
-    questions_proxy: Questions1Proxy<'a>,
     objects_proxy: ObjectManagerProxy<'a>,
 }
 
@@ -38,24 +37,70 @@ impl<'a> QuestionsClient<'a> {
     pub async fn new(dbus: zbus::Connection) -> Result<Self, zbus::Error> {
         Ok(Self {
             connection: dbus.clone(),
-            questions_proxy: Questions1Proxy::new(&dbus).await?,
             objects_proxy: ObjectManagerProxy::new(&dbus).await?
         })
     }
 
-    pub async fn questions(self) -> Result<Vec<Question>, ServiceError> {
-        // TODO: real call to dbus
-        Ok(vec![])
-    }
-
-    pub async fn answer(self, id: u32, answer: Answer) -> Result<(), ServiceError> {
+    pub async fn questions(&self) -> Result<Vec<Question>, ServiceError> {
         let objects = self.objects_proxy.get_managed_objects().await
             .context("failed to get managed object with Object Manager")?;
+        let mut result: Vec<Question> = Vec::with_capacity(objects.len());
+        let password_interface = OwnedInterfaceName::from(
+            InterfaceName::from_static_str("org.opensuse.Agama1.Questions.WithPassword")
+                .context("Failed to create interface name for question with password")?
+        );
+        for (path, interfaces_hash) in objects.iter() {
+            if interfaces_hash.contains_key(&password_interface) {
+                result.push(self.create_question_with_password(&path).await?)
+            } else {
+                result.push(self.create_generic_question(&path).await?)
+            }
+        }
+        Ok(result)
+    }
+
+    async fn create_generic_question(&self, path: &OwnedObjectPath) -> Result<Question, ServiceError> {
+        let dbus_question = GenericQuestionProxy::builder(&self.connection)
+            .path(path)?.cache_properties(zbus::CacheProperties::No).build().await?;
+        let result = Question {
+            generic: GenericQuestion {
+                id: dbus_question.id().await?,
+                class: dbus_question.class().await?,
+                text: dbus_question.text().await?,
+                options: dbus_question.options().await?,
+                default_option: dbus_question.default_option().await?,
+                data: dbus_question.data().await?
+            },
+            with_password: None
+        };
+
+        Ok(result)
+    }
+
+    async fn create_question_with_password(&self, path: &OwnedObjectPath) -> Result<Question, ServiceError> {
+        let dbus_question = QuestionWithPasswordProxy::builder(&self.connection)
+            .path(path)?.cache_properties(zbus::CacheProperties::No).build().await?;
+        let mut result = self.create_generic_question(path).await?;
+        result.with_password = Some(QuestionWithPassword{
+            password: dbus_question.password().await?
+        });
+
+        Ok(result)
+    }
+
+    pub async fn answer(&self, id: u32, answer: Answer) -> Result<(), ServiceError> {
         let question_path = OwnedObjectPath::from(
             ObjectPath::try_from(format!("/org/opensuse/Agama1/Questions/{}", id))
                 .context("Failed to create dbus path")?
             );
-        let question = objects.get(&question_path);
+        if let Some(password) = answer.with_password {
+            let dbus_password = QuestionWithPasswordProxy::builder(&self.connection)
+            .path(&question_path)?.cache_properties(zbus::CacheProperties::No).build().await?;
+            dbus_password.set_password(password.password.as_str()).await?
+        }
+        let dbus_generic = GenericQuestionProxy::builder(&self.connection)
+            .path(&question_path)?.cache_properties(zbus::CacheProperties::No).build().await?;
+        dbus_generic.set_answer(answer.generic.answer.as_str()).await?;
         Ok(())
     }
 }
@@ -160,6 +205,6 @@ State(state): State<QuestionsState<'_>>,
 Path(question_id): Path<u32>,
 Json(answer): Json<Answer>
 ) -> Result<(), QuestionsError> {
-    //TODO: real answer
+    state.questions.answer(question_id, answer).await?;
     Ok(())
 }
\ No newline at end of file

From 957e3f64c0f6675dd9910907322aa6d4692bb365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 07:00:08 +0000
Subject: [PATCH 093/324] Fix WithIssues path for ProductClient

---
 web/src/client/software.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 0a9cbd0b8c..8ed8f2e8f7 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -355,6 +355,7 @@ class ProductBaseClient {
   }
 }
 
-class ProductClient extends WithIssues(ProductBaseClient, "/issues/product", PRODUCT_PATH) {}
+class ProductClient
+  extends WithIssues(ProductBaseClient, "software/issues/product", PRODUCT_PATH) {}
 
 export { ProductClient, SoftwareClient };

From b6e9ff05a55b153750b4e7e7e443c5b7f6eb0805 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Tue, 5 Mar 2024 09:09:51 +0000
Subject: [PATCH 094/324] Added http API for networking

---
 rust/agama-lib/src/network/types.rs        |   5 +-
 rust/agama-server/Cargo.toml               |   2 +-
 rust/agama-server/src/network.rs           |   1 +
 rust/agama-server/src/network/action.rs    |  11 ++-
 rust/agama-server/src/network/dbus/tree.rs |  10 ++
 rust/agama-server/src/network/model.rs     |  83 ++++++++++------
 rust/agama-server/src/network/system.rs    |  15 +++
 rust/agama-server/src/network/web.rs       | 104 +++++++++++++++++++++
 rust/agama-server/src/web.rs               |   2 +
 rust/agama-server/src/web/docs.rs          |   6 ++
 10 files changed, 208 insertions(+), 31 deletions(-)
 create mode 100644 rust/agama-server/src/network/web.rs

diff --git a/rust/agama-lib/src/network/types.rs b/rust/agama-lib/src/network/types.rs
index cb8f9695c8..6caf9549eb 100644
--- a/rust/agama-lib/src/network/types.rs
+++ b/rust/agama-lib/src/network/types.rs
@@ -4,7 +4,8 @@ use thiserror::Error;
 use zbus;
 
 /// Network device
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(tag = "type")]
 pub struct Device {
     pub name: String,
     pub type_: DeviceType,
@@ -31,7 +32,7 @@ impl From<SSID> for Vec<u8> {
     }
 }
 
-#[derive(Debug, PartialEq, Copy, Clone, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Copy, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub enum DeviceType {
     Loopback = 0,
     Ethernet = 1,
diff --git a/rust/agama-server/Cargo.toml b/rust/agama-server/Cargo.toml
index 1e6cd6652f..739926c0a6 100644
--- a/rust/agama-server/Cargo.toml
+++ b/rust/agama-server/Cargo.toml
@@ -25,7 +25,7 @@ tokio-stream = "0.1.14"
 gettext-rs = { version = "0.7.0", features = ["gettext-system"] }
 regex = "1.10.2"
 once_cell = "1.18.0"
-macaddr = "1.0"
+macaddr = { version = "1.0", features = ["serde_std"] }
 async-trait = "0.1.75"
 axum = { version = "0.7.4", features = ["ws"] }
 serde_json = "1.0.113"
diff --git a/rust/agama-server/src/network.rs b/rust/agama-server/src/network.rs
index 536fdfdbf8..633397a3b6 100644
--- a/rust/agama-server/src/network.rs
+++ b/rust/agama-server/src/network.rs
@@ -45,6 +45,7 @@ pub mod error;
 pub mod model;
 mod nm;
 pub mod system;
+pub mod web;
 
 pub use action::Action;
 pub use adapter::{Adapter, NetworkAdapterError};
diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index 3b98ee912f..5a40424372 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -1,4 +1,4 @@
-use crate::network::model::Connection;
+use crate::network::model::{Connection, Device};
 use agama_lib::network::types::DeviceType;
 use tokio::sync::oneshot;
 use uuid::Uuid;
@@ -24,8 +24,10 @@ pub enum Action {
     /// Gets a connection
     GetConnection(Uuid, Responder<Option<Connection>>),
     /// Gets a connection
+    GetConnections(Responder<Vec<Connection>>),
+    /// Gets a connection path
     GetConnectionPath(Uuid, Responder<Option<OwnedObjectPath>>),
-    /// Gets a connection
+    /// Gets a connection path by id
     GetConnectionPathById(String, Responder<Option<OwnedObjectPath>>),
     /// Get connections paths
     GetConnectionsPaths(Responder<Vec<OwnedObjectPath>>),
@@ -34,6 +36,11 @@ pub enum Action {
         Uuid,
         Responder<Result<ControllerConnection, NetworkStateError>>,
     ),
+    /// Gets a device
+    GetDevice(String, Responder<Option<Device>>),
+    GetDevices(Responder<Vec<Device>>),
+    /// Gets a device path
+    GetDevicePath(String, Responder<Option<OwnedObjectPath>>),
     /// Get devices paths
     GetDevicesPaths(Responder<Vec<OwnedObjectPath>>),
     /// Sets a controller's ports. It uses the Uuid of the controller and the IDs or interface names
diff --git a/rust/agama-server/src/network/dbus/tree.rs b/rust/agama-server/src/network/dbus/tree.rs
index a1872c2da9..76674d9a90 100644
--- a/rust/agama-server/src/network/dbus/tree.rs
+++ b/rust/agama-server/src/network/dbus/tree.rs
@@ -130,6 +130,10 @@ impl Tree {
         self.objects.devices_paths()
     }
 
+    pub fn device_path(&self, name: &str) -> Option<OwnedObjectPath> {
+        self.objects.device_path(name).map(|o| o.into())
+    }
+
     /// Returns all connection paths.
     pub fn connections_paths(&self) -> Vec<OwnedObjectPath> {
         self.objects.connections_paths()
@@ -237,6 +241,12 @@ impl ObjectsRegistry {
         path
     }
 
+    /// Returns the path for a device.
+    ///
+    /// * `name`: device name.
+    pub fn device_path(&self, name: &str) -> Option<ObjectPath> {
+        self.devices.get(name).map(|p| p.as_ref())
+    }
     /// Returns the path for a connection.
     ///
     /// * `uuid`: connection ID.
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 551c353496..18bddf85c0 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -5,6 +5,8 @@
 use crate::network::error::NetworkStateError;
 use agama_lib::network::types::{BondMode, DeviceType, SSID};
 use cidr::IpInet;
+use serde::Serialize;
+use serde_with::{serde_as, skip_serializing_none, DisplayFromStr};
 use std::{
     collections::HashMap,
     default::Default,
@@ -16,7 +18,7 @@ use thiserror::Error;
 use uuid::Uuid;
 use zbus::zvariant::Value;
 
-#[derive(Default, Clone, Debug)]
+#[derive(Default, Clone, Debug, utoipa::ToSchema)]
 pub struct NetworkState {
     pub devices: Vec<Device>,
     pub connections: Vec<Connection>,
@@ -368,17 +370,21 @@ mod tests {
 }
 
 /// Network device
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
 pub struct Device {
     pub name: String,
+    #[serde(rename = "type")]
     pub type_: DeviceType,
 }
 
-/// Represents an availble network connection.
-#[derive(Debug, Clone, PartialEq)]
+/// Represents a known network connection.
+#[serde_as]
+#[skip_serializing_none]
+#[derive(Debug, Clone, PartialEq, Serialize, utoipa::ToSchema)]
 pub struct Connection {
     pub id: String,
     pub uuid: Uuid,
+    #[serde_as(as = "DisplayFromStr")]
     pub mac_address: MacAddress,
     pub ip_config: IpConfig,
     pub status: Status,
@@ -459,7 +465,7 @@ impl Default for Connection {
     }
 }
 
-#[derive(Default, Debug, PartialEq, Clone)]
+#[derive(Default, Debug, PartialEq, Clone, Serialize)]
 pub enum ConnectionConfig {
     #[default]
     Ethernet,
@@ -471,7 +477,7 @@ pub enum ConnectionConfig {
     Bridge(BridgeConfig),
 }
 
-#[derive(Default, Debug, PartialEq, Clone)]
+#[derive(Default, Debug, PartialEq, Clone, Serialize)]
 pub enum PortConfig {
     #[default]
     None,
@@ -494,7 +500,7 @@ impl From<WirelessConfig> for ConnectionConfig {
 #[error("Invalid MAC address: {0}")]
 pub struct InvalidMacAddress(String);
 
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, Serialize)]
 pub enum MacAddress {
     MacAddress(macaddr::MacAddr6),
     Preserve,
@@ -554,7 +560,7 @@ impl From<InvalidMacAddress> for zbus::fdo::Error {
     }
 }
 
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Serialize)]
 pub enum Status {
     #[default]
     Up,
@@ -562,11 +568,14 @@ pub enum Status {
     Removed,
 }
 
-#[derive(Default, Debug, PartialEq, Clone)]
+#[skip_serializing_none]
+#[derive(Default, Debug, PartialEq, Clone, Serialize)]
 pub struct IpConfig {
     pub method4: Ipv4Method,
     pub method6: Ipv6Method,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
     pub addresses: Vec<IpInet>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
     pub nameservers: Vec<IpAddr>,
     pub gateway4: Option<IpAddr>,
     pub gateway6: Option<IpAddr>,
@@ -574,11 +583,16 @@ pub struct IpConfig {
     pub routes6: Option<Vec<IpRoute>>,
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[skip_serializing_none]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub struct MatchConfig {
+    #[serde(skip_serializing_if = "Vec::is_empty")]
     pub driver: Vec<String>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
     pub interface: Vec<String>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
     pub path: Vec<String>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
     pub kernel: Vec<String>,
 }
 
@@ -586,7 +600,7 @@ pub struct MatchConfig {
 #[error("Unknown IP configuration method name: {0}")]
 pub struct UnknownIpMethod(String);
 
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Serialize)]
 pub enum Ipv4Method {
     #[default]
     Disabled = 0,
@@ -621,7 +635,7 @@ impl FromStr for Ipv4Method {
     }
 }
 
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
+#[derive(Debug, Default, Copy, Clone, PartialEq, Serialize)]
 pub enum Ipv6Method {
     #[default]
     Disabled = 0,
@@ -668,10 +682,12 @@ impl From<UnknownIpMethod> for zbus::fdo::Error {
     }
 }
 
-#[derive(Debug, PartialEq, Clone)]
+#[derive(Debug, PartialEq, Clone, Serialize)]
 pub struct IpRoute {
     pub destination: IpInet,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub next_hop: Option<IpAddr>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub metric: Option<u32>,
 }
 
@@ -694,7 +710,7 @@ impl From<&IpRoute> for HashMap<&str, Value<'_>> {
     }
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub enum VlanProtocol {
     #[default]
     IEEE802_1Q,
@@ -727,22 +743,29 @@ impl fmt::Display for VlanProtocol {
     }
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub struct VlanConfig {
     pub parent: String,
     pub id: u32,
     pub protocol: VlanProtocol,
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[serde_as]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub struct WirelessConfig {
     pub mode: WirelessMode,
+    #[serde_as(as = "DisplayFromStr")]
     pub ssid: SSID,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub password: Option<String>,
     pub security: SecurityProtocol,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub band: Option<WirelessBand>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub channel: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub bssid: Option<macaddr::MacAddr6>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub wep_security: Option<WEPSecurity>,
     pub hidden: bool,
 }
@@ -758,7 +781,7 @@ impl TryFrom<ConnectionConfig> for WirelessConfig {
     }
 }
 
-#[derive(Debug, Default, Clone, Copy, PartialEq)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Serialize)]
 pub enum WirelessMode {
     Unknown = 0,
     AdHoc = 1,
@@ -796,7 +819,7 @@ impl fmt::Display for WirelessMode {
     }
 }
 
-#[derive(Debug, Clone, Copy, Default, PartialEq)]
+#[derive(Debug, Clone, Copy, Default, PartialEq, Serialize)]
 pub enum SecurityProtocol {
     #[default]
     WEP, // No encryption or WEP ("none")
@@ -842,15 +865,16 @@ impl TryFrom<&str> for SecurityProtocol {
     }
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub struct WEPSecurity {
     pub auth_alg: WEPAuthAlg,
     pub wep_key_type: WEPKeyType,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
     pub keys: Vec<String>,
     pub wep_key_index: u32,
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub enum WEPKeyType {
     #[default]
     Unknown = 0,
@@ -871,7 +895,7 @@ impl TryFrom<u32> for WEPKeyType {
     }
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub enum WEPAuthAlg {
     #[default]
     Unset,
@@ -906,7 +930,7 @@ impl fmt::Display for WEPAuthAlg {
     }
 }
 
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Serialize)]
 pub enum WirelessBand {
     A,  // 5GHz
     BG, // 2.4GHz
@@ -934,7 +958,7 @@ impl TryFrom<&str> for WirelessBand {
     }
 }
 
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, Serialize)]
 pub struct BondOptions(pub HashMap<String, String>);
 
 impl TryFrom<&str> for BondOptions {
@@ -967,7 +991,7 @@ impl fmt::Display for BondOptions {
     }
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub struct BondConfig {
     pub mode: BondMode,
     pub options: BondOptions,
@@ -984,18 +1008,25 @@ impl TryFrom<ConnectionConfig> for BondConfig {
     }
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub struct BridgeConfig {
     pub stp: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub priority: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub forward_delay: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub hello_time: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub max_age: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub ageing_time: Option<u32>,
 }
 
-#[derive(Debug, Default, PartialEq, Clone)]
+#[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub struct BridgePortConfig {
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub priority: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub path_cost: Option<u32>,
 }
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index a347caca6a..2fb3838a60 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -79,6 +79,9 @@ impl<T: Adapter> NetworkSystem<T> {
                 let conn = self.state.get_connection_by_uuid(uuid);
                 tx.send(conn.cloned()).unwrap();
             }
+            Action::GetConnections(tx) => {
+                tx.send(self.state.connections.clone()).unwrap();
+            }
             Action::GetConnectionPath(uuid, tx) => {
                 let tree = self.tree.lock().await;
                 let path = tree.connection_path(uuid);
@@ -92,6 +95,18 @@ impl<T: Adapter> NetworkSystem<T> {
                 let result = self.get_controller_action(uuid);
                 tx.send(result).unwrap()
             }
+            Action::GetDevice(name, tx) => {
+                let device = self.state.get_device(name.as_str());
+                tx.send(device.cloned()).unwrap();
+            }
+            Action::GetDevicePath(name, tx) => {
+                let tree = self.tree.lock().await;
+                let path = tree.device_path(name.as_str());
+                tx.send(path).unwrap();
+            }
+            Action::GetDevices(tx) => {
+                tx.send(self.state.devices.clone()).unwrap();
+            }
             Action::GetDevicesPaths(tx) => {
                 let tree = self.tree.lock().await;
                 tx.send(tree.devices_paths()).unwrap();
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
new file mode 100644
index 0000000000..e63134a38d
--- /dev/null
+++ b/rust/agama-server/src/network/web.rs
@@ -0,0 +1,104 @@
+//! This module implements the web API for the network module.
+
+use crate::{error::Error, web::EventsSender};
+use axum::{
+    extract::State,
+    http::StatusCode,
+    response::{IntoResponse, Response},
+    routing::get,
+    Json, Router,
+};
+
+use super::Action;
+
+use crate::network::{model::Connection, model::Device, nm::NetworkManagerAdapter, NetworkSystem};
+use agama_lib::connection;
+
+use serde_json::json;
+use thiserror::Error;
+use tokio::sync::{mpsc::UnboundedSender, oneshot};
+
+#[derive(Error, Debug)]
+pub enum NetworkError {
+    #[error("Unknown connection id: {0}")]
+    UnknownConnection(String),
+    #[error("Cannot translate: {0}")]
+    CannotTranslate(#[from] Error),
+}
+
+impl IntoResponse for NetworkError {
+    fn into_response(self) -> Response {
+        let body = json!({
+            "error": self.to_string()
+        });
+        (StatusCode::BAD_REQUEST, Json(body)).into_response()
+    }
+}
+
+#[derive(Clone)]
+struct NetworkState {
+    actions: UnboundedSender<Action>,
+    events: EventsSender,
+}
+
+/// Sets up and returns the axum service for the network module.
+///
+/// * `events`: channel to send the events to the main service.
+pub async fn network_service(events: EventsSender) -> Router {
+    let adapter = NetworkManagerAdapter::from_system()
+        .await
+        .expect("Could not connect to NetworkManager to read the configuration.");
+    let connection = connection().await.unwrap();
+    let mut network = NetworkSystem::new(connection.clone(), adapter);
+
+    let state = NetworkState {
+        actions: network.actions_tx(),
+        events,
+    };
+
+    tokio::spawn(async move {
+        network
+            .setup()
+            .await
+            .expect("Could not set up the D-Bus tree");
+
+        network.listen().await;
+    });
+
+    Router::new()
+        .route("/connections", get(connections))
+        .route("/devices", get(devices))
+        .with_state(state)
+}
+
+#[utoipa::path(get, path = "/network/devices", responses(
+  (status = 200, description = "List of devices", body = Vec<Device>)
+))]
+async fn devices(State(state): State<NetworkState>) -> Json<Vec<Device>> {
+    let (tx, rx) = oneshot::channel();
+    state.actions.send(Action::GetDevices(tx)).unwrap();
+    let result = rx.await.unwrap();
+    let mut devices = vec![];
+
+    for device in result {
+        devices.push(device)
+    }
+
+    Json(devices)
+}
+
+#[utoipa::path(get, path = "/network/connections", responses(
+  (status = 200, description = "List of known connections", body = Vec<Connection>)
+))]
+async fn connections(State(state): State<NetworkState>) -> Json<Vec<Connection>> {
+    let (tx, rx) = oneshot::channel();
+    state.actions.send(Action::GetConnections(tx)).unwrap();
+    let result = rx.await.unwrap();
+    let mut connections = vec![];
+
+    for connection in result {
+        connections.push(connection)
+    }
+
+    Json(connections)
+}
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 9f941b1326..289b7da37d 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -8,6 +8,7 @@ use crate::{
     error::Error,
     l10n::web::l10n_service,
     manager::web::{manager_service, manager_stream},
+    network::web::network_service,
     software::web::{software_service, software_stream},
     web::common::{issues_stream, progress_stream, service_status_stream},
 };
@@ -51,6 +52,7 @@ where
         .add_service("/l10n", l10n_service(events.clone()))
         .add_service("/manager", manager_service(dbus.clone()).await?)
         .add_service("/software", software_service(dbus).await?)
+        .add_service("/network", network_service(events).await)
         .with_config(config)
         .build();
     Ok(router)
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 34ded88acf..27983bbcf0 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -8,6 +8,8 @@ use utoipa::OpenApi;
         crate::l10n::web::locales,
         crate::l10n::web::set_config,
         crate::l10n::web::timezones,
+        crate::network::web::devices,
+        crate::network::web::connections,
         crate::software::web::get_config,
         crate::software::web::patterns,
         crate::software::web::patterns,
@@ -26,6 +28,10 @@ use utoipa::OpenApi;
         schemas(crate::l10n::LocaleEntry),
         schemas(crate::l10n::TimezoneEntry),
         schemas(crate::l10n::web::LocaleConfig),
+        schemas(crate::network::model::NetworkState),
+        schemas(crate::network::model::Device),
+        schemas(crate::network::model::Connection),
+        schemas(agama_lib::network::types::DeviceType),
         schemas(crate::software::web::PatternEntry),
         schemas(crate::software::web::SoftwareConfig),
         schemas(crate::software::web::SoftwareProposal),

From e58deb8b1721a8fb752cb10bf0db6330973882b4 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 6 Mar 2024 19:56:41 +0000
Subject: [PATCH 095/324] Changes based on code review.

---
 rust/agama-server/src/network/action.rs       |  5 +--
 .../network/dbus/interfaces/connections.rs    |  2 +-
 rust/agama-server/src/network/web.rs          | 33 +++++--------------
 rust/agama-server/src/web.rs                  |  4 +--
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index 5a40424372..4f05960b85 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -21,7 +21,7 @@ pub enum Action {
         DeviceType,
         Responder<Result<OwnedObjectPath, NetworkStateError>>,
     ),
-    /// Gets a connection
+    /// Gets a connection by its Uuid
     GetConnection(Uuid, Responder<Option<Connection>>),
     /// Gets a connection
     GetConnections(Responder<Vec<Connection>>),
@@ -36,8 +36,9 @@ pub enum Action {
         Uuid,
         Responder<Result<ControllerConnection, NetworkStateError>>,
     ),
-    /// Gets a device
+    /// Gets a device by its name
     GetDevice(String, Responder<Option<Device>>),
+    /// Gets all the existent devices
     GetDevices(Responder<Vec<Device>>),
     /// Gets a device path
     GetDevicePath(String, Responder<Option<OwnedObjectPath>>),
diff --git a/rust/agama-server/src/network/dbus/interfaces/connections.rs b/rust/agama-server/src/network/dbus/interfaces/connections.rs
index 885aefb042..aca6bf50ad 100644
--- a/rust/agama-server/src/network/dbus/interfaces/connections.rs
+++ b/rust/agama-server/src/network/dbus/interfaces/connections.rs
@@ -21,7 +21,7 @@ pub struct Connections {
 impl Connections {
     /// Creates a Connections interface object.
     ///
-    /// * `objects`: Objects paths registry.
+    /// * `actions`: sending-half of a channel to send actions.
     pub fn new(actions: UnboundedSender<Action>) -> Self {
         Self {
             actions: Arc::new(Mutex::new(actions)),
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index e63134a38d..7a42977b3b 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -1,6 +1,6 @@
 //! This module implements the web API for the network module.
 
-use crate::{error::Error, web::EventsSender};
+use crate::error::Error;
 use axum::{
     extract::State,
     http::StatusCode,
@@ -12,7 +12,7 @@ use axum::{
 use super::Action;
 
 use crate::network::{model::Connection, model::Device, nm::NetworkManagerAdapter, NetworkSystem};
-use agama_lib::connection;
+use agama_lib::error::ServiceError;
 
 use serde_json::json;
 use thiserror::Error;
@@ -38,22 +38,19 @@ impl IntoResponse for NetworkError {
 #[derive(Clone)]
 struct NetworkState {
     actions: UnboundedSender<Action>,
-    events: EventsSender,
 }
 
 /// Sets up and returns the axum service for the network module.
 ///
-/// * `events`: channel to send the events to the main service.
-pub async fn network_service(events: EventsSender) -> Router {
+/// * `dbus`: zbus Connection.
+pub async fn network_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
     let adapter = NetworkManagerAdapter::from_system()
         .await
         .expect("Could not connect to NetworkManager to read the configuration.");
-    let connection = connection().await.unwrap();
-    let mut network = NetworkSystem::new(connection.clone(), adapter);
+    let mut network = NetworkSystem::new(dbus.clone(), adapter);
 
     let state = NetworkState {
         actions: network.actions_tx(),
-        events,
     };
 
     tokio::spawn(async move {
@@ -65,10 +62,10 @@ pub async fn network_service(events: EventsSender) -> Router {
         network.listen().await;
     });
 
-    Router::new()
+    Ok(Router::new()
         .route("/connections", get(connections))
         .route("/devices", get(devices))
-        .with_state(state)
+        .with_state(state))
 }
 
 #[utoipa::path(get, path = "/network/devices", responses(
@@ -77,14 +74,8 @@ pub async fn network_service(events: EventsSender) -> Router {
 async fn devices(State(state): State<NetworkState>) -> Json<Vec<Device>> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::GetDevices(tx)).unwrap();
-    let result = rx.await.unwrap();
-    let mut devices = vec![];
 
-    for device in result {
-        devices.push(device)
-    }
-
-    Json(devices)
+    Json(rx.await.unwrap())
 }
 
 #[utoipa::path(get, path = "/network/connections", responses(
@@ -93,12 +84,6 @@ async fn devices(State(state): State<NetworkState>) -> Json<Vec<Device>> {
 async fn connections(State(state): State<NetworkState>) -> Json<Vec<Connection>> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::GetConnections(tx)).unwrap();
-    let result = rx.await.unwrap();
-    let mut connections = vec![];
-
-    for connection in result {
-        connections.push(connection)
-    }
 
-    Json(connections)
+    Json(rx.await.unwrap())
 }
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 289b7da37d..c30fb3c2e8 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -51,8 +51,8 @@ where
     let router = MainServiceBuilder::new(events.clone(), web_ui_dir)
         .add_service("/l10n", l10n_service(events.clone()))
         .add_service("/manager", manager_service(dbus.clone()).await?)
-        .add_service("/software", software_service(dbus).await?)
-        .add_service("/network", network_service(events).await)
+        .add_service("/software", software_service(dbus.clone()).await?)
+        .add_service("/network", network_service(dbus).await?)
         .with_config(config)
         .build();
     Ok(router)

From f35ef0419adbf486e66e5a6bea4998600e4edffb Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 20 Mar 2024 14:50:32 +0000
Subject: [PATCH 096/324] Added support for modifying the network configuration
 through http

---
 rust/agama-lib/src/network/types.rs           |  14 +-
 rust/agama-server/src/network/action.rs       |  20 +-
 rust/agama-server/src/network/adapter.rs      |   6 +-
 .../network/dbus/interfaces/connections.rs    |   5 +-
 rust/agama-server/src/network/model.rs        | 188 +++++++++++++++++-
 rust/agama-server/src/network/nm/adapter.rs   |  96 ++++++++-
 rust/agama-server/src/network/nm/client.rs    |  95 ++++++++-
 rust/agama-server/src/network/nm/proxies.rs   | 109 ++++++++++
 rust/agama-server/src/network/system.rs       |  49 ++++-
 rust/agama-server/src/network/web.rs          | 167 +++++++++++++++-
 10 files changed, 715 insertions(+), 34 deletions(-)

diff --git a/rust/agama-lib/src/network/types.rs b/rust/agama-lib/src/network/types.rs
index 6caf9549eb..e3ec61957a 100644
--- a/rust/agama-lib/src/network/types.rs
+++ b/rust/agama-lib/src/network/types.rs
@@ -1,5 +1,9 @@
+use cidr::errors::NetworkParseError;
 use serde::{Deserialize, Serialize};
-use std::{fmt, str};
+use std::{
+    fmt,
+    str::{self, FromStr},
+};
 use thiserror::Error;
 use zbus;
 
@@ -26,6 +30,14 @@ impl fmt::Display for SSID {
     }
 }
 
+impl FromStr for SSID {
+    type Err = NetworkParseError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(SSID(s.as_bytes().into()))
+    }
+}
+
 impl From<SSID> for Vec<u8> {
     fn from(value: SSID) -> Self {
         value.0
diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index 4f05960b85..ed29ec2a10 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -1,10 +1,10 @@
-use crate::network::model::{Connection, Device};
+use crate::network::model::{AccessPoint, Connection, Device};
 use agama_lib::network::types::DeviceType;
 use tokio::sync::oneshot;
 use uuid::Uuid;
 use zbus::zvariant::OwnedObjectPath;
 
-use super::{error::NetworkStateError, NetworkAdapterError};
+use super::{error::NetworkStateError, model::GeneralState, NetworkAdapterError};
 
 pub type Responder<T> = oneshot::Sender<T>;
 pub type ControllerConnection = (Connection, Vec<String>);
@@ -21,6 +21,11 @@ pub enum Action {
         DeviceType,
         Responder<Result<OwnedObjectPath, NetworkStateError>>,
     ),
+    /// Add a new connection
+    NewConnection(
+        Connection,
+        Responder<Result<OwnedObjectPath, NetworkStateError>>,
+    ),
     /// Gets a connection by its Uuid
     GetConnection(Uuid, Responder<Option<Connection>>),
     /// Gets a connection
@@ -36,6 +41,8 @@ pub enum Action {
         Uuid,
         Responder<Result<ControllerConnection, NetworkStateError>>,
     ),
+    /// Gets all scanned access points
+    GetAccessPoints(Responder<Vec<AccessPoint>>),
     /// Gets a device by its name
     GetDevice(String, Responder<Option<Device>>),
     /// Gets all the existent devices
@@ -44,6 +51,7 @@ pub enum Action {
     GetDevicePath(String, Responder<Option<OwnedObjectPath>>),
     /// Get devices paths
     GetDevicesPaths(Responder<Vec<OwnedObjectPath>>),
+    GetGeneralState(Responder<GeneralState>),
     /// Sets a controller's ports. It uses the Uuid of the controller and the IDs or interface names
     /// of the ports.
     SetPorts(
@@ -51,10 +59,14 @@ pub enum Action {
         Box<Vec<String>>,
         Responder<Result<(), NetworkStateError>>,
     ),
-    /// Update a connection (replacing the old one).
+    /// Updates a connection (replacing the old one).
     UpdateConnection(Box<Connection>),
+    /// Updates the general network configuration
+    UpdateGeneralState(GeneralState),
+    /// Forces a wireless networks scan refresh
+    RefreshScan(Responder<Result<(), NetworkAdapterError>>),
     /// Remove the connection with the given Uuid.
-    RemoveConnection(Uuid),
+    RemoveConnection(Uuid, Responder<Result<(), NetworkStateError>>),
     /// Apply the current configuration.
     Apply(Responder<Result<(), NetworkAdapterError>>),
 }
diff --git a/rust/agama-server/src/network/adapter.rs b/rust/agama-server/src/network/adapter.rs
index 8aba3251db..2d1a9be4ef 100644
--- a/rust/agama-server/src/network/adapter.rs
+++ b/rust/agama-server/src/network/adapter.rs
@@ -1,3 +1,4 @@
+use crate::network::model::NetworkStateItems;
 use crate::network::NetworkState;
 use agama_lib::error::ServiceError;
 use async_trait::async_trait;
@@ -16,7 +17,10 @@ pub enum NetworkAdapterError {
 /// A trait for the ability to read/write from/to a network service
 #[async_trait]
 pub trait Adapter {
-    async fn read(&self) -> Result<NetworkState, NetworkAdapterError>;
+    async fn read(
+        &self,
+        items: Vec<NetworkStateItems>,
+    ) -> Result<NetworkState, NetworkAdapterError>;
     async fn write(&self, network: &NetworkState) -> Result<(), NetworkAdapterError>;
 }
 
diff --git a/rust/agama-server/src/network/dbus/interfaces/connections.rs b/rust/agama-server/src/network/dbus/interfaces/connections.rs
index aca6bf50ad..56a2e11363 100644
--- a/rust/agama-server/src/network/dbus/interfaces/connections.rs
+++ b/rust/agama-server/src/network/dbus/interfaces/connections.rs
@@ -101,7 +101,10 @@ impl Connections {
             .parse()
             .map_err(|_| NetworkStateError::InvalidUuid(uuid.to_string()))?;
         let actions = self.actions.lock().await;
-        actions.send(Action::RemoveConnection(uuid)).unwrap();
+        let (tx, rx) = oneshot::channel();
+        actions.send(Action::RemoveConnection(uuid, tx)).unwrap();
+
+        rx.await.unwrap()?;
         Ok(())
     }
 
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 18bddf85c0..5eeabda890 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -3,9 +3,10 @@
 //! * This module contains the types that represent the network concepts. They are supposed to be
 //! agnostic from the real network service (e.g., NetworkManager).
 use crate::network::error::NetworkStateError;
+use agama_lib::network::settings::{BondSettings, NetworkConnection, WirelessSettings};
 use agama_lib::network::types::{BondMode, DeviceType, SSID};
 use cidr::IpInet;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, skip_serializing_none, DisplayFromStr};
 use std::{
     collections::HashMap,
@@ -18,8 +19,18 @@ use thiserror::Error;
 use uuid::Uuid;
 use zbus::zvariant::Value;
 
+#[derive(PartialEq)]
+pub enum NetworkStateItems {
+    AccessPoints,
+    Devices,
+    Connections,
+    GeneralState,
+}
+
 #[derive(Default, Clone, Debug, utoipa::ToSchema)]
 pub struct NetworkState {
+    pub general_state: GeneralState,
+    pub access_points: Vec<AccessPoint>,
     pub devices: Vec<Device>,
     pub connections: Vec<Connection>,
 }
@@ -27,10 +38,19 @@ pub struct NetworkState {
 impl NetworkState {
     /// Returns a NetworkState struct with the given devices and connections.
     ///
+    /// * `general_state`: General network configuration
+    /// * `access_points`: Access points to include in the state.
     /// * `devices`: devices to include in the state.
     /// * `connections`: connections to include in the state.
-    pub fn new(devices: Vec<Device>, connections: Vec<Connection>) -> Self {
+    pub fn new(
+        general_state: GeneralState,
+        access_points: Vec<AccessPoint>,
+        devices: Vec<Device>,
+        connections: Vec<Connection>,
+    ) -> Self {
         Self {
+            general_state,
+            access_points,
             devices,
             connections,
         }
@@ -369,6 +389,35 @@ mod tests {
     }
 }
 
+/// Network state
+#[serde_as]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct GeneralState {
+    pub connectivity: bool,
+    pub wireless_enabled: bool,
+    pub networking_enabled: bool, // pub network_state: NMSTATE
+                                  // pub dns: GlobalDnsConfiguration <HashMap>
+}
+
+impl Default for GeneralState {
+    fn default() -> Self {
+        Self {
+            connectivity: false,
+            wireless_enabled: false,
+            networking_enabled: false,
+        }
+    }
+}
+
+/// Access Point
+#[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
+pub struct AccessPoint {
+    pub ssid: SSID,
+    pub hw_address: String,
+    pub strength: u8,
+    pub security_protocols: Vec<SecurityProtocol>,
+}
+
 /// Network device
 #[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
 pub struct Device {
@@ -465,6 +514,84 @@ impl Default for Connection {
     }
 }
 
+impl TryFrom<NetworkConnection> for Connection {
+    type Error = NetworkStateError;
+
+    fn try_from(conn: NetworkConnection) -> Result<Self, Self::Error> {
+        let id = conn.clone().id;
+        let mut connection = Connection::new(id, conn.device_type());
+
+        if let Some(method) = conn.clone().method4 {
+            let method: Ipv4Method = method.parse().unwrap();
+            connection.ip_config.method4 = method;
+        }
+
+        if let Some(method) = conn.method6 {
+            let method: Ipv6Method = method.parse().unwrap();
+            connection.ip_config.method6 = method;
+        }
+
+        if let Some(wireless_config) = conn.wireless {
+            let config = WirelessConfig::try_from(wireless_config)?;
+            connection.config = config.into();
+        }
+
+        if let Some(bond_config) = conn.bond {
+            let config = BondConfig::try_from(bond_config)?;
+            connection.config = config.into();
+        }
+
+        connection.ip_config.nameservers = conn.nameservers;
+        connection.ip_config.gateway4 = conn.gateway4;
+        connection.ip_config.gateway6 = conn.gateway6;
+        connection.interface = conn.interface;
+
+        Ok(connection)
+    }
+}
+
+impl TryFrom<Connection> for NetworkConnection {
+    type Error = NetworkStateError;
+
+    fn try_from(conn: Connection) -> Result<Self, Self::Error> {
+        let id = conn.clone().id;
+        let mac = conn.mac_address.to_string();
+        let method4 = Some(conn.ip_config.method4.to_string());
+        let method6 = Some(conn.ip_config.method6.to_string());
+        let mac_address = (!mac.is_empty()).then(|| mac);
+        let nameservers = conn.ip_config.nameservers.into();
+        let addresses = conn.ip_config.addresses.into();
+        let gateway4 = conn.ip_config.gateway4.into();
+        let gateway6 = conn.ip_config.gateway6.into();
+        let interface = conn.interface.into();
+
+        let mut connection = NetworkConnection {
+            id,
+            method4,
+            method6,
+            gateway4,
+            gateway6,
+            nameservers,
+            mac_address,
+            interface,
+            addresses,
+            ..Default::default()
+        };
+
+        match conn.config {
+            ConnectionConfig::Wireless(config) => {
+                connection.wireless = Some(WirelessSettings::try_from(config)?);
+            }
+            ConnectionConfig::Bond(config) => {
+                connection.bond = Some(BondSettings::try_from(config)?);
+            }
+            _ => {}
+        }
+
+        Ok(connection)
+    }
+}
+
 #[derive(Default, Debug, PartialEq, Clone, Serialize)]
 pub enum ConnectionConfig {
     #[default]
@@ -781,6 +908,36 @@ impl TryFrom<ConnectionConfig> for WirelessConfig {
     }
 }
 
+impl TryFrom<WirelessSettings> for WirelessConfig {
+    type Error = NetworkStateError;
+
+    fn try_from(settings: WirelessSettings) -> Result<Self, Self::Error> {
+        let ssid = SSID(settings.ssid.as_bytes().into());
+        let mode = WirelessMode::try_from(settings.mode.as_str())?;
+        let security = SecurityProtocol::try_from(settings.security.as_str())?;
+        Ok(WirelessConfig {
+            ssid,
+            mode,
+            security,
+            password: Some(settings.password),
+            ..Default::default()
+        })
+    }
+}
+
+impl TryFrom<WirelessConfig> for WirelessSettings {
+    type Error = NetworkStateError;
+
+    fn try_from(wireless: WirelessConfig) -> Result<Self, Self::Error> {
+        Ok(WirelessSettings {
+            ssid: wireless.ssid.to_string(),
+            mode: wireless.mode.to_string(),
+            security: wireless.security.to_string(),
+            password: wireless.password.unwrap_or_default(),
+        })
+    }
+}
+
 #[derive(Debug, Default, Clone, Copy, PartialEq, Serialize)]
 pub enum WirelessMode {
     Unknown = 0,
@@ -1008,6 +1165,33 @@ impl TryFrom<ConnectionConfig> for BondConfig {
     }
 }
 
+impl TryFrom<BondSettings> for BondConfig {
+    type Error = NetworkStateError;
+
+    fn try_from(settings: BondSettings) -> Result<Self, Self::Error> {
+        let mode = BondMode::try_from(settings.mode.as_str())
+            .map_err(|_| NetworkStateError::InvalidBondMode(settings.mode))?;
+        let mut options = BondOptions::default();
+        if let Some(setting_options) = settings.options {
+            options = BondOptions::try_from(setting_options.as_str())?;
+        }
+
+        Ok(BondConfig { mode, options })
+    }
+}
+
+impl TryFrom<BondConfig> for BondSettings {
+    type Error = NetworkStateError;
+
+    fn try_from(bond: BondConfig) -> Result<Self, Self::Error> {
+        Ok(BondSettings {
+            mode: bond.mode.to_string(),
+            options: Some(bond.options.to_string()),
+            ..Default::default()
+        })
+    }
+}
+
 #[derive(Debug, Default, PartialEq, Clone, Serialize)]
 pub struct BridgeConfig {
     pub stp: bool,
diff --git a/rust/agama-server/src/network/nm/adapter.rs b/rust/agama-server/src/network/nm/adapter.rs
index 0df720e5ba..c8a9882f21 100644
--- a/rust/agama-server/src/network/nm/adapter.rs
+++ b/rust/agama-server/src/network/nm/adapter.rs
@@ -1,11 +1,13 @@
 use crate::network::{
-    model::{Connection, NetworkState},
+    model::{Connection, NetworkState, NetworkStateItems},
     nm::NetworkManagerClient,
     Adapter, NetworkAdapterError,
 };
 use agama_lib::error::ServiceError;
 use async_trait::async_trait;
+use core::time;
 use log;
+use std::thread;
 
 /// An adapter for NetworkManager
 pub struct NetworkManagerAdapter<'a> {
@@ -29,18 +31,68 @@ impl<'a> NetworkManagerAdapter<'a> {
 
 #[async_trait]
 impl<'a> Adapter for NetworkManagerAdapter<'a> {
-    async fn read(&self) -> Result<NetworkState, NetworkAdapterError> {
-        let devices = self
-            .client
-            .devices()
-            .await
-            .map_err(NetworkAdapterError::Read)?;
-        let connections = self
+    async fn read(
+        &self,
+        items: Vec<NetworkStateItems>,
+    ) -> Result<NetworkState, NetworkAdapterError> {
+        let items = if items.is_empty() {
+            vec![
+                NetworkStateItems::AccessPoints,
+                NetworkStateItems::Connections,
+                NetworkStateItems::Devices,
+                NetworkStateItems::GeneralState,
+            ]
+        } else {
+            items
+        };
+
+        let general_state = self
             .client
-            .connections()
+            .general_state()
             .await
             .map_err(NetworkAdapterError::Read)?;
-        Ok(NetworkState::new(devices, connections))
+
+        let devices = if items.contains(&NetworkStateItems::Devices) {
+            self.client
+                .devices()
+                .await
+                .map_err(NetworkAdapterError::Read)?
+        } else {
+            vec![]
+        };
+
+        let connections = if items.contains(&NetworkStateItems::Connections) {
+            self.client
+                .connections()
+                .await
+                .map_err(NetworkAdapterError::Read)?
+        } else {
+            vec![]
+        };
+
+        let access_points =
+            if items.contains(&NetworkStateItems::AccessPoints) && general_state.wireless_enabled {
+                if items.len() == 1 {
+                    self.client
+                        .request_scan()
+                        .await
+                        .map_err(NetworkAdapterError::Read)?;
+                    thread::sleep(time::Duration::from_secs(1));
+                };
+                self.client
+                    .access_points()
+                    .await
+                    .map_err(NetworkAdapterError::Read)?
+            } else {
+                vec![]
+            };
+
+        Ok(NetworkState::new(
+            general_state,
+            access_points,
+            devices,
+            connections,
+        ))
     }
 
     /// Writes the connections to NetworkManager.
@@ -51,13 +103,34 @@ impl<'a> Adapter for NetworkManagerAdapter<'a> {
     ///
     /// * `network`: network model.
     async fn write(&self, network: &NetworkState) -> Result<(), NetworkAdapterError> {
-        let old_state = self.read().await?;
+        let old_state = self.read(vec![]).await?;
         let checkpoint = self
             .client
             .create_checkpoint()
             .await
             .map_err(NetworkAdapterError::Checkpoint)?;
 
+        log::info!("Updating the general state {:?}", &network.general_state);
+
+        let result = self
+            .client
+            .update_general_state(&network.general_state)
+            .await;
+
+        if let Err(e) = result {
+            self.client
+                .rollback_checkpoint(&checkpoint.as_ref())
+                .await
+                .map_err(NetworkAdapterError::Checkpoint)?;
+
+            log::error!(
+                "Could not update the general state {:?}: {}",
+                &network.general_state,
+                &e
+            );
+            return Err(NetworkAdapterError::Write(e));
+        }
+
         for conn in ordered_connections(network) {
             if !Self::is_writable(conn) {
                 continue;
@@ -88,6 +161,7 @@ impl<'a> Adapter for NetworkManagerAdapter<'a> {
                 return Err(NetworkAdapterError::Write(e));
             }
         }
+
         self.client
             .destroy_checkpoint(&checkpoint.as_ref())
             .await
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index 8396d9d649..81dc8a41c3 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -6,9 +6,13 @@ use super::dbus::{
     merge_dbus_connections,
 };
 use super::model::NmDeviceType;
-use super::proxies::{ConnectionProxy, DeviceProxy, NetworkManagerProxy, SettingsProxy};
-use crate::network::model::{Connection, Device};
+use super::proxies::{
+    AccessPointProxy, ConnectionProxy, DeviceProxy, NetworkManagerProxy, SettingsProxy,
+    WirelessProxy,
+};
+use crate::network::model::{AccessPoint, Connection, Device, GeneralState};
 use agama_lib::error::ServiceError;
+use agama_lib::network::types::{DeviceType, SSID};
 use log;
 use uuid::Uuid;
 use zbus;
@@ -41,7 +45,94 @@ impl<'a> NetworkManagerClient<'a> {
             connection,
         })
     }
+    /// Returns the general state
+    pub async fn general_state(&self) -> Result<GeneralState, ServiceError> {
+        let wireless_enabled = self.nm_proxy.wireless_enabled().await?;
+        let networking_enabled = self.nm_proxy.networking_enabled().await?;
+        // TODO:: Allow to set global DNS configuration
+        // let global_dns_configuration = self.nm_proxy.global_dns_configuration().await?;
+        // Fixme: save as NMConnectivityState enum
+        let connectivity = self.nm_proxy.connectivity().await? == 4;
+
+        Ok(GeneralState {
+            wireless_enabled,
+            networking_enabled,
+            connectivity,
+        })
+    }
+
+    /// Updates the general state
+    pub async fn update_general_state(&self, state: &GeneralState) -> Result<(), ServiceError> {
+        let wireless_enabled = self.nm_proxy.wireless_enabled().await?;
 
+        if wireless_enabled != state.wireless_enabled {
+            self.nm_proxy
+                .set_wireless_enabled(state.wireless_enabled)
+                .await?;
+        };
+
+        Ok(())
+    }
+
+    /// Returns the list of access points.
+    pub async fn request_scan(&self) -> Result<(), ServiceError> {
+        for path in &self.nm_proxy.get_devices().await? {
+            let proxy = DeviceProxy::builder(&self.connection)
+                .path(path.as_str())?
+                .build()
+                .await?;
+
+            let device_type = NmDeviceType(proxy.device_type().await?).try_into();
+            if let Ok(DeviceType::Wireless) = device_type {
+                let wproxy = WirelessProxy::builder(&self.connection)
+                    .path(path.as_str())?
+                    .build()
+                    .await?;
+                wproxy.request_scan(HashMap::new()).await?;
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Returns the list of access points.
+    pub async fn access_points(&self) -> Result<Vec<AccessPoint>, ServiceError> {
+        let mut points = vec![];
+        for path in &self.nm_proxy.get_devices().await? {
+            let proxy = DeviceProxy::builder(&self.connection)
+                .path(path.as_str())?
+                .build()
+                .await?;
+
+            let device_type = NmDeviceType(proxy.device_type().await?).try_into();
+            if let Ok(DeviceType::Wireless) = device_type {
+                let wproxy = WirelessProxy::builder(&self.connection)
+                    .path(path.as_str())?
+                    .build()
+                    .await?;
+
+                for ap_path in wproxy.access_points().await? {
+                    let wproxy = AccessPointProxy::builder(&self.connection)
+                        .path(ap_path.as_str())?
+                        .build()
+                        .await?;
+
+                    let ssid = SSID(wproxy.ssid().await?);
+                    let hw_address = wproxy.hw_address().await?;
+                    let strength = wproxy.strength().await?;
+
+                    points.push(AccessPoint {
+                        ssid,
+                        hw_address,
+                        strength,
+                        security_protocols: vec![],
+                    })
+                }
+            }
+        }
+
+        Ok(points)
+    }
     /// Returns the list of network devices.
     pub async fn devices(&self) -> Result<Vec<Device>, ServiceError> {
         let mut devs = vec![];
diff --git a/rust/agama-server/src/network/nm/proxies.rs b/rust/agama-server/src/network/nm/proxies.rs
index fd933a3d9d..56927caa4d 100644
--- a/rust/agama-server/src/network/nm/proxies.rs
+++ b/rust/agama-server/src/network/nm/proxies.rs
@@ -252,6 +252,115 @@ trait NetworkManager {
     fn wwan_hardware_enabled(&self) -> zbus::Result<bool>;
 }
 
+#[dbus_proxy(
+    interface = "org.freedesktop.NetworkManager.AccessPoint",
+    default_service = "org.freedesktop.NetworkManager",
+    default_path = "/org/freedesktop/NetworkManager/AccessPoint/1"
+)]
+trait AccessPoint {
+    /// Flags property
+    #[dbus_proxy(property)]
+    fn flags(&self) -> zbus::Result<u32>;
+
+    /// Frequency property
+    #[dbus_proxy(property)]
+    fn frequency(&self) -> zbus::Result<u32>;
+
+    /// HwAddress property
+    #[dbus_proxy(property)]
+    fn hw_address(&self) -> zbus::Result<String>;
+
+    /// LastSeen property
+    #[dbus_proxy(property)]
+    fn last_seen(&self) -> zbus::Result<i32>;
+
+    /// MaxBitrate property
+    #[dbus_proxy(property)]
+    fn max_bitrate(&self) -> zbus::Result<u32>;
+
+    /// Mode property
+    #[dbus_proxy(property)]
+    fn mode(&self) -> zbus::Result<u32>;
+
+    /// RsnFlags property
+    #[dbus_proxy(property)]
+    fn rsn_flags(&self) -> zbus::Result<u32>;
+
+    /// Ssid property
+    #[dbus_proxy(property)]
+    fn ssid(&self) -> zbus::Result<Vec<u8>>;
+
+    /// Strength property
+    #[dbus_proxy(property)]
+    fn strength(&self) -> zbus::Result<u8>;
+
+    /// WpaFlags property
+    #[dbus_proxy(property)]
+    fn wpa_flags(&self) -> zbus::Result<u32>;
+}
+
+/// # DBus interface proxies for: `org.freedesktop.NetworkManager.Device.Wireless`
+///
+/// This code was generated by `zbus-xmlgen` `3.1.0` from DBus introspection data.
+#[dbus_proxy(
+    interface = "org.freedesktop.NetworkManager.Device.Wireless",
+    default_service = "org.freedesktop.NetworkManager",
+    default_path = "/org/freedesktop/NetworkManager/Devices/5"
+)]
+trait Wireless {
+    /// GetAllAccessPoints method
+    fn get_all_access_points(&self) -> zbus::Result<Vec<zbus::zvariant::OwnedObjectPath>>;
+
+    /// RequestScan method
+    fn request_scan(
+        &self,
+        options: std::collections::HashMap<&str, zbus::zvariant::Value<'_>>,
+    ) -> zbus::Result<()>;
+
+    /// AccessPointAdded signal
+    #[dbus_proxy(signal)]
+    fn access_point_added(&self, access_point: zbus::zvariant::ObjectPath<'_>) -> zbus::Result<()>;
+
+    /// AccessPointRemoved signal
+    #[dbus_proxy(signal)]
+    fn access_point_removed(
+        &self,
+        access_point: zbus::zvariant::ObjectPath<'_>,
+    ) -> zbus::Result<()>;
+
+    /// AccessPoints property
+    #[dbus_proxy(property)]
+    fn access_points(&self) -> zbus::Result<Vec<zbus::zvariant::OwnedObjectPath>>;
+
+    /// ActiveAccessPoint property
+    #[dbus_proxy(property)]
+    fn active_access_point(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
+
+    /// Bitrate property
+    #[dbus_proxy(property)]
+    fn bitrate(&self) -> zbus::Result<u32>;
+
+    /// HwAddress property
+    #[dbus_proxy(property)]
+    fn hw_address(&self) -> zbus::Result<String>;
+
+    /// LastScan property
+    #[dbus_proxy(property)]
+    fn last_scan(&self) -> zbus::Result<i64>;
+
+    /// Mode property
+    #[dbus_proxy(property)]
+    fn mode(&self) -> zbus::Result<u32>;
+
+    /// PermHwAddress property
+    #[dbus_proxy(property)]
+    fn perm_hw_address(&self) -> zbus::Result<String>;
+
+    /// WirelessCapabilities property
+    #[dbus_proxy(property)]
+    fn wireless_capabilities(&self) -> zbus::Result<u32>;
+}
+
 /// # DBus interface proxies for: `org.freedesktop.NetworkManager.Device`
 ///
 /// This code was generated by `zbus-xmlgen` `3.1.0` from DBus introspection data.
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 2fb3838a60..00fddf9432 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -1,4 +1,4 @@
-use super::{error::NetworkStateError, NetworkAdapterError};
+use super::{error::NetworkStateError, model::NetworkStateItems, NetworkAdapterError};
 use crate::network::{dbus::Tree, model::Connection, Action, Adapter, NetworkState};
 use agama_lib::network::types::DeviceType;
 use std::{error::Error, sync::Arc};
@@ -37,7 +37,7 @@ impl<T: Adapter> NetworkSystem<T> {
     /// Writes the network configuration.
     pub async fn write(&mut self) -> Result<(), NetworkAdapterError> {
         self.adapter.write(&self.state).await?;
-        self.state = self.adapter.read().await?;
+        self.state = self.adapter.read(vec![]).await?;
         Ok(())
     }
 
@@ -50,7 +50,7 @@ impl<T: Adapter> NetworkSystem<T> {
 
     /// Populates the D-Bus tree with the known devices and connections.
     pub async fn setup(&mut self) -> Result<(), Box<dyn Error>> {
-        self.state = self.adapter.read().await?;
+        self.state = self.adapter.read(vec![]).await?;
         let mut tree = self.tree.lock().await;
         tree.set_connections(&mut self.state.connections).await?;
         tree.set_devices(&self.state.devices).await?;
@@ -75,6 +75,26 @@ impl<T: Adapter> NetworkSystem<T> {
                 let result = self.add_connection_action(name, ty).await;
                 tx.send(result).unwrap();
             }
+            Action::RefreshScan(tx) => {
+                let state = self
+                    .adapter
+                    .read(vec![NetworkStateItems::AccessPoints])
+                    .await?;
+                self.state.general_state = state.general_state;
+                self.state.access_points = state.access_points;
+                tx.send(Ok(())).unwrap();
+            }
+            Action::GetAccessPoints(tx) => {
+                tx.send(self.state.access_points.clone()).unwrap();
+            }
+            Action::NewConnection(conn, tx) => {
+                let result = self.new_connection_action(conn).await;
+                tx.send(result).unwrap();
+            }
+            Action::GetGeneralState(tx) => {
+                let config = self.state.general_state.clone();
+                tx.send(config.clone()).unwrap();
+            }
             Action::GetConnection(uuid, tx) => {
                 let conn = self.state.get_connection_by_uuid(uuid);
                 tx.send(conn.cloned()).unwrap();
@@ -122,10 +142,15 @@ impl<T: Adapter> NetworkSystem<T> {
             Action::UpdateConnection(conn) => {
                 self.state.update_connection(*conn)?;
             }
-            Action::RemoveConnection(uuid) => {
+            Action::UpdateGeneralState(general_state) => {
+                self.state.general_state = general_state;
+            }
+            Action::RemoveConnection(uuid, tx) => {
                 let mut tree = self.tree.lock().await;
                 tree.remove_connection(uuid).await?;
-                self.state.remove_connection(uuid)?;
+                let result = self.state.remove_connection(uuid);
+
+                tx.send(result).unwrap();
             }
             Action::Apply(tx) => {
                 let result = self.write().await;
@@ -170,6 +195,20 @@ impl<T: Adapter> NetworkSystem<T> {
         Ok(path)
     }
 
+    async fn new_connection_action(
+        &mut self,
+        conn: Connection,
+    ) -> Result<OwnedObjectPath, NetworkStateError> {
+        // TODO: handle tree handling problems
+        self.state.add_connection(conn.clone())?;
+        let mut tree = self.tree.lock().await;
+        let path = tree
+            .add_connection(&conn)
+            .await
+            .expect("Could not update the D-Bus tree");
+        Ok(path)
+    }
+
     fn set_ports_action(
         &mut self,
         uuid: Uuid,
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 7a42977b3b..706b880c58 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -2,17 +2,19 @@
 
 use crate::error::Error;
 use axum::{
-    extract::State,
+    extract::{Path, State},
     http::StatusCode,
     response::{IntoResponse, Response},
-    routing::get,
+    routing::{delete, get, put},
     Json, Router,
 };
 
-use super::Action;
+use super::{error::NetworkStateError, model::GeneralState, Action};
 
 use crate::network::{model::Connection, model::Device, nm::NetworkManagerAdapter, NetworkSystem};
 use agama_lib::error::ServiceError;
+use agama_lib::network::settings::NetworkConnection;
+use uuid::Uuid;
 
 use serde_json::json;
 use thiserror::Error;
@@ -24,6 +26,10 @@ pub enum NetworkError {
     UnknownConnection(String),
     #[error("Cannot translate: {0}")]
     CannotTranslate(#[from] Error),
+    #[error("Cannot apply configuration")]
+    CannotApplyConfig,
+    #[error("Network states error: {0}")]
+    Error(#[from] NetworkStateError),
 }
 
 impl IntoResponse for NetworkError {
@@ -63,11 +69,71 @@ pub async fn network_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
     });
 
     Ok(Router::new()
-        .route("/connections", get(connections))
+        .route("/state", get(general_state).post(update_general_state))
+        .route("/connections", get(connections).post(add_connection))
+        .route(
+            "/connections/:id",
+            delete(delete_connection).put(update_connection),
+        )
         .route("/devices", get(devices))
+        .route("/system/apply", put(apply))
+        .route("/wifi", get(wifi_networks))
         .with_state(state))
 }
 
+#[utoipa::path(get, path = "/network/state", responses(
+  (status = 200, description = "Get general network config", body = GenereralState)
+))]
+async fn general_state(State(state): State<NetworkState>) -> Json<GeneralState> {
+    let (tx, rx) = oneshot::channel();
+    state.actions.send(Action::GetGeneralState(tx)).unwrap();
+
+    let state = rx.await.unwrap();
+
+    Json(state)
+}
+
+#[utoipa::path(post, path = "/network/state", responses(
+  (status = 200, description = "Update general network config", body = GenereralState)
+))]
+async fn update_general_state(
+    State(state): State<NetworkState>,
+    Json(value): Json<GeneralState>,
+) -> Result<Json<GeneralState>, NetworkError> {
+    state
+        .actions
+        .send(Action::UpdateGeneralState(value.clone()))
+        .unwrap();
+
+    let (tx, rx) = oneshot::channel();
+    state.actions.send(Action::GetGeneralState(tx)).unwrap();
+    let state = rx.await.unwrap();
+
+    Ok(Json(state))
+}
+
+#[utoipa::path(get, path = "/network/wifi", responses(
+  (status = 200, description = "List of wireless networks", body = Vec<String>)
+))]
+async fn wifi_networks(State(state): State<NetworkState>) -> Json<Vec<String>> {
+    let (tx, rx) = oneshot::channel();
+    state.actions.send(Action::RefreshScan(tx)).unwrap();
+    let _ = rx.await.unwrap();
+    let (tx, rx) = oneshot::channel();
+    state.actions.send(Action::GetAccessPoints(tx)).unwrap();
+
+    let access_points = rx.await.unwrap();
+    let mut networks = vec![];
+    for ap in access_points {
+        let ssid = ap.ssid.to_string();
+        if !ssid.is_empty() && !networks.contains(&ssid) {
+            networks.push(ssid);
+        }
+    }
+
+    Json(networks)
+}
+
 #[utoipa::path(get, path = "/network/devices", responses(
   (status = 200, description = "List of devices", body = Vec<Device>)
 ))]
@@ -79,11 +145,98 @@ async fn devices(State(state): State<NetworkState>) -> Json<Vec<Device>> {
 }
 
 #[utoipa::path(get, path = "/network/connections", responses(
-  (status = 200, description = "List of known connections", body = Vec<Connection>)
+  (status = 200, description = "List of known connections", body = Vec<NetworkConnection>)
 ))]
-async fn connections(State(state): State<NetworkState>) -> Json<Vec<Connection>> {
+async fn connections(State(state): State<NetworkState>) -> Json<Vec<NetworkConnection>> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::GetConnections(tx)).unwrap();
+    let connections = rx.await.unwrap();
+    let connections = connections
+        .iter()
+        .map(|c| NetworkConnection::try_from(c.clone()).unwrap())
+        .collect();
 
-    Json(rx.await.unwrap())
+    Json(connections)
+}
+
+#[utoipa::path(post, path = "/network/connections", responses(
+  (status = 200, description = "Add a new connection", body = Connection)
+))]
+async fn add_connection(
+    State(state): State<NetworkState>,
+    Json(value): Json<NetworkConnection>,
+) -> Result<Json<Uuid>, NetworkError> {
+    let (tx, rx) = oneshot::channel();
+    let conn = NetworkConnection::from(value);
+
+    state
+        .actions
+        .send(Action::AddConnection(
+            conn.id.clone(),
+            conn.device_type(),
+            tx,
+        ))
+        .unwrap();
+    let _ = rx.await.unwrap();
+
+    let conn = Connection::try_from(conn)?;
+
+    state
+        .actions
+        .send(Action::UpdateConnection(Box::new(conn.clone())))
+        .unwrap();
+
+    Ok(Json(conn.uuid))
+}
+
+#[utoipa::path(delete, path = "/network/connections/:uuid", responses(
+  (status = 200, description = "Delete connection", body = Connection)
+))]
+async fn delete_connection(
+    State(state): State<NetworkState>,
+    Path(id): Path<Uuid>,
+) -> Result<Json<()>, NetworkError> {
+    let (tx, rx) = oneshot::channel();
+    state
+        .actions
+        .send(Action::RemoveConnection(id, tx))
+        .unwrap();
+
+    let _ = rx.await.unwrap();
+    let (tx, rx) = oneshot::channel();
+    state.actions.send(Action::Apply(tx)).unwrap();
+    let _ = rx.await.unwrap();
+
+    Ok(Json(()))
+}
+
+#[utoipa::path(put, path = "/network/connections/:uuid", responses(
+  (status = 200, description = "Update connection", body = Connection)
+))]
+async fn update_connection(
+    State(state): State<NetworkState>,
+    Path(id): Path<Uuid>,
+    Json(value): Json<NetworkConnection>,
+) -> Result<Json<()>, NetworkError> {
+    let conn = NetworkConnection::from(value);
+    let mut conn = Connection::try_from(conn)?;
+    conn.uuid = id;
+
+    state
+        .actions
+        .send(Action::UpdateConnection(Box::new(conn.clone())))
+        .unwrap();
+
+    Ok(Json(()))
+}
+
+#[utoipa::path(put, path = "/network/system/apply", responses(
+  (status = 200, description = "Apply configuration")
+))]
+async fn apply(State(state): State<NetworkState>) -> Result<Json<()>, NetworkError> {
+    let (tx, rx) = oneshot::channel();
+    state.actions.send(Action::Apply(tx)).unwrap();
+    let _ = rx.await.map_err(|_| NetworkError::CannotApplyConfig)?;
+
+    Ok(Json(()))
 }

From 40cbc06caa0071b8567a4771a6a9e5ac5efd0d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 16:21:08 +0000
Subject: [PATCH 097/324] Move the selected patterns to the proposal

---
 rust/agama-server/src/software/web.rs | 43 +++++++--------------------
 rust/agama-server/src/web/docs.rs     |  1 -
 rust/agama-server/src/web/event.rs    |  6 +++-
 3 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index f5c7bd6cb5..b7ccc4298b 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -92,7 +92,7 @@ async fn patterns_changed_stream(
             }
             None
         })
-        .filter_map(|e| e.map(Event::PatternsChanged));
+        .filter_map(|e| e.map(|patterns| Event::SoftwareProposalChanged { patterns }));
     Ok(stream)
 }
 
@@ -150,43 +150,16 @@ async fn products(State(state): State<SoftwareState<'_>>) -> Result<Json<Vec<Pro
     Ok(Json(products))
 }
 
-/// Represents a pattern.
-///
-/// It augments the information coming from the D-Bus client.
-#[derive(Serialize, utoipa::ToSchema)]
-pub struct PatternEntry {
-    #[serde(flatten)]
-    pattern: Pattern,
-    selected_by: SelectedBy,
-}
-
 /// Returns the list of software patterns.
 ///
 /// * `state`: service state.
 #[utoipa::path(get, path = "/software/patterns", responses(
-    (status = 200, description = "List of known software patterns", body = Vec<PatternEntry>),
+    (status = 200, description = "List of known software patterns", body = Vec<Pattern>),
     (status = 400, description = "The D-Bus service could not perform the action")
 ))]
-async fn patterns(
-    State(state): State<SoftwareState<'_>>,
-) -> Result<Json<Vec<PatternEntry>>, Error> {
+async fn patterns(State(state): State<SoftwareState<'_>>) -> Result<Json<Vec<Pattern>>, Error> {
     let patterns = state.software.patterns(true).await?;
-    let selected = state.software.selected_patterns().await?;
-    let items = patterns
-        .into_iter()
-        .map(|pattern| {
-            let selected_by: SelectedBy = selected
-                .get(&pattern.id)
-                .copied()
-                .unwrap_or(SelectedBy::None);
-            PatternEntry {
-                pattern,
-                selected_by,
-            }
-        })
-        .collect();
-
-    Ok(Json(items))
+    Ok(Json(patterns))
 }
 
 /// Sets the software configuration.
@@ -229,7 +202,7 @@ async fn get_config(State(state): State<SoftwareState<'_>>) -> Result<Json<Softw
     let patterns = state.software.user_selected_patterns().await?;
     let config = SoftwareConfig {
         patterns: Some(patterns),
-        product: product,
+        product,
     };
     Ok(Json(config))
 }
@@ -240,6 +213,9 @@ pub struct SoftwareProposal {
     /// Space required for installation. It is returned as a formatted string which includes
     /// a number and a unit (e.g., "GiB").
     size: String,
+    /// Patterns selection. It is respresented as a hash map where the key is the pattern's name
+    /// and the value why the pattern is selected.
+    patterns: HashMap<String, SelectedBy>,
 }
 
 /// Returns the proposal information.
@@ -251,7 +227,8 @@ pub struct SoftwareProposal {
 ))]
 async fn proposal(State(state): State<SoftwareState<'_>>) -> Result<Json<SoftwareProposal>, Error> {
     let size = state.software.used_disk_space().await?;
-    let proposal = SoftwareProposal { size };
+    let patterns = state.software.selected_patterns().await?;
+    let proposal = SoftwareProposal { size, patterns };
     Ok(Json(proposal))
 }
 
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 34ded88acf..b69908b07c 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -26,7 +26,6 @@ use utoipa::OpenApi;
         schemas(crate::l10n::LocaleEntry),
         schemas(crate::l10n::TimezoneEntry),
         schemas(crate::l10n::web::LocaleConfig),
-        schemas(crate::software::web::PatternEntry),
         schemas(crate::software::web::SoftwareConfig),
         schemas(crate::software::web::SoftwareProposal),
         schemas(crate::manager::web::InstallerStatus),
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 999e4d6619..ef6cbf0f50 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -21,7 +21,11 @@ pub enum Event {
     ProductChanged {
         id: String,
     },
-    PatternsChanged(HashMap<String, SelectedBy>),
+    // TODO: it should include the full software proposal or, at least,
+    // all the relevant changes.
+    SoftwareProposalChanged {
+        patterns: HashMap<String, SelectedBy>,
+    },
     InstallationPhaseChanged {
         phase: InstallationPhase,
     },

From dd0c91797bf1ec0ad006ab01a5b5973ba3dd9296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 16:55:06 +0000
Subject: [PATCH 098/324] Rename Pattern 'id' to 'name'

---
 rust/agama-lib/src/software/client.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rust/agama-lib/src/software/client.rs b/rust/agama-lib/src/software/client.rs
index 4769976847..9c42094da5 100644
--- a/rust/agama-lib/src/software/client.rs
+++ b/rust/agama-lib/src/software/client.rs
@@ -7,8 +7,8 @@ use zbus::Connection;
 /// Represents a software product
 #[derive(Debug, Serialize, utoipa::ToSchema)]
 pub struct Pattern {
-    /// Pattern ID (eg., "aaa_base", "gnome")
-    pub id: String,
+    /// Pattern name (eg., "aaa_base", "gnome")
+    pub name: String,
     /// Pattern category (e.g., "Production")
     pub category: String,
     /// Pattern icon path locally on system
@@ -69,8 +69,8 @@ impl<'a> SoftwareClient<'a> {
             .await?
             .into_iter()
             .map(
-                |(id, (category, description, icon, summary, order))| Pattern {
-                    id,
+                |(name, (category, description, icon, summary, order))| Pattern {
+                    name,
                     category,
                     icon,
                     description,

From 64d16254066b3d0baa640a2e174e39b4189c3748 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 16:55:27 +0000
Subject: [PATCH 099/324] Serialize SelectedBy as a number

---
 rust/agama-lib/src/software/client.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rust/agama-lib/src/software/client.rs b/rust/agama-lib/src/software/client.rs
index 9c42094da5..d8f1095403 100644
--- a/rust/agama-lib/src/software/client.rs
+++ b/rust/agama-lib/src/software/client.rs
@@ -1,6 +1,7 @@
 use super::proxies::Software1Proxy;
 use crate::error::ServiceError;
 use serde::Serialize;
+use serde_repr::Serialize_repr;
 use std::collections::HashMap;
 use zbus::Connection;
 
@@ -22,7 +23,8 @@ pub struct Pattern {
 }
 
 /// Represents the reason why a pattern is selected.
-#[derive(Clone, Copy, Debug, PartialEq, Serialize)]
+#[derive(Clone, Copy, Debug, PartialEq, Serialize_repr)]
+#[repr(u8)]
 pub enum SelectedBy {
     /// The pattern was selected by the user.
     User = 0,

From 248d040d447fd065881fa3522c015ccba50416b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 17:36:45 +0000
Subject: [PATCH 100/324] Adapt the SoftwareClient to the HTTP/JSON API

---
 web/src/client/index.js    |   4 +-
 web/src/client/software.js | 135 +++++++++----------------------------
 2 files changed, 35 insertions(+), 104 deletions(-)

diff --git a/web/src/client/index.js b/web/src/client/index.js
index 206365b695..63b6e2b422 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -78,7 +78,7 @@ const createClient = (url) => {
   const manager = new ManagerClient(client);
   // const monitor = new Monitor(address, MANAGER_SERVICE);
   // const network = new NetworkClient(address);
-  // const software = new SoftwareClient(address);
+  const software = new SoftwareClient(client);
   // const storage = new StorageClient(address);
   // const users = new UsersClient(address);
   // const questions = new QuestionsClient(address);
@@ -139,7 +139,7 @@ const createClient = (url) => {
     manager,
     // monitor,
     // network,
-    // software,
+    software,
     // storage,
     // users,
     // questions,
diff --git a/web/src/client/software.js b/web/src/client/software.js
index 8ed8f2e8f7..4e9907ef5b 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -22,12 +22,9 @@
 // @ts-check
 
 import DBusClient from "./dbus";
-import { WithIssues, WithStatus, WithProgress } from "./mixins";
+import { WithIssues, WithProgress, WithStatus } from "./mixins";
 
 const SOFTWARE_SERVICE = "org.opensuse.Agama.Software1";
-const SOFTWARE_IFACE = "org.opensuse.Agama.Software1";
-const SOFTWARE_PATH = "/org/opensuse/Agama/Software1";
-const PRODUCT_IFACE = "org.opensuse.Agama.Software1.Product";
 const PRODUCT_PATH = "/org/opensuse/Agama/Software1/Product";
 const REGISTRATION_IFACE = "org.opensuse.Agama1.Registration";
 
@@ -65,57 +62,6 @@ class BaseProductManager {
     this.proxies = {};
   }
 
-  /**
-   * Returns the list of available products.
-   *
-   * @return {Promise<Array<Product>>}
-   */
-  async getAll() {
-    const proxy = await this.client.proxy(PRODUCT_IFACE);
-    return proxy.AvailableProducts.map(product => {
-      const [id, name, meta] = product;
-      return { id, name, description: meta.description?.v };
-    });
-  }
-
-  /**
-   * Returns the selected product.
-   *
-   * @return {Promise<Product|null>}
-   */
-  async getSelected() {
-    const products = await this.getAll();
-    const proxy = await this.client.proxy(PRODUCT_IFACE);
-    if (proxy.SelectedProduct === "") {
-      return null;
-    }
-    return products.find(product => product.id === proxy.SelectedProduct);
-  }
-
-  /**
-   * Selects a product for installation.
-   *
-   * @param {string} id - Product ID.
-   */
-  async select(id) {
-    const proxy = await this.client.proxy(PRODUCT_IFACE);
-    return proxy.SelectProduct(id);
-  }
-
-  /**
-   * Registers a callback to run when properties in the Product object change.
-   *
-   * @param {(id: string) => void} handler - Callback function.
-   */
-  onChange(handler) {
-    return this.client.onObjectChanged(PRODUCT_PATH, PRODUCT_IFACE, changes => {
-      if ("SelectedProduct" in changes) {
-        const selected = changes.SelectedProduct.v.toString();
-        handler(selected);
-      }
-    });
-  }
-
   /**
    * Returns the registration of the selected product.
    *
@@ -147,7 +93,7 @@ class BaseProductManager {
 
     return {
       success: result[0] === 0,
-      message: result[1]
+      message: result[1],
     };
   }
 
@@ -162,7 +108,7 @@ class BaseProductManager {
 
     return {
       success: result[0] === 0,
-      message: result[1]
+      message: result[1],
     };
   }
 
@@ -203,11 +149,6 @@ class BaseProductManager {
   }
 }
 
-/**
- * Manages product selection.
- */
-class ProductManager extends WithIssues(BaseProductManager, PRODUCT_PATH) { }
-
 /**
  * Software client
  *
@@ -217,10 +158,11 @@ class SoftwareBaseClient {
   /**
    * @param {string|undefined} address - D-Bus address; if it is undefined, it uses the system bus.
    */
-  constructor(address = undefined) {
-    this.client = new DBusClient(SOFTWARE_SERVICE, address);
-    this.product = new ProductManager(this.client);
-    this.proxies = {};
+  /**
+   * @param {import("./http").HTTPClient} client - HTTP client.
+   */
+  constructor(client) {
+    this.client = client;
   }
 
   /**
@@ -228,67 +170,54 @@ class SoftwareBaseClient {
    *
    * @return {Promise<void>}
    */
-  async probe() {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.Probe();
+  probe() {
+    return this.client.post("/software/probe");
   }
 
   /**
    * Returns how much space installation takes on disk
    *
-   * @return {Promise<string>}
+   * @return {Promise<object>}
    */
-  async getUsedSpace() {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.UsedDiskSpace();
+  getProposal() {
+    return this.client.get("/software/proposal");
   }
 
   /**
    * Returns available patterns
    *
-   * @param {boolean} filter - `true` = filter the patterns, `false` = all patterns
-   * @return {Promise<Array<string>>}
+   * @return {Promise<object>}
    */
-  async patterns(filter) {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.ListPatterns(filter);
+  getPatterns() {
+    return this.client.get("/software/patterns");
   }
 
   /**
    * @typedef {Object.<string, number>} PatternSelection mapping "name" =>
    * "who selected the pattern"
    */
-
-  /**
-   * Returns selected patterns
-   *
-   * @return {Promise<PatternSelection>}
-   */
-  async selectedPatterns() {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.SelectedPatterns;
+  config() {
+    return this.client.get("/software/config");
   }
 
   /**
-   * Select a pattern to install
-   *
-   * @param {string} name - name of the pattern
+   * @param {string[]} patterns - name of the user-selected patterns.
    * @return {Promise<void>}
    */
-  async addPattern(name) {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.AddPattern(name);
+  selectPatterns(patterns) {
+    return this.client.put("/software/config", { patterns });
   }
 
   /**
-   * Deselect a pattern to install
+   * Registers a callback to run when the select product changes.
    *
-   * @param {string} name - name of the pattern
-   * @return {Promise<void>}
+   * @param {(changes: object) => void} handler - Callback function.
+   * @return {import ("./http").RemoveFn} Function to remove the callback.
    */
-  async removePattern(name) {
-    const proxy = await this.client.proxy(SOFTWARE_IFACE);
-    return proxy.RemovePattern(name);
+  onSelectedPatternsChanged(handler) {
+    return this.client.onEvent("SoftwareProposalChanged", ({ patterns }) => {
+      handler(patterns);
+    });
   }
 }
 
@@ -297,10 +226,12 @@ class SoftwareBaseClient {
  */
 class SoftwareClient extends WithIssues(
   WithProgress(
-    WithStatus(SoftwareBaseClient, SOFTWARE_PATH),
-    SOFTWARE_PATH,
+    WithStatus(SoftwareBaseClient, "software/status", SOFTWARE_SERVICE),
+    "software/progress",
+    SOFTWARE_SERVICE,
   ),
-  SOFTWARE_PATH,
+  "software/issues/software",
+  "/org/opensuse/Agama/Software1",
 ) {}
 
 class ProductBaseClient {

From bcbfb4e8c7a4923d06fc656ac6e974c82f79f925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 20 Mar 2024 17:39:40 +0000
Subject: [PATCH 101/324] Initial adaptation of the software section to the
 HTTP/JSON API

---
 web/src/components/overview/OverviewPage.jsx  |  8 +-
 .../components/overview/SoftwareSection.jsx   | 36 ++++----
 .../overview/SoftwareSection.test.jsx         | 18 ++--
 web/src/components/software/PatternItem.jsx   | 37 ++------
 .../components/software/PatternSelector.jsx   | 91 ++++++++++++-------
 5 files changed, 94 insertions(+), 96 deletions(-)

diff --git a/web/src/components/overview/OverviewPage.jsx b/web/src/components/overview/OverviewPage.jsx
index 6c18505320..b51a6129d0 100644
--- a/web/src/components/overview/OverviewPage.jsx
+++ b/web/src/components/overview/OverviewPage.jsx
@@ -22,14 +22,14 @@
 import React, { useState } from "react";
 import { useProduct } from "~/context/product";
 import { Navigate } from "react-router-dom";
-import { Page, InstallButton } from "~/components/core";
+import { InstallButton, Page } from "~/components/core";
 import {
   L10nSection,
   NetworkSection,
   ProductSection,
   SoftwareSection,
   StorageSection,
-  UsersSection
+  UsersSection,
 } from "~/components/overview";
 import { _ } from "~/i18n";
 
@@ -47,11 +47,8 @@ export default function OverviewPage() {
   //     // TRANSLATORS: page title
   //     title={_("Installation Summary")}
   //   >
-  //     <ProductSection />
-  //     <L10nSection />
   //     <NetworkSection />
   //     <StorageSection showErrors />
-  //     <SoftwareSection showErrors />
   //     <UsersSection showErrors={showErrors} />
 
   //     <Page.Actions>
@@ -68,6 +65,7 @@ export default function OverviewPage() {
     >
       <ProductSection />
       <L10nSection />
+      <SoftwareSection showErrors />
     </Page>
   );
 }
diff --git a/web/src/components/overview/SoftwareSection.jsx b/web/src/components/overview/SoftwareSection.jsx
index a5ac99b8fc..b6887a2502 100644
--- a/web/src/components/overview/SoftwareSection.jsx
+++ b/web/src/components/overview/SoftwareSection.jsx
@@ -19,7 +19,7 @@
  * find current contact information at www.suse.com.
  */
 
-import React, { useReducer, useEffect } from "react";
+import React, { useEffect, useReducer } from "react";
 import { BUSY } from "~/client/status";
 import { Button } from "@patternfly/react-core";
 import { Icon } from "~/components/layout";
@@ -35,7 +35,7 @@ const initialState = {
   errorsRead: false,
   size: "",
   patterns: {},
-  progress: { message: _("Reading software repositories"), current: 0, total: 0, finished: false }
+  progress: { message: _("Reading software repositories"), current: 0, total: 0, finished: false },
 };
 
 const reducer = (state, action) => {
@@ -82,8 +82,8 @@ export default function SoftwareSection({ showErrors }) {
   useEffect(() => {
     const updateProposal = async () => {
       const errors = await cancellablePromise(client.getIssues());
-      const size = await cancellablePromise(client.getUsedSpace());
-      const patterns = await cancellablePromise(client.patterns(true));
+      const { size } = await cancellablePromise(client.getProposal());
+      const patterns = await cancellablePromise(client.getPatterns(true));
 
       dispatch({ type: "UPDATE_PROPOSAL", payload: { errors, size, patterns } });
     };
@@ -95,7 +95,7 @@ export default function SoftwareSection({ showErrors }) {
     cancellablePromise(client.getProgress()).then(({ message, current, total, finished }) => {
       dispatch({
         type: "UPDATE_PROGRESS",
-        payload: { message, current, total, finished }
+        payload: { message, current, total, finished },
       });
     });
   }, [client, cancellablePromise]);
@@ -104,7 +104,7 @@ export default function SoftwareSection({ showErrors }) {
     return client.onProgressChange(({ message, current, total, finished }) => {
       dispatch({
         type: "UPDATE_PROGRESS",
-        payload: { message, current, total, finished }
+        payload: { message, current, total, finished },
       });
     });
   }, [client, cancellablePromise]);
@@ -114,24 +114,24 @@ export default function SoftwareSection({ showErrors }) {
   const SectionContent = () => {
     if (state.busy) {
       const { message, current, total } = state.progress;
-      return (
-        <ProgressText message={message} current={current} total={total} />
-      );
+      return <ProgressText message={message} current={current} total={total} />;
     }
 
     return (
       <>
         <UsedSize size={state.size} />
         {errors.length > 0 &&
-          <Button
-            isInline
-            variant="link"
-            icon={<Icon name="refresh" size="xxs" />}
-            onClick={probe}
-          >
-            {/* TRANSLATORS: clickable link label */}
-            {_("Refresh the repositories")}
-          </Button>}
+          (
+            <Button
+              isInline
+              variant="link"
+              icon={<Icon name="refresh" size="xxs" />}
+              onClick={probe}
+            >
+              {/* TRANSLATORS: clickable link label */}
+              {_("Refresh the repositories")}
+            </Button>
+          )}
       </>
     );
   };
diff --git a/web/src/components/overview/SoftwareSection.test.jsx b/web/src/components/overview/SoftwareSection.test.jsx
index d0fdf55711..f0f94638b3 100644
--- a/web/src/components/overview/SoftwareSection.test.jsx
+++ b/web/src/components/overview/SoftwareSection.test.jsx
@@ -35,14 +35,14 @@ const kdePattern = {
     "Packages providing the Plasma desktop environment and applications from KDE.",
     "./pattern-kde",
     "KDE Applications and Plasma 5 Desktop",
-    "1110"
-  ]
+    "1110",
+  ],
 };
 
 let getStatusFn = jest.fn().mockResolvedValue(IDLE);
 let getProgressFn = jest.fn().mockResolvedValue({});
 let getIssuesFn = jest.fn().mockResolvedValue([]);
-let patternsFn = jest.fn().mockResolvedValue(kdePattern);
+let getPatternsFn = jest.fn().mockResolvedValue(kdePattern);
 
 beforeEach(() => {
   createClient.mockImplementation(() => {
@@ -53,8 +53,8 @@ beforeEach(() => {
         getIssues: getIssuesFn,
         onStatusChange: noop,
         onProgressChange: noop,
-        patterns: patternsFn,
-        getUsedSpace: jest.fn().mockResolvedValue("500 MB")
+        getPatterns: getPatternsFn,
+        getProposal: jest.fn().mockResolvedValue({ size: "500 MiB" }),
       },
     };
   });
@@ -63,13 +63,13 @@ beforeEach(() => {
 describe("when the proposal is calculated", () => {
   beforeEach(() => {
     getStatusFn = jest.fn().mockResolvedValue(IDLE);
-    patternsFn = jest.fn().mockResolvedValue(kdePattern);
+    getPatternsFn = jest.fn().mockResolvedValue(kdePattern);
   });
 
   it("renders the required space", async () => {
     installerRender(<SoftwareSection showErrors />);
     await screen.findByText("Installation will take");
-    await screen.findByText("500 MB");
+    await screen.findByText("500 MiB");
   });
 
   describe("patterns are available", () => {
@@ -83,7 +83,7 @@ describe("when the proposal is calculated", () => {
 
   describe("no patterns are available", () => {
     beforeEach(() => {
-      patternsFn = jest.fn().mockResolvedValue({});
+      getPatternsFn = jest.fn().mockResolvedValue({});
     });
 
     it("the header is a plain text", async () => {
@@ -110,7 +110,7 @@ describe("when the proposal is being calculated", () => {
   beforeEach(() => {
     getStatusFn = jest.fn().mockResolvedValue(BUSY);
     getProgressFn = jest.fn().mockResolvedValue(
-      { message: "Initializing target repositories", current: 1, total: 4, finished: false }
+      { message: "Initializing target repositories", current: 1, total: 4, finished: false },
     );
   });
 
diff --git a/web/src/components/software/PatternItem.jsx b/web/src/components/software/PatternItem.jsx
index cc6f5ac7e8..75cdc464de 100644
--- a/web/src/components/software/PatternItem.jsx
+++ b/web/src/components/software/PatternItem.jsx
@@ -77,53 +77,32 @@ function stateAriaLabel(selected) {
  * @param {function} onChange callback called when the pattern status is changed
  * @returns {JSX.Element}
  */
-function PatternItem({ pattern, onChange }) {
-  const client = useInstallerClient();
+function PatternItem({ pattern, onToggle }) {
   const [icon, setIcon] = useState();
 
-  const onClick = () => {
-    switch (pattern.selected) {
-      // available pattern (not selected)
-      case undefined:
-        client.software.addPattern(pattern.name).then(onChange);
-        break;
-      // user selected
-      case 0:
-        client.software.removePattern(pattern.name).then(onChange);
-        break;
-      // auto selected
-      case 1:
-        // try to deselect an automatically selected pattern,
-        // that can work only for soft dependencies (Recommends, Suggests,...),
-        // the hard dependencies (Requires) cannot be changed
-        client.software.removePattern(pattern.name).then(onChange);
-        break;
-      default:
-        console.error("Unknown patterns status: ", pattern.selected);
-    }
-  };
-
   // download the pattern icon from the system
   useEffect(() => {
     if (icon) return;
     cockpit.file(sprintf(ICON_PATH, pattern.icon)).read()
-      .then((data) => { setIcon(data) });
+      .then((data) => {
+        setIcon(data);
+      });
   }, [pattern.icon, icon]);
 
-  const patternIcon = (icon)
+  const patternIcon = icon
     // use a Base64 encoded inline pattern image
     ? <img src={"data:image/svg+xml;base64," + btoa(icon)} aria-hidden="true" />
     // fallback icon
     : <Icon name="apps" aria-hidden="true" />;
 
   return (
-    <div className="pattern-container" onClick={onClick}>
+    <div className="pattern-container" onClick={() => onToggle(pattern.name)}>
       <div className="pattern-checkbox">
-        <img src={stateIcon(pattern.selected)} aria-label={stateAriaLabel(pattern.selected)} />
+        <img src={stateIcon(pattern.selected_by)} aria-label={stateAriaLabel(pattern.selected)} />
       </div>
       <div className="pattern-label">
         <div className="pattern-label-icon">
-          { patternIcon }
+          {patternIcon}
         </div>
         <div className="pattern-label-text">{pattern.summary}</div>
       </div>
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 06de61c3b0..6c8e0dbc50 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -61,7 +61,7 @@ function convert(pattern_data, selected) {
       icon: pattern[2],
       summary: pattern[3],
       order: pattern[4],
-      selected: selected[name]
+      selected: selected[name],
     });
   });
 
@@ -83,10 +83,10 @@ function groupPatterns(patterns) {
   const pattern_groups = {};
 
   patterns.forEach((pattern) => {
-    if (pattern_groups[pattern.group]) {
-      pattern_groups[pattern.group].push(pattern);
+    if (pattern_groups[pattern.category]) {
+      pattern_groups[pattern.category].push(pattern);
     } else {
-      pattern_groups[pattern.group] = [pattern];
+      pattern_groups[pattern.category] = [pattern];
     }
   });
 
@@ -138,7 +138,8 @@ function sortGroups(groups) {
  */
 function PatternSelector() {
   const [patterns, setPatterns] = useState();
-  const [selected, setSelected] = useState();
+  const [visiblePatterns, setVisiblePatterns] = useState(undefined);
+  const [selected, setSelected] = useState({});
   const [errors, setErrors] = useState([]);
   const [used, setUsed] = useState();
   const [searchValue, setSearchValue] = useState("");
@@ -148,55 +149,75 @@ function PatternSelector() {
     setSearchValue(value);
   };
 
-  // refresh the page content after changing a pattern status
-  const refreshCb = useCallback(() => {
-    const refresh = async () => {
-      setSelected(await client.software.selectedPatterns());
-      setUsed(await client.software.getUsedSpace());
-      setErrors(await client.software.getIssues());
-    };
-
-    refresh();
-  }, [client.software]);
+  useEffect(() => {
+    return client.software.onSelectedPatternsChanged(setSelected);
+  }, [client.software, setSelected]);
 
   useEffect(() => {
-    // patterns already loaded
     if (patterns) return;
 
     const loadData = async () => {
-      setSelected(await client.software.selectedPatterns());
-      setUsed(await client.software.getUsedSpace());
+      setPatterns(await client.software.getPatterns());
+      const { patterns: selected, size } = await client.software.getProposal();
+      setSelected(selected);
+      setUsed(size);
       setErrors(await client.software.getIssues());
-      setPatterns(await client.software.patterns(true));
     };
 
     loadData();
   }, [patterns, client.software]);
 
-  // initial empty screen, the patterns are loaded very quickly, no need for any progress
-  if (!patterns) return null;
+  useEffect(() => {
+    if (!patterns) return;
 
-  let patternsData = convert(patterns, selected);
+    let visible = patterns.map((pattern) => {
+      const selected_by = (selected[pattern.name] === undefined) ? 2 : selected[pattern.name];
+      return { ...pattern, selected_by };
+    });
 
-  // filtering - search the required text in the name and pattern description
-  if (searchValue !== "") {
-    // case insensitive search
-    const searchData = searchValue.toUpperCase();
-    patternsData = patternsData.filter((p) =>
-      p.name.toUpperCase().indexOf(searchData) !== -1 ||
-      p.description.toUpperCase().indexOf(searchData) !== -1
-    );
-  }
+    // filtering - search the required text in the name and pattern description
+    if (searchValue !== "") {
+      // case insensitive search
+      const searchData = searchValue.toUpperCase();
+      visible = visible.filter((p) =>
+        p.name.toUpperCase().indexOf(searchData) !== -1 ||
+        p.description.toUpperCase().indexOf(searchData) !== -1
+      );
+    }
+
+    setVisiblePatterns(visible);
+  }, [patterns, selected, searchValue]);
+
+  const onToggle = useCallback((name) => {
+    const selected = visiblePatterns.filter((p) => p.selected_by === 0).map((p) => p.name);
+
+    const index = selected.indexOf(name);
+    if (index === -1) {
+      selected.push(name);
+    } else {
+      selected.splice(index, 1);
+    }
 
-  const groups = groupPatterns(patternsData);
+    client.software.selectPatterns(selected);
+  }, [visiblePatterns, client.software]);
+
+  // initial empty screen, the patterns are loaded very quickly, no need for any progress
+  if (!visiblePatterns) return null;
 
+  const groups = groupPatterns(visiblePatterns);
   const selector = sortGroups(groups).map((group) => {
     return (
       <PatternGroup
         key={group}
         name={group}
       >
-        { (groups[group]).map(p => <PatternItem key={p.name} pattern={p} onChange={refreshCb} />) }
+        {groups[group].map((p) => (
+          <PatternItem
+            key={p.name}
+            pattern={p}
+            onToggle={(name) => onToggle(name)}
+          />
+        ))}
       </PatternGroup>
     );
   });
@@ -218,11 +239,11 @@ function PatternSelector() {
           onChange={(_event, value) => onSearchChange(value)}
           onClear={() => onSearchChange("")}
           // do not display the counter when search filter is empty
-          resultsCount={searchValue === "" ? 0 : patternsData.length}
+          resultsCount={searchValue === "" ? 0 : groups.length}
         />
       </Section>
 
-      { selector }
+      {selector}
     </>
   );
 }

From eebbbd444d11b7b8ec6a3fbae6fd3fb11e1610ce Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 21 Mar 2024 07:37:54 +0100
Subject: [PATCH 102/324] fix routing of questions

---
 rust/agama-server/src/questions/web.rs | 12 +++++++-----
 rust/agama-server/src/web.rs           |  6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 01f5a38e3c..47645495ba 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -5,7 +5,7 @@
 //! * `questions_service` which returns the Axum service.
 //! * `questions_stream` which offers an stream that emits questions related signals.
 
-use std::collections::HashMap;
+use std::{collections::HashMap,pin::Pin};
 use crate::{error::Error, web::Event};
 use agama_lib::{
     error::ServiceError, proxies::{GenericQuestionProxy, QuestionWithPasswordProxy},
@@ -172,13 +172,14 @@ pub async fn questions_service(dbus: zbus::Connection) -> Result<Router, Service
     let questions = QuestionsClient::new(dbus.clone()).await?;
     let state = QuestionsState { questions };
     let router = Router::new()
-        .route("/questions", get(list_questions))
-        .route("/questions/:id/answer", put(answer))
+        .route("/", get(list_questions))
+        .route("/:id/answer", put(answer))
         .with_state(state);
     Ok(router)
 }
 
-pub async fn questions_stream(dbus: zbus::Connection) -> Result<impl Stream<Item = Event>, Error> {
+pub async fn questions_stream(dbus: zbus::Connection) -> 
+        Result<Pin<Box<dyn Stream<Item = Event> + Send>>, Error> {
     let proxy = ObjectManagerProxy::new(&dbus).await?;
     let add_stream = proxy
         .receive_interfaces_added()
@@ -192,7 +193,8 @@ pub async fn questions_stream(dbus: zbus::Connection) -> Result<impl Stream<Item
         .then(|_| async move {
             Event::QuestionsChanged
         });
-    Ok(StreamExt::merge(add_stream, remove_stream))
+    let stream = StreamExt::merge(add_stream, remove_stream);
+    Ok(Box::pin(stream))
 }
 
 async fn list_questions(State(state): State<QuestionsState<'_>>
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 11eeb5e989..d142cb0d6b 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -9,7 +9,7 @@ use crate::{
     l10n::web::l10n_service,
     manager::web::{manager_service, manager_stream},
     software::web::{software_service, software_stream},
-    questions::web::{questions_service, questions_stream}
+    questions::web::{questions_service, questions_stream},
     web::common::{progress_stream, service_status_stream},
 };
 use axum::Router;
@@ -51,7 +51,8 @@ where
     let router = MainServiceBuilder::new(events.clone(), web_ui_dir)
         .add_service("/l10n", l10n_service(events.clone()))
         .add_service("/manager", manager_service(dbus.clone()).await?)
-        .add_service("/software", software_service(dbus).await?)
+        .add_service("/software", software_service(dbus.clone()).await?)
+        .add_service("/questions", questions_service(dbus).await?)
         .with_config(config)
         .build();
     Ok(router)
@@ -115,6 +116,7 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
         )
         .await?,
     );
+    stream.insert("questions", questions_stream(dbus.clone()).await?);
 
     tokio::pin!(stream);
     let e = events.clone();

From 22a936c53e9a3bee2b918fa4d63c08db6bb5f6e6 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 21 Mar 2024 08:00:12 +0100
Subject: [PATCH 103/324] apply formatter and fix creating object proxy

---
 rust/agama-server/src/questions/web.rs | 131 ++++++++++++++++---------
 rust/agama-server/src/web.rs           |   2 +-
 2 files changed, 87 insertions(+), 46 deletions(-)

diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 47645495ba..66a92e19b2 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -5,26 +5,30 @@
 //! * `questions_service` which returns the Axum service.
 //! * `questions_stream` which offers an stream that emits questions related signals.
 
-use std::{collections::HashMap,pin::Pin};
 use crate::{error::Error, web::Event};
 use agama_lib::{
-    error::ServiceError, proxies::{GenericQuestionProxy, QuestionWithPasswordProxy},
+    error::ServiceError,
+    proxies::{GenericQuestionProxy, QuestionWithPasswordProxy},
 };
 use anyhow::Context;
 use axum::{
-    extract::{State, Path},
+    extract::{Path, State},
     http::StatusCode,
     response::{IntoResponse, Response},
     routing::{get, put},
     Json, Router,
 };
-use tokio_stream::{Stream, StreamExt};
-use zbus::{fdo::ObjectManagerProxy, names::{InterfaceName, OwnedInterfaceName}};
-use zbus::zvariant::OwnedObjectPath;
-use zbus::zvariant::ObjectPath;
-use thiserror::Error;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
+use std::{collections::HashMap, pin::Pin};
+use thiserror::Error;
+use tokio_stream::{Stream, StreamExt};
+use zbus::zvariant::ObjectPath;
+use zbus::zvariant::OwnedObjectPath;
+use zbus::{
+    fdo::ObjectManagerProxy,
+    names::{InterfaceName, OwnedInterfaceName},
+};
 
 // TODO: move to lib
 #[derive(Clone)]
@@ -35,19 +39,27 @@ struct QuestionsClient<'a> {
 
 impl<'a> QuestionsClient<'a> {
     pub async fn new(dbus: zbus::Connection) -> Result<Self, zbus::Error> {
+        let question_path =
+            OwnedObjectPath::from(ObjectPath::try_from("/org/opensuse/Agama1/Questions")?);
         Ok(Self {
             connection: dbus.clone(),
-            objects_proxy: ObjectManagerProxy::new(&dbus).await?
+            objects_proxy: ObjectManagerProxy::builder(&dbus)
+                .path(question_path)?
+                .build()
+                .await?,
         })
     }
 
     pub async fn questions(&self) -> Result<Vec<Question>, ServiceError> {
-        let objects = self.objects_proxy.get_managed_objects().await
+        let objects = self
+            .objects_proxy
+            .get_managed_objects()
+            .await
             .context("failed to get managed object with Object Manager")?;
         let mut result: Vec<Question> = Vec::with_capacity(objects.len());
         let password_interface = OwnedInterfaceName::from(
             InterfaceName::from_static_str("org.opensuse.Agama1.Questions.WithPassword")
-                .context("Failed to create interface name for question with password")?
+                .context("Failed to create interface name for question with password")?,
         );
         for (path, interfaces_hash) in objects.iter() {
             if interfaces_hash.contains_key(&password_interface) {
@@ -59,9 +71,15 @@ impl<'a> QuestionsClient<'a> {
         Ok(result)
     }
 
-    async fn create_generic_question(&self, path: &OwnedObjectPath) -> Result<Question, ServiceError> {
+    async fn create_generic_question(
+        &self,
+        path: &OwnedObjectPath,
+    ) -> Result<Question, ServiceError> {
         let dbus_question = GenericQuestionProxy::builder(&self.connection)
-            .path(path)?.cache_properties(zbus::CacheProperties::No).build().await?;
+            .path(path)?
+            .cache_properties(zbus::CacheProperties::No)
+            .build()
+            .await?;
         let result = Question {
             generic: GenericQuestion {
                 id: dbus_question.id().await?,
@@ -69,20 +87,26 @@ impl<'a> QuestionsClient<'a> {
                 text: dbus_question.text().await?,
                 options: dbus_question.options().await?,
                 default_option: dbus_question.default_option().await?,
-                data: dbus_question.data().await?
+                data: dbus_question.data().await?,
             },
-            with_password: None
+            with_password: None,
         };
 
         Ok(result)
     }
 
-    async fn create_question_with_password(&self, path: &OwnedObjectPath) -> Result<Question, ServiceError> {
+    async fn create_question_with_password(
+        &self,
+        path: &OwnedObjectPath,
+    ) -> Result<Question, ServiceError> {
         let dbus_question = QuestionWithPasswordProxy::builder(&self.connection)
-            .path(path)?.cache_properties(zbus::CacheProperties::No).build().await?;
+            .path(path)?
+            .cache_properties(zbus::CacheProperties::No)
+            .build()
+            .await?;
         let mut result = self.create_generic_question(path).await?;
-        result.with_password = Some(QuestionWithPassword{
-            password: dbus_question.password().await?
+        result.with_password = Some(QuestionWithPassword {
+            password: dbus_question.password().await?,
         });
 
         Ok(result)
@@ -91,16 +115,26 @@ impl<'a> QuestionsClient<'a> {
     pub async fn answer(&self, id: u32, answer: Answer) -> Result<(), ServiceError> {
         let question_path = OwnedObjectPath::from(
             ObjectPath::try_from(format!("/org/opensuse/Agama1/Questions/{}", id))
-                .context("Failed to create dbus path")?
-            );
+                .context("Failed to create dbus path")?,
+        );
         if let Some(password) = answer.with_password {
             let dbus_password = QuestionWithPasswordProxy::builder(&self.connection)
-            .path(&question_path)?.cache_properties(zbus::CacheProperties::No).build().await?;
-            dbus_password.set_password(password.password.as_str()).await?
+                .path(&question_path)?
+                .cache_properties(zbus::CacheProperties::No)
+                .build()
+                .await?;
+            dbus_password
+                .set_password(password.password.as_str())
+                .await?
         }
         let dbus_generic = GenericQuestionProxy::builder(&self.connection)
-            .path(&question_path)?.cache_properties(zbus::CacheProperties::No).build().await?;
-        dbus_generic.set_answer(answer.generic.answer.as_str()).await?;
+            .path(&question_path)?
+            .cache_properties(zbus::CacheProperties::No)
+            .build()
+            .await?;
+        dbus_generic
+            .set_answer(answer.generic.answer.as_str())
+            .await?;
         Ok(())
     }
 }
@@ -140,14 +174,14 @@ pub struct GenericQuestion {
     text: String,
     options: Vec<String>,
     default_option: String,
-    data: HashMap<String, String>
+    data: HashMap<String, String>,
 }
 
 /// Facade of agama_lib::questions::WithPassword
 /// For fields details see it.
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct QuestionWithPassword {
-    password: String
+    password: String,
 }
 
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
@@ -159,13 +193,13 @@ pub struct Answer {
 /// Answer needed for GenericQuestion
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct GenericAnswer {
-    answer: String
+    answer: String,
 }
 
 /// Answer needed for Password specific questions.
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct PasswordAnswer {
-    password: String
+    password: String,
 }
 /// Sets up and returns the axum service for the questions module.
 pub async fn questions_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
@@ -178,35 +212,42 @@ pub async fn questions_service(dbus: zbus::Connection) -> Result<Router, Service
     Ok(router)
 }
 
-pub async fn questions_stream(dbus: zbus::Connection) -> 
-        Result<Pin<Box<dyn Stream<Item = Event> + Send>>, Error> {
-    let proxy = ObjectManagerProxy::new(&dbus).await?;
+pub async fn questions_stream(
+    dbus: zbus::Connection,
+) -> Result<Pin<Box<dyn Stream<Item = Event> + Send>>, Error> {
+    let question_path = OwnedObjectPath::from(
+        ObjectPath::try_from("/org/opensuse/Agama1/Questions")
+            .context("failed to create object path")?,
+    );
+    let proxy = ObjectManagerProxy::builder(&dbus)
+        .path(question_path)
+        .context("Failed to create object manager path")?
+        .build()
+        .await
+        .context("Failed to create Object MAnager proxy")?;
     let add_stream = proxy
         .receive_interfaces_added()
         .await?
-        .then(|_| async move {
-            Event::QuestionsChanged
-        });
+        .then(|_| async move { Event::QuestionsChanged });
     let remove_stream = proxy
         .receive_interfaces_removed()
         .await?
-        .then(|_| async move {
-            Event::QuestionsChanged
-        });
+        .then(|_| async move { Event::QuestionsChanged });
     let stream = StreamExt::merge(add_stream, remove_stream);
     Ok(Box::pin(stream))
 }
 
-async fn list_questions(State(state): State<QuestionsState<'_>>
-    ) -> Result<Json<Vec<Question>>, QuestionsError> {
-  Ok(Json(state.questions.questions().await?))
+async fn list_questions(
+    State(state): State<QuestionsState<'_>>,
+) -> Result<Json<Vec<Question>>, QuestionsError> {
+    Ok(Json(state.questions.questions().await?))
 }
 
 async fn answer(
-State(state): State<QuestionsState<'_>>,
-Path(question_id): Path<u32>,
-Json(answer): Json<Answer>
+    State(state): State<QuestionsState<'_>>,
+    Path(question_id): Path<u32>,
+    Json(answer): Json<Answer>,
 ) -> Result<(), QuestionsError> {
     state.questions.answer(question_id, answer).await?;
     Ok(())
-}
\ No newline at end of file
+}
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index d142cb0d6b..fb7c8ede6c 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -8,8 +8,8 @@ use crate::{
     error::Error,
     l10n::web::l10n_service,
     manager::web::{manager_service, manager_stream},
-    software::web::{software_service, software_stream},
     questions::web::{questions_service, questions_stream},
+    software::web::{software_service, software_stream},
     web::common::{progress_stream, service_status_stream},
 };
 use axum::Router;

From e8adad1353d601b7a3347ba22694094f78028770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 07:24:18 +0000
Subject: [PATCH 104/324] Move the PatternsSelector to a pop-up

---
 web/src/client/software.js                   |  32 +++-
 web/src/components/software/PatternItem.jsx  |   1 -
 web/src/components/software/SoftwarePage.jsx | 177 +++++++++++++++----
 web/src/components/software/UsedSize.jsx     |   7 +-
 4 files changed, 179 insertions(+), 38 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 4e9907ef5b..1493c5a1a1 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -49,6 +49,22 @@ const REGISTRATION_IFACE = "org.opensuse.Agama1.Registration";
  * @property {string} message - Result message.
  */
 
+/**
+ * @typedef {object} SoftwareProposal
+ * @property {string} size - Used space in human-readable form.
+ * @property {Object.<string, number>} patterns - Selected patterns and the reason.
+ */
+
+/**
+ * @typedef {Object} Pattern
+ * @property {string} name - pattern name (internal ID)
+ * @property {string} category - pattern category
+ * @property {string} summary - pattern name (user visible)
+ * @property {string} description - long description of the pattern
+ * @property {number} order - display order (string!)
+ * @property {string} icon - icon name (not path or file name!)
+ */
+
 /**
  * Product manager.
  * @ignore
@@ -177,7 +193,7 @@ class SoftwareBaseClient {
   /**
    * Returns how much space installation takes on disk
    *
-   * @return {Promise<object>}
+   * @return {Promise<SoftwareProposal>}
    */
   getProposal() {
     return this.client.get("/software/proposal");
@@ -186,10 +202,18 @@ class SoftwareBaseClient {
   /**
    * Returns available patterns
    *
-   * @return {Promise<object>}
+   * @return {Promise<Pattern[]>}
    */
-  getPatterns() {
-    return this.client.get("/software/patterns");
+  async getPatterns() {
+    const patterns = await this.client.get("/software/patterns");
+    return patterns.map((pattern) => ({
+      name: pattern.name,
+      category: pattern.category,
+      summary: pattern.summary,
+      description: pattern.description,
+      order: parseInt(pattern.order),
+      icon: pattern.icon,
+    }));
   }
 
   /**
diff --git a/web/src/components/software/PatternItem.jsx b/web/src/components/software/PatternItem.jsx
index 75cdc464de..36806a2cc5 100644
--- a/web/src/components/software/PatternItem.jsx
+++ b/web/src/components/software/PatternItem.jsx
@@ -24,7 +24,6 @@ import { sprintf } from "sprintf-js";
 
 import cockpit from "../../lib/cockpit";
 
-import { useInstallerClient } from "~/context/installer";
 import { Icon } from "~/components/layout";
 import { _ } from "~/i18n";
 
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index ae57d48d97..2fc1be63ac 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -19,42 +19,137 @@
  * find current contact information at www.suse.com.
  */
 
-import React, { useState, useEffect } from "react";
-import { Skeleton } from "@patternfly/react-core";
+// @ts-check
 
-import { Page } from "~/components/core";
+import React, { useEffect, useState } from "react";
+import { Button, Skeleton } from "@patternfly/react-core";
+
+import { Page, Popup, Section } from "~/components/core";
 import { Center } from "~/components/layout";
-import { PatternSelector } from "~/components/software";
+import { PatternSelector, UsedSize } from "~/components/software";
 import { useInstallerClient } from "~/context/installer";
-import { useCancellablePromise } from "~/utils";
+import { noop, useCancellablePromise } from "~/utils";
 import { BUSY } from "~/client/status";
 import { _ } from "~/i18n";
 
+/**
+ * @typedef {Object} Pattern
+ * @property {string} name - pattern name (internal ID)
+ * @property {string} category -  pattern category
+ * @property {string} summary - pattern name (user visible)
+ * @property {string} description -  long description of the pattern
+ * @property {number} order - display order (string!)
+ * @property {number} selected_by - who selected the pattern
+ */
+
+/**
+ * Builds a list of patterns include its selection status
+ *
+ * @param {import("~/client/software").Pattern[]} patterns - Patterns from the HTTP API
+ * @param {Object.<string, number>} selection - Patterns selection
+ * @return {Pattern[]} List of patterns including its selection status
+ */
+function buildPatterns(patterns, selection) {
+  return patterns.map((pattern) => {
+    const selected_by = (selection[pattern.name] !== undefined) ? selection[pattern.name] : 2;
+    return {
+      ...pattern,
+      selected_by,
+    };
+  }).sort((a, b) => a.order - b.order);
+}
+
+/**
+ * Popup for selecting software patterns.
+ * @component
+ *
+ * @param {object} props
+ * @param {Pattern[]} props.patterns - List of patterns
+ * @param {boolean} props.isOpen - Whether the pop-up should be open
+ * @param {function} props.onFinish - Callback to be called when the selection is finished
+ */
+const PatternsSelectorPopup = ({
+  patterns,
+  isOpen = false,
+  onFinish = noop,
+}) => {
+  console.log("isOpen", isOpen);
+  return (
+    <Popup title={_("Software selection")} isOpen={isOpen}>
+      <PatternSelector patterns={patterns} />
+
+      <Popup.Actions>
+        <Popup.PrimaryAction
+          onClick={() => onFinish()}
+        >
+          {_("Close")}
+        </Popup.PrimaryAction>
+      </Popup.Actions>
+    </Popup>
+  );
+};
+
+const SelectPatternsButton = ({ patterns }) => {
+  const [isPopupOpen, setIsPopupOpen] = useState(false);
+
+  const openPopup = () => setIsPopupOpen(true);
+  const closePopup = () => setIsPopupOpen(false);
+
+  return (
+    <>
+      <Button
+        variant="primary"
+        onClick={openPopup}
+      >
+        {_("Change")}
+      </Button>
+      <PatternsSelectorPopup
+        patterns={patterns}
+        isOpen={isPopupOpen}
+        onFinish={closePopup}
+      />
+    </>
+  );
+};
+
 /**
  * Software page content depending on the current service state
  * @component
- * @param {number} status current backend service status
+ * @param {object} props
+ * @param {number} props.status - current backend service status
+ * @param {string} props.used- used space in human readable format
+ * @param {Pattern[]} props.patterns - patterns
  * @returns {JSX.Element}
  */
-function Content({ status }) {
-  switch (status) {
-    case undefined:
-      return null;
-    case BUSY:
-      return (
-        <Center>
-          <Skeleton width="20%" />
-          <Skeleton width="35%" />
-          <Skeleton width="70%" />
-          <Skeleton width="65%" />
-          <Skeleton width="80%" />
-          <Skeleton width="75%" />
-        </Center>
-      );
-    default:
-      return <PatternSelector />;
+const Content = ({ patterns, status, used }) => {
+  if (status === BUSY) {
+    return (
+      <Center>
+        <Skeleton width="20%" />
+        <Skeleton width="35%" />
+        <Skeleton width="70%" />
+        <Skeleton width="65%" />
+        <Skeleton width="80%" />
+        <Skeleton width="75%" />
+      </Center>
+    );
   }
-}
+
+  // return <PatternSelector />;
+  return (
+    <Section title={_("Software selection")} aria-label={_("List of software patterns")}>
+      <UsedSize size={used} />
+      <ul>
+        {patterns.filter((p) => p.selected_by !== 2).map((pattern) => (
+          <li key={pattern.name}>
+            {pattern.summary}
+          </li>
+        ))}
+      </ul>
+      <SelectPatternsButton patterns={patterns} />
+    </Section>
+  );
+};
 
 /**
  * Software page component
@@ -62,24 +157,42 @@ function Content({ status }) {
  * @returns {JSX.Element}
  */
 function SoftwarePage() {
-  const [status, setStatus] = useState();
+  const [status, setStatus] = useState(BUSY);
+  const [patterns, setPatterns] = useState([]);
+  const [used, setUsed] = useState("");
   const client = useInstallerClient();
   const { cancellablePromise } = useCancellablePromise();
 
-  const updateStatus = (status) => {
-    setStatus(status);
-  };
-
   useEffect(() => {
-    cancellablePromise(client.software.getStatus().then(updateStatus));
+    cancellablePromise(client.software.getStatus().then(setStatus));
 
-    return client.software.onStatusChange(updateStatus);
+    return client.software.onStatusChange(setStatus);
   }, [client, cancellablePromise]);
 
+  useEffect(() => {
+    if (!patterns) return;
+
+    return client.software.onSelectedPatternsChanged((selection) => {
+      client.software.getProposal().then(({ size }) => setUsed(size));
+      setPatterns(buildPatterns(patterns, selection));
+    });
+  }, [client.software, patterns]);
+
+  useEffect(() => {
+    const loadPatterns = async () => {
+      const patterns = await cancellablePromise(client.software.getPatterns());
+      const { patterns: selection, size } = await cancellablePromise(client.software.getProposal());
+      setUsed(size);
+      setPatterns(buildPatterns(patterns, selection));
+    };
+
+    loadPatterns();
+  }, [client.software, cancellablePromise]);
+
   return (
     // TRANSLATORS: page title
     <Page icon="apps" title={_("Software")}>
-      <Content status={status} />
+      <Content patterns={patterns} status={status} used={used} />
     </Page>
   );
 }
diff --git a/web/src/components/software/UsedSize.jsx b/web/src/components/software/UsedSize.jsx
index 6e68738244..036b5230f7 100644
--- a/web/src/components/software/UsedSize.jsx
+++ b/web/src/components/software/UsedSize.jsx
@@ -25,12 +25,17 @@ import { Em } from "~/components/core";
 import { _ } from "~/i18n";
 
 export default function UsedSize({ size }) {
+  console.log("size", size);
   if (size === undefined || size === "" || size === "0 B") return null;
 
   // TRANSLATORS: %s will be replaced by the estimated installation size,
   // example: "728.8 MiB"
   const [msg1, msg2] = _("Installation will take %s").split("%s");
   return (
-    <>{msg1}<Em>{size}</Em>{msg2}</>
+    <>
+      {msg1}
+      <Em>{size}</Em>
+      {msg2}
+    </>
   );
 }

From 281e053e04e17133170791223f5816c0d415c641 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 21 Mar 2024 12:01:48 +0100
Subject: [PATCH 105/324] add also proper destination for object manager

---
 rust/agama-server/src/questions/web.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 66a92e19b2..8694eb88dc 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -45,6 +45,7 @@ impl<'a> QuestionsClient<'a> {
             connection: dbus.clone(),
             objects_proxy: ObjectManagerProxy::builder(&dbus)
                 .path(question_path)?
+                .destination("org.opensuse.Agama1.Questions")?
                 .build()
                 .await?,
         })
@@ -222,6 +223,7 @@ pub async fn questions_stream(
     let proxy = ObjectManagerProxy::builder(&dbus)
         .path(question_path)
         .context("Failed to create object manager path")?
+        .destination("org.opensuse.Agama1.Questions")?
         .build()
         .await
         .context("Failed to create Object MAnager proxy")?;

From ba5a4dd242455a902bc1810854ffaab51defa2f7 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 21 Mar 2024 12:25:55 +0100
Subject: [PATCH 106/324] another fix for destination

---
 rust/agama-server/src/questions/web.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 8694eb88dc..109082161d 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -45,7 +45,7 @@ impl<'a> QuestionsClient<'a> {
             connection: dbus.clone(),
             objects_proxy: ObjectManagerProxy::builder(&dbus)
                 .path(question_path)?
-                .destination("org.opensuse.Agama1.Questions")?
+                .destination("org.opensuse.Agama1")?
                 .build()
                 .await?,
         })
@@ -223,7 +223,7 @@ pub async fn questions_stream(
     let proxy = ObjectManagerProxy::builder(&dbus)
         .path(question_path)
         .context("Failed to create object manager path")?
-        .destination("org.opensuse.Agama1.Questions")?
+        .destination("org.opensuse.Agama1")?
         .build()
         .await
         .context("Failed to create Object MAnager proxy")?;

From 61b0c0f509ce9b050332a82411f9cdfaf2625e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 13:04:44 +0000
Subject: [PATCH 107/324] Add a onOptionClick option to the Selector

---
 web/src/components/core/Selector.jsx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/web/src/components/core/Selector.jsx b/web/src/components/core/Selector.jsx
index 243695d0f2..383fc55a16 100644
--- a/web/src/components/core/Selector.jsx
+++ b/web/src/components/core/Selector.jsx
@@ -20,8 +20,8 @@
  */
 
 // @ts-check
-import React from 'react';
-import { noop } from '~/utils';
+import React from "react";
+import { noop } from "~/utils";
 
 /**
  * @callback onSelectionChangeCallback
@@ -62,6 +62,7 @@ import { noop } from '~/utils';
  * @param {string} [props.optionIdKey="id"] - Key used for retrieve options id.
  * @param {Array<*>} [props.selectedIds=[]] - Identifiers for selected options.
  * @param {onSelectionChangeCallback} [props.onSelectionChange=noop] - Callback to be called when the selection changes.
+ * @param {function|undefined} [props.onOptionClick] - Callback to be called when the selection changes.
  * @param {object} [props.props] - Other props sent to the internal selector <ul> component
  */
 const Selector = ({
@@ -72,9 +73,12 @@ const Selector = ({
   optionIdKey = "id",
   selectedIds = [],
   onSelectionChange = noop,
+  onOptionClick,
   ...props
 }) => {
-  const onOptionClick = (optionId) => {
+  const onOptionClicked = (optionId) => {
+    if (typeof onOptionClick === "function") return onOptionClick(optionId);
+
     const alreadySelected = selectedIds.includes(optionId);
 
     if (!isMultiple) {
@@ -90,12 +94,12 @@ const Selector = ({
   };
 
   return (
-    <ul { ...props } id={id} data-type="agama/list" role="grid">
-      { options.map(option => {
+    <ul {...props} id={id} data-type="agama/list" role="grid">
+      {options.map((option) => {
         const optionId = option[optionIdKey];
         const optionHtmlId = `${id}-option-${optionId}`;
         const isSelected = selectedIds.includes(optionId);
-        const onClick = () => onOptionClick(optionId);
+        const onClick = () => onOptionClicked(optionId);
 
         return (
           <li
@@ -112,7 +116,7 @@ const Selector = ({
                 onChange={onClick}
                 aria-labelledby={optionHtmlId}
               />
-              { renderOption(option) }
+              {renderOption(option)}
             </div>
           </li>
         );

From eec9124c5adac289b1033e4ead4fe583de6609fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 13:07:22 +0000
Subject: [PATCH 108/324] Revamp the software page

---
 .../components/overview/SoftwareSection.jsx   |   2 +
 web/src/components/software/PatternItem.jsx   |  25 +---
 .../components/software/PatternSelector.jsx   | 120 ++++++++----------
 web/src/components/software/SoftwarePage.jsx  |  86 +++++--------
 4 files changed, 91 insertions(+), 142 deletions(-)

diff --git a/web/src/components/overview/SoftwareSection.jsx b/web/src/components/overview/SoftwareSection.jsx
index b6887a2502..f4b3a45150 100644
--- a/web/src/components/overview/SoftwareSection.jsx
+++ b/web/src/components/overview/SoftwareSection.jsx
@@ -80,6 +80,8 @@ export default function SoftwareSection({ showErrors }) {
   }, [client, cancellablePromise]);
 
   useEffect(() => {
+    if (state.busy) return;
+
     const updateProposal = async () => {
       const errors = await cancellablePromise(client.getIssues());
       const { size } = await cancellablePromise(client.getProposal());
diff --git a/web/src/components/software/PatternItem.jsx b/web/src/components/software/PatternItem.jsx
index 36806a2cc5..1686bd5ed5 100644
--- a/web/src/components/software/PatternItem.jsx
+++ b/web/src/components/software/PatternItem.jsx
@@ -19,12 +19,9 @@
  * find current contact information at www.suse.com.
  */
 
-import React, { useEffect, useState } from "react";
+import React, { useState } from "react";
 import { sprintf } from "sprintf-js";
 
-import cockpit from "../../lib/cockpit";
-
-import { Icon } from "~/components/layout";
 import { _ } from "~/i18n";
 
 import iconAvailable from "./icons/package-available.svg";
@@ -77,32 +74,12 @@ function stateAriaLabel(selected) {
  * @returns {JSX.Element}
  */
 function PatternItem({ pattern, onToggle }) {
-  const [icon, setIcon] = useState();
-
-  // download the pattern icon from the system
-  useEffect(() => {
-    if (icon) return;
-    cockpit.file(sprintf(ICON_PATH, pattern.icon)).read()
-      .then((data) => {
-        setIcon(data);
-      });
-  }, [pattern.icon, icon]);
-
-  const patternIcon = icon
-    // use a Base64 encoded inline pattern image
-    ? <img src={"data:image/svg+xml;base64," + btoa(icon)} aria-hidden="true" />
-    // fallback icon
-    : <Icon name="apps" aria-hidden="true" />;
-
   return (
     <div className="pattern-container" onClick={() => onToggle(pattern.name)}>
       <div className="pattern-checkbox">
         <img src={stateIcon(pattern.selected_by)} aria-label={stateAriaLabel(pattern.selected)} />
       </div>
       <div className="pattern-label">
-        <div className="pattern-label-icon">
-          {patternIcon}
-        </div>
         <div className="pattern-label-text">{pattern.summary}</div>
       </div>
       <div className="pattern-summary">{pattern.description}</div>
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 6c8e0dbc50..eaacdd75ca 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -23,11 +23,10 @@ import React, { useCallback, useEffect, useState } from "react";
 import { SearchInput } from "@patternfly/react-core";
 
 import { useInstallerClient } from "~/context/installer";
-import { Section, ValidationErrors } from "~/components/core";
+import { If, Section, Selector, ValidationErrors } from "~/components/core";
 import PatternGroup from "./PatternGroup";
 import PatternItem from "./PatternItem";
 import { toValidationError } from "~/utils";
-import UsedSize from "./UsedSize";
 import { _ } from "~/i18n";
 
 /**
@@ -76,37 +75,32 @@ function convert(pattern_data, selected) {
 /**
  * Group the patterns with the same group name
  * @param {Array<Pattern>} patterns input
- * @returns {PatternGroups}
+ * @return {PatternGroups}
  */
 function groupPatterns(patterns) {
-  // group patterns
-  const pattern_groups = {};
+  const groups = {};
 
   patterns.forEach((pattern) => {
-    if (pattern_groups[pattern.category]) {
-      pattern_groups[pattern.category].push(pattern);
+    if (groups[pattern.category]) {
+      groups[pattern.category].push(pattern);
     } else {
-      pattern_groups[pattern.category] = [pattern];
+      groups[pattern.category] = [pattern];
     }
   });
 
   // sort patterns by the "order" value
-  Object.keys(pattern_groups).forEach((group) => {
-    pattern_groups[group].sort((p1, p2) => {
+  Object.keys(groups).forEach((group) => {
+    groups[group].sort((p1, p2) => {
       if (p1.order === p2.order) {
         // there should be no patterns with the same name
         return p1.name < p2.name ? -1 : 1;
       } else {
-        // patterns with undefined (empty) order are always at the end
-        if (p1.order === "") return 1;
-        if (p2.order === "") return -1;
-
-        return p1.order < p2.order ? -1 : 1;
+        return p1.order - p2.order;
       }
     });
   });
 
-  return pattern_groups;
+  return groups;
 }
 
 /**
@@ -134,62 +128,42 @@ function sortGroups(groups) {
 /**
  * Pattern selector component
  * @component
+ * @param {object} props
+ * @param {import("~/components/software/SoftwarePage").Pattern[]} props.patterns - list of patterns
+ * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
  * @returns {JSX.Element}
  */
-function PatternSelector() {
-  const [patterns, setPatterns] = useState();
-  const [visiblePatterns, setVisiblePatterns] = useState(undefined);
-  const [selected, setSelected] = useState({});
+function PatternSelector({ patterns, proposal }) {
   const [errors, setErrors] = useState([]);
-  const [used, setUsed] = useState();
+  const [visiblePatterns, setVisiblePatterns] = useState(patterns);
   const [searchValue, setSearchValue] = useState("");
   const client = useInstallerClient();
 
+  const { patterns: selection, used } = proposal;
+
   const onSearchChange = (value) => {
     setSearchValue(value);
   };
 
-  useEffect(() => {
-    return client.software.onSelectedPatternsChanged(setSelected);
-  }, [client.software, setSelected]);
-
-  useEffect(() => {
-    if (patterns) return;
-
-    const loadData = async () => {
-      setPatterns(await client.software.getPatterns());
-      const { patterns: selected, size } = await client.software.getProposal();
-      setSelected(selected);
-      setUsed(size);
-      setErrors(await client.software.getIssues());
-    };
-
-    loadData();
-  }, [patterns, client.software]);
-
   useEffect(() => {
     if (!patterns) return;
 
-    let visible = patterns.map((pattern) => {
-      const selected_by = (selected[pattern.name] === undefined) ? 2 : selected[pattern.name];
-      return { ...pattern, selected_by };
-    });
-
     // filtering - search the required text in the name and pattern description
     if (searchValue !== "") {
       // case insensitive search
       const searchData = searchValue.toUpperCase();
-      visible = visible.filter((p) =>
+      const filtered = patterns.filter((p) =>
         p.name.toUpperCase().indexOf(searchData) !== -1 ||
         p.description.toUpperCase().indexOf(searchData) !== -1
       );
+      setVisiblePatterns(filtered);
+    } else {
+      setVisiblePatterns(patterns);
     }
-
-    setVisiblePatterns(visible);
-  }, [patterns, selected, searchValue]);
+  }, [patterns, searchValue]);
 
   const onToggle = useCallback((name) => {
-    const selected = visiblePatterns.filter((p) => p.selected_by === 0).map((p) => p.name);
+    const selected = patterns.filter((p) => p.selected_by === 0).map((p) => p.name);
 
     const index = selected.indexOf(name);
     if (index === -1) {
@@ -199,38 +173,52 @@ function PatternSelector() {
     }
 
     client.software.selectPatterns(selected);
-  }, [visiblePatterns, client.software]);
+  }, [patterns, client.software]);
 
   // initial empty screen, the patterns are loaded very quickly, no need for any progress
-  if (!visiblePatterns) return null;
+  if (visiblePatterns.length === 0) return null;
 
   const groups = groupPatterns(visiblePatterns);
-  const selector = sortGroups(groups).map((group) => {
+
+  const renderPatternOption = (pattern) => (
+    <>
+      <div>
+        <b>{pattern.summary}</b>
+      </div>
+      <div>{pattern.description}</div>
+      {/* eslint-disable-next-line i18next/no-literal-string */}
+      <If condition={pattern.selected_by === 1} then={<div>auto</div>} />
+    </>
+  );
+
+  const selector = sortGroups(groups).map((groupName) => {
+    const selectedIds = groups[groupName].filter((p) => p.selected_by !== 2).map((p) => p.name);
     return (
-      <PatternGroup
-        key={group}
-        name={group}
+      <Section
+        key={groupName}
+        title={groupName}
       >
-        {groups[group].map((p) => (
-          <PatternItem
-            key={p.name}
-            pattern={p}
-            onToggle={(name) => onToggle(name)}
-          />
-        ))}
-      </PatternGroup>
+        <Selector
+          isMultiple
+          renderOption={renderPatternOption}
+          options={groups[groupName]}
+          onOptionClick={onToggle}
+          optionIdKey="name"
+          selectedIds={selectedIds}
+          dataItemsType="agama/software-patterns"
+        />
+      </Section>
     );
   });
 
   // FIXME: ValidationErrors should be replaced by an equivalent component to show issues.
   // Note that only the Users client uses the old Validation D-Bus interface.
-  const validationErrors = errors.map(toValidationError);
+  // const validationErrors = errors.map(toValidationError);
+  // <ValidationErrors errors={validationErrors} sectionId="software" />
 
   return (
     <>
       <Section aria-label={_("Software summary and filter options")}>
-        <UsedSize size={used} />
-        <ValidationErrors errors={validationErrors} sectionId="software" />
         <SearchInput
           // TRANSLATORS: search field placeholder text
           placeholder={_("Search")}
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index 2fc1be63ac..df2f75ec9b 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -24,8 +24,7 @@
 import React, { useEffect, useState } from "react";
 import { Button, Skeleton } from "@patternfly/react-core";
 
-import { Page, Popup, Section } from "~/components/core";
-import { Center } from "~/components/layout";
+import { If, Page, Popup, Section, SectionSkeleton } from "~/components/core";
 import { PatternSelector, UsedSize } from "~/components/software";
 import { useInstallerClient } from "~/context/installer";
 import { noop, useCancellablePromise } from "~/utils";
@@ -65,18 +64,19 @@ function buildPatterns(patterns, selection) {
  *
  * @param {object} props
  * @param {Pattern[]} props.patterns - List of patterns
+ * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
  * @param {boolean} props.isOpen - Whether the pop-up should be open
  * @param {function} props.onFinish - Callback to be called when the selection is finished
  */
 const PatternsSelectorPopup = ({
   patterns,
+  proposal,
   isOpen = false,
   onFinish = noop,
 }) => {
-  console.log("isOpen", isOpen);
   return (
-    <Popup title={_("Software selection")} isOpen={isOpen}>
-      <PatternSelector patterns={patterns} />
+    <Popup className="large" title={_("Software selection")} isOpen={isOpen}>
+      <PatternSelector patterns={patterns} proposal={proposal} />
 
       <Popup.Actions>
         <Popup.PrimaryAction
@@ -89,7 +89,7 @@ const PatternsSelectorPopup = ({
   );
 };
 
-const SelectPatternsButton = ({ patterns }) => {
+const SelectPatternsButton = ({ patterns, proposal }) => {
   const [isPopupOpen, setIsPopupOpen] = useState(false);
 
   const openPopup = () => setIsPopupOpen(true);
@@ -105,6 +105,7 @@ const SelectPatternsButton = ({ patterns }) => {
       </Button>
       <PatternsSelectorPopup
         patterns={patterns}
+        proposal={proposal}
         isOpen={isPopupOpen}
         onFinish={closePopup}
       />
@@ -112,45 +113,6 @@ const SelectPatternsButton = ({ patterns }) => {
   );
 };
 
-/**
- * Software page content depending on the current service state
- * @component
- * @param {object} props
- * @param {number} props.status - current backend service status
- * @param {string} props.used- used space in human readable format
- * @param {Pattern[]} props.patterns - patterns
- * @returns {JSX.Element}
- */
-const Content = ({ patterns, status, used }) => {
-  if (status === BUSY) {
-    return (
-      <Center>
-        <Skeleton width="20%" />
-        <Skeleton width="35%" />
-        <Skeleton width="70%" />
-        <Skeleton width="65%" />
-        <Skeleton width="80%" />
-        <Skeleton width="75%" />
-      </Center>
-    );
-  }
-
-  // return <PatternSelector />;
-  return (
-    <Section title={_("Software selection")} aria-label={_("List of software patterns")}>
-      <UsedSize size={used} />
-      <ul>
-        {patterns.filter((p) => p.selected_by !== 2).map((pattern) => (
-          <li key={pattern.name}>
-            {pattern.summary}
-          </li>
-        ))}
-      </ul>
-      <SelectPatternsButton patterns={patterns} />
-    </Section>
-  );
-};
-
 /**
  * Software page component
  * @component
@@ -159,7 +121,7 @@ const Content = ({ patterns, status, used }) => {
 function SoftwarePage() {
   const [status, setStatus] = useState(BUSY);
   const [patterns, setPatterns] = useState([]);
-  const [used, setUsed] = useState("");
+  const [proposal, setProposal] = useState({ patterns: {}, size: "" });
   const client = useInstallerClient();
   const { cancellablePromise } = useCancellablePromise();
 
@@ -173,26 +135,46 @@ function SoftwarePage() {
     if (!patterns) return;
 
     return client.software.onSelectedPatternsChanged((selection) => {
-      client.software.getProposal().then(({ size }) => setUsed(size));
+      client.software.getProposal().then((proposal) => setProposal(proposal));
       setPatterns(buildPatterns(patterns, selection));
     });
   }, [client.software, patterns]);
 
   useEffect(() => {
+    if (patterns.length > 0) return;
+
     const loadPatterns = async () => {
       const patterns = await cancellablePromise(client.software.getPatterns());
-      const { patterns: selection, size } = await cancellablePromise(client.software.getProposal());
-      setUsed(size);
-      setPatterns(buildPatterns(patterns, selection));
+      const proposal = await cancellablePromise(client.software.getProposal());
+      setPatterns(buildPatterns(patterns, proposal.patterns));
+      setProposal(proposal);
     };
 
     loadPatterns();
-  }, [client.software, cancellablePromise]);
+  }, [client.software, patterns, cancellablePromise]);
 
   return (
     // TRANSLATORS: page title
     <Page icon="apps" title={_("Software")}>
-      <Content patterns={patterns} status={status} used={used} />
+      <Section title={_("Software selection")}>
+        <If
+          condition={status === BUSY}
+          then={<SectionSkeleton numRows={5} />}
+          else={
+            <>
+              <UsedSize size={proposal.size} />
+              <ul>
+                {patterns.filter((p) => p.selected_by !== 2).map((pattern) => (
+                  <li key={pattern.name}>
+                    {pattern.summary}
+                  </li>
+                ))}
+              </ul>
+              <SelectPatternsButton patterns={patterns} proposal={proposal} />
+            </>
+          }
+        />
+      </Section>
     </Page>
   );
 }

From af3ce48736706b3356f210ebd959517e10421d01 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Thu, 21 Mar 2024 13:02:49 +0000
Subject: [PATCH 109/324] Fix tests

---
 rust/agama-server/src/web/common.rs |  4 ++--
 rust/agama-server/tests/network.rs  | 23 +++++++++++++++++++----
 rust/agama-server/tests/service.rs  | 29 +++++++++--------------------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 5484111121..eb4cd431b6 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -138,7 +138,7 @@ async fn build_service_status_proxy<'a>(
 /// ).await.unwrap();
 /// let router: Router<HelloWorldState> = Router::new()
 ///   .route("/hello", get(hello))
-///   .merge(progress)
+///   .merge(progress_router)
 ///   .with_state(HelloWorldState {});
 /// });
 /// ```
@@ -238,7 +238,7 @@ async fn build_progress_proxy<'a>(
 /// ```no_run
 /// # use axum::{extract::State, routing::get, Json, Router};
 /// # use agama_lib::connection;
-/// # use agama_server::web::common::service_status_router;
+/// # use agama_server::web::common::{issues_router, service_status_router};
 /// # use tokio_test;
 ///
 /// # tokio_test::block_on(async {
diff --git a/rust/agama-server/tests/network.rs b/rust/agama-server/tests/network.rs
index e437331d9d..7413e20ac8 100644
--- a/rust/agama-server/tests/network.rs
+++ b/rust/agama-server/tests/network.rs
@@ -8,7 +8,7 @@ use agama_lib::network::{
 };
 use agama_server::network::{
     self,
-    model::{self, Ipv4Method, Ipv6Method},
+    model::{self, GeneralState, Ipv4Method, Ipv6Method, NetworkStateItems},
     Adapter, NetworkAdapterError, NetworkService, NetworkState,
 };
 use async_trait::async_trait;
@@ -21,7 +21,10 @@ pub struct NetworkTestAdapter(network::NetworkState);
 
 #[async_trait]
 impl Adapter for NetworkTestAdapter {
-    async fn read(&self) -> Result<network::NetworkState, NetworkAdapterError> {
+    async fn read(
+        &self,
+        _: Vec<NetworkStateItems>,
+    ) -> Result<network::NetworkState, NetworkAdapterError> {
         Ok(self.0.clone())
     }
 
@@ -34,12 +37,18 @@ impl Adapter for NetworkTestAdapter {
 async fn test_read_connections() -> Result<(), Box<dyn Error>> {
     let mut server = DBusServer::new().start().await?;
 
+    let general_state = GeneralState {
+        wireless_enabled: false,
+        connectivity: true,
+        networking_enabled: true,
+    };
+
     let device = model::Device {
         name: String::from("eth0"),
         type_: DeviceType::Ethernet,
     };
     let eth0 = model::Connection::new("eth0".to_string(), DeviceType::Ethernet);
-    let state = NetworkState::new(vec![device], vec![eth0]);
+    let state = NetworkState::new(general_state, vec![], vec![device], vec![eth0]);
     let adapter = NetworkTestAdapter(state);
 
     NetworkService::start(&server.connection(), adapter).await?;
@@ -143,12 +152,18 @@ async fn test_add_bond_connection() -> Result<(), Box<dyn Error>> {
 async fn test_update_connection() -> Result<(), Box<dyn Error>> {
     let mut server = DBusServer::new().start().await?;
 
+    let general_state = GeneralState {
+        wireless_enabled: false,
+        connectivity: true,
+        networking_enabled: true,
+    };
+
     let device = model::Device {
         name: String::from("eth0"),
         type_: DeviceType::Ethernet,
     };
     let eth0 = model::Connection::new("eth0".to_string(), DeviceType::Ethernet);
-    let state = NetworkState::new(vec![device], vec![eth0]);
+    let state = NetworkState::new(general_state, vec![], vec![device], vec![eth0]);
     let adapter = NetworkTestAdapter(state);
 
     NetworkService::start(&server.connection(), adapter).await?;
diff --git a/rust/agama-server/tests/service.rs b/rust/agama-server/tests/service.rs
index c4e48cdf55..53e06393b2 100644
--- a/rust/agama-server/tests/service.rs
+++ b/rust/agama-server/tests/service.rs
@@ -1,41 +1,30 @@
 pub mod common;
 
-use agama_server::{
-    service,
-    web::{generate_token, MainServiceBuilder, ServiceConfig},
-};
+use agama_server::web::{generate_token, MainServiceBuilder, ServiceConfig};
 use axum::{
     body::Body,
     http::{Method, Request, StatusCode},
     response::Response,
     routing::get,
-    Router,
 };
-use common::{body_to_string, DBusServer};
+use common::body_to_string;
 use std::{error::Error, path::PathBuf};
 use tokio::{sync::broadcast::channel, test};
 use tower::ServiceExt;
 
-async fn build_service() -> Router {
-    let (tx, _) = channel(16);
-    let server = DBusServer::new().start().await.unwrap();
-    service(
-        ServiceConfig::default(),
-        tx,
-        server.connection(),
-        public_dir(),
-    )
-    .await
-    .unwrap()
-}
-
 fn public_dir() -> PathBuf {
     std::env::current_dir().unwrap().join("public")
 }
 
 #[test]
 async fn test_ping() -> Result<(), Box<dyn Error>> {
-    let web_service = build_service().await;
+    let config = ServiceConfig::default();
+    let (tx, _) = channel(16);
+    let web_service = MainServiceBuilder::new(tx, public_dir())
+        .add_service("/protected", get(protected))
+        .with_config(config)
+        .build();
+
     let request = Request::builder()
         .uri("/api/ping")
         .body(Body::empty())

From 48e54162c0fe39f6bc8ab48b22f4c16d9ac577f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 16:05:09 +0000
Subject: [PATCH 110/324] Improve the usability of the software page

---
 web/src/components/software/PatternGroup.jsx  |  36 ------
 .../components/software/PatternGroup.test.jsx |  41 -------
 web/src/components/software/PatternItem.jsx   |  90 --------------
 .../components/software/PatternItem.test.jsx  | 115 ------------------
 .../components/software/PatternSelector.jsx   |  47 +------
 web/src/components/software/SoftwarePage.jsx  |  60 +++++++--
 web/src/components/software/UsedSize.jsx      |   1 -
 7 files changed, 50 insertions(+), 340 deletions(-)
 delete mode 100644 web/src/components/software/PatternGroup.jsx
 delete mode 100644 web/src/components/software/PatternGroup.test.jsx
 delete mode 100644 web/src/components/software/PatternItem.jsx
 delete mode 100644 web/src/components/software/PatternItem.test.jsx

diff --git a/web/src/components/software/PatternGroup.jsx b/web/src/components/software/PatternGroup.jsx
deleted file mode 100644
index 9c1b71a545..0000000000
--- a/web/src/components/software/PatternGroup.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { Section } from "~/components/core";
-
-/**
- * Pattern group component
- * @component
- * @param {string} name name of the group
- * @param {JSX.Element} children the wrapped content with the patterns belonging to this group
- * @returns {JSX.Element}
- */
-export default function PatternGroup({ name, children }) {
-  return (
-    <Section title={name}>{children}</Section>
-  );
-}
diff --git a/web/src/components/software/PatternGroup.test.jsx b/web/src/components/software/PatternGroup.test.jsx
deleted file mode 100644
index d757172880..0000000000
--- a/web/src/components/software/PatternGroup.test.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-
-import { screen } from "@testing-library/react";
-import { plainRender } from "~/test-utils";
-
-import PatternGroup from "./PatternGroup";
-
-describe("PatternGroup", () => {
-  const name = "Pattern name";
-  const content = "Just a children content";
-
-  it("displays the pattern name and the content", async () => {
-    plainRender(<PatternGroup name={name}>{content}</PatternGroup>);
-
-    // the name is displayed
-    screen.getByText(name);
-    // the content is displayed
-    screen.getByText(content);
-  });
-});
diff --git a/web/src/components/software/PatternItem.jsx b/web/src/components/software/PatternItem.jsx
deleted file mode 100644
index 1686bd5ed5..0000000000
--- a/web/src/components/software/PatternItem.jsx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React, { useState } from "react";
-import { sprintf } from "sprintf-js";
-
-import { _ } from "~/i18n";
-
-import iconAvailable from "./icons/package-available.svg";
-import iconInstall from "./icons/package-install.svg";
-import iconAutoInstall from "./icons/package-install-auto.svg";
-
-// path to pattern icons, %s is replaced by the icon name
-const ICON_PATH = "/usr/share/icons/hicolor/scalable/apps/%s.svg";
-
-/**
- * Get checkbox status icon for the required pattern installation status
- * @param {number} state pattern selection status
- * @returns {string} Raw SVG icon data
- */
-function stateIcon(state) {
-  switch (state) {
-    case 0:
-      return iconInstall;
-    case 1:
-      return iconAutoInstall;
-    default:
-      return iconAvailable;
-  }
-}
-
-/**
- * Get ARIA label for the required pattern installation status
- * @param {number} state pattern selection status
- * @returns {string} Label
- */
-function stateAriaLabel(selected) {
-  switch (selected) {
-    case 0:
-      // TRANSLATORS: pattern status, selected to install (by user)
-      return _("selected");
-    case 1:
-      // TRANSLATORS: pattern status, selected to install (by dependencies)
-      return _("automatically selected");
-    default:
-      // TRANSLATORS: pattern status, not selected to install
-      return _("not selected");
-  }
-}
-
-/**
- * Pattern component
- * @component
- * @param {Pattern} pattern pattern to display
- * @param {function} onChange callback called when the pattern status is changed
- * @returns {JSX.Element}
- */
-function PatternItem({ pattern, onToggle }) {
-  return (
-    <div className="pattern-container" onClick={() => onToggle(pattern.name)}>
-      <div className="pattern-checkbox">
-        <img src={stateIcon(pattern.selected_by)} aria-label={stateAriaLabel(pattern.selected)} />
-      </div>
-      <div className="pattern-label">
-        <div className="pattern-label-text">{pattern.summary}</div>
-      </div>
-      <div className="pattern-summary">{pattern.description}</div>
-    </div>
-  );
-}
-
-export default PatternItem;
diff --git a/web/src/components/software/PatternItem.test.jsx b/web/src/components/software/PatternItem.test.jsx
deleted file mode 100644
index 295858cade..0000000000
--- a/web/src/components/software/PatternItem.test.jsx
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) [2023] SUSE LLC
- *
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of version 2 of the GNU General Public License as published
- * by the Free Software Foundation.
- *
- * 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, contact SUSE LLC.
- *
- * To contact SUSE LLC about this file by physical or electronic mail, you may
- * find current contact information at www.suse.com.
- */
-
-import React from "react";
-import { act, screen } from "@testing-library/react";
-import { installerRender } from "~/test-utils";
-
-import { createClient } from "~/client";
-import cockpit from "../../lib/cockpit";
-
-import PatternItem from "./PatternItem";
-
-jest.mock("~/client");
-const addPatternFn = jest.fn().mockResolvedValue();
-const removePatternFn = jest.fn().mockResolvedValue();
-beforeEach(() => {
-  createClient.mockImplementation(() => {
-    return {
-      software: {
-        addPattern: addPatternFn,
-        removePattern: removePatternFn,
-      },
-    };
-  });
-});
-
-jest.mock("../../lib/cockpit");
-const readFn = jest.fn().mockResolvedValue("");
-const fileFn = jest.fn();
-fileFn.mockImplementation(() => {
-  return {
-    read: readFn
-  };
-});
-cockpit.file.mockImplementation(fileFn);
-
-const pattern = {
-  category: "Documentation",
-  description: "Help and Documentation, various books.",
-  icon: "./pattern-documentation",
-  name: "books",
-  order: "5200",
-  summary: "Documentation"
-};
-
-describe("PatternItem", () => {
-  it("displays the pattern summary and description", async () => {
-    await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    // the summary is displayed
-    screen.getByText(pattern.summary);
-    // the description is displayed
-    screen.getByText(pattern.description);
-  });
-
-  it("displays the pattern icon if it as available", async () => {
-    readFn.mockResolvedValue("<?xml version=\"1.0\" ?>");
-    const { container } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    expect(container.querySelector(".pattern-label-icon img")).not.toBeNull();
-  });
-
-  it("displays the generic fallback icon if the pattern icon is not available", async () => {
-    readFn.mockResolvedValue("");
-    const { container } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    expect(container.querySelector(".pattern-label-icon svg")).not.toBeNull();
-  });
-
-  it("selects unselected pattern after clicking it", async () => {
-    pattern.selected = undefined;
-    const { container, user } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    // console.log(prettyDOM(container));
-    await user.click(container.querySelector(".pattern-container"));
-
-    expect(addPatternFn).toHaveBeenCalledWith(pattern.name);
-  });
-
-  it("deselects selected pattern after clicking it", async () => {
-    pattern.selected = 0;
-    const { container, user } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    await user.click(container.querySelector(".pattern-container"));
-
-    expect(removePatternFn).toHaveBeenCalledWith(pattern.name);
-  });
-
-  it("deselects automatically selected pattern after clicking it", async () => {
-    pattern.selected = 1;
-    const { container, user } = await act(async () => installerRender(<PatternItem pattern={pattern} />));
-
-    await user.click(container.querySelector(".pattern-container"));
-
-    expect(removePatternFn).toHaveBeenCalledWith(pattern.name);
-  });
-});
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index eaacdd75ca..fcf58ec394 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -23,10 +23,7 @@ import React, { useCallback, useEffect, useState } from "react";
 import { SearchInput } from "@patternfly/react-core";
 
 import { useInstallerClient } from "~/context/installer";
-import { If, Section, Selector, ValidationErrors } from "~/components/core";
-import PatternGroup from "./PatternGroup";
-import PatternItem from "./PatternItem";
-import { toValidationError } from "~/utils";
+import { If, Section, Selector } from "~/components/core";
 import { _ } from "~/i18n";
 
 /**
@@ -41,32 +38,6 @@ import { _ } from "~/i18n";
  *   means it is not selected to install
  */
 
-/**
- * Convert DBus pattern data to JS objects
- * @param {Object.<string, Array<string>>} pattern_data input pattern data
- * @param {PatternSelection} selected selected patterns
- * @returns {Array<Pattern>} converted patterns
- */
-function convert(pattern_data, selected) {
-  const patterns = [];
-
-  Object.keys(pattern_data).forEach((name) => {
-    const pattern = pattern_data[name];
-
-    patterns.push({
-      name,
-      group: pattern[0],
-      description: pattern[1],
-      icon: pattern[2],
-      summary: pattern[3],
-      order: pattern[4],
-      selected: selected[name],
-    });
-  });
-
-  return patterns;
-}
-
 /**
  * @typedef {Object.<string, Array<Pattern>} PatternGroups mapping "group name" =>
  * list of patterns
@@ -134,17 +105,10 @@ function sortGroups(groups) {
  * @returns {JSX.Element}
  */
 function PatternSelector({ patterns, proposal }) {
-  const [errors, setErrors] = useState([]);
   const [visiblePatterns, setVisiblePatterns] = useState(patterns);
   const [searchValue, setSearchValue] = useState("");
   const client = useInstallerClient();
 
-  const { patterns: selection, used } = proposal;
-
-  const onSearchChange = (value) => {
-    setSearchValue(value);
-  };
-
   useEffect(() => {
     if (!patterns) return;
 
@@ -211,11 +175,6 @@ function PatternSelector({ patterns, proposal }) {
     );
   });
 
-  // FIXME: ValidationErrors should be replaced by an equivalent component to show issues.
-  // Note that only the Users client uses the old Validation D-Bus interface.
-  // const validationErrors = errors.map(toValidationError);
-  // <ValidationErrors errors={validationErrors} sectionId="software" />
-
   return (
     <>
       <Section aria-label={_("Software summary and filter options")}>
@@ -224,8 +183,8 @@ function PatternSelector({ patterns, proposal }) {
           placeholder={_("Search")}
           aria-label={_("Search")}
           value={searchValue}
-          onChange={(_event, value) => onSearchChange(value)}
-          onClear={() => onSearchChange("")}
+          onChange={(_event, value) => setSearchValue(value)}
+          onClear={() => setSearchValue("")}
           // do not display the counter when search filter is empty
           resultsCount={searchValue === "" ? 0 : groups.length}
         />
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index df2f75ec9b..54bcc2d215 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -22,7 +22,7 @@
 // @ts-check
 
 import React, { useEffect, useState } from "react";
-import { Button, Skeleton } from "@patternfly/react-core";
+import { Button } from "@patternfly/react-core";
 
 import { If, Page, Popup, Section, SectionSkeleton } from "~/components/core";
 import { PatternSelector, UsedSize } from "~/components/software";
@@ -98,10 +98,10 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
   return (
     <>
       <Button
-        variant="primary"
+        variant="link"
         onClick={openPopup}
       >
-        {_("Change")}
+        {_("Change selection")}
       </Button>
       <PatternsSelectorPopup
         patterns={patterns}
@@ -113,6 +113,40 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
   );
 };
 
+const SelectedPatternsList = ({ patterns, proposal }) => {
+  const selected = patterns.filter((p) => p.selected_by !== 2);
+  let description;
+
+  if (selected.length === 0) {
+    description = (
+      <>
+        {_("No additional software was selected.")}
+      </>
+    );
+  } else {
+    description = (
+      <>
+        <p>{_("The following software patterns are selected for installation:")}</p>
+        <ul>
+          {selected.map((pattern) => (
+            <li key={pattern.name}>
+              {pattern.summary}
+            </li>
+          ))}
+        </ul>
+      </>
+    );
+  }
+  return (
+    <>
+      {description}
+      <div>
+        <SelectPatternsButton patterns={patterns} proposal={proposal} />
+      </div>
+    </>
+  );
+};
+
 /**
  * Software page component
  * @component
@@ -121,6 +155,7 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
 function SoftwarePage() {
   const [status, setStatus] = useState(BUSY);
   const [patterns, setPatterns] = useState([]);
+  const [isLoading, setIsLoading] = useState(true);
   const [proposal, setProposal] = useState({ patterns: {}, size: "" });
   const client = useInstallerClient();
   const { cancellablePromise } = useCancellablePromise();
@@ -141,36 +176,35 @@ function SoftwarePage() {
   }, [client.software, patterns]);
 
   useEffect(() => {
-    if (patterns.length > 0) return;
+    if (patterns.length !== 0) return;
 
     const loadPatterns = async () => {
       const patterns = await cancellablePromise(client.software.getPatterns());
       const proposal = await cancellablePromise(client.software.getProposal());
       setPatterns(buildPatterns(patterns, proposal.patterns));
       setProposal(proposal);
+      setIsLoading(false);
     };
 
     loadPatterns();
   }, [client.software, patterns, cancellablePromise]);
 
+  console.log("SoftPage");
+
   return (
     // TRANSLATORS: page title
     <Page icon="apps" title={_("Software")}>
+      {/* TRANSLATORS: page title */}
       <Section title={_("Software selection")}>
         <If
           condition={status === BUSY}
           then={<SectionSkeleton numRows={5} />}
           else={
             <>
-              <UsedSize size={proposal.size} />
-              <ul>
-                {patterns.filter((p) => p.selected_by !== 2).map((pattern) => (
-                  <li key={pattern.name}>
-                    {pattern.summary}
-                  </li>
-                ))}
-              </ul>
-              <SelectPatternsButton patterns={patterns} proposal={proposal} />
+              <SelectedPatternsList patterns={patterns} proposal={proposal} />
+              <div>
+                <UsedSize size={proposal.size} />
+              </div>
             </>
           }
         />
diff --git a/web/src/components/software/UsedSize.jsx b/web/src/components/software/UsedSize.jsx
index 036b5230f7..df49c860eb 100644
--- a/web/src/components/software/UsedSize.jsx
+++ b/web/src/components/software/UsedSize.jsx
@@ -25,7 +25,6 @@ import { Em } from "~/components/core";
 import { _ } from "~/i18n";
 
 export default function UsedSize({ size }) {
-  console.log("size", size);
   if (size === undefined || size === "" || size === "0 B") return null;
 
   // TRANSLATORS: %s will be replaced by the estimated installation size,

From 089fa8af57940214adf8826a7f1ff7b5ef4596a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 20:57:19 +0000
Subject: [PATCH 111/324] Introduce a SelectedBy "enum"

---
 web/src/client/software.js                      | 15 +++++++++++++++
 web/src/components/software/PatternSelector.jsx | 10 +++++++---
 web/src/components/software/SoftwarePage.jsx    |  9 +++++----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 1493c5a1a1..c5dc480c8d 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -28,6 +28,21 @@ const SOFTWARE_SERVICE = "org.opensuse.Agama.Software1";
 const PRODUCT_PATH = "/org/opensuse/Agama/Software1/Product";
 const REGISTRATION_IFACE = "org.opensuse.Agama1.Registration";
 
+/**
+ * Enum for the reasons to select a pattern
+ *
+ * @readonly
+ * @enum { number }
+ */
+const SelectedBy = Object.freeze({
+  /** Selected by the user */
+  USER: 0,
+  /** Automatically selected as a dependency of another package */
+  AUTO: 1,
+  /** No selected */
+  NONE: 2,
+});
+
 /**
  * @typedef {object} Product
  * @property {string} id - Product ID (e.g., "Leap")
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index fcf58ec394..7a0459293c 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -25,6 +25,7 @@ import { SearchInput } from "@patternfly/react-core";
 import { useInstallerClient } from "~/context/installer";
 import { If, Section, Selector } from "~/components/core";
 import { _ } from "~/i18n";
+import { SelectedBy } from "~/client/software";
 
 /**
  * @typedef {Object} Pattern
@@ -127,7 +128,8 @@ function PatternSelector({ patterns, proposal }) {
   }, [patterns, searchValue]);
 
   const onToggle = useCallback((name) => {
-    const selected = patterns.filter((p) => p.selected_by === 0).map((p) => p.name);
+    const selected = patterns.filter((p) => p.selectedBy === SelectedBy.USER)
+      .map((p) => p.name);
 
     const index = selected.indexOf(name);
     if (index === -1) {
@@ -151,12 +153,14 @@ function PatternSelector({ patterns, proposal }) {
       </div>
       <div>{pattern.description}</div>
       {/* eslint-disable-next-line i18next/no-literal-string */}
-      <If condition={pattern.selected_by === 1} then={<div>auto</div>} />
+      <If condition={pattern.selectedBy === SelectedBy.AUTO} then={<div>auto</div>} />
     </>
   );
 
   const selector = sortGroups(groups).map((groupName) => {
-    const selectedIds = groups[groupName].filter((p) => p.selected_by !== 2).map((p) => p.name);
+    const selectedIds = groups[groupName].filter((p) => p.selectedBy !== SelectedBy.NONE).map((p) =>
+      p.name
+    );
     return (
       <Section
         key={groupName}
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index 54bcc2d215..fe667b7ba9 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -30,6 +30,7 @@ import { useInstallerClient } from "~/context/installer";
 import { noop, useCancellablePromise } from "~/utils";
 import { BUSY } from "~/client/status";
 import { _ } from "~/i18n";
+import { SelectedBy } from "~/client/software";
 
 /**
  * @typedef {Object} Pattern
@@ -38,7 +39,7 @@ import { _ } from "~/i18n";
  * @property {string} summary - pattern name (user visible)
  * @property {string} description -  long description of the pattern
  * @property {number} order - display order (string!)
- * @property {number} selected_by - who selected the pattern
+ * @property {number} selectedBy - who selected the pattern
  */
 
 /**
@@ -50,10 +51,10 @@ import { _ } from "~/i18n";
  */
 function buildPatterns(patterns, selection) {
   return patterns.map((pattern) => {
-    const selected_by = (selection[pattern.name] !== undefined) ? selection[pattern.name] : 2;
+    const selectedBy = (selection[pattern.name] !== undefined) ? selection[pattern.name] : 2;
     return {
       ...pattern,
-      selected_by,
+      selectedBy,
     };
   }).sort((a, b) => a.order - b.order);
 }
@@ -114,7 +115,7 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
 };
 
 const SelectedPatternsList = ({ patterns, proposal }) => {
-  const selected = patterns.filter((p) => p.selected_by !== 2);
+  const selected = patterns.filter((p) => p.selectedBy !== SelectedBy.NONE);
   let description;
 
   if (selected.length === 0) {

From da4a3437832e17a43eb7a274947a925b9da7ac5f Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 21 Mar 2024 21:57:39 +0100
Subject: [PATCH 112/324] provide openapi documentation

---
 rust/agama-server/src/questions/web.rs | 16 ++++++++++++++++
 rust/agama-server/src/web/docs.rs      |  8 ++++++++
 2 files changed, 24 insertions(+)

diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 109082161d..22ecf54212 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -239,12 +239,28 @@ pub async fn questions_stream(
     Ok(Box::pin(stream))
 }
 
+/// Returns the list of questions that waits for answer.
+///
+/// * `state`: service state.
+#[utoipa::path(get, path = "/questions", responses(
+    (status = 200, description = "List of open questions", body = Vec<Question>),
+    (status = 400, description = "The D-Bus service could not perform the action")
+))]
 async fn list_questions(
     State(state): State<QuestionsState<'_>>,
 ) -> Result<Json<Vec<Question>>, QuestionsError> {
     Ok(Json(state.questions.questions().await?))
 }
 
+/// Provide answer to question.
+///
+/// * `state`: service state.
+/// * `questions_id`: id of question
+/// * `answer`: struct with answer and possible other data needed for answer like password
+#[utoipa::path(put, path = "/questions/:id/answer", responses(
+    (status = 200, description = "answer question"),
+    (status = 400, description = "The D-Bus service could not perform the action")
+))]
 async fn answer(
     State(state): State<QuestionsState<'_>>,
     Path(question_id): Path<u32>,
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 34ded88acf..af8309be15 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -16,6 +16,8 @@ use utoipa::OpenApi;
         crate::manager::web::install_action,
         crate::manager::web::finish_action,
         crate::manager::web::installer_status,
+        crate::questions::web::list_questions,
+        crate::questions::web::answer,
         super::http::ping,
     ),
     components(
@@ -30,6 +32,12 @@ use utoipa::OpenApi;
         schemas(crate::software::web::SoftwareConfig),
         schemas(crate::software::web::SoftwareProposal),
         schemas(crate::manager::web::InstallerStatus),
+        schemas(crate::questions::web::Question),
+        schemas(crate::questions::web::GenericQuestion),
+        schemas(crate::questions::web::QuestionWithPassword),
+        schemas(crate::questions::web::Answer),
+        schemas(crate::questions::web::GenericAnswer),
+        schemas(crate::questions::web::PasswordAnswer),
         schemas(super::http::PingResponse),
     )
 )]

From 189f24ea81e2bc7db825426e3f36395e59bc0494 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 21 Mar 2024 22:31:25 +0100
Subject: [PATCH 113/324] apply clippy suggestions

---
 rust/agama-cli/src/auth.rs                | 8 ++++----
 rust/agama-lib/src/manager.rs             | 2 +-
 rust/agama-server/src/agama-web-server.rs | 2 +-
 rust/agama-server/src/l10n.rs             | 6 +++---
 rust/agama-server/src/l10n/web.rs         | 2 +-
 rust/agama-server/src/manager/web.rs      | 4 ++--
 rust/agama-server/src/questions/web.rs    | 4 ++--
 rust/agama-server/src/software/web.rs     | 8 ++++----
 rust/agama-server/src/web/common.rs       | 8 ++++----
 rust/agama-server/tests/common/mod.rs     | 6 ++++++
 10 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/rust/agama-cli/src/auth.rs b/rust/agama-cli/src/auth.rs
index 2d7321fd89..a93441bcd8 100644
--- a/rust/agama-cli/src/auth.rs
+++ b/rust/agama-cli/src/auth.rs
@@ -1,5 +1,5 @@
 use clap::{arg, Args, Subcommand};
-use home;
+
 use reqwest::header::{HeaderMap, HeaderValue, CONTENT_TYPE};
 use std::fs;
 use std::fs::File;
@@ -36,7 +36,7 @@ pub async fn run(subcommand: AuthCommands) -> anyhow::Result<()> {
 /// Reads stored token and returns it
 fn jwt() -> anyhow::Result<String> {
     if let Some(file) = jwt_file() {
-        if let Ok(token) = read_line_from_file(&file.as_path()) {
+        if let Ok(token) = read_line_from_file(file.as_path()) {
             return Ok(token);
         }
     }
@@ -93,7 +93,7 @@ impl Credentials for KnownCredentials {
 
 impl Credentials for FileCredentials {
     fn password(&self) -> io::Result<String> {
-        read_line_from_file(&self.path.as_path())
+        read_line_from_file(self.path.as_path())
     }
 }
 
@@ -119,7 +119,7 @@ fn read_line_from_file(path: &Path) -> io::Result<String> {
         ));
     }
 
-    if let Ok(file) = File::open(&path) {
+    if let Ok(file) = File::open(path) {
         // cares only of first line, take everything. No comments
         // or something like that supported
         let raw = BufReader::new(file).lines().next();
diff --git a/rust/agama-lib/src/manager.rs b/rust/agama-lib/src/manager.rs
index 2c4e3e9ada..ef7d9f7bc2 100644
--- a/rust/agama-lib/src/manager.rs
+++ b/rust/agama-lib/src/manager.rs
@@ -61,7 +61,7 @@ impl<'a> ManagerClient<'a> {
     /// Returns the current installation phase.
     pub async fn current_installation_phase(&self) -> Result<InstallationPhase, ServiceError> {
         let phase = self.manager_proxy.current_installation_phase().await?;
-        Ok(phase.try_into()?)
+        phase.try_into()
     }
 
     /// Starts the probing process.
diff --git a/rust/agama-server/src/agama-web-server.rs b/rust/agama-server/src/agama-web-server.rs
index 46c14797d0..215250ede5 100644
--- a/rust/agama-server/src/agama-web-server.rs
+++ b/rust/agama-server/src/agama-web-server.rs
@@ -13,7 +13,7 @@ use tokio::sync::broadcast::channel;
 use tracing_subscriber::prelude::*;
 use utoipa::OpenApi;
 
-const DEFAULT_WEB_UI_DIR: &'static str = "/usr/share/agama/web_ui";
+const DEFAULT_WEB_UI_DIR: &str = "/usr/share/agama/web_ui";
 
 #[derive(Subcommand, Debug)]
 enum Commands {
diff --git a/rust/agama-server/src/l10n.rs b/rust/agama-server/src/l10n.rs
index e130c01a46..afa4db98b6 100644
--- a/rust/agama-server/src/l10n.rs
+++ b/rust/agama-server/src/l10n.rs
@@ -40,9 +40,9 @@ impl Locale {
     #[dbus_interface(property)]
     fn set_locales(&mut self, locales: Vec<String>) -> zbus::fdo::Result<()> {
         if locales.is_empty() {
-            return Err(zbus::fdo::Error::Failed(format!(
-                "The locales list cannot be empty"
-            )));
+            return Err(zbus::fdo::Error::Failed(
+                "The locales list cannot be empty".to_string(),
+            ));
         }
         for loc in &locales {
             if !self.locales_db.exists(loc.as_str()) {
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index 5cb2a7f777..271a2bd846 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -153,7 +153,7 @@ async fn set_config(
             .output()
             .map_err(LocaleError::Commit)?;
         Command::new("/usr/bin/setxkbmap")
-            .arg(&ui_keymap)
+            .arg(ui_keymap)
             .env("DISPLAY", ":0")
             .output()
             .map_err(LocaleError::Commit)?;
diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index ce3ebe64d5..3564dd787b 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -77,8 +77,8 @@ pub async fn manager_stream(
 
 /// Sets up and returns the axum service for the manager module
 pub async fn manager_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
-    const DBUS_SERVICE: &'static str = "org.opensuse.Agama.Manager1";
-    const DBUS_PATH: &'static str = "/org/opensuse/Agama/Manager1";
+    const DBUS_SERVICE: &str = "org.opensuse.Agama.Manager1";
+    const DBUS_PATH: &str = "/org/opensuse/Agama/Manager1";
 
     let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let progress_router = progress_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 22ecf54212..b8ee3142fc 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -64,9 +64,9 @@ impl<'a> QuestionsClient<'a> {
         );
         for (path, interfaces_hash) in objects.iter() {
             if interfaces_hash.contains_key(&password_interface) {
-                result.push(self.create_question_with_password(&path).await?)
+                result.push(self.create_question_with_password(path).await?)
             } else {
-                result.push(self.create_generic_question(&path).await?)
+                result.push(self.create_generic_question(path).await?)
             }
         }
         Ok(result)
diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index f5c7bd6cb5..e8f7effb4e 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -112,9 +112,9 @@ fn reason_to_selected_by(
 
 /// Sets up and returns the axum service for the software module.
 pub async fn software_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
-    const DBUS_SERVICE: &'static str = "org.opensuse.Agama.Software1";
-    const DBUS_PATH: &'static str = "/org/opensuse/Agama/Software1";
-    const DBUS_PRODUCT_PATH: &'static str = "/org/opensuse/Agama/Software1/Product";
+    const DBUS_SERVICE: &str = "org.opensuse.Agama.Software1";
+    const DBUS_PATH: &str = "/org/opensuse/Agama/Software1";
+    const DBUS_PRODUCT_PATH: &str = "/org/opensuse/Agama/Software1/Product";
 
     let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let progress_router = progress_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
@@ -229,7 +229,7 @@ async fn get_config(State(state): State<SoftwareState<'_>>) -> Result<Json<Softw
     let patterns = state.software.user_selected_patterns().await?;
     let config = SoftwareConfig {
         patterns: Some(patterns),
-        product: product,
+        product,
     };
     Ok(Json(config))
 }
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 5484111121..86b3fb1c49 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -109,7 +109,7 @@ async fn build_service_status_proxy<'a>(
     destination: &str,
     path: &str,
 ) -> Result<ServiceStatusProxy<'a>, zbus::Error> {
-    let proxy = ServiceStatusProxy::builder(&dbus)
+    let proxy = ServiceStatusProxy::builder(dbus)
         .destination(destination.to_string())?
         .path(path.to_string())?
         .build()
@@ -205,7 +205,7 @@ impl<'a> Stream for ProgressStream<'a> {
         let pinned = self.project();
         match pinned.inner.poll_next(cx) {
             Poll::Pending => Poll::Pending,
-            Poll::Ready(_change) => match Progress::from_cached_proxy(&pinned.proxy) {
+            Poll::Ready(_change) => match Progress::from_cached_proxy(pinned.proxy) {
                 Some(progress) => {
                     let event = Event::Progress {
                         progress,
@@ -224,7 +224,7 @@ async fn build_progress_proxy<'a>(
     destination: &str,
     path: &str,
 ) -> Result<ProgressProxy<'a>, zbus::Error> {
-    let proxy = ProgressProxy::builder(&dbus)
+    let proxy = ProgressProxy::builder(dbus)
         .destination(destination.to_string())?
         .path(path.to_string())?
         .build()
@@ -345,7 +345,7 @@ async fn build_issues_proxy<'a>(
     destination: &str,
     path: &str,
 ) -> Result<IssuesProxy<'a>, zbus::Error> {
-    let proxy = IssuesProxy::builder(&dbus)
+    let proxy = IssuesProxy::builder(dbus)
         .destination(destination.to_string())?
         .path(path.to_string())?
         .build()
diff --git a/rust/agama-server/tests/common/mod.rs b/rust/agama-server/tests/common/mod.rs
index cd77539774..4525c96fa4 100644
--- a/rust/agama-server/tests/common/mod.rs
+++ b/rust/agama-server/tests/common/mod.rs
@@ -41,6 +41,12 @@ pub trait ServerState {}
 impl ServerState for Started {}
 impl ServerState for Stopped {}
 
+impl Default for DBusServer<Stopped> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl DBusServer<Stopped> {
     pub fn new() -> Self {
         let uuid = Uuid::new_v4();

From a13e6a877c06e9927b9e4b68ff3816e84dc39db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 21:50:46 +0000
Subject: [PATCH 114/324] Fix software clients type checking and a few tests

---
 web/src/client/software.js      | 12 +++--
 web/src/client/software.test.js | 77 ++++++++++++++++++++++-----------
 2 files changed, 61 insertions(+), 28 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index c5dc480c8d..1fa1d8672b 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -70,6 +70,12 @@ const SelectedBy = Object.freeze({
  * @property {Object.<string, number>} patterns - Selected patterns and the reason.
  */
 
+/**
+ * @typedef {object} SoftwareConfig
+ * @property {Array<string>|undefined} patterns - Name of the selected packages.
+ * @property {string|undefined} product - Product to install.
+ */
+
 /**
  * @typedef {Object} Pattern
  * @property {string} name - pattern name (internal ID)
@@ -220,6 +226,7 @@ class SoftwareBaseClient {
    * @return {Promise<Pattern[]>}
    */
   async getPatterns() {
+    /** @type Array<{ name: string, category: string, summary: string, description: string, order: string, icon: string }> */
     const patterns = await this.client.get("/software/patterns");
     return patterns.map((pattern) => ({
       name: pattern.name,
@@ -232,8 +239,7 @@ class SoftwareBaseClient {
   }
 
   /**
-   * @typedef {Object.<string, number>} PatternSelection mapping "name" =>
-   * "who selected the pattern"
+   * @return {Promise<SoftwareConfig>}
    */
   config() {
     return this.client.get("/software/config");
@@ -328,4 +334,4 @@ class ProductBaseClient {
 class ProductClient
   extends WithIssues(ProductBaseClient, "software/issues/product", PRODUCT_PATH) {}
 
-export { ProductClient, SoftwareClient };
+export { ProductClient, SelectedBy, SoftwareClient };
diff --git a/web/src/client/software.test.js b/web/src/client/software.test.js
index dfcdaeaed7..5aeeaf6339 100644
--- a/web/src/client/software.test.js
+++ b/web/src/client/software.test.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2022-2023] SUSE LLC
+ * Copyright (c) [2022-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -22,7 +22,20 @@
 // @ts-check
 
 import DBusClient from "./dbus";
-import { SoftwareClient } from "./software";
+import { HTTPClient } from "./http";
+import { ProductClient, SoftwareClient } from "./software";
+
+jest.mock("./http", () => {
+  return {
+    HTTPClient: jest.fn().mockImplementation(() => {
+      return {
+        get: mockGetFn,
+      };
+    }),
+  };
+});
+
+const mockGetFn = jest.fn();
 
 jest.mock("./dbus");
 
@@ -33,13 +46,25 @@ const productProxy = {
   wait: jest.fn(),
   AvailableProducts: [
     ["MicroOS", "openSUSE MicroOS", {}],
-    ["Tumbleweed", "openSUSE Tumbleweed", {}]
+    ["Tumbleweed", "openSUSE Tumbleweed", {}],
   ],
-  SelectedProduct: "MicroOS"
+  SelectedProduct: "MicroOS",
 };
 
 const registrationProxy = {};
 
+const tumbleweed = {
+  id: "Tumbleweed",
+  name: "openSUSE Tumbleweed",
+  description: "Tumbleweed is...",
+};
+
+const microos = {
+  id: "MicroOS",
+  name: "openSUSE MicroOS",
+  description: "MicroOS is...",
+};
+
 beforeEach(() => {
   // @ts-ignore
   DBusClient.mockImplementation(() => {
@@ -47,30 +72,32 @@ beforeEach(() => {
       proxy: (iface) => {
         if (iface === PRODUCT_IFACE) return productProxy;
         if (iface === REGISTRATION_IFACE) return registrationProxy;
-      }
+      },
     };
   });
 });
 
-describe("#product", () => {
+describe("ProductClient", () => {
   describe("#getAll", () => {
-    it("returns the list of available products", async () => {
-      const client = new SoftwareClient();
-      const availableProducts = await client.product.getAll();
-      expect(availableProducts).toEqual([
-        { id: "MicroOS", name: "openSUSE MicroOS" },
-        { id: "Tumbleweed", name: "openSUSE Tumbleweed" }
+    it.only("returns the list of available products", async () => {
+      const http = new HTTPClient(new URL("http://localhost"));
+      const client = new ProductClient(http);
+      mockGetFn.mockResolvedValue([tumbleweed, microos]);
+      const products = await client.getAll();
+      expect(products).toEqual([
+        { id: "Tumbleweed", name: "openSUSE Tumbleweed", description: "Tumbleweed is..." },
+        { id: "MicroOS", name: "openSUSE MicroOS", description: "MicroOS is..." },
       ]);
     });
   });
 
   describe("#getSelected", () => {
-    it("returns the selected product", async () => {
-      const client = new SoftwareClient();
-      const selectedProduct = await client.product.getSelected();
-      expect(selectedProduct).toEqual(
-        { id: "MicroOS", name: "openSUSE MicroOS" }
-      );
+    it.only("returns the selected product", async () => {
+      const http = new HTTPClient(new URL("http://localhost"));
+      const client = new ProductClient(http);
+      mockGetFn.mockResolvedValue({ product: "microos" });
+      const selected = await client.getSelected();
+      expect(selected).toEqual("microos");
     });
   });
 
@@ -88,7 +115,7 @@ describe("#product", () => {
         expect(registration).toStrictEqual({
           code: null,
           email: null,
-          requirement: "optional"
+          requirement: "optional",
         });
       });
     });
@@ -106,7 +133,7 @@ describe("#product", () => {
         expect(registration).toStrictEqual({
           code: "111222",
           email: "test@test.com",
-          requirement: "mandatory"
+          requirement: "mandatory",
         });
       });
     });
@@ -122,7 +149,7 @@ describe("#product", () => {
       await client.product.register("111222", "test@test.com");
       expect(registrationProxy.Register).toHaveBeenCalledWith(
         "111222",
-        { Email: { t: "s", v: "test@test.com" } }
+        { Email: { t: "s", v: "test@test.com" } },
       );
     });
 
@@ -136,7 +163,7 @@ describe("#product", () => {
         const result = await client.product.register("111222", "test@test.com");
         expect(result).toStrictEqual({
           success: true,
-          message: ""
+          message: "",
         });
       });
     });
@@ -151,7 +178,7 @@ describe("#product", () => {
         const result = await client.product.register("111222", "test@test.com");
         expect(result).toStrictEqual({
           success: false,
-          message: "error message"
+          message: "error message",
         });
       });
     });
@@ -168,7 +195,7 @@ describe("#product", () => {
         const result = await client.product.deregister();
         expect(result).toStrictEqual({
           success: true,
-          message: ""
+          message: "",
         });
       });
     });
@@ -183,7 +210,7 @@ describe("#product", () => {
         const result = await client.product.deregister();
         expect(result).toStrictEqual({
           success: false,
-          message: "error message"
+          message: "error message",
         });
       });
     });

From dee2bd549594ac0f161e6afdb138ff5b1054019d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 21:51:37 +0000
Subject: [PATCH 115/324] Type checking fixes

---
 web/src/components/software/PatternSelector.jsx |  2 +-
 web/src/components/software/SoftwarePage.jsx    | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 7a0459293c..d0306c5095 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -105,7 +105,7 @@ function sortGroups(groups) {
  * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
  * @returns {JSX.Element}
  */
-function PatternSelector({ patterns, proposal }) {
+function PatternSelector({ patterns }) {
   const [visiblePatterns, setVisiblePatterns] = useState(patterns);
   const [searchValue, setSearchValue] = useState("");
   const client = useInstallerClient();
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index fe667b7ba9..5d9a10569f 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -114,6 +114,14 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
   );
 };
 
+/**
+ * List of selected patterns.
+ * @component
+ * @param {object} props
+ * @param {Pattern[]} props.patterns - List of patterns, including selected and unselected ones.
+ * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
+ * @return {JSX.Element}
+ */
 const SelectedPatternsList = ({ patterns, proposal }) => {
   const selected = patterns.filter((p) => p.selectedBy !== SelectedBy.NONE);
   let description;
@@ -190,15 +198,13 @@ function SoftwarePage() {
     loadPatterns();
   }, [client.software, patterns, cancellablePromise]);
 
-  console.log("SoftPage");
-
   return (
     // TRANSLATORS: page title
     <Page icon="apps" title={_("Software")}>
       {/* TRANSLATORS: page title */}
       <Section title={_("Software selection")}>
         <If
-          condition={status === BUSY}
+          condition={status === BUSY || isLoading}
           then={<SectionSkeleton numRows={5} />}
           else={
             <>

From 1eab869afae9ff48e21eac1c43451ade0545b404 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 21 Mar 2024 21:58:29 +0000
Subject: [PATCH 116/324] Add description to the list of selected patterns

---
 web/src/components/software/SoftwarePage.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index 5d9a10569f..e6de10a9c4 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -139,7 +139,10 @@ const SelectedPatternsList = ({ patterns, proposal }) => {
         <ul>
           {selected.map((pattern) => (
             <li key={pattern.name}>
-              {pattern.summary}
+              <div>
+                <b>{pattern.summary}</b>
+              </div>
+              <div>{pattern.description}</div>
             </li>
           ))}
         </ul>

From c37c01a9f0a9f21ce23b53a61a04401fee2fa2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 12:49:03 +0000
Subject: [PATCH 117/324] Fix patterns removal when they are in auto mode

---
 rust/agama-lib/src/software/client.rs      | 14 +++++++++++---
 rust/agama-lib/src/software/proxies.rs     |  2 +-
 rust/agama-lib/src/software/store.rs       | 11 ++++++++---
 rust/agama-server/src/software/web.rs      | 15 ++++++++++++---
 service/lib/agama/dbus/software/manager.rb |  4 +++-
 service/lib/agama/software/manager.rb      | 22 +++++++++++++++++-----
 6 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/rust/agama-lib/src/software/client.rs b/rust/agama-lib/src/software/client.rs
index d8f1095403..1364956196 100644
--- a/rust/agama-lib/src/software/client.rs
+++ b/rust/agama-lib/src/software/client.rs
@@ -120,11 +120,19 @@ impl<'a> SoftwareClient<'a> {
     }
 
     /// Selects patterns by user
-    pub async fn select_patterns(&self, patterns: &[String]) -> Result<(), ServiceError> {
-        let patterns: Vec<&str> = patterns.iter().map(AsRef::as_ref).collect();
+    pub async fn select_patterns(
+        &self,
+        patterns: HashMap<String, bool>,
+    ) -> Result<(), ServiceError> {
+        let (add, remove): (Vec<_>, Vec<_>) =
+            patterns.into_iter().partition(|(_, install)| *install);
+
+        let add: Vec<_> = add.iter().map(|(name, _)| name.as_ref()).collect();
+        let remove: Vec<_> = remove.iter().map(|(name, _)| name.as_ref()).collect();
+
         let wrong_patterns = self
             .software_proxy
-            .set_user_patterns(patterns.as_slice())
+            .set_user_patterns(add.as_slice(), remove.as_slice())
             .await?;
         if !wrong_patterns.is_empty() {
             Err(ServiceError::UnknownPatterns(wrong_patterns))
diff --git a/rust/agama-lib/src/software/proxies.rs b/rust/agama-lib/src/software/proxies.rs
index e7298f2187..cdb79b4829 100644
--- a/rust/agama-lib/src/software/proxies.rs
+++ b/rust/agama-lib/src/software/proxies.rs
@@ -48,7 +48,7 @@ trait Software1 {
     fn remove_pattern(&self, id: &str) -> zbus::Result<bool>;
 
     /// SetUserPatterns method
-    fn set_user_patterns(&self, ids: &[&str]) -> zbus::Result<Vec<String>>;
+    fn set_user_patterns(&self, add: &[&str], remove: &[&str]) -> zbus::Result<Vec<String>>;
 
     /// UsedDiskSpace method
     fn used_disk_space(&self) -> zbus::Result<String>;
diff --git a/rust/agama-lib/src/software/store.rs b/rust/agama-lib/src/software/store.rs
index 66b6f6b092..5bb5ee21c4 100644
--- a/rust/agama-lib/src/software/store.rs
+++ b/rust/agama-lib/src/software/store.rs
@@ -1,5 +1,7 @@
 //! Implements the store for the storage settings.
 
+use std::collections::HashMap;
+
 use super::{SoftwareClient, SoftwareSettings};
 use crate::error::ServiceError;
 use zbus::Connection;
@@ -22,9 +24,12 @@ impl<'a> SoftwareStore<'a> {
     }
 
     pub async fn store(&self, settings: &SoftwareSettings) -> Result<(), ServiceError> {
-        self.software_client
-            .select_patterns(&settings.patterns)
-            .await?;
+        let patterns: HashMap<String, bool> = settings
+            .patterns
+            .iter()
+            .map(|name| (name.to_owned(), true))
+            .collect();
+        self.software_client.select_patterns(patterns).await?;
 
         Ok(())
     }
diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index b7ccc4298b..249fa38dab 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -35,9 +35,12 @@ struct SoftwareState<'a> {
     software: SoftwareClient<'a>,
 }
 
+/// Software service configuration (product, patterns, etc.).
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct SoftwareConfig {
-    patterns: Option<Vec<String>>,
+    /// A map where the keys are the patter names and the values whether they should be installed or not.
+    patterns: Option<HashMap<String, bool>>,
+    /// Name of the product to install.
     product: Option<String>,
 }
 
@@ -179,7 +182,7 @@ async fn set_config(
     }
 
     if let Some(patterns) = config.patterns {
-        state.software.select_patterns(&patterns).await?;
+        state.software.select_patterns(patterns).await?;
     }
 
     Ok(())
@@ -199,7 +202,13 @@ async fn get_config(State(state): State<SoftwareState<'_>>) -> Result<Json<Softw
     } else {
         Some(product)
     };
-    let patterns = state.software.user_selected_patterns().await?;
+    let patterns = state
+        .software
+        .user_selected_patterns()
+        .await?
+        .into_iter()
+        .map(|p| (p, true))
+        .collect();
     let config = SoftwareConfig {
         patterns: Some(patterns),
         product,
diff --git a/service/lib/agama/dbus/software/manager.rb b/service/lib/agama/dbus/software/manager.rb
index 6fec2df0f4..5028663df1 100644
--- a/service/lib/agama/dbus/software/manager.rb
+++ b/service/lib/agama/dbus/software/manager.rb
@@ -89,7 +89,9 @@ def issues
 
           dbus_method(:AddPattern, "in id:s, out result:b") { |p| backend.add_pattern(p) }
           dbus_method(:RemovePattern, "in id:s, out result:b") { |p| backend.remove_pattern(p) }
-          dbus_method(:SetUserPatterns, "in ids:as, out wrong:as") { |ids| [backend.assign_patterns(ids)] }
+          dbus_method(:SetUserPatterns, "in add:as, in remove:as, out wrong:as") do |add, remove|
+           [backend.assign_patterns(add, remove)]
+          end
 
           dbus_method :ProvisionsSelected, "in Provisions:as, out Result:ab" do |provisions|
             [provisions.map { |p| backend.provision_selected?(p) }]
diff --git a/service/lib/agama/software/manager.rb b/service/lib/agama/software/manager.rb
index a6ebf38ff2..139ca59e3a 100644
--- a/service/lib/agama/software/manager.rb
+++ b/service/lib/agama/software/manager.rb
@@ -249,16 +249,28 @@ def remove_pattern(id)
         true
       end
 
-      def assign_patterns(ids)
-        wrong_patterns = ids.reject { |p| pattern_exist?(p) }
+      def assign_patterns(add, remove)
+        wrong_patterns = [add, remove].flatten.reject { |p| pattern_exist?(p) }
         return wrong_patterns unless wrong_patterns.empty?
 
         user_patterns = Yast::PackagesProposal.GetResolvables(PROPOSAL_ID, :pattern)
         user_patterns.each { |p| Yast::Pkg.ResolvableNeutral(p, :pattern, force = false) }
-        Yast::PackagesProposal.SetResolvables(PROPOSAL_ID, :pattern, ids)
-        ids.each { |p| Yast::Pkg.ResolvableInstall(p, :pattern) }
-        logger.info "Setting patterns to #{ids.inspect}"
+        logger.info "Adding patterns: #{add.join(", ")}. Removing patterns: #{remove.join(",")}."
+
+        Yast::PackagesProposal.SetResolvables(PROPOSAL_ID, :pattern, add)
+        add.each do |id|
+          res = Yast::Pkg.ResolvableInstall(id, :pattern)
+          logger.info "Adding pattern #{id}: #{res.inspect}"
+        end
+
+        remove.each do |id|
+          res = Yast::Pkg.ResolvableNeutral(id, :pattern, force = false)
+          logger.info "Removing pattern #{id}: #{res.inspect}"
+          Yast::PackagesProposal.RemoveResolvables(PROPOSAL_ID, :pattern, [id])
+        end
+
         proposal.solve_dependencies
+
         selected_patterns_changed
 
         []

From 426d78b6f73bceb11da0704d37759ae9caa7b2aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 12:54:54 +0000
Subject: [PATCH 118/324] Adapt the PatternSelector to selectPatterns changes

---
 web/src/client/software.js                      |  6 ++++--
 web/src/components/software/PatternSelector.jsx | 14 ++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 1fa1d8672b..04a0c51117 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -72,7 +72,8 @@ const SelectedBy = Object.freeze({
 
 /**
  * @typedef {object} SoftwareConfig
- * @property {Array<string>|undefined} patterns - Name of the selected packages.
+ * @property {Array<string>|undefined} patterns - An object where the keys are the pattern names
+ *   and the values whether to install them or not.
  * @property {string|undefined} product - Product to install.
  */
 
@@ -246,7 +247,8 @@ class SoftwareBaseClient {
   }
 
   /**
-   * @param {string[]} patterns - name of the user-selected patterns.
+   * @param {Object.<string, boolean>} patterns - An object where the keys are the pattern names
+   *   and the values whether to install them or not.
    * @return {Promise<void>}
    */
   selectPatterns(patterns) {
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index d0306c5095..eabe3a2c4a 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -129,14 +129,12 @@ function PatternSelector({ patterns }) {
 
   const onToggle = useCallback((name) => {
     const selected = patterns.filter((p) => p.selectedBy === SelectedBy.USER)
-      .map((p) => p.name);
-
-    const index = selected.indexOf(name);
-    if (index === -1) {
-      selected.push(name);
-    } else {
-      selected.splice(index, 1);
-    }
+      .reduce((all, p) => {
+        all[p.name] = true;
+        return all;
+      }, {});
+    const pattern = patterns.find((p) => p.name === name);
+    selected[name] = pattern.selectedBy === SelectedBy.NONE;
 
     client.software.selectPatterns(selected);
   }, [patterns, client.software]);

From fcabdccb549cc56182e2ad4b4b37110e945d2d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 12:58:44 +0000
Subject: [PATCH 119/324] Fix a typo in the documentation

---
 rust/agama-server/src/software/web.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index 249fa38dab..6e968c189a 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -38,7 +38,7 @@ struct SoftwareState<'a> {
 /// Software service configuration (product, patterns, etc.).
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct SoftwareConfig {
-    /// A map where the keys are the patter names and the values whether they should be installed or not.
+    /// A map where the keys are the pattern names and the values whether to install them or not.
     patterns: Option<HashMap<String, bool>>,
     /// Name of the product to install.
     product: Option<String>,

From 0a4634e49ed3de72066a1fc48fae45b71c4e7f8d Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Fri, 22 Mar 2024 13:15:50 +0000
Subject: [PATCH 120/324] Changes based on code review

---
 rust/agama-server/src/network/adapter.rs    |  7 +-
 rust/agama-server/src/network/model.rs      | 21 ++++--
 rust/agama-server/src/network/nm/adapter.rs | 77 ++++++++-------------
 rust/agama-server/src/network/system.rs     | 11 +--
 rust/agama-server/src/network/web.rs        | 22 +++---
 rust/agama-server/src/web.rs                |  8 ++-
 rust/agama-server/tests/network.rs          | 20 ++----
 7 files changed, 75 insertions(+), 91 deletions(-)

diff --git a/rust/agama-server/src/network/adapter.rs b/rust/agama-server/src/network/adapter.rs
index 2d1a9be4ef..c6002faee7 100644
--- a/rust/agama-server/src/network/adapter.rs
+++ b/rust/agama-server/src/network/adapter.rs
@@ -1,4 +1,4 @@
-use crate::network::model::NetworkStateItems;
+use crate::network::model::StateConfig;
 use crate::network::NetworkState;
 use agama_lib::error::ServiceError;
 use async_trait::async_trait;
@@ -17,10 +17,7 @@ pub enum NetworkAdapterError {
 /// A trait for the ability to read/write from/to a network service
 #[async_trait]
 pub trait Adapter {
-    async fn read(
-        &self,
-        items: Vec<NetworkStateItems>,
-    ) -> Result<NetworkState, NetworkAdapterError>;
+    async fn read(&self, config: StateConfig) -> Result<NetworkState, NetworkAdapterError>;
     async fn write(&self, network: &NetworkState) -> Result<(), NetworkAdapterError>;
 }
 
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 5eeabda890..cd57163749 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -20,11 +20,22 @@ use uuid::Uuid;
 use zbus::zvariant::Value;
 
 #[derive(PartialEq)]
-pub enum NetworkStateItems {
-    AccessPoints,
-    Devices,
-    Connections,
-    GeneralState,
+pub struct StateConfig {
+    pub access_points: bool,
+    pub devices: bool,
+    pub connections: bool,
+    pub general_state: bool,
+}
+
+impl Default for StateConfig {
+    fn default() -> Self {
+        Self {
+            access_points: true,
+            devices: true,
+            connections: true,
+            general_state: true,
+        }
+    }
 }
 
 #[derive(Default, Clone, Debug, utoipa::ToSchema)]
diff --git a/rust/agama-server/src/network/nm/adapter.rs b/rust/agama-server/src/network/nm/adapter.rs
index c8a9882f21..fcd5160a9f 100644
--- a/rust/agama-server/src/network/nm/adapter.rs
+++ b/rust/agama-server/src/network/nm/adapter.rs
@@ -1,5 +1,5 @@
 use crate::network::{
-    model::{Connection, NetworkState, NetworkStateItems},
+    model::{Connection, NetworkState, StateConfig},
     nm::NetworkManagerClient,
     Adapter, NetworkAdapterError,
 };
@@ -31,68 +31,47 @@ impl<'a> NetworkManagerAdapter<'a> {
 
 #[async_trait]
 impl<'a> Adapter for NetworkManagerAdapter<'a> {
-    async fn read(
-        &self,
-        items: Vec<NetworkStateItems>,
-    ) -> Result<NetworkState, NetworkAdapterError> {
-        let items = if items.is_empty() {
-            vec![
-                NetworkStateItems::AccessPoints,
-                NetworkStateItems::Connections,
-                NetworkStateItems::Devices,
-                NetworkStateItems::GeneralState,
-            ]
-        } else {
-            items
-        };
-
+    async fn read(&self, config: StateConfig) -> Result<NetworkState, NetworkAdapterError> {
         let general_state = self
             .client
             .general_state()
             .await
             .map_err(NetworkAdapterError::Read)?;
 
-        let devices = if items.contains(&NetworkStateItems::Devices) {
-            self.client
+        let mut state = NetworkState::default();
+
+        if config.devices {
+            state.devices = self
+                .client
                 .devices()
                 .await
-                .map_err(NetworkAdapterError::Read)?
-        } else {
-            vec![]
-        };
+                .map_err(NetworkAdapterError::Read)?;
+        }
 
-        let connections = if items.contains(&NetworkStateItems::Connections) {
-            self.client
+        if config.connections {
+            state.connections = self
+                .client
                 .connections()
                 .await
-                .map_err(NetworkAdapterError::Read)?
-        } else {
-            vec![]
-        };
-
-        let access_points =
-            if items.contains(&NetworkStateItems::AccessPoints) && general_state.wireless_enabled {
-                if items.len() == 1 {
-                    self.client
-                        .request_scan()
-                        .await
-                        .map_err(NetworkAdapterError::Read)?;
-                    thread::sleep(time::Duration::from_secs(1));
-                };
+                .map_err(NetworkAdapterError::Read)?;
+        }
+
+        if config.access_points && general_state.wireless_enabled {
+            if !config.devices && !config.connections {
                 self.client
-                    .access_points()
+                    .request_scan()
                     .await
-                    .map_err(NetworkAdapterError::Read)?
-            } else {
-                vec![]
+                    .map_err(NetworkAdapterError::Read)?;
+                thread::sleep(time::Duration::from_secs(1));
             };
+            state.access_points = self
+                .client
+                .access_points()
+                .await
+                .map_err(NetworkAdapterError::Read)?;
+        }
 
-        Ok(NetworkState::new(
-            general_state,
-            access_points,
-            devices,
-            connections,
-        ))
+        Ok(state)
     }
 
     /// Writes the connections to NetworkManager.
@@ -103,7 +82,7 @@ impl<'a> Adapter for NetworkManagerAdapter<'a> {
     ///
     /// * `network`: network model.
     async fn write(&self, network: &NetworkState) -> Result<(), NetworkAdapterError> {
-        let old_state = self.read(vec![]).await?;
+        let old_state = self.read(StateConfig::default()).await?;
         let checkpoint = self
             .client
             .create_checkpoint()
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 00fddf9432..afb0cf2b69 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -1,4 +1,4 @@
-use super::{error::NetworkStateError, model::NetworkStateItems, NetworkAdapterError};
+use super::{error::NetworkStateError, model::StateConfig, NetworkAdapterError};
 use crate::network::{dbus::Tree, model::Connection, Action, Adapter, NetworkState};
 use agama_lib::network::types::DeviceType;
 use std::{error::Error, sync::Arc};
@@ -37,7 +37,7 @@ impl<T: Adapter> NetworkSystem<T> {
     /// Writes the network configuration.
     pub async fn write(&mut self) -> Result<(), NetworkAdapterError> {
         self.adapter.write(&self.state).await?;
-        self.state = self.adapter.read(vec![]).await?;
+        self.state = self.adapter.read(StateConfig::default()).await?;
         Ok(())
     }
 
@@ -50,7 +50,7 @@ impl<T: Adapter> NetworkSystem<T> {
 
     /// Populates the D-Bus tree with the known devices and connections.
     pub async fn setup(&mut self) -> Result<(), Box<dyn Error>> {
-        self.state = self.adapter.read(vec![]).await?;
+        self.state = self.adapter.read(StateConfig::default()).await?;
         let mut tree = self.tree.lock().await;
         tree.set_connections(&mut self.state.connections).await?;
         tree.set_devices(&self.state.devices).await?;
@@ -78,7 +78,10 @@ impl<T: Adapter> NetworkSystem<T> {
             Action::RefreshScan(tx) => {
                 let state = self
                     .adapter
-                    .read(vec![NetworkStateItems::AccessPoints])
+                    .read(StateConfig {
+                        access_points: true,
+                        ..Default::default()
+                    })
                     .await?;
                 self.state.general_state = state.general_state;
                 self.state.access_points = state.access_points;
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 706b880c58..ff5e653527 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -9,9 +9,9 @@ use axum::{
     Json, Router,
 };
 
-use super::{error::NetworkStateError, model::GeneralState, Action};
+use super::{error::NetworkStateError, model::GeneralState, Action, Adapter};
 
-use crate::network::{model::Connection, model::Device, nm::NetworkManagerAdapter, NetworkSystem};
+use crate::network::{model::Connection, model::Device, NetworkSystem};
 use agama_lib::error::ServiceError;
 use agama_lib::network::settings::NetworkConnection;
 use uuid::Uuid;
@@ -26,9 +26,11 @@ pub enum NetworkError {
     UnknownConnection(String),
     #[error("Cannot translate: {0}")]
     CannotTranslate(#[from] Error),
+    #[error("Cannot update configuration: {0}")]
+    CannotUpdate(Uuid),
     #[error("Cannot apply configuration")]
     CannotApplyConfig,
-    #[error("Network states error: {0}")]
+    #[error("Network state error: {0}")]
     Error(#[from] NetworkStateError),
 }
 
@@ -49,10 +51,10 @@ struct NetworkState {
 /// Sets up and returns the axum service for the network module.
 ///
 /// * `dbus`: zbus Connection.
-pub async fn network_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
-    let adapter = NetworkManagerAdapter::from_system()
-        .await
-        .expect("Could not connect to NetworkManager to read the configuration.");
+pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
+    dbus: zbus::Connection,
+    adapter: T,
+) -> Result<Router, ServiceError> {
     let mut network = NetworkSystem::new(dbus.clone(), adapter);
 
     let state = NetworkState {
@@ -69,7 +71,7 @@ pub async fn network_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
     });
 
     Ok(Router::new()
-        .route("/state", get(general_state).post(update_general_state))
+        .route("/state", get(general_state).put(update_general_state))
         .route("/connections", get(connections).post(add_connection))
         .route(
             "/connections/:id",
@@ -93,7 +95,7 @@ async fn general_state(State(state): State<NetworkState>) -> Json<GeneralState>
     Json(state)
 }
 
-#[utoipa::path(post, path = "/network/state", responses(
+#[utoipa::path(put, path = "/network/state", responses(
   (status = 200, description = "Update general network config", body = GenereralState)
 ))]
 async fn update_general_state(
@@ -224,7 +226,7 @@ async fn update_connection(
 
     state
         .actions
-        .send(Action::UpdateConnection(Box::new(conn.clone())))
+        .send(Action::UpdateConnection(Box::new(conn)))
         .unwrap();
 
     Ok(Json(()))
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index c30fb3c2e8..8065bcfbb7 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -8,7 +8,7 @@ use crate::{
     error::Error,
     l10n::web::l10n_service,
     manager::web::{manager_service, manager_stream},
-    network::web::network_service,
+    network::{web::network_service, NetworkManagerAdapter},
     software::web::{software_service, software_stream},
     web::common::{issues_stream, progress_stream, service_status_stream},
 };
@@ -48,11 +48,15 @@ pub async fn service<P>(
 where
     P: AsRef<Path>,
 {
+    let network_adapter = NetworkManagerAdapter::from_system()
+        .await
+        .expect("Could not connect to NetworkManager to read the configuration");
+
     let router = MainServiceBuilder::new(events.clone(), web_ui_dir)
         .add_service("/l10n", l10n_service(events.clone()))
         .add_service("/manager", manager_service(dbus.clone()).await?)
         .add_service("/software", software_service(dbus.clone()).await?)
-        .add_service("/network", network_service(dbus).await?)
+        .add_service("/network", network_service(dbus, network_adapter).await?)
         .with_config(config)
         .build();
     Ok(router)
diff --git a/rust/agama-server/tests/network.rs b/rust/agama-server/tests/network.rs
index 7413e20ac8..5e783a14af 100644
--- a/rust/agama-server/tests/network.rs
+++ b/rust/agama-server/tests/network.rs
@@ -8,7 +8,7 @@ use agama_lib::network::{
 };
 use agama_server::network::{
     self,
-    model::{self, GeneralState, Ipv4Method, Ipv6Method, NetworkStateItems},
+    model::{self, GeneralState, Ipv4Method, Ipv6Method, StateConfig},
     Adapter, NetworkAdapterError, NetworkService, NetworkState,
 };
 use async_trait::async_trait;
@@ -21,10 +21,7 @@ pub struct NetworkTestAdapter(network::NetworkState);
 
 #[async_trait]
 impl Adapter for NetworkTestAdapter {
-    async fn read(
-        &self,
-        _: Vec<NetworkStateItems>,
-    ) -> Result<network::NetworkState, NetworkAdapterError> {
+    async fn read(&self, _: StateConfig) -> Result<network::NetworkState, NetworkAdapterError> {
         Ok(self.0.clone())
     }
 
@@ -37,11 +34,7 @@ impl Adapter for NetworkTestAdapter {
 async fn test_read_connections() -> Result<(), Box<dyn Error>> {
     let mut server = DBusServer::new().start().await?;
 
-    let general_state = GeneralState {
-        wireless_enabled: false,
-        connectivity: true,
-        networking_enabled: true,
-    };
+    let general_state = GeneralState::default();
 
     let device = model::Device {
         name: String::from("eth0"),
@@ -152,12 +145,7 @@ async fn test_add_bond_connection() -> Result<(), Box<dyn Error>> {
 async fn test_update_connection() -> Result<(), Box<dyn Error>> {
     let mut server = DBusServer::new().start().await?;
 
-    let general_state = GeneralState {
-        wireless_enabled: false,
-        connectivity: true,
-        networking_enabled: true,
-    };
-
+    let general_state = GeneralState::default();
     let device = model::Device {
         name: String::from("eth0"),
         type_: DeviceType::Ethernet,

From 9506e1fb5dfaf02f031c98a58caddc26d0eb04bc Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Fri, 22 Mar 2024 13:16:13 +0000
Subject: [PATCH 121/324] Added some network_service unit test

---
 rust/agama-server/src/network/model.rs     |   2 +-
 rust/agama-server/tests/network_service.rs | 167 +++++++++++++++++++++
 2 files changed, 168 insertions(+), 1 deletion(-)
 create mode 100644 rust/agama-server/tests/network_service.rs

diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index cd57163749..381ebcd122 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -421,7 +421,7 @@ impl Default for GeneralState {
 }
 
 /// Access Point
-#[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
+#[derive(Default, Debug, Clone, Serialize, utoipa::ToSchema)]
 pub struct AccessPoint {
     pub ssid: SSID,
     pub hw_address: String,
diff --git a/rust/agama-server/tests/network_service.rs b/rust/agama-server/tests/network_service.rs
new file mode 100644
index 0000000000..be8238f5a9
--- /dev/null
+++ b/rust/agama-server/tests/network_service.rs
@@ -0,0 +1,167 @@
+pub mod common;
+
+use crate::common::DBusServer;
+use agama_lib::error::ServiceError;
+use agama_lib::network::types::{DeviceType, SSID};
+use agama_server::network::web::network_service;
+use agama_server::network::{
+    self,
+    model::{self, AccessPoint, GeneralState, Ipv4Method, Ipv6Method, StateConfig},
+    Adapter, NetworkAdapterError, NetworkService, NetworkState,
+};
+use agama_server::web::{generate_token, MainServiceBuilder, ServiceConfig};
+
+use async_trait::async_trait;
+use axum::http::header;
+use axum::{
+    body::Body,
+    http::{Method, Request, StatusCode},
+    response::Response,
+    routing::{get, put},
+    Json, Router,
+};
+use common::body_to_string;
+use serde_json::{json, to_string};
+use std::{error::Error, path::PathBuf};
+use tokio::{sync::broadcast::channel, test};
+use tower::ServiceExt;
+
+fn public_dir() -> PathBuf {
+    std::env::current_dir().unwrap().join("public")
+}
+async fn build_state() -> NetworkState {
+    let general_state = GeneralState::default();
+    let device = model::Device {
+        name: String::from("eth0"),
+        type_: DeviceType::Ethernet,
+    };
+    let eth0 = model::Connection::new("eth0".to_string(), DeviceType::Ethernet);
+
+    NetworkState::new(general_state, vec![], vec![device], vec![eth0])
+}
+
+async fn build_service(state: NetworkState) -> Result<Router, ServiceError> {
+    let dbus = DBusServer::new().start().await?.connection();
+
+    let adapter = NetworkTestAdapter(state);
+    Ok(network_service(dbus, adapter).await?)
+}
+
+#[derive(Default)]
+pub struct NetworkTestAdapter(network::NetworkState);
+
+#[async_trait]
+impl Adapter for NetworkTestAdapter {
+    async fn read(&self, _: StateConfig) -> Result<network::NetworkState, NetworkAdapterError> {
+        Ok(self.0.clone())
+    }
+
+    async fn write(&self, _network: &network::NetworkState) -> Result<(), NetworkAdapterError> {
+        unimplemented!("Not used in tests");
+    }
+}
+
+#[test]
+async fn test_network_state() -> Result<(), Box<dyn Error>> {
+    let state = build_state().await;
+    let network_service = build_service(state).await?;
+
+    let request = Request::builder()
+        .uri("/state")
+        .method(Method::GET)
+        .body(Body::empty())
+        .unwrap();
+
+    let response = network_service.oneshot(request).await?;
+    assert_eq!(response.status(), StatusCode::OK);
+    let body = body_to_string(response.into_body()).await;
+    assert!(body.contains(r#""wireless_enabled":false"#));
+    Ok(())
+}
+
+#[test]
+async fn test_change_network_state() -> Result<(), Box<dyn Error>> {
+    let mut state = build_state().await;
+    let network_service = build_service(state.clone()).await?;
+    state.general_state.wireless_enabled = true;
+
+    let request = Request::builder()
+        .uri("/state")
+        .method(Method::PUT)
+        .header(header::CONTENT_TYPE, "application/json")
+        .body(to_string(&state.general_state)?)
+        .unwrap();
+
+    let response = network_service.oneshot(request).await?;
+    assert_eq!(response.status(), StatusCode::OK);
+    let body = response.into_body();
+    let body = body_to_string(body).await;
+    assert_eq!(body, to_string(&state.general_state)?);
+    Ok(())
+}
+
+#[test]
+async fn test_network_connections() -> Result<(), Box<dyn Error>> {
+    let state = build_state().await;
+    let network_service = build_service(state.clone()).await?;
+
+    let request = Request::builder()
+        .uri("/connections")
+        .method(Method::GET)
+        .body(Body::empty())
+        .unwrap();
+
+    let response = network_service.oneshot(request).await?;
+    assert_eq!(response.status(), StatusCode::OK);
+    let body = body_to_string(response.into_body()).await;
+    assert!(body.contains(r#""id":"eth0""#));
+    Ok(())
+}
+
+#[test]
+async fn test_network_devices() -> Result<(), Box<dyn Error>> {
+    let state = build_state().await;
+    let network_service = build_service(state.clone()).await?;
+
+    let request = Request::builder()
+        .uri("/devices")
+        .method(Method::GET)
+        .body(Body::empty())
+        .unwrap();
+
+    let response = network_service.oneshot(request).await?;
+    assert_eq!(response.status(), StatusCode::OK);
+    let body = body_to_string(response.into_body()).await;
+    assert!(body.contains(r#""name":"eth0""#));
+    Ok(())
+}
+
+#[test]
+async fn test_network_wifis() -> Result<(), Box<dyn Error>> {
+    let mut state = build_state().await;
+    state.access_points = vec![
+        AccessPoint {
+            ssid: SSID("AgamaNetwork".as_bytes().into()),
+            hw_address: "00:11:22:33:44:00".into(),
+            ..Default::default()
+        },
+        AccessPoint {
+            ssid: SSID("AgamaNetwork2".as_bytes().into()),
+            hw_address: "00:11:22:33:44:01".into(),
+            ..Default::default()
+        },
+    ];
+    let network_service = build_service(state.clone()).await?;
+
+    let request = Request::builder()
+        .uri("/wifi")
+        .method(Method::GET)
+        .body(Body::empty())
+        .unwrap();
+
+    let response = network_service.oneshot(request).await?;
+    assert_eq!(response.status(), StatusCode::OK);
+    let body = body_to_string(response.into_body()).await;
+    assert_eq!(body, to_string(&json!(["AgamaNetwork", "AgamaNetwork2"]))?);
+    Ok(())
+}

From bccf78cf030518a852b89ec4b6f5326e3a192bf1 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 22 Mar 2024 16:39:23 +0100
Subject: [PATCH 122/324] apply suggestions

---
 rust/agama-server/src/questions/web.rs | 36 ++++++++++----------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index b8ee3142fc..44d09b2ecb 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -13,21 +13,16 @@ use agama_lib::{
 use anyhow::Context;
 use axum::{
     extract::{Path, State},
-    http::StatusCode,
-    response::{IntoResponse, Response},
     routing::{get, put},
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
-use serde_json::json;
 use std::{collections::HashMap, pin::Pin};
-use thiserror::Error;
 use tokio_stream::{Stream, StreamExt};
-use zbus::zvariant::ObjectPath;
-use zbus::zvariant::OwnedObjectPath;
 use zbus::{
     fdo::ObjectManagerProxy,
     names::{InterfaceName, OwnedInterfaceName},
+    zvariant::{ObjectPath,OwnedObjectPath}
 };
 
 // TODO: move to lib
@@ -140,21 +135,6 @@ impl<'a> QuestionsClient<'a> {
     }
 }
 
-#[derive(Error, Debug)]
-pub enum QuestionsError {
-    #[error("Question service error: {0}")]
-    Error(#[from] ServiceError),
-}
-
-impl IntoResponse for QuestionsError {
-    fn into_response(self) -> Response {
-        let body = json!({
-            "error": self.to_string()
-        });
-        (StatusCode::BAD_REQUEST, Json(body)).into_response()
-    }
-}
-
 #[derive(Clone)]
 struct QuestionsState<'a> {
     questions: QuestionsClient<'a>,
@@ -168,6 +148,11 @@ pub struct Question {
 
 /// Facade of agama_lib::questions::GenericQuestion
 /// For fields details see it.
+/// Reason why it does not use directly GenericQuestion from lib
+/// is that it contain both question and answer. It works for dbus
+/// API which has both as attributes, but web API separate
+/// question and its answer. So here it is split into GenericQuestion
+/// and GenericAnswer
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct GenericQuestion {
     id: u32,
@@ -180,6 +165,11 @@ pub struct GenericQuestion {
 
 /// Facade of agama_lib::questions::WithPassword
 /// For fields details see it.
+/// Reason why it does not use directly WithPassword from lib
+/// is that it is not composition as used here, but more like
+/// child of generic question and contain reference to Base.
+/// Here for web API we want to have in json that separation that would
+/// allow to compose any possible future specialization of question
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct QuestionWithPassword {
     password: String,
@@ -248,7 +238,7 @@ pub async fn questions_stream(
 ))]
 async fn list_questions(
     State(state): State<QuestionsState<'_>>,
-) -> Result<Json<Vec<Question>>, QuestionsError> {
+) -> Result<Json<Vec<Question>>, Error> {
     Ok(Json(state.questions.questions().await?))
 }
 
@@ -265,7 +255,7 @@ async fn answer(
     State(state): State<QuestionsState<'_>>,
     Path(question_id): Path<u32>,
     Json(answer): Json<Answer>,
-) -> Result<(), QuestionsError> {
+) -> Result<(), Error> {
     state.questions.answer(question_id, answer).await?;
     Ok(())
 }

From e5bdecc2f4236daf254dd370ef3c1106cb4db1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 15:41:02 +0000
Subject: [PATCH 123/324] Fix PatternSelector type checking

---
 web/src/client/mixins.js            | 4 ++--
 web/src/components/core/Page.jsx    | 3 +--
 web/src/components/core/Section.jsx | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index c7a9b28b7d..927610784d 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -150,7 +150,7 @@ const WithStatus = (superclass, status_path, service_name) =>
      * Register a callback to run when the "CurrentInstallationPhase" changes
      *
      * @param {function} handler - callback function
-     * @return {function} function to disable the callback
+     * @return {import ("./http").RemoveFn} function to disable the callback
      */
     onStatusChange(handler) {
       return this.client.onEvent("ServiceStatusChanged", ({ status, service }) => {
@@ -207,7 +207,7 @@ const WithProgress = (superclass, progress_path, service_name) =>
      * Register a callback to run when the progress changes
      *
      * @param {ProgressHandler} handler - callback function
-     * @return {import ("./dbus").RemoveFn} function to disable the callback
+     * @return {import ("./http").RemoveFn} function to disable the callback
      */
     onProgressChange(handler) {
       return this.client.onEvent("Progress", ({ service, ...progress }) => {
diff --git a/web/src/components/core/Page.jsx b/web/src/components/core/Page.jsx
index e425ca5757..cd053549d0 100644
--- a/web/src/components/core/Page.jsx
+++ b/web/src/components/core/Page.jsx
@@ -162,8 +162,7 @@ const BackAction = () => {
  * @param {string} [props.title="Agama"] - The title for the page. By default it
  *   uses the name of the tool, do not mark it for translation.
  * @param {boolean} [props.mountSidebar=true] - Whether include the core/Sidebar component.
- * @param {JSX.Element[]} [props.children] - The page content.
- *
+ * @param {React.ReactNode} [props.children] - The page content.
  */
 const Page = ({
   icon,
diff --git a/web/src/components/core/Section.jsx b/web/src/components/core/Section.jsx
index f57d77965a..831d5f792d 100644
--- a/web/src/components/core/Section.jsx
+++ b/web/src/components/core/Section.jsx
@@ -56,7 +56,7 @@ import { If, ValidationErrors } from "~/components/core";
  * @property {string} [className] - Class name for section html tag.
  * @property {string} [id] - Id of the section ("software", "product", "storage", "storage-actions", ...)
  * @property {import("~/client/mixins").ValidationError[]} [props.errors] - Validation errors to be shown before the title.
- * @property {JSX.Element[]} [children] - The section content.
+ * @property {React.ReactNode} [children] - The section content.
  * @property {string} [aria-label] - aria-label attribute, required if title if not given
  *
  * @param { SectionProps } props

From 3646c0b23306662fbc199d244838b31e850a4097 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 22 Mar 2024 16:44:54 +0100
Subject: [PATCH 124/324] fix formatting

---
 rust/agama-server/src/questions/web.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 44d09b2ecb..9cb1ca2a26 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -22,7 +22,7 @@ use tokio_stream::{Stream, StreamExt};
 use zbus::{
     fdo::ObjectManagerProxy,
     names::{InterfaceName, OwnedInterfaceName},
-    zvariant::{ObjectPath,OwnedObjectPath}
+    zvariant::{ObjectPath, OwnedObjectPath},
 };
 
 // TODO: move to lib

From 4c9f50a53136f360103cc385067f15c33da70d84 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Fri, 22 Mar 2024 16:22:29 +0000
Subject: [PATCH 125/324] Changes based on code review.

---
 rust/agama-server/src/network/model.rs | 12 +-----------
 rust/agama-server/src/network/web.rs   | 11 +++++------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 381ebcd122..7428942da1 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -402,7 +402,7 @@ mod tests {
 
 /// Network state
 #[serde_as]
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, utoipa::ToSchema)]
+#[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct GeneralState {
     pub connectivity: bool,
     pub wireless_enabled: bool,
@@ -410,16 +410,6 @@ pub struct GeneralState {
                                   // pub dns: GlobalDnsConfiguration <HashMap>
 }
 
-impl Default for GeneralState {
-    fn default() -> Self {
-        Self {
-            connectivity: false,
-            wireless_enabled: false,
-            networking_enabled: false,
-        }
-    }
-}
-
 /// Access Point
 #[derive(Default, Debug, Clone, Serialize, utoipa::ToSchema)]
 pub struct AccessPoint {
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index ff5e653527..a29624fdd9 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -166,10 +166,9 @@ async fn connections(State(state): State<NetworkState>) -> Json<Vec<NetworkConne
 ))]
 async fn add_connection(
     State(state): State<NetworkState>,
-    Json(value): Json<NetworkConnection>,
+    Json(conn): Json<NetworkConnection>,
 ) -> Result<Json<Uuid>, NetworkError> {
     let (tx, rx) = oneshot::channel();
-    let conn = NetworkConnection::from(value);
 
     state
         .actions
@@ -182,13 +181,14 @@ async fn add_connection(
     let _ = rx.await.unwrap();
 
     let conn = Connection::try_from(conn)?;
+    let uuid = conn.uuid.clone();
 
     state
         .actions
-        .send(Action::UpdateConnection(Box::new(conn.clone())))
+        .send(Action::UpdateConnection(Box::new(conn)))
         .unwrap();
 
-    Ok(Json(conn.uuid))
+    Ok(Json(uuid))
 }
 
 #[utoipa::path(delete, path = "/network/connections/:uuid", responses(
@@ -218,9 +218,8 @@ async fn delete_connection(
 async fn update_connection(
     State(state): State<NetworkState>,
     Path(id): Path<Uuid>,
-    Json(value): Json<NetworkConnection>,
+    Json(conn): Json<NetworkConnection>,
 ) -> Result<Json<()>, NetworkError> {
-    let conn = NetworkConnection::from(value);
     let mut conn = Connection::try_from(conn)?;
     conn.uuid = id;
 

From 801cb6e6993feb0fc9d90165e6198f8080e2c4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 18:43:58 +0000
Subject: [PATCH 126/324] Move the software selection to the SoftwarePage

---
 .../components/software/PatternSelector.jsx   | 10 +++----
 web/src/components/software/SoftwarePage.jsx  | 27 ++++++++++++++-----
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index eabe3a2c4a..f8615055b6 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -26,6 +26,7 @@ import { useInstallerClient } from "~/context/installer";
 import { If, Section, Selector } from "~/components/core";
 import { _ } from "~/i18n";
 import { SelectedBy } from "~/client/software";
+import { noop } from "~/utils";
 
 /**
  * @typedef {Object} Pattern
@@ -102,13 +103,12 @@ function sortGroups(groups) {
  * @component
  * @param {object} props
  * @param {import("~/components/software/SoftwarePage").Pattern[]} props.patterns - list of patterns
- * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
+ * @param {function} [props.onSelectionChanged] - Callback to be called when the selection changes
  * @returns {JSX.Element}
  */
-function PatternSelector({ patterns }) {
+function PatternSelector({ patterns, onSelectionChanged = noop }) {
   const [visiblePatterns, setVisiblePatterns] = useState(patterns);
   const [searchValue, setSearchValue] = useState("");
-  const client = useInstallerClient();
 
   useEffect(() => {
     if (!patterns) return;
@@ -136,8 +136,8 @@ function PatternSelector({ patterns }) {
     const pattern = patterns.find((p) => p.name === name);
     selected[name] = pattern.selectedBy === SelectedBy.NONE;
 
-    client.software.selectPatterns(selected);
-  }, [patterns, client.software]);
+    onSelectionChanged(selected);
+  }, [patterns, onSelectionChanged]);
 
   // initial empty screen, the patterns are loaded very quickly, no need for any progress
   if (visiblePatterns.length === 0) return null;
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index e6de10a9c4..fa00082ada 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -68,16 +68,20 @@ function buildPatterns(patterns, selection) {
  * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
  * @param {boolean} props.isOpen - Whether the pop-up should be open
  * @param {function} props.onFinish - Callback to be called when the selection is finished
+ * @param {function} props.onSelectionChanged - Callback to be called when the selection changes
  */
 const PatternsSelectorPopup = ({
   patterns,
-  proposal,
   isOpen = false,
+  onSelectionChanged = noop,
   onFinish = noop,
 }) => {
   return (
     <Popup className="large" title={_("Software selection")} isOpen={isOpen}>
-      <PatternSelector patterns={patterns} proposal={proposal} />
+      <PatternSelector
+        patterns={patterns}
+        onSelectionChanged={onSelectionChanged}
+      />
 
       <Popup.Actions>
         <Popup.PrimaryAction
@@ -90,7 +94,7 @@ const PatternsSelectorPopup = ({
   );
 };
 
-const SelectPatternsButton = ({ patterns, proposal }) => {
+const SelectPatternsButton = ({ patterns, proposal, onSelectionChanged }) => {
   const [isPopupOpen, setIsPopupOpen] = useState(false);
 
   const openPopup = () => setIsPopupOpen(true);
@@ -109,6 +113,7 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
         proposal={proposal}
         isOpen={isPopupOpen}
         onFinish={closePopup}
+        onSelectionChanged={onSelectionChanged}
       />
     </>
   );
@@ -120,9 +125,10 @@ const SelectPatternsButton = ({ patterns, proposal }) => {
  * @param {object} props
  * @param {Pattern[]} props.patterns - List of patterns, including selected and unselected ones.
  * @param {import("~/client/software").SoftwareProposal} props.proposal - Software proposal
+ * @param {function} props.onSelectionChanged - Callback to be called when the selection changes
  * @return {JSX.Element}
  */
-const SelectedPatternsList = ({ patterns, proposal }) => {
+const SelectedPatternsList = ({ patterns, proposal, onSelectionChanged }) => {
   const selected = patterns.filter((p) => p.selectedBy !== SelectedBy.NONE);
   let description;
 
@@ -153,7 +159,11 @@ const SelectedPatternsList = ({ patterns, proposal }) => {
     <>
       {description}
       <div>
-        <SelectPatternsButton patterns={patterns} proposal={proposal} />
+        <SelectPatternsButton
+          patterns={patterns}
+          proposal={proposal}
+          onSelectionChanged={onSelectionChanged}
+        />
       </div>
     </>
   );
@@ -211,7 +221,12 @@ function SoftwarePage() {
           then={<SectionSkeleton numRows={5} />}
           else={
             <>
-              <SelectedPatternsList patterns={patterns} proposal={proposal} />
+              <SelectedPatternsList
+                patterns={patterns}
+                proposal={proposal}
+                onSelectionChanged={(selected) => client.software.selectPatterns(selected)}
+              />
+
               <div>
                 <UsedSize size={proposal.size} />
               </div>

From 53c59ace75c012342ab76f706c31e3fd29e5a5a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 18:46:54 +0000
Subject: [PATCH 127/324] Clean-up the PatternSelector component

---
 web/src/components/software/PatternSelector.jsx | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index f8615055b6..227c5e8d71 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -22,8 +22,7 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { SearchInput } from "@patternfly/react-core";
 
-import { useInstallerClient } from "~/context/installer";
-import { If, Section, Selector } from "~/components/core";
+import { Section, Selector } from "~/components/core";
 import { _ } from "~/i18n";
 import { SelectedBy } from "~/client/software";
 import { noop } from "~/utils";
@@ -85,16 +84,7 @@ function sortGroups(groups) {
   return Object.keys(groups).sort((g1, g2) => {
     const order1 = groups[g1][0].order;
     const order2 = groups[g2][0].order;
-
-    if (order1 === order2) {
-      return g1 === g2 ? 0 : (g1 < g2 ? -1 : 1);
-    }
-
-    // patterns with undefined (empty) order are always at the end
-    if (order1 === "") return 1;
-    if (order2 === "") return -1;
-
-    return order1 < order2 ? -1 : 1;
+    return order1 - order2;
   });
 }
 
@@ -150,8 +140,6 @@ function PatternSelector({ patterns, onSelectionChanged = noop }) {
         <b>{pattern.summary}</b>
       </div>
       <div>{pattern.description}</div>
-      {/* eslint-disable-next-line i18next/no-literal-string */}
-      <If condition={pattern.selectedBy === SelectedBy.AUTO} then={<div>auto</div>} />
     </>
   );
 
@@ -171,7 +159,6 @@ function PatternSelector({ patterns, onSelectionChanged = noop }) {
           onOptionClick={onToggle}
           optionIdKey="name"
           selectedIds={selectedIds}
-          dataItemsType="agama/software-patterns"
         />
       </Section>
     );

From d7cf9edc6f3b959063d14438c434b30bb91407cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 18:53:39 +0000
Subject: [PATCH 128/324] Adapt the PatternSelector tests

---
 .../software/PatternSelector.test.json        | 132 ++++++++++--------
 .../software/PatternSelector.test.jsx         |  93 +++++-------
 2 files changed, 106 insertions(+), 119 deletions(-)

diff --git a/web/src/components/software/PatternSelector.test.json b/web/src/components/software/PatternSelector.test.json
index e1d64533e2..58c301ba47 100644
--- a/web/src/components/software/PatternSelector.test.json
+++ b/web/src/components/software/PatternSelector.test.json
@@ -1,58 +1,74 @@
-{
-  "32bit": [
-    "Base Technologies",
-    "This will install the 32-bit variant of all selected patterns. This allows to execute 32-bit software.",
-    "./pattern-cli",
-    "32-Bit Runtime Environment",
-    "1180"
-  ],
-  "base": [
-    "Base Technologies",
-    "This is the base runtime system.  It contains only a basic multiuser booting system. For running on real hardware, you need to add additional packages and pattern to make this pattern useful on its own.",
-    "./pattern-basis",
-    "Base System",
-    "1030"
-  ],
-  "documentation": [
-    "Documentation",
-    "Help and Support Documentation",
-    "./pattern-documentation",
-    "Help and Support Documentation",
-    "1005"
-  ],
-  "books": [
-    "Documentation",
-    "Help and Documentation, various books.",
-    "./pattern-documentation",
-    "Documentation",
-    "5200"
-  ],
-  "devel_C_C++": [
-    "Development",
-    "Tools and libraries for software development using C/C++ and other derivative\nof the C programming language.",
-    "./pattern-c-devel",
-    "C/C++ Development",
-    "3240"
-  ],
-  "devel_basis": [
-    "Development",
-    "Minimal set of tools for compiling and linking applications.",
-    "./pattern-basis-devel",
-    "Base Development",
-    "3140"
-  ],
-  "devel_rpm_build": [
-    "Development",
-    "Minimal set of tools and libraries for building packages using the RPM package manager.",
-    "./pattern-rpm-devel",
-    "RPM Build Environment",
-    "3280"
-  ],
-  "wsl_base": [
-    "Development",
-    "This package contains the wsl_base pattern: recommended configs,tools,libraries for using WSL.",
-    "./pattern-generic",
-    "Base WSL packages",
-    ""
-  ]
-}
+[
+  {
+    "name": "xfce",
+    "category": "Graphical Environments",
+    "icon": "./pattern-xfce",
+    "description": "Xfce is a lightweight desktop environment for various *NIX systems.",
+    "summary": "XFCE Desktop Environment",
+    "order": "1310"
+  },
+  {
+    "name": "basic_desktop",
+    "category": "Graphical Environments",
+    "icon": "./pattern-x11",
+    "description": "This pattern installs a rather basic desktop (icewm)",
+    "summary": "A very basic desktop (previously part of x11 pattern)",
+    "order": "1802"
+  },
+  {
+    "name": "yast2_server",
+    "category": "Base Technologies",
+    "icon": "./yast",
+    "description": "YaST tools for server system administration.",
+    "summary": "YaST Server Utilities",
+    "order": "1224"
+  },
+  {
+    "name": "office",
+    "category": "Desktop Functions",
+    "icon": "./pattern-office",
+    "description": "Office software for your desktop environment including LibreOffice.",
+    "summary": "Office Software",
+    "order": "1640"
+  },
+  {
+    "name": "gnome",
+    "category": "Graphical Environments",
+    "icon": "./pattern-gnome-wayland",
+    "description": "The GNOME desktop environment is an intuitive and attractive desktop for users.\nThis pattern installs components for GNOME to run with Wayland and X11 technologies.",
+    "summary": "GNOME Desktop Environment (Wayland)",
+    "order": "1010"
+  },
+  {
+    "name": "kde",
+    "category": "Graphical Environments",
+    "icon": "./pattern-kde",
+    "description": "Packages providing the Plasma desktop environment and applications from KDE.",
+    "summary": "KDE Applications and Plasma Desktop",
+    "order": "1110"
+  },
+  {
+    "name": "multimedia",
+    "category": "Desktop Functions",
+    "icon": "./pattern-multimedia",
+    "description": "Multimedia players, sound editing tools, video and image manipulation applications.",
+    "summary": "Multimedia",
+    "order": "1580"
+  },
+  {
+    "name": "yast2_basis",
+    "category": "Base Technologies",
+    "icon": "./yast",
+    "description": "YaST tools for basic system administration.",
+    "summary": "YaST Base Utilities",
+    "order": "1220"
+  },
+  {
+    "name": "yast2_desktop",
+    "category": "Base Technologies",
+    "icon": "./yast",
+    "description": "YaST tools for desktop system administration.",
+    "summary": "YaST Desktop Utilities",
+    "order": "1222"
+  }
+]
diff --git a/web/src/components/software/PatternSelector.test.jsx b/web/src/components/software/PatternSelector.test.jsx
index 5039721310..f871f29f34 100644
--- a/web/src/components/software/PatternSelector.test.jsx
+++ b/web/src/components/software/PatternSelector.test.jsx
@@ -21,84 +21,55 @@
 
 import React from "react";
 import { screen, within } from "@testing-library/react";
-import { installerRender } from "~/test-utils";
-
-import { createClient } from "~/client";
+import { plainRender } from "~/test-utils";
 
 import test_patterns from "./PatternSelector.test.json";
 import PatternSelector from "./PatternSelector";
 
-jest.mock("~/client");
-const selectedPatternsFn = jest.fn().mockResolvedValue([]);
-const getUsedSpaceFn = jest.fn().mockResolvedValue("1 Gb");
-const getIssuesFn = jest.fn().mockResolvedValue([]);
-const patternsFn = jest.fn().mockResolvedValue(test_patterns);
-
-beforeEach(() => {
-  createClient.mockImplementation(() => {
-    return {
-      software: {
-        selectedPatterns: selectedPatternsFn,
-        getUsedSpace: getUsedSpaceFn,
-        getIssues: getIssuesFn,
-        patterns: patternsFn
-      },
-    };
-  });
-});
-
-const PatternItemMock = ({ pattern }) => <h3>{pattern.summary}</h3>;
-jest.mock("~/components/software/PatternItem", () => ({ pattern }) => { return <PatternItemMock pattern={pattern} /> });
-
 describe("PatternSelector", () => {
-  it("displays a summary", async () => {
-    installerRender(<PatternSelector />);
-    const summarySection = await screen.findByRole("region", { name: /Software summary/ });
-    within(summarySection).findByText(/Installation will take/);
-  });
-
-  it("displays an input for filtering", async () => {
-    installerRender(<PatternSelector />);
-    const summarySection = await screen.findByRole("region", { name: /Software summary/ });
-    within(summarySection).getByRole("textbox", { name: "Search" });
-  });
-
-  it("displays the pattern groups in correct order", async () => {
-    installerRender(<PatternSelector />);
-    const headings = await screen.findAllByRole("heading", { level: 2 });
-    const headingsText = headings.map(node => node.textContent);
-    expect(headingsText).toEqual(["Documentation", "Base Technologies", "Development"]);
+  it("displays the pattern groups in the correct order", () => {
+    plainRender(<PatternSelector patterns={test_patterns} />);
+    const headings = screen.getAllByRole("heading", { level: 2 });
+    const headingsText = headings.map((node) => node.textContent);
+    expect(headingsText).toEqual([
+      "Graphical Environments",
+      "Base Technologies",
+      "Desktop Functions",
+    ]);
   });
 
   it("displays the patterns in a group in correct order", async () => {
-    installerRender(<PatternSelector />);
+    plainRender(
+      <PatternSelector patterns={test_patterns} />,
+    );
 
-    // the "Development" pattern group
-    const develGroup = await screen.findByRole("region", { name: "Development" });
+    // the "Base Technologies" pattern group
+    const baseGroup = await screen.findByRole("region", { name: "Base Technologies" });
 
-    // the "Development" pattern names
-    const develPatternsHeadings = within(develGroup).getAllByRole("heading", { level: 3 });
-    const develPatterns = develPatternsHeadings.map((node) => node.textContent);
+    // the pattern names
+    const rows = within(baseGroup).getAllByRole("row");
 
-    // sorted by order, the WSL pattern with empty order is the last one
-    expect(develPatterns).toEqual(["Base Development", "C/C++ Development", "RPM Build Environment", "Base WSL packages"]);
+    expect(rows[0]).toHaveTextContent(/YaST Base Utilities/);
+    expect(rows[1]).toHaveTextContent(/YaST Desktop Utilities/);
+    expect(rows[2]).toHaveTextContent(/YaST Server Utilities/);
   });
 
   it("displays only the matching patterns when using the search filter", async () => {
-    const { user } = installerRender(<PatternSelector />);
+    const { user } = plainRender(
+      <PatternSelector patterns={test_patterns} />,
+    );
 
-    // enter "wsl" into the search filter
+    // enter "multimedia" into the search filter
     const searchFilter = await screen.findByRole("textbox", { name: "Search" });
-    await user.type(searchFilter, "wsl");
-
-    // the "Development" pattern group
-    const develGroup = screen.getByRole("region", { name: "Development" });
+    await user.type(searchFilter, "multimedia");
 
-    // the "Development" pattern names
-    const develPatternsHeadings = within(develGroup).getAllByRole("heading", { level: 3 });
-    const develPatterns = develPatternsHeadings.map((node) => node.textContent);
+    const headings = screen.getAllByRole("heading", { level: 2 });
+    const headingsText = headings.map((node) => node.textContent);
+    expect(headingsText).toEqual(["Desktop Functions"]);
 
-    // only the WSL pattern is displayed
-    expect(develPatterns).toEqual(["Base WSL packages"]);
+    const desktopGroup = screen.getByRole("region", { name: "Desktop Functions" });
+    expect(within(desktopGroup).queryByRole("row", { name: /Multimedia/ })).toBeInTheDocument();
+    expect(within(desktopGroup).queryByRole("row", { name: /Office Software/ })).not
+      .toBeInTheDocument();
   });
 });

From 738ed3e3d745e9e78b81bf6ba6e997d7fdde99f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 18:53:50 +0000
Subject: [PATCH 129/324] Copyright updates

---
 web/src/components/software/PatternSelector.jsx      | 2 +-
 web/src/components/software/PatternSelector.test.jsx | 2 +-
 web/src/components/software/SoftwarePage.jsx         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 227c5e8d71..419f7ec52a 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2023] SUSE LLC
+ * Copyright (c) [2023-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
diff --git a/web/src/components/software/PatternSelector.test.jsx b/web/src/components/software/PatternSelector.test.jsx
index f871f29f34..2f33f41c7f 100644
--- a/web/src/components/software/PatternSelector.test.jsx
+++ b/web/src/components/software/PatternSelector.test.jsx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2023] SUSE LLC
+ * Copyright (c) [2023-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
diff --git a/web/src/components/software/SoftwarePage.jsx b/web/src/components/software/SoftwarePage.jsx
index fa00082ada..2c51e3180a 100644
--- a/web/src/components/software/SoftwarePage.jsx
+++ b/web/src/components/software/SoftwarePage.jsx
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2023] SUSE LLC
+ * Copyright (c) [2023-2024] SUSE LLC
  *
  * All Rights Reserved.
  *

From 97eabe8105f4b437fd0efb516037f82558c8ef15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 20:56:10 +0000
Subject: [PATCH 130/324] Extend SoftwarePage and PatternSelector tests

---
 .../components/software/PatternSelector.jsx   |  2 +-
 .../software/PatternSelector.test.jsx         | 29 ++++++++++++--
 .../components/software/SoftwarePage.test.jsx | 39 +++++++++++++++----
 3 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 419f7ec52a..7773075b86 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -35,7 +35,7 @@ import { noop } from "~/utils";
  * @property {string} description long description of the pattern
  * @property {string} order display order (string!)
  * @property {string} icon icon name (not path or file name!)
- * @property {number|undefined} selected who selected the pattern, undefined
+ * @property {number} selected who selected the pattern, undefined
  *   means it is not selected to install
  */
 
diff --git a/web/src/components/software/PatternSelector.test.jsx b/web/src/components/software/PatternSelector.test.jsx
index 2f33f41c7f..6e8e60bca5 100644
--- a/web/src/components/software/PatternSelector.test.jsx
+++ b/web/src/components/software/PatternSelector.test.jsx
@@ -25,10 +25,13 @@ import { plainRender } from "~/test-utils";
 
 import test_patterns from "./PatternSelector.test.json";
 import PatternSelector from "./PatternSelector";
+import { SelectedBy } from "~/client/software";
+
+const patterns = test_patterns.map((p) => ({ ...p, selectedBy: SelectedBy.NONE }));
 
 describe("PatternSelector", () => {
   it("displays the pattern groups in the correct order", () => {
-    plainRender(<PatternSelector patterns={test_patterns} />);
+    plainRender(<PatternSelector patterns={patterns} />);
     const headings = screen.getAllByRole("heading", { level: 2 });
     const headingsText = headings.map((node) => node.textContent);
     expect(headingsText).toEqual([
@@ -40,7 +43,7 @@ describe("PatternSelector", () => {
 
   it("displays the patterns in a group in correct order", async () => {
     plainRender(
-      <PatternSelector patterns={test_patterns} />,
+      <PatternSelector patterns={patterns} />,
     );
 
     // the "Base Technologies" pattern group
@@ -56,7 +59,7 @@ describe("PatternSelector", () => {
 
   it("displays only the matching patterns when using the search filter", async () => {
     const { user } = plainRender(
-      <PatternSelector patterns={test_patterns} />,
+      <PatternSelector patterns={patterns} />,
     );
 
     // enter "multimedia" into the search filter
@@ -72,4 +75,24 @@ describe("PatternSelector", () => {
     expect(within(desktopGroup).queryByRole("row", { name: /Office Software/ })).not
       .toBeInTheDocument();
   });
+
+  it("displays the checkbox depending whether the patter is selected", async () => {
+    const pattern = patterns.find((p) => p.name === "yast2_basis");
+    pattern.selectedBy = SelectedBy.USER;
+
+    plainRender(
+      <PatternSelector patterns={patterns} />,
+    );
+
+    // the "Base Technologies" pattern group
+    const baseGroup = await screen.findByRole("region", { name: "Base Technologies" });
+
+    const rowBasis = within(baseGroup).getByRole("row", { name: /YaST Base/ });
+    const checkboxBasis = await within(rowBasis).findByRole("checkbox");
+    expect(checkboxBasis).toBeChecked();
+
+    const rowDesktop = within(baseGroup).getByRole("row", { name: /YaST Desktop/ });
+    const checkboxDesktop = await within(rowDesktop).findByRole("checkbox");
+    expect(checkboxDesktop).not.toBeChecked();
+  });
 });
diff --git a/web/src/components/software/SoftwarePage.test.jsx b/web/src/components/software/SoftwarePage.test.jsx
index d27aaea9d8..fab6768193 100644
--- a/web/src/components/software/SoftwarePage.test.jsx
+++ b/web/src/components/software/SoftwarePage.test.jsx
@@ -21,36 +21,49 @@
 
 import React from "react";
 
-import { act, screen } from "@testing-library/react";
+import { act, screen, within } from "@testing-library/react";
 import { installerRender } from "~/test-utils";
 import { BUSY, IDLE } from "~/client/status";
 import { createClient } from "~/client";
-
+import test_patterns from "./PatternSelector.test.json";
 import SoftwarePage from "./SoftwarePage";
 
 jest.mock("~/client");
+
 const getStatusFn = jest.fn();
 const onStatusChangeFn = jest.fn();
+const onSelectedPatternsChangedFn = jest.fn();
+const selectPatternsFn = jest.fn();
+const proposal = {
+  patterns: { yast2_basis: 1 },
+  size: "1.8 GiB",
+};
+
 beforeEach(() => {
   createClient.mockImplementation(() => {
     return {
       software: {
         getStatus: getStatusFn,
-        onStatusChange: onStatusChangeFn
+        onStatusChange: onStatusChangeFn,
+        onSelectedPatternsChanged: onSelectedPatternsChangedFn,
+        getPatterns: jest.fn().mockResolvedValue(test_patterns),
+        getProposal: jest.fn().mockResolvedValue(proposal),
+        selectPatterns: selectPatternsFn,
       },
     };
   });
 });
+
 jest.mock("@patternfly/react-core", () => {
   const original = jest.requireActual("@patternfly/react-core");
 
   return {
     ...original,
-    Skeleton: () => <span>Skeleton Mock</span>
+    Skeleton: () => <span>Skeleton Mock</span>,
   };
 });
+
 jest.mock("~/components/core/Sidebar", () => () => <div>Agama sidebar</div>);
-jest.mock("~/components/software/PatternSelector", () => () => "PatternSelector Mock");
 
 describe("SoftwarePage", () => {
   it("displays a progress when the backend in busy", async () => {
@@ -59,9 +72,19 @@ describe("SoftwarePage", () => {
     screen.getAllByText("Skeleton Mock");
   });
 
-  it("displays the PatternSelector when the backend in ready", async () => {
+  it("clicking in a pattern's checkbox selects the pattern", async () => {
     getStatusFn.mockResolvedValue(IDLE);
-    await act(async () => installerRender(<SoftwarePage />));
-    screen.getByText("PatternSelector Mock");
+
+    const { user } = installerRender(<SoftwarePage />);
+    const button = await screen.findByRole("button", { name: "Change selection" });
+    await user.click(button);
+
+    const basePatterns = await screen.findByRole("region", {
+      name: "Base Technologies",
+    });
+    const row = await within(basePatterns).findByRole("row", { name: /YaST Base/ });
+    const checkbox = await within(row).findByRole("checkbox");
+
+    expect(checkbox).toBeChecked();
   });
 });

From c2090899d5f2a53282fd2e5deb7010dd3ae4c633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 22 Mar 2024 22:33:21 +0000
Subject: [PATCH 131/324] Fix indentation

---
 rust/Cargo.lock                            | 858 ++++++++++-----------
 service/lib/agama/dbus/software/manager.rb |   2 +-
 2 files changed, 410 insertions(+), 450 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index a1074e1097..aa3ca3b46b 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -49,7 +49,7 @@ version = "1.0.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -144,9 +144,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -158,9 +158,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -197,9 +197,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -211,9 +211,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
@@ -245,9 +245,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
 
 [[package]]
 name = "async-broadcast"
@@ -261,13 +261,13 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c"
+checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3"
 dependencies = [
  "concurrent-queue",
- "event-listener 4.0.0",
- "event-listener-strategy",
+ "event-listener 5.2.0",
+ "event-listener-strategy 0.5.0",
  "futures-core",
  "pin-project-lite",
 ]
@@ -307,18 +307,18 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.2.2"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7"
+checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
 dependencies = [
- "async-lock 3.2.0",
+ "async-lock 3.3.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
- "futures-lite 2.1.0",
+ "futures-lite 2.3.0",
  "parking",
- "polling 3.3.1",
- "rustix 0.38.28",
+ "polling 3.5.0",
+ "rustix 0.38.32",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -335,12 +335,12 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c"
+checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
 dependencies = [
- "event-listener 4.0.0",
- "event-listener-strategy",
+ "event-listener 4.0.3",
+ "event-listener-strategy 0.4.0",
  "pin-project-lite",
 ]
 
@@ -357,19 +357,19 @@ dependencies = [
  "cfg-if",
  "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.38.28",
+ "rustix 0.38.32",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "async-recursion"
-version = "1.0.5"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
+checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -378,13 +378,13 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
 dependencies = [
- "async-io 2.2.2",
+ "async-io 2.3.2",
  "async-lock 2.8.0",
  "atomic-waker",
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.28",
+ "rustix 0.38.32",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.48.0",
@@ -409,24 +409,24 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.5.0"
+version = "4.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1"
+checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
 
 [[package]]
 name = "async-trait"
-version = "0.1.77"
+version = "0.1.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -452,10 +452,10 @@ dependencies = [
  "base64 0.21.7",
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
- "hyper 1.1.0",
+ "hyper 1.2.0",
  "hyper-util",
  "itoa",
  "matchit",
@@ -487,7 +487,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
  "mime",
@@ -510,7 +510,7 @@ dependencies = [
  "bytes",
  "futures-util",
  "headers",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
  "mime",
@@ -523,9 +523,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "95d8e92cac0961e91dbd517496b00f7e9b92363dbe6d42c3198268323798860c"
 dependencies = [
  "addr2line",
  "cc",
@@ -554,7 +554,7 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "cexpr",
  "clang-sys",
  "itertools",
@@ -565,7 +565,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -591,9 +591,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 dependencies = [
  "serde",
 ]
@@ -620,20 +620,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
 dependencies = [
  "async-channel",
- "async-lock 3.2.0",
+ "async-lock 3.3.0",
  "async-task",
  "fastrand 2.0.1",
  "futures-io",
- "futures-lite 2.1.0",
+ "futures-lite 2.3.0",
  "piper",
  "tracing",
 ]
 
 [[package]]
 name = "brotli"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f"
+checksum = "d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -652,9 +652,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.15.0"
+version = "3.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f"
+checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
 
 [[package]]
 name = "bytecount"
@@ -670,18 +670,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
 
 [[package]]
 name = "cexpr"
@@ -700,22 +697,22 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.34"
+version = "0.4.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
+checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
 name = "chrono-tz"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76"
+checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e"
 dependencies = [
  "chrono",
  "chrono-tz-build",
@@ -754,9 +751,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.0"
+version = "4.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
+checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -764,9 +761,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.0"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
@@ -777,14 +774,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.0"
+version = "4.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
+checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -830,22 +827,22 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "const-random"
-version = "0.1.17"
+version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
 dependencies = [
  "const-random-macro",
 ]
@@ -888,30 +885,27 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.17"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "crunchy"
@@ -931,24 +925,24 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.44"
+version = "0.4.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
+checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
 dependencies = [
  "curl-sys",
  "libc",
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.4.10",
- "winapi",
+ "socket2 0.5.6",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.4.70+curl-8.5.0"
+version = "0.4.72+curl-8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e"
+checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea"
 dependencies = [
  "cc",
  "libc",
@@ -956,7 +950,7 @@ dependencies = [
  "openssl-sys",
  "pkg-config",
  "vcpkg",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -980,7 +974,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -991,7 +985,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1002,9 +996,9 @@ checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
 
 [[package]]
 name = "deranged"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
  "serde",
@@ -1064,9 +1058,9 @@ dependencies = [
 
 [[package]]
 name = "enumflags2"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939"
+checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -1074,13 +1068,13 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
+checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -1118,9 +1112,20 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "4.0.0"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae"
+checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1133,7 +1138,17 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
 dependencies = [
- "event-listener 4.0.0",
+ "event-listener 4.0.3",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291"
+dependencies = [
+ "event-listener 5.2.0",
  "pin-project-lite",
 ]
 
@@ -1220,24 +1235,24 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
@@ -1256,9 +1271,9 @@ dependencies = [
 
 [[package]]
 name = "futures-lite"
-version = "2.1.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143"
+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -1266,32 +1281,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-core",
  "futures-macro",
@@ -1314,9 +1329,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1359,17 +1374,17 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "h2"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9"
+checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.11",
- "indexmap 2.1.0",
+ "http 0.2.12",
+ "indexmap 2.2.5",
  "slab",
  "tokio",
  "tokio-util",
@@ -1378,17 +1393,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943"
+checksum = "51ee2dd2e4f378392eeff5d51618cd9a63166a2513846bbc55f21cfacd9199d4"
 dependencies = [
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 1.0.0",
- "indexmap 2.1.0",
+ "http 1.1.0",
+ "indexmap 2.2.5",
  "slab",
  "tokio",
  "tokio-util",
@@ -1422,7 +1437,7 @@ dependencies = [
  "base64 0.21.7",
  "bytes",
  "headers-core",
- "http 1.0.0",
+ "http 1.1.0",
  "httpdate",
  "mime",
  "sha1",
@@ -1434,20 +1449,20 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
 dependencies = [
- "http 1.0.0",
+ "http 1.1.0",
 ]
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -1475,9 +1490,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -1486,9 +1501,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -1502,7 +1517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http 0.2.11",
+ "http 0.2.12",
  "pin-project-lite",
 ]
 
@@ -1513,18 +1528,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
  "bytes",
- "http 1.0.0",
+ "http 1.1.0",
 ]
 
 [[package]]
 name = "http-body-util"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840"
+checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
 dependencies = [
  "bytes",
- "futures-util",
- "http 1.0.0",
+ "futures-core",
+ "http 1.1.0",
  "http-body 1.0.0",
  "pin-project-lite",
 ]
@@ -1557,14 +1572,14 @@ dependencies = [
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
- "http 0.2.11",
+ "h2 0.3.25",
+ "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio",
  "tower-service",
  "tracing",
@@ -1573,20 +1588,21 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75"
+checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.2",
- "http 1.0.0",
+ "h2 0.4.3",
+ "http 1.1.0",
  "http-body 1.0.0",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
+ "smallvec",
  "tokio",
 ]
 
@@ -1611,11 +1627,11 @@ checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
- "hyper 1.1.0",
+ "hyper 1.2.0",
  "pin-project-lite",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio",
 ]
 
@@ -1671,9 +1687,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.3",
@@ -1682,9 +1698,9 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
 dependencies = [
  "console",
  "instant",
@@ -1745,9 +1761,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1792,9 +1808,9 @@ dependencies = [
 
 [[package]]
 name = "jsonwebtoken"
-version = "9.2.0"
+version = "9.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4"
+checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
 dependencies = [
  "base64 0.21.7",
  "js-sys",
@@ -1819,9 +1835,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libsystemd"
@@ -1843,9 +1859,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.12"
+version = "1.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b"
+checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
 dependencies = [
  "cc",
  "libc",
@@ -1867,9 +1883,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "locale_config"
@@ -1896,9 +1912,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 dependencies = [
  "value-bag",
 ]
@@ -1908,6 +1924,9 @@ name = "macaddr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "malloc_buf"
@@ -1926,9 +1945,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "memoffset"
@@ -1972,18 +1991,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi",
@@ -2026,7 +2045,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "cfg-if",
  "libc",
 ]
@@ -2084,28 +2103,33 @@ checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa"
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
 dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -2126,9 +2150,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
 ]
@@ -2145,9 +2169,9 @@ dependencies = [
 
 [[package]]
 name = "num_threads"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
 dependencies = [
  "libc",
 ]
@@ -2189,9 +2213,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -2208,7 +2232,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -2225,7 +2249,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -2368,9 +2392,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.7"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546"
+checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8"
 dependencies = [
  "memchr",
  "thiserror",
@@ -2379,9 +2403,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.7"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809"
+checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026"
 dependencies = [
  "pest",
  "pest_generator",
@@ -2389,22 +2413,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.7"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e"
+checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.7"
+version = "2.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a"
+checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293"
 dependencies = [
  "once_cell",
  "pest",
@@ -2466,7 +2490,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -2494,9 +2518,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "polling"
@@ -2516,14 +2540,14 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.3.1"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e"
+checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
  "pin-project-lite",
- "rustix 0.38.28",
+ "rustix 0.38.32",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -2582,9 +2606,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
 dependencies = [
  "unicode-ident",
 ]
@@ -2649,9 +2673,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2661,9 +2685,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2678,17 +2702,17 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reqwest"
-version = "0.11.24"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.24",
- "http 0.2.11",
+ "h2 0.3.25",
+ "http 0.2.12",
  "http-body 0.4.6",
  "hyper 0.14.28",
  "hyper-tls",
@@ -2718,16 +2742,17 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
+ "cfg-if",
  "getrandom",
  "libc",
  "spin",
  "untrusted",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2737,7 +2762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64 0.21.7",
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "serde",
  "serde_derive",
 ]
@@ -2780,14 +2805,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.12",
+ "linux-raw-sys 0.4.13",
  "windows-sys 0.52.0",
 ]
 
@@ -2808,17 +2833,17 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "schannel"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2852,29 +2877,29 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",
@@ -2883,9 +2908,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
+checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
 dependencies = [
  "itoa",
  "serde",
@@ -2899,7 +2924,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -2925,15 +2950,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270"
+checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a"
 dependencies = [
  "base64 0.21.7",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2943,23 +2968,23 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.6.1"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d"
+checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.27"
+version = "0.9.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
+checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "itoa",
  "ryu",
  "serde",
@@ -3026,9 +3051,9 @@ dependencies = [
 
 [[package]]
 name = "simplelog"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
+checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
 dependencies = [
  "log",
  "termcolor",
@@ -3052,9 +3077,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "socket2"
@@ -3068,12 +3093,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
+checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
 dependencies = [
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3119,9 +3144,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3167,28 +3192,27 @@ dependencies = [
 
 [[package]]
 name = "temp-dir"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab"
+checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
 
 [[package]]
 name = "tempfile"
-version = "3.8.1"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand 2.0.1",
- "redox_syscall",
- "rustix 0.38.28",
- "windows-sys 0.48.0",
+ "rustix 0.38.32",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
@@ -3199,35 +3223,35 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 0.38.28",
+ "rustix 0.38.32",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -3235,13 +3259,14 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
 dependencies = [
  "deranged",
  "itoa",
  "libc",
+ "num-conv",
  "num_threads",
  "powerfmt",
  "serde",
@@ -3257,10 +3282,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -3290,9 +3316,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.0"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "bytes",
@@ -3301,7 +3327,7 @@ dependencies = [
  "num_cpus",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2 0.5.6",
  "tokio-macros",
  "tracing",
  "windows-sys 0.48.0",
@@ -3315,7 +3341,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -3330,9 +3356,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -3341,9 +3367,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-test"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719"
+checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7"
 dependencies = [
  "async-stream",
  "bytes",
@@ -3380,14 +3406,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.6",
+ "toml_edit 0.22.9",
 ]
 
 [[package]]
@@ -3405,22 +3431,22 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "toml_datetime",
- "winnow 0.5.28",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.6"
+version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6"
+checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.1",
+ "winnow 0.6.5",
 ]
 
 [[package]]
@@ -3441,16 +3467,16 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
  "async-compression",
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "bytes",
  "futures-core",
  "futures-util",
- "http 1.0.0",
+ "http 1.1.0",
  "http-body 1.0.0",
  "http-body-util",
  "http-range-header",
@@ -3498,7 +3524,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
@@ -3562,7 +3588,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 1.0.0",
+ "http 1.1.0",
  "httparse",
  "log",
  "rand",
@@ -3606,9 +3632,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
@@ -3618,18 +3644,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
@@ -3639,9 +3665,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unsafe-libyaml"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
 
 [[package]]
 name = "untrusted"
@@ -3688,7 +3714,7 @@ version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7"
 dependencies = [
- "indexmap 2.1.0",
+ "indexmap 2.2.5",
  "serde",
  "serde_json",
  "utoipa-gen",
@@ -3704,14 +3730,14 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "uuid"
-version = "1.6.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
  "getrandom",
  "serde",
@@ -3725,9 +3751,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "value-bag"
-version = "1.4.2"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe"
+checksum = "74797339c3b98616c009c7c3eb53a0ce41e85c8ec66bd3db96ed132d20cfdee8"
 
 [[package]]
 name = "vcpkg"
@@ -3764,9 +3790,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -3774,24 +3800,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -3801,9 +3827,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -3811,28 +3837,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "web-sys"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -3875,16 +3901,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.0",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -3902,22 +3919,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -3937,25 +3939,19 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -3964,15 +3960,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -3982,15 +3972,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4000,15 +3984,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4018,15 +3996,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4036,15 +4008,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4054,15 +4020,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4072,24 +4032,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "winnow"
-version = "0.5.28"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.6.1"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401"
+checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
 dependencies = [
  "memchr",
 ]
@@ -4106,11 +4066,11 @@ dependencies = [
 
 [[package]]
 name = "xdg-home"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd"
+checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e"
 dependencies = [
- "nix 0.26.4",
+ "libc",
  "winapi",
 ]
 
@@ -4125,9 +4085,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "3.14.1"
+version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948"
+checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6"
 dependencies = [
  "async-broadcast",
  "async-process",
@@ -4161,9 +4121,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "3.14.1"
+version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d"
+checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -4175,9 +4135,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_names"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9"
+checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d"
 dependencies = [
  "serde",
  "static_assertions",
@@ -4186,29 +4146,29 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.31"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.31"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.48",
+ "syn 2.0.53",
 ]
 
 [[package]]
 name = "zvariant"
-version = "3.15.0"
+version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c"
+checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db"
 dependencies = [
  "byteorder",
  "enumflags2",
@@ -4220,9 +4180,9 @@ dependencies = [
 
 [[package]]
 name = "zvariant_derive"
-version = "3.15.0"
+version = "3.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd"
+checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
diff --git a/service/lib/agama/dbus/software/manager.rb b/service/lib/agama/dbus/software/manager.rb
index 5028663df1..5a72a9b989 100644
--- a/service/lib/agama/dbus/software/manager.rb
+++ b/service/lib/agama/dbus/software/manager.rb
@@ -90,7 +90,7 @@ def issues
           dbus_method(:AddPattern, "in id:s, out result:b") { |p| backend.add_pattern(p) }
           dbus_method(:RemovePattern, "in id:s, out result:b") { |p| backend.remove_pattern(p) }
           dbus_method(:SetUserPatterns, "in add:as, in remove:as, out wrong:as") do |add, remove|
-           [backend.assign_patterns(add, remove)]
+            [backend.assign_patterns(add, remove)]
           end
 
           dbus_method :ProvisionsSelected, "in Provisions:as, out Result:ab" do |provisions|

From 5d84a2f2a713dd2987ba1264970b175065773119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Sat, 23 Mar 2024 10:12:12 +0000
Subject: [PATCH 132/324] Allow visiting Software section even if it is not
 ready

---
 .../components/overview/SoftwareSection.jsx   | 11 ++----
 .../overview/SoftwareSection.test.jsx         | 38 +++----------------
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/web/src/components/overview/SoftwareSection.jsx b/web/src/components/overview/SoftwareSection.jsx
index f4b3a45150..a427ca901e 100644
--- a/web/src/components/overview/SoftwareSection.jsx
+++ b/web/src/components/overview/SoftwareSection.jsx
@@ -34,7 +34,6 @@ const initialState = {
   errors: [],
   errorsRead: false,
   size: "",
-  patterns: {},
   progress: { message: _("Reading software repositories"), current: 0, total: 0, finished: false },
 };
 
@@ -52,8 +51,8 @@ const reducer = (state, action) => {
     case "UPDATE_PROPOSAL": {
       if (state.busy) return state;
 
-      const { errors, size, patterns } = action.payload;
-      return { ...state, errors, size, patterns, errorsRead: true };
+      const { errors, size } = action.payload;
+      return { ...state, errors, size, errorsRead: true };
     }
 
     default: {
@@ -85,9 +84,8 @@ export default function SoftwareSection({ showErrors }) {
     const updateProposal = async () => {
       const errors = await cancellablePromise(client.getIssues());
       const { size } = await cancellablePromise(client.getProposal());
-      const patterns = await cancellablePromise(client.getPatterns(true));
 
-      dispatch({ type: "UPDATE_PROPOSAL", payload: { errors, size, patterns } });
+      dispatch({ type: "UPDATE_PROPOSAL", payload: { errors, size } });
     };
 
     updateProposal();
@@ -146,8 +144,7 @@ export default function SoftwareSection({ showErrors }) {
       icon="apps"
       loading={state.busy}
       errors={errors.map(toValidationError)}
-      // do not display the pattern selector when there are no patterns to display
-      path={Object.keys(state.patterns).length > 0 ? "/software" : null}
+      path="/software"
       id="software"
     >
       <SectionContent />
diff --git a/web/src/components/overview/SoftwareSection.test.jsx b/web/src/components/overview/SoftwareSection.test.jsx
index f0f94638b3..f71d7ced1b 100644
--- a/web/src/components/overview/SoftwareSection.test.jsx
+++ b/web/src/components/overview/SoftwareSection.test.jsx
@@ -30,19 +30,17 @@ import { SoftwareSection } from "~/components/overview";
 jest.mock("~/client");
 
 const kdePattern = {
-  kde: [
-    "Graphical Environments",
-    "Packages providing the Plasma desktop environment and applications from KDE.",
-    "./pattern-kde",
-    "KDE Applications and Plasma 5 Desktop",
-    "1110",
-  ],
+  "name": "kde",
+  "category": "Graphical Environments",
+  "icon": "./pattern-kde",
+  "description": "Packages providing the Plasma desktop environment and applications from KDE.",
+  "summary": "KDE Applications and Plasma Desktop",
+  "order": "1110",
 };
 
 let getStatusFn = jest.fn().mockResolvedValue(IDLE);
 let getProgressFn = jest.fn().mockResolvedValue({});
 let getIssuesFn = jest.fn().mockResolvedValue([]);
-let getPatternsFn = jest.fn().mockResolvedValue(kdePattern);
 
 beforeEach(() => {
   createClient.mockImplementation(() => {
@@ -53,7 +51,6 @@ beforeEach(() => {
         getIssues: getIssuesFn,
         onStatusChange: noop,
         onProgressChange: noop,
-        getPatterns: getPatternsFn,
         getProposal: jest.fn().mockResolvedValue({ size: "500 MiB" }),
       },
     };
@@ -63,7 +60,6 @@ beforeEach(() => {
 describe("when the proposal is calculated", () => {
   beforeEach(() => {
     getStatusFn = jest.fn().mockResolvedValue(IDLE);
-    getPatternsFn = jest.fn().mockResolvedValue(kdePattern);
   });
 
   it("renders the required space", async () => {
@@ -72,28 +68,6 @@ describe("when the proposal is calculated", () => {
     await screen.findByText("500 MiB");
   });
 
-  describe("patterns are available", () => {
-    it("the header is a link", async () => {
-      const { container } = installerRender(<SoftwareSection showErrors />);
-      // wait until the component is fully rendered
-      await screen.findByText("Installation will take");
-      expect(container.querySelector("h2 a[href='/software']")).not.toBeNull();
-    });
-  });
-
-  describe("no patterns are available", () => {
-    beforeEach(() => {
-      getPatternsFn = jest.fn().mockResolvedValue({});
-    });
-
-    it("the header is a plain text", async () => {
-      const { container } = installerRender(<SoftwareSection showErrors />);
-      // wait until the component is fully rendered
-      await screen.findByText("Installation will take");
-      expect(container.querySelector("h2 a")).toBeNull();
-    });
-  });
-
   describe("and there are errors", () => {
     beforeEach(() => {
       getIssuesFn = jest.fn().mockResolvedValue([{ description: "Could not install..." }]);

From 15b20923e86cdee1551c0335b9bf116b62779eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 12:45:02 +0000
Subject: [PATCH 133/324] Update documentation style in software.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David Díaz <1691872+dgdavid@users.noreply.github.com>
---
 web/src/client/software.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 04a0c51117..3e86692d6a 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -79,12 +79,12 @@ const SelectedBy = Object.freeze({
 
 /**
  * @typedef {Object} Pattern
- * @property {string} name - pattern name (internal ID)
- * @property {string} category - pattern category
- * @property {string} summary - pattern name (user visible)
- * @property {string} description - long description of the pattern
- * @property {number} order - display order (string!)
- * @property {string} icon - icon name (not path or file name!)
+ * @property {string} name - Pattern name (internal ID).
+ * @property {string} category - Pattern category.
+ * @property {string} summary - User visible pattern name.
+ * @property {string} description - Long description of the pattern.
+ * @property {number} order - Display order (string!).
+ * @property {string} icon - Icon name (not path or file name!).
  */
 
 /**

From 5b937df8af7aaf4f12233497091f8ada631d42ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 12:57:24 +0000
Subject: [PATCH 134/324] Documentation fixes

---
 web/src/client/software.js                      | 2 +-
 web/src/components/software/PatternSelector.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 3e86692d6a..764a9d14c2 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -72,7 +72,7 @@ const SelectedBy = Object.freeze({
 
 /**
  * @typedef {object} SoftwareConfig
- * @property {Array<string>|undefined} patterns - An object where the keys are the pattern names
+ * @propery {Object.<string, boolean>} patterns - An object where the keys are the pattern names
  *   and the values whether to install them or not.
  * @property {string|undefined} product - Product to install.
  */
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 7773075b86..ceedc238fd 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -33,7 +33,7 @@ import { noop } from "~/utils";
  * @property {string} group pattern group
  * @property {string} summary pattern name (user visible)
  * @property {string} description long description of the pattern
- * @property {string} order display order (string!)
+ * @property {string} order display order
  * @property {string} icon icon name (not path or file name!)
  * @property {number} selected who selected the pattern, undefined
  *   means it is not selected to install

From 0b11396c4f6948ca4e10d6f5bdd0ff033067dc22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 15:00:09 +0000
Subject: [PATCH 135/324] Rename the authentication token

---
 rust/agama-server/src/web/auth.rs | 2 +-
 rust/agama-server/src/web/http.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/agama-server/src/web/auth.rs b/rust/agama-server/src/web/auth.rs
index cdb3eba495..5394cc5fbc 100644
--- a/rust/agama-server/src/web/auth.rs
+++ b/rust/agama-server/src/web/auth.rs
@@ -78,7 +78,7 @@ impl FromRequestParts<ServiceState> for TokenClaims {
                     .await
                     .map_err(|_| AuthError::MissingToken)?;
                 cookie
-                    .get("token")
+                    .get("agamaToken")
                     .ok_or(AuthError::MissingToken)?
                     .to_owned()
             }
diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index bbb71966c9..dce25e517e 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -60,7 +60,7 @@ pub async fn login(
     });
 
     let mut headers = HeaderMap::new();
-    let cookie = format!("token={}; HttpOnly", &token);
+    let cookie = format!("agamaToken={}; HttpOnly", &token);
     headers.insert(
         SET_COOKIE,
         cookie.parse().expect("could not build a valid cookie"),
@@ -74,7 +74,7 @@ pub async fn login(
 ))]
 pub async fn logout(_claims: TokenClaims) -> Result<impl IntoResponse, AuthError> {
     let mut headers = HeaderMap::new();
-    let cookie = "token=deleted; HttpOnly; Expires=Thu, 01 Jan 1970 00:00:00 GMT".to_string();
+    let cookie = "agamaToken=deleted; HttpOnly; Expires=Thu, 01 Jan 1970 00:00:00 GMT".to_string();
     headers.insert(
         SET_COOKIE,
         cookie.parse().expect("could not build a valid cookie"),

From 21fee15e19597f00076f045a1cb43110e25aeeaf Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 25 Mar 2024 18:05:21 +0000
Subject: [PATCH 136/324] Changes needed in the backend for the UI

---
 rust/agama-server/src/network/action.rs       |  6 ++-
 .../src/network/dbus/interfaces/common.rs     |  2 +-
 rust/agama-server/src/network/model.rs        | 11 +++--
 rust/agama-server/src/network/system.rs       | 12 +++--
 rust/agama-server/src/network/web.rs          | 46 ++++++++++++++-----
 5 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index ed29ec2a10..9e0967198a 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -26,8 +26,10 @@ pub enum Action {
         Connection,
         Responder<Result<OwnedObjectPath, NetworkStateError>>,
     ),
+    /// Gets a connection by its id
+    GetConnection(String, Responder<Option<Connection>>),
     /// Gets a connection by its Uuid
-    GetConnection(Uuid, Responder<Option<Connection>>),
+    GetConnectionByUuid(Uuid, Responder<Option<Connection>>),
     /// Gets a connection
     GetConnections(Responder<Vec<Connection>>),
     /// Gets a connection path
@@ -66,7 +68,7 @@ pub enum Action {
     /// Forces a wireless networks scan refresh
     RefreshScan(Responder<Result<(), NetworkAdapterError>>),
     /// Remove the connection with the given Uuid.
-    RemoveConnection(Uuid, Responder<Result<(), NetworkStateError>>),
+    RemoveConnection(String, Responder<Result<(), NetworkStateError>>),
     /// Apply the current configuration.
     Apply(Responder<Result<(), NetworkAdapterError>>),
 }
diff --git a/rust/agama-server/src/network/dbus/interfaces/common.rs b/rust/agama-server/src/network/dbus/interfaces/common.rs
index e5a49f122c..91838a689c 100644
--- a/rust/agama-server/src/network/dbus/interfaces/common.rs
+++ b/rust/agama-server/src/network/dbus/interfaces/common.rs
@@ -25,7 +25,7 @@ pub trait ConnectionInterface {
         let actions = self.actions().await;
         let (tx, rx) = oneshot::channel();
         actions
-            .send(Action::GetConnection(self.uuid(), tx))
+            .send(Action::GetConnectionByUuid(self.uuid(), tx))
             .unwrap();
         rx.await
             .unwrap()
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 7428942da1..f4d61020d8 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -149,9 +149,9 @@ impl NetworkState {
     /// Removes a connection from the state.
     ///
     /// Additionally, it registers the connection to be removed when the changes are applied.
-    pub fn remove_connection(&mut self, uuid: Uuid) -> Result<(), NetworkStateError> {
-        let Some(conn) = self.get_connection_by_uuid_mut(uuid) else {
-            return Err(NetworkStateError::UnknownConnection(uuid.to_string()));
+    pub fn remove_connection(&mut self, id: &str) -> Result<(), NetworkStateError> {
+        let Some(conn) = self.get_connection_mut(id) else {
+            return Err(NetworkStateError::UnknownConnection(id.to_string()));
         };
 
         conn.remove();
@@ -311,7 +311,7 @@ mod tests {
         let conn0 = Connection::new("eth0".to_string(), DeviceType::Ethernet);
         let uuid = conn0.uuid;
         state.add_connection(conn0).unwrap();
-        state.remove_connection(uuid).unwrap();
+        state.remove_connection("eth0".as_ref()).unwrap();
         let found = state.get_connection("eth0").unwrap();
         assert!(found.is_removed());
     }
@@ -319,7 +319,7 @@ mod tests {
     #[test]
     fn test_remove_unknown_connection() {
         let mut state = NetworkState::default();
-        let error = state.remove_connection(Uuid::new_v4()).unwrap_err();
+        let error = state.remove_connection("unknown".as_ref()).unwrap_err();
         assert!(matches!(error, NetworkStateError::UnknownConnection(_)));
     }
 
@@ -542,6 +542,7 @@ impl TryFrom<NetworkConnection> for Connection {
             connection.config = config.into();
         }
 
+        connection.ip_config.addresses = conn.addresses;
         connection.ip_config.nameservers = conn.nameservers;
         connection.ip_config.gateway4 = conn.gateway4;
         connection.ip_config.gateway6 = conn.gateway6;
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index afb0cf2b69..780f6bfbc7 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -98,7 +98,11 @@ impl<T: Adapter> NetworkSystem<T> {
                 let config = self.state.general_state.clone();
                 tx.send(config.clone()).unwrap();
             }
-            Action::GetConnection(uuid, tx) => {
+            Action::GetConnection(id, tx) => {
+                let conn = self.state.get_connection(id.as_ref());
+                tx.send(conn.cloned()).unwrap();
+            }
+            Action::GetConnectionByUuid(uuid, tx) => {
                 let conn = self.state.get_connection_by_uuid(uuid);
                 tx.send(conn.cloned()).unwrap();
             }
@@ -148,10 +152,8 @@ impl<T: Adapter> NetworkSystem<T> {
             Action::UpdateGeneralState(general_state) => {
                 self.state.general_state = general_state;
             }
-            Action::RemoveConnection(uuid, tx) => {
-                let mut tree = self.tree.lock().await;
-                tree.remove_connection(uuid).await?;
-                let result = self.state.remove_connection(uuid);
+            Action::RemoveConnection(id, tx) => {
+                let result = self.state.remove_connection(id.as_str());
 
                 tx.send(result).unwrap();
             }
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index a29624fdd9..9c4571c87e 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -14,7 +14,6 @@ use super::{error::NetworkStateError, model::GeneralState, Action, Adapter};
 use crate::network::{model::Connection, model::Device, NetworkSystem};
 use agama_lib::error::ServiceError;
 use agama_lib::network::settings::NetworkConnection;
-use uuid::Uuid;
 
 use serde_json::json;
 use thiserror::Error;
@@ -26,8 +25,10 @@ pub enum NetworkError {
     UnknownConnection(String),
     #[error("Cannot translate: {0}")]
     CannotTranslate(#[from] Error),
+    #[error("Cannot add new connection: {0}")]
+    CannotAddConnection(String),
     #[error("Cannot update configuration: {0}")]
-    CannotUpdate(Uuid),
+    CannotUpdate(String),
     #[error("Cannot apply configuration")]
     CannotApplyConfig,
     #[error("Network state error: {0}")]
@@ -167,7 +168,7 @@ async fn connections(State(state): State<NetworkState>) -> Json<Vec<NetworkConne
 async fn add_connection(
     State(state): State<NetworkState>,
     Json(conn): Json<NetworkConnection>,
-) -> Result<Json<Uuid>, NetworkError> {
+) -> Result<Json<Connection>, NetworkError> {
     let (tx, rx) = oneshot::channel();
 
     state
@@ -181,22 +182,31 @@ async fn add_connection(
     let _ = rx.await.unwrap();
 
     let conn = Connection::try_from(conn)?;
-    let uuid = conn.uuid.clone();
+    let id = conn.id.clone();
 
     state
         .actions
         .send(Action::UpdateConnection(Box::new(conn)))
         .unwrap();
 
-    Ok(Json(uuid))
+    let (tx, rx) = oneshot::channel();
+    state
+        .actions
+        .send(Action::GetConnection(id.clone(), tx))
+        .unwrap();
+
+    match rx.await.unwrap() {
+        None => Err(NetworkError::CannotAddConnection(id.clone())),
+        Some(conn) => Ok(Json(conn)),
+    }
 }
 
-#[utoipa::path(delete, path = "/network/connections/:uuid", responses(
+#[utoipa::path(delete, path = "/network/connections/:id", responses(
   (status = 200, description = "Delete connection", body = Connection)
 ))]
 async fn delete_connection(
     State(state): State<NetworkState>,
-    Path(id): Path<Uuid>,
+    Path(id): Path<String>,
 ) -> Result<Json<()>, NetworkError> {
     let (tx, rx) = oneshot::channel();
     state
@@ -212,16 +222,30 @@ async fn delete_connection(
     Ok(Json(()))
 }
 
-#[utoipa::path(put, path = "/network/connections/:uuid", responses(
+#[utoipa::path(put, path = "/network/connections/:id", responses(
   (status = 200, description = "Update connection", body = Connection)
 ))]
 async fn update_connection(
     State(state): State<NetworkState>,
-    Path(id): Path<Uuid>,
+    Path(id): Path<String>,
     Json(conn): Json<NetworkConnection>,
 ) -> Result<Json<()>, NetworkError> {
-    let mut conn = Connection::try_from(conn)?;
-    conn.uuid = id;
+    let (tx, rx) = oneshot::channel();
+    state
+        .actions
+        .send(Action::GetConnection(id.clone(), tx))
+        .unwrap();
+    let current_conn = rx.await.unwrap();
+    match current_conn {
+        Some(current) => {
+            if current.id != id.clone() {
+                return Err(NetworkError::UnknownConnection(id));
+            }
+        }
+        None => return Err(NetworkError::UnknownConnection(id)),
+    }
+
+    let conn = Connection::try_from(conn)?;
 
     state
         .actions

From 1f761cdb325110d0e9e7ca386f59603e897489e9 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 25 Mar 2024 18:06:03 +0000
Subject: [PATCH 137/324] Start adapting the Network UI for using the http API

---
 web/src/client/http.js                        |  21 ++
 web/src/client/index.js                       |   6 +-
 web/src/client/network/index.js               | 249 +++---------------
 web/src/client/network/model.js               |  69 ++---
 web/src/client/network/model.test.js          |  36 ++-
 web/src/client/network/utils.js               |   8 +-
 .../components/network/ConnectionsTable.jsx   |   6 +-
 web/src/components/network/IpSettingsForm.jsx |  19 +-
 web/src/components/network/NetworkPage.jsx    |  64 ++---
 .../components/overview/NetworkSection.jsx    |  37 +--
 web/src/components/overview/OverviewPage.jsx  |   2 +-
 11 files changed, 150 insertions(+), 367 deletions(-)

diff --git a/web/src/client/http.js b/web/src/client/http.js
index 4b3a123313..a44d97d82e 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -150,6 +150,27 @@ class HTTPClient {
     }
   }
 
+  /**
+   * @param {string} url - Endpoint URL (e.g., "/l10n/config").
+   * @param {object} data - Data to submit
+   * @return {Promise<object>} Server response.
+   */
+  async delete(url) {
+    const response = await fetch(`${this.baseUrl}/${url}`, {
+      method: "DELETE",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+
+    try {
+      return await response.json();
+    } catch (e) {
+      console.warn("Expecting a JSON response", e);
+      return response.status === 200;
+    }
+  }
+
   /**
    * Registers a handler for a given type of events.
    *
diff --git a/web/src/client/index.js b/web/src/client/index.js
index 63b6e2b422..50e9ad1fa6 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -77,7 +77,7 @@ const createClient = (url) => {
   const product = new ProductClient(client);
   const manager = new ManagerClient(client);
   // const monitor = new Monitor(address, MANAGER_SERVICE);
-  // const network = new NetworkClient(address);
+  const network = new NetworkClient(client);
   const software = new SoftwareClient(client);
   // const storage = new StorageClient(address);
   // const users = new UsersClient(address);
@@ -138,7 +138,7 @@ const createClient = (url) => {
     product,
     manager,
     // monitor,
-    // network,
+    network,
     software,
     // storage,
     // users,
@@ -147,7 +147,7 @@ const createClient = (url) => {
     onIssuesChange,
     isConnected,
     onDisconnect: (handler) => {
-      return () => {};
+      return () => { };
     },
     // onDisconnect: (handler) => monitor.onDisconnect(handler),
   };
diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index 0e02c0bced..b8b887a87e 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -25,6 +25,7 @@ import DBusClient from "../dbus";
 import { NetworkManagerAdapter } from "./network_manager";
 import cockpit from "../../lib/cockpit";
 import { createConnection, ConnectionTypes, ConnectionState } from "./model";
+import { formatIp } from "./utils";
 
 const SERVICE_NAME = "org.opensuse.Agama1";
 const CONNECTIONS_IFACE = "org.opensuse.Agama1.Network.Connections";
@@ -95,80 +96,47 @@ const NetworkEventTypes = Object.freeze({
  */
 class NetworkClient {
   /**
-   * @param {string} address - D-Bus address
+   * @param {import("../http").HTTPClient} client - HTTP client.
    */
-  constructor(address) {
-    this.subscribed = false;
-    this.nm = new NetworkManagerAdapter();
-    this.client = new DBusClient(SERVICE_NAME, address);
-    this.proxies = {
-      connectionsRoot: null,
-      connections: {},
-      ipConfigs: {},
-      wireless: {}
-    };
-    this.eventsHandler = null;
-    this.setUpDone = false;
-    this.handlers = [];
+  constructor(client) {
+    this.client = client;
   }
 
   /**
-   * Adds a callback to run when a network event happens (a connection is added,
-   * updated, removed, etc.).
+   * Returns the connection settings
    *
-   * @param {NetworkEventFn} handler - Callback function
-   * @return {() => void} Function to remove the handler
+   * @return {Promise<Connection[]>}
    */
-  onNetworkEvent(handler) {
-    this.handlers.push(handler);
-    return () => {
-      const position = this.handlers.indexOf(handler);
-      if (position > -1) this.handlers.splice(position, 1);
-    };
-  }
+  async connections() {
+    const connections = await this.client.get("/network/connections");
 
-  /**
-   * Set up the client
-   */
-  async setUp() {
-    if (this.setUpDone) return;
+    return connections.map((connection) => {
+      return this.fromApiConnection(connection);
+    });
+  }
 
-    this.proxies = {
-      connectionsRoot: await this.client.proxy(CONNECTIONS_IFACE, CONNECTIONS_PATH),
-      connections: await this.client.proxies(CONNECTION_IFACE, CONNECTIONS_NAMESPACE),
-      ipConfigs: await this.client.proxies(IP_IFACE, CONNECTIONS_NAMESPACE),
-      wireless: await this.client.proxies(WIRELESS_IFACE, CONNECTIONS_NAMESPACE)
-    };
+  fromApiConnection(connection) {
+    const addresses = (connection.addresses || []).map((address) => {
+      const [ip, netmask] = address.split("/");
+      return { address: ip, prefix: netmask };
+    });
 
-    this.setUpDone = true;
-    return this.nm.setUp(e => this.handlers.forEach(f => f(e)));
+    return { ...connection, addresses };
   }
 
-  /**
-   * Returns the active connections
-   *
-   * @return {ActiveConnection[]}
-   */
-  activeConnections() {
-    return this.nm.activeConnections();
-  }
+  toApiConnection(connection) {
+    const addresses = (connection.addresses || []).map((addr) => formatIp(addr));
 
-  /**
-   * Returns the connection settings
-   *
-   * @return {Promise<Connection[]>}
-   */
-  connections() {
-    return this.nm.connections();
+    return { ...connection, addresses };
   }
 
   /**
    * Returns the list of available wireless access points (AP)
    *
-   * @return {AccessPoint[]}
+   * @return {Promise<AccessPoint[]>}
    */
   accessPoints() {
-    return this.nm.accessPoints();
+    return this.client.get("/network/wifi");
   }
 
   /**
@@ -177,7 +145,7 @@ class NetworkClient {
    * @param {Connection} connection - connection to be activated
    */
   async connectTo(connection) {
-    return this.nm.connectTo(connection);
+    return this.client.post("/network/connections", connection);
   }
 
   /**
@@ -199,7 +167,7 @@ class NetworkClient {
     });
 
     // the connection is automatically activated when written
-    return this.addConnection(connection);
+    return this.connectTo(connection);
   }
 
   /**
@@ -212,166 +180,33 @@ class NetworkClient {
    * @return {Promise<Connection>} the added connection
    */
   async addConnection(connection) {
-    const { id } = connection;
-    const proxy = await this.client.proxy(CONNECTIONS_IFACE, CONNECTIONS_PATH);
-    const deviceType = (connection.wireless) ? DeviceType.WIRELESS : DeviceType.ETHERNET;
-    let path;
-    try {
-      path = await proxy.GetConnectionById(id);
-    } catch {
-      path = await proxy.AddConnection(id, deviceType);
-    }
-    await this.updateConnectionAt(path, connection);
-    return this.connectionFromPath(path);
+    return this.connectTo(connection);
   }
 
   /**
    * Returns the connection with the given ID
    *
-   * @param {string} uuid - Connection ID
+   * @param {string} id - Connection ID
    * @return {Promise<Connection|undefined>}
    */
-  async getConnection(uuid) {
-    const path = await this.getConnectionPath(uuid);
-    if (path) {
-      return this.connectionFromPath(path);
-    }
-  }
+  async getConnection(id) {
+    const connections = await this.connections();
 
-  /**
-   * Returns a connection from the given D-Bus path
-   *
-   * @param {string} path - Path of the D-Bus object representing the connection
-   * @return {Promise<Connection>}
-   */
-  async connectionFromPath(path) {
-    const connection = await this.proxies.connections[path];
-    const ip = await this.proxies.ipConfigs[path];
-
-    const conn = {
-      id: connection.Id,
-      uuid: connection.Uuid,
-      iface: connection.Interface,
-      ipv4: {
-        method: ip.Method4,
-        nameServers: ip.Nameservers,
-        addresses: ip.Addresses.map(addr => {
-          const [address, prefix] = addr.split("/");
-          return { address, prefix };
-        }),
-        gateway: ip.Gateway4
-      },
-    };
-
-    const wireless = await this.proxies.wireless[path];
-    if (wireless) {
-      conn.wireless = {
-        ssid: window.atob(wireless.SSID),
-        hidden: wireless.Hidden,
-        mode: wireless.Mode,
-        security: wireless.Security // see AgamaSecurityProtocols
-      };
-    }
-
-    return createConnection(conn);
-  }
-
-  /**
-   * Sets a property for a given path
-   *
-   * @param {string} path - Object path.
-   * @param {string} iface - Interface name.
-   * @param {object} values - Properties values (indexed by names). The value
-   *   should be created by using the cockpit.variant() function.
-   */
-  async setProperties(path, iface, values) {
-    for (const [prop, value] of Object.entries(values)) {
-      await this.setProperty(path, iface, prop, value);
-    }
-  }
-
-  /**
-   * Sets a property for a given path
-   *
-   * @param {string} path - Object path.
-   * @param {string} iface - Interface name.
-   * @param {string} property - Property name.
-   * @param {object} value - Property value. The value should be created by
-   *   using the cockpit.variant() function.
-   */
-  async setProperty(path, iface, property, value) {
-    return this.client.call(path, "org.freedesktop.DBus.Properties", "Set", [iface, property, value]);
-  }
-
-  /**
-   * Returns the D-Bus path of the connection.
-   *
-   * @param {string} uuid - Connection UUID
-   * @return {Promise<string|undefined>} - Connection D-Bus path
-   */
-  async getConnectionPath(uuid) {
-    for (const path in this.proxies.connections) {
-      const proxy = await this.proxies.connections[path];
-      if (proxy.Uuid === uuid) {
-        return path;
-      }
-    }
+    return connections.find((conn) => conn.id === id);
   }
 
   /**
    * Updates the connection
    *
-   * It uses the 'uuid' to match the connection in the backend.
+   * It uses the 'id' to match the connection in the backend.
    *
    * @param {Connection} connection - Connection to update
    * @return {Promise<boolean>} - the promise resolves to true if the connection
    *   was successfully updated and to false it it does not exist.
    */
-  async updateConnection(connection) {
-    const path = await this.getConnectionPath(connection.uuid);
-    if (path === undefined) {
-      return false;
-    }
-
-    await this.updateConnectionAt(path, connection);
-    return true;
-  }
-
-  /**
-   * Updates the connection in the given path
-   *
-   *
-   * @param {string} path - D-Bus path of the connection to update.
-   * @param {Connection} connection - Connection to update.
-   */
-  async updateConnectionAt(path, connection) {
-    const { ipv4, wireless } = connection;
-    const addresses = ipv4.addresses.map(a => `${a.address}/${a.prefix}`);
-    const ipv4_props = {
-      Method4: cockpit.variant("s", ipv4.method),
-      Gateway4: cockpit.variant("s", ipv4.gateway),
-      Addresses: cockpit.variant("as", addresses),
-      Nameservers: cockpit.variant("as", ipv4.nameServers)
-    };
-    await this.setProperties(path, IP_IFACE, ipv4_props);
-
-    if (wireless) {
-      const wireless_props = {
-        Mode: cockpit.variant("s", "infrastructure"),
-        Security: cockpit.variant("s", wireless.security),
-        SSID: cockpit.variant("ay", cockpit.byte_array(wireless.ssid)),
-        Hidden: cockpit.variant("b", !!wireless.hidden)
-      };
-
-      if (wireless.password) {
-        wireless_props.Password = cockpit.variant("s", wireless.password);
-      }
-
-      await this.setProperties(path, WIRELESS_IFACE, wireless_props);
-    }
-
-    // TODO: apply the changes only in this connection
-    return this.proxies.connectionsRoot.Apply();
+  updateConnection(connection) {
+    const conn = this.toApiConnection(connection);
+    return this.client.put(`/network/connections/${conn.id}`, conn);
   }
 
   /**
@@ -379,12 +214,12 @@ class NetworkClient {
    *
    * It uses the 'path' to match the connection in the backend.
    *
-   * @param {String} uuid - Connection uuid
+   * @param {String} id - Connection id
+   * @return {Promise<boolean>} - the promise resolves to true if the connection
+   *  was successfully deleted.
    */
-  async deleteConnection(uuid) {
-    const proxy = await this.client.proxy(CONNECTIONS_IFACE, CONNECTIONS_PATH);
-    await proxy.RemoveConnection(uuid);
-    return this.proxies.connectionsRoot.Apply();
+  deleteConnection(id) {
+    return this.client.delete(`/network/connections/${id}`);
   }
 
   /*
@@ -394,8 +229,8 @@ class NetworkClient {
    * @private
    * @return {Promise<IPAddress[]>}
    */
-  addresses() {
-    const conns = this.activeConnections();
+  async addresses() {
+    const conns = await this.connections();
     return conns.flatMap(c => c.addresses);
   }
 
@@ -403,7 +238,7 @@ class NetworkClient {
   * Returns network general settings
   */
   settings() {
-    return this.nm.settings();
+    return this.client.get("/network/state");
   }
 }
 
diff --git a/web/src/client/network/model.js b/web/src/client/network/model.js
index 1c224a05be..9a9d76a7ad 100644
--- a/web/src/client/network/model.js
+++ b/web/src/client/network/model.js
@@ -77,21 +77,16 @@ const SecurityProtocols = Object.freeze({
  * @property {number|string} prefix - like "16"
  */
 
-/**
- * @typedef {object} ActiveConnection
- * @property {string} id
- * @property {string} uuid
- * @property {string} type
- * @property {number} state
- * @property {IPAddress[]} addresses
- */
-
 /**
  * @typedef {object} Connection
  * @property {string} id
- * @property {string} uuid
  * @property {string} iface
- * @property {IPv4} [ipv4]
+ * @property {IPAddress[]} addresses
+ * @property {string[]} nameServers
+ * @property {string} gateway4
+ * @property {string} gateway6
+ * @property {string} method4
+ * @property {string} method6
  * @property {Wireless} [wireless]
  */
 
@@ -103,14 +98,6 @@ const SecurityProtocols = Object.freeze({
  * @property {boolean} hidden
  */
 
-/**
- * @typedef {object} IPv4
- * @property {string} method
- * @property {IPAddress[]} addresses
- * @property {string[]} nameServers
- * @property {string} gateway
- */
-
 /**
  * @typedef {object} AccessPoint
  * @property {string} ssid
@@ -121,31 +108,11 @@ const SecurityProtocols = Object.freeze({
 
 /**
 * @typedef {object} NetworkSettings
-* @property {boolean} wifiScanSupported
+* @property {boolean} connectivity
+* @property {boolean} wirelessEnabled
+* @property {boolean} networkingEnabled
 * @property {string} hostname
 
-/**
- * Returns an IPv4 configuration object
- *
- * Defaults values can be overridden
- *
- * @private
- * @param {object} props
- * @param {string} [props.method]
- * @param {IPAddress[]} [props.addresses]
- * @param {string[]} [props.nameServers]
- * @param {string} [props.gateway]
- * @return {IPv4}
- */
-const createIPv4 = ({ method, addresses, nameServers, gateway }) => {
-  return {
-    method: method || "auto",
-    addresses: addresses || [],
-    nameServers: nameServers || [],
-    gateway: gateway || "",
-  };
-};
-
 /**
  * Returns a connection object
  *
@@ -153,18 +120,26 @@ const createIPv4 = ({ method, addresses, nameServers, gateway }) => {
  *
  * @param {object} options
  * @param {string} [options.id] - Connection ID
- * @param {string} [options.uuid] - Connection UUID
+ * @param {string} [options.method4] - Connection IPv4 method
+ * @param {string} [options.method6] - Connection IPv6 method
+ * @param {string} [options.gateway4] - Connection IPv4 gateway
+ * @param {string} [options.gateway6] - Connection IPv6 gateway
  * @param {string} [options.iface] - Connection interface
- * @param {object} [options.ipv4] IPv4 Settings
+ * @param {IPAddress[]} [options.addresses] Connection addresses
+ * @param {string[]} [options.nameServers] Connection nameservers
  * @param {object} [options.wireless] Wireless Settings
  * @return {Connection}
  */
-const createConnection = ({ id, uuid, iface, ipv4, wireless }) => {
+const createConnection = ({ id, iface, method4, method6, gateway4, gateway6, addresses, nameServers, wireless }) => {
   const connection = {
     id,
-    uuid,
     iface,
-    ipv4: createIPv4(ipv4 || {}),
+    method4: method4 || "auto",
+    method6: method6 || "auto",
+    gateway4: gateway4 || "",
+    gateway6: gateway6 || "",
+    addresses: addresses || [],
+    nameServers: nameServers || []
   };
 
   if (wireless) connection.wireless = wireless;
diff --git a/web/src/client/network/model.test.js b/web/src/client/network/model.test.js
index babfb5c72c..9890a3db27 100644
--- a/web/src/client/network/model.test.js
+++ b/web/src/client/network/model.test.js
@@ -31,33 +31,31 @@ describe("createConnection", () => {
     expect(connection).toEqual({
       id: "Wired connection 1",
       iface: undefined,
-      uuid: undefined,
-      ipv4: {
-        method: "auto",
-        addresses: [],
-        nameServers: [],
-        gateway: ""
-      }
+      method4: "auto",
+      method6: "auto",
+      addresses: [],
+      nameServers: [],
+      gateway4: "",
+      gateway6: ""
     });
     expect(connection.wireless).toBeUndefined();
   });
 
   it("merges given properties", () => {
     const addresses = [{ address: "192.168.0.1", prefix: 24 }];
-    const connection = createConnection({ ipv4: { addresses, testing: 1 } });
-    expect(connection.ipv4).toEqual({
-      method: "auto",
-      addresses,
-      nameServers: [],
-      gateway: ""
-    });
+    const connection = createConnection({ addresses, testing: 1 });
+    expect(connection.method4).toEqual("auto");
+    expect(connection.gateway4).toEqual("auto");
+    expect(connection.addresses).toEqual([]);
+    expect(connection.nameServers).toEqual(addresses);
   });
+});
 
-  it("adds a wireless key when given", () => {
-    const wireless = { ssid: "MY_WIRELESS" };
-    const connection = createConnection({ id: "Wireless connection 1", wireless });
-    expect(connection.wireless).toEqual(wireless);
-  });
+it("adds a wireless key when given", () => {
+  const wireless = { ssid: "MY_WIRELESS" };
+  const connection = createConnection({ id: "Wireless connection 1", wireless });
+  expect(connection.wireless).toEqual(wireless);
+});
 });
 
 describe("createAccessPoint", () => {
diff --git a/web/src/client/network/utils.js b/web/src/client/network/utils.js
index 29d07a8aa8..0e8ac55e82 100644
--- a/web/src/client/network/utils.js
+++ b/web/src/client/network/utils.js
@@ -113,7 +113,13 @@ const stringToIPInt = (text) => {
  * @param {IPAddress} addr
  * @return {string}
  */
-const formatIp = addr => `${addr.address}/${addr.prefix}`;
+const formatIp = (addr) => {
+  if (addr.prefix === undefined) {
+    return `${addr.address}`;
+  } else {
+    return `${addr.address}/${addr.prefix}`;
+  }
+};
 
 export {
   isValidIp,
diff --git a/web/src/components/network/ConnectionsTable.jsx b/web/src/components/network/ConnectionsTable.jsx
index cbae048365..9b9f421f7d 100644
--- a/web/src/components/network/ConnectionsTable.jsx
+++ b/web/src/components/network/ConnectionsTable.jsx
@@ -82,12 +82,12 @@ export default function ConnectionsTable({
           ].filter(Boolean);
 
           return (
-            <Tr key={connection.uuid}>
+            <Tr key={connection.id}>
               <Td dataLabel={_("Name")}>{connection.id}</Td>
-              <Td dataLabel={_("IP addresses")}>{connection.addresses.map(formatIp).join(", ")}</Td>
+              <Td dataLabel={_("IP addresses")}>{connection.addresses?.map(formatIp).join(", ")}</Td>
               <Td isActionCell>
                 <RowActions
-                  id={`actions-for-connection-${connection.uuid}`}
+                  id={`actions-for-connection-${connection.id}`}
                   // TRANSLATORS: %s is replaced by a network connection name
                   aria-label={sprintf(_("Actions for connection %s"), connection.id)}
                   actions={actions}
diff --git a/web/src/components/network/IpSettingsForm.jsx b/web/src/components/network/IpSettingsForm.jsx
index 8244590143..a74589919f 100644
--- a/web/src/components/network/IpSettingsForm.jsx
+++ b/web/src/components/network/IpSettingsForm.jsx
@@ -37,13 +37,12 @@ const usingDHCP = (method) => method === METHODS.AUTO;
 
 export default function IpSettingsForm({ connection, onClose }) {
   const client = useInstallerClient();
-  const { ipv4 = {} } = connection;
-  const [addresses, setAddresses] = useState(ipv4.addresses);
-  const [nameServers, setNameServers] = useState(ipv4.nameServers.map(a => {
+  const [addresses, setAddresses] = useState(connection.addresses);
+  const [nameServers, setNameServers] = useState(connection.nameservers.map(a => {
     return { address: a };
   }));
-  const [method, setMethod] = useState(ipv4.method || "auto");
-  const [gateway, setGateway] = useState(ipv4.gateway || "");
+  const [method, setMethod] = useState(connection.method4);
+  const [gateway, setGateway] = useState(connection.gateway4);
   const [errors, setErrors] = useState({});
 
   const isSetAsInvalid = field => Object.keys(errors).includes(field);
@@ -103,12 +102,10 @@ export default function IpSettingsForm({ connection, onClose }) {
     // TODO: deal with DNS servers
     const updatedConnection = {
       ...connection,
-      ipv4: {
-        addresses: sanitizedAddresses,
-        method,
-        gateway,
-        nameServers: sanitizedNameServers.map(s => s.address)
-      }
+      addresses: sanitizedAddresses,
+      method4: method,
+      gatewa4: gateway,
+      nameservers: sanitizedNameServers.map(s => s.address)
     };
 
     client.network.updateConnection(updatedConnection)
diff --git a/web/src/components/network/NetworkPage.jsx b/web/src/components/network/NetworkPage.jsx
index e61f48dbd9..0a7396f7c4 100644
--- a/web/src/components/network/NetworkPage.jsx
+++ b/web/src/components/network/NetworkPage.jsx
@@ -82,9 +82,7 @@ const NoWifiConnections = ({ wifiScanSupported, openWifiSelector }) => {
  */
 export default function NetworkPage() {
   const { network: client } = useInstallerClient();
-  const [initialized, setInitialized] = useState(false);
-  const [ready, setReady] = useState(false);
-  const [connections, setConnections] = useState([]);
+  const [connections, setConnections] = useState(undefined);
   const [selectedConnection, setSelectedConnection] = useState(null);
   const [wifiScanSupported, setWifiScanSupported] = useState(false);
   const [wifiSelectorOpen, setWifiSelectorOpen] = useState(false);
@@ -93,60 +91,26 @@ export default function NetworkPage() {
   const closeWifiSelector = () => setWifiSelectorOpen(false);
 
   useEffect(() => {
-    client.setUp().then(() => setInitialized(true));
-  }, [client]);
+    if (connections !== undefined) return;
 
-  useEffect(() => {
-    if (!initialized) return;
-
-    setWifiScanSupported(client.settings().wifiScanSupported);
-    setConnections(client.activeConnections());
-    setReady(true);
-  }, [client, initialized]);
-
-  useEffect(() => {
-    return client.onNetworkEvent(({ type, payload }) => {
-      switch (type) {
-        case NetworkEventTypes.ACTIVE_CONNECTION_ADDED: {
-          setConnections(conns => {
-            const newConnections = conns.filter(c => c.id !== payload.id);
-            return [...newConnections, payload];
-          });
-          break;
-        }
-
-        case NetworkEventTypes.ACTIVE_CONNECTION_UPDATED: {
-          setConnections(conns => {
-            const newConnections = conns.filter(c => c.id !== payload.id);
-            return [...newConnections, payload];
-          });
-          break;
-        }
+    client.settings().then((s) => setWifiScanSupported(s.wirelessEnabled));
+    client.connections().then(setConnections);
+  }, [client, connections]);
 
-        case NetworkEventTypes.ACTIVE_CONNECTION_REMOVED: {
-          setConnections(conns => conns.filter(c => c.id !== payload.id));
-          break;
-        }
-
-        case NetworkEventTypes.SETTINGS_UPDATED: {
-          setWifiScanSupported(payload.wifiScanSupported);
-        }
-      }
-    });
-  });
-
-  const selectConnection = ({ uuid }) => {
-    client.getConnection(uuid).then(setSelectedConnection);
+  const selectConnection = ({ id }) => {
+    client.getConnection(id).then(setSelectedConnection);
   };
 
-  const forgetConnection = async ({ uuid }) => {
-    await client.deleteConnection(uuid);
+  const forgetConnection = async ({ id }) => {
+    await client.deleteConnection(id);
   };
 
-  const activeWiredConnections = connections.filter(c => c.type === ConnectionTypes.ETHERNET);
-  const activeWifiConnections = connections.filter(c => c.type === ConnectionTypes.WIFI);
+  const ready = connections !== undefined;
+  console.log(connections);
 
   const WifiConnections = () => {
+    const activeWifiConnections = connections.filter(c => c.wireless);
+
     if (activeWifiConnections.length === 0) {
       return (
         <NoWifiConnections wifiScanSupported={wifiScanSupported} openWifiSelector={openWifiSelector} />
@@ -159,6 +123,8 @@ export default function NetworkPage() {
   };
 
   const WiredConnections = () => {
+    const activeWiredConnections = connections.filter(c => !c.wireless);
+
     if (activeWiredConnections.length === 0) return <NoWiredConnections />;
 
     return <ConnectionsTable connections={activeWiredConnections} onEdit={selectConnection} />;
diff --git a/web/src/components/overview/NetworkSection.jsx b/web/src/components/overview/NetworkSection.jsx
index 5eecc682c3..3fd4f3e0c2 100644
--- a/web/src/components/overview/NetworkSection.jsx
+++ b/web/src/components/overview/NetworkSection.jsx
@@ -30,43 +30,28 @@ import { _, n_ } from "~/i18n";
 
 export default function NetworkSection() {
   const { network: client } = useInstallerClient();
-  const [initialized, setInitialized] = useState(false);
-  const [connections, setConnections] = useState([]);
+  const [connections, setConnections] = useState(undefined);
 
   useEffect(() => {
-    client.setUp().then(() => setInitialized(true));
-  }, [client]);
+    if (connections !== undefined) return;
 
-  useEffect(() => {
-    if (initialized) {
-      setConnections(client.activeConnections());
-    }
-  }, [client, initialized]);
-
-  useEffect(() => {
-    if (!initialized) return;
-
-    return client.onNetworkEvent(() => {
-      setConnections(client.activeConnections());
-    });
-  }, [client, initialized]);
+    client.connections().then(setConnections);
+  }, [client, connections]);
 
   const Content = () => {
-    if (!initialized) return <SectionSkeleton />;
-
-    const activeConnections = connections.filter(c => [ConnectionTypes.WIFI, ConnectionTypes.ETHERNET].includes(c.type));
+    if (connections === undefined) return <SectionSkeleton />;
 
-    if (activeConnections.length === 0) return _("No network connections detected");
+    if (connections.length === 0) return _("No network connections detected");
 
-    const summary = activeConnections.map(connection => (
-      <Em key={connection.uuid}>{connection.id} - {connection.addresses.map(formatIp)}</Em>
+    const summary = connections.map(connection => (
+      <Em key={connection.id}>{connection.id} - {connection.addresses.map(formatIp).join(", ")}</Em>
     ));
 
     const msg = sprintf(
       // TRANSLATORS: header for the list of active network connections,
       // %d is replaced by the number of active connections
-      n_("%d connection set:", "%d connections set:", activeConnections.length),
-      activeConnections.length
+      n_("%d connection set:", "%d connections set:", connections.length),
+      connections.length
     );
 
     return (
@@ -82,7 +67,7 @@ export default function NetworkSection() {
       // TRANSLATORS: page section title
       title={_("Network")}
       icon="settings_ethernet"
-      loading={!initialized}
+      loading={!connections}
       path="/network"
       id="network"
     >
diff --git a/web/src/components/overview/OverviewPage.jsx b/web/src/components/overview/OverviewPage.jsx
index b51a6129d0..51cc21436b 100644
--- a/web/src/components/overview/OverviewPage.jsx
+++ b/web/src/components/overview/OverviewPage.jsx
@@ -47,7 +47,6 @@ export default function OverviewPage() {
   //     // TRANSLATORS: page title
   //     title={_("Installation Summary")}
   //   >
-  //     <NetworkSection />
   //     <StorageSection showErrors />
   //     <UsersSection showErrors={showErrors} />
 
@@ -65,6 +64,7 @@ export default function OverviewPage() {
     >
       <ProductSection />
       <L10nSection />
+      <NetworkSection />
       <SoftwareSection showErrors />
     </Page>
   );

From 0549f4fa67a982fd1e75731245b02815778ccf7c Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 26 Mar 2024 08:58:18 +0100
Subject: [PATCH 138/324] initial commit of users service

---
 rust/Cargo.lock                      |   3 +
 rust/agama-lib/src/users.rs          |   2 +-
 rust/agama-lib/src/users/client.rs   |   1 +
 rust/agama-lib/src/users/settings.rs |   2 +-
 rust/agama-server/src/lib.rs         |   1 +
 rust/agama-server/src/users.rs       |   2 +
 rust/agama-server/src/users/web.rs   | 116 +++++++++++++++++++++++++++
 rust/agama-server/src/web.rs         |   3 +-
 rust/agama-server/src/web/event.rs   |   9 ++-
 9 files changed, 135 insertions(+), 4 deletions(-)
 create mode 100644 rust/agama-server/src/users.rs
 create mode 100644 rust/agama-server/src/users/web.rs

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index a1074e1097..aeac4854b6 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -1908,6 +1908,9 @@ name = "macaddr"
 version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baee0bbc17ce759db233beb01648088061bf678383130602a298e6998eedb2d8"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "malloc_buf"
diff --git a/rust/agama-lib/src/users.rs b/rust/agama-lib/src/users.rs
index a7dc878639..9ee6a72b5a 100644
--- a/rust/agama-lib/src/users.rs
+++ b/rust/agama-lib/src/users.rs
@@ -1,7 +1,7 @@
 //! Implements support for handling the users settings
 
 mod client;
-mod proxies;
+pub mod proxies;
 mod settings;
 mod store;
 
diff --git a/rust/agama-lib/src/users/client.rs b/rust/agama-lib/src/users/client.rs
index 437ff3f21d..6b2729a354 100644
--- a/rust/agama-lib/src/users/client.rs
+++ b/rust/agama-lib/src/users/client.rs
@@ -66,6 +66,7 @@ impl Settings for FirstUser {
 }
 
 /// D-Bus client for the users service
+#[derive(Clone)]
 pub struct UsersClient<'a> {
     users_proxy: Users1Proxy<'a>,
 }
diff --git a/rust/agama-lib/src/users/settings.rs b/rust/agama-lib/src/users/settings.rs
index 39b31c1484..c902896156 100644
--- a/rust/agama-lib/src/users/settings.rs
+++ b/rust/agama-lib/src/users/settings.rs
@@ -17,7 +17,7 @@ pub struct UserSettings {
 /// First user settings
 ///
 /// Holds the settings for the first user.
-#[derive(Debug, Default, Settings, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, Settings, Serialize, Deserialize, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct FirstUserSettings {
     /// First user's full name
diff --git a/rust/agama-server/src/lib.rs b/rust/agama-server/src/lib.rs
index 3cb0e78344..a483ef2e6f 100644
--- a/rust/agama-server/src/lib.rs
+++ b/rust/agama-server/src/lib.rs
@@ -4,5 +4,6 @@ pub mod manager;
 pub mod network;
 pub mod questions;
 pub mod software;
+pub mod users;
 pub mod web;
 pub use web::service;
diff --git a/rust/agama-server/src/users.rs b/rust/agama-server/src/users.rs
new file mode 100644
index 0000000000..2356d1ef98
--- /dev/null
+++ b/rust/agama-server/src/users.rs
@@ -0,0 +1,2 @@
+pub mod web;
+pub use web::{users_service, add_users_streams};
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
new file mode 100644
index 0000000000..b5ad736d95
--- /dev/null
+++ b/rust/agama-server/src/users/web.rs
@@ -0,0 +1,116 @@
+//!
+//! The module offers two public functions:
+//!
+//! * `users_service` which returns the Axum service.
+//! * `users_stream` which offers an stream that emits the users events coming from D-Bus.
+
+use axum::{
+    extract::State,
+    routing::{get, post, put},
+    Json, Router,
+};
+use serde::{Deserialize, Serialize};
+use std::{collections::HashMap, pin::Pin};
+use tokio_stream::{Stream, StreamExt, StreamMap};
+use crate::{
+    error::Error,
+    web::{
+        common::{issues_router, progress_router, service_status_router},
+        Event,
+    },
+};
+use agama_lib::{
+    connection, error::ServiceError, users::{
+        proxies::Users1Proxy, FirstUserSettings, UsersClient
+    }
+};
+
+#[derive(Clone)]
+struct UsersState<'a> {
+    users: UsersClient<'a>,
+}
+
+/// Returns an stream that emits users related events coming from D-Bus.
+///
+/// It emits the Event::RootPasswordChange, Event::RootSSHKeyChanged and Event::FirstUserChanged events.
+///
+/// * `connection`: D-Bus connection to listen for events.
+/// * `map`: stream map to which it adds streams
+pub async fn add_users_streams(
+    dbus: zbus::Connection,
+    mut map: StreamMap<&str, Pin<Box<dyn Stream<Item = Event> + Send>>>,
+) -> Result<StreamMap<&str, Pin<Box<dyn Stream<Item = Event> + Send>>>, Error> {
+    map.insert("first_user", Box::pin(first_user_changed_stream(dbus.clone()).await?));
+    map.insert("root_password", Box::pin(root_password_changed_stream(dbus.clone()).await?));
+    map.insert("root_sshkey", Box::pin(root_ssh_key_changed_stream(dbus.clone()).await?));
+    Ok(map)
+}
+
+async fn first_user_changed_stream(dbus: zbus::Connection,
+) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = Users1Proxy::new(&dbus).await?;
+    let stream = proxy
+        .receive_first_user_changed()
+        .await
+        .then(|change| async move {
+            if let Ok(user) = change.get().await {
+                let user_struct = FirstUserSettings {
+                    full_name: Some(user.0),
+                    user_name: Some(user.1),
+                    password: Some(user.2),
+                    autologin: Some(user.3),
+                };
+                return Some(Event::FirstUserChanged(user_struct));
+            }
+            None
+        })
+        .filter_map(|e| e);
+    Ok(stream)
+}
+
+async fn root_password_changed_stream(dbus: zbus::Connection,
+) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = Users1Proxy::new(&dbus).await?;
+    let stream = proxy
+        .receive_root_password_set_changed()
+        .await
+        .then(|change| async move {
+            if let Ok(is_set) = change.get().await {
+                return Some(Event::RootPasswordChanged { password_is_set: is_set });
+            }
+            None
+        })
+        .filter_map(|e| e);
+    Ok(stream)
+}
+
+async fn root_ssh_key_changed_stream(dbus: zbus::Connection,
+) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = Users1Proxy::new(&dbus).await?;
+    let stream = proxy
+        .receive_root_sshkey_changed()
+        .await
+        .then(|change| async move {
+            if let Ok(key) = change.get().await {
+                let value = if key.is_empty() {
+                    None 
+                } else {
+                    Some(key)
+                };
+                return Some(Event::RootSSHKeyChanged { key: value });
+            }
+            None
+        })
+        .filter_map(|e| e);
+    Ok(stream)
+}
+
+/// Sets up and returns the axum service for the software module.
+pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
+
+    let users = UsersClient::new(dbus).await?;
+    let state = UsersState { users };
+    let router = Router::new()
+        .with_state(state);
+    Ok(router)
+}
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index c87d219594..8278c67324 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -11,6 +11,7 @@ use crate::{
     network::{web::network_service, NetworkManagerAdapter},
     questions::web::{questions_service, questions_stream},
     software::web::{software_service, software_stream},
+    users::web::{users_service, add_users_streams},
     web::common::{issues_stream, progress_stream, service_status_stream},
 };
 use axum::Router;
@@ -105,7 +106,7 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
         )
         .await?,
     );
-
+    stream = add_users_streams(dbus.clone(), stream).await?;
     stream.insert("software", software_stream(dbus.clone()).await?);
     stream.insert(
         "software-status",
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 255886a1e4..73f2c82ce4 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -1,5 +1,5 @@
 use crate::l10n::web::LocaleConfig;
-use agama_lib::{manager::InstallationPhase, progress::Progress, software::SelectedBy};
+use agama_lib::{manager::InstallationPhase, progress::Progress, software::SelectedBy, users::FirstUserSettings};
 use serde::Serialize;
 use std::collections::HashMap;
 use tokio::sync::broadcast::{Receiver, Sender};
@@ -21,6 +21,13 @@ pub enum Event {
     ProductChanged {
         id: String,
     },
+    FirstUserChanged(FirstUserSettings),
+    RootPasswordChanged {
+        password_is_set: bool
+    },
+    RootSSHKeyChanged {
+        key: Option<String>,
+    },
     PatternsChanged(HashMap<String, SelectedBy>),
     QuestionsChanged,
     InstallationPhaseChanged {

From 5902ba9f7b9e54fc787a4738cc9c722951c5e232 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 26 Mar 2024 11:10:48 +0100
Subject: [PATCH 139/324] use tuple of streams instead of StreamMap

---
 rust/agama-server/src/users.rs     |  2 +-
 rust/agama-server/src/users/web.rs | 26 ++++++++++++++------------
 rust/agama-server/src/web.rs       |  6 ++++--
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/rust/agama-server/src/users.rs b/rust/agama-server/src/users.rs
index 2356d1ef98..76ddbc68ee 100644
--- a/rust/agama-server/src/users.rs
+++ b/rust/agama-server/src/users.rs
@@ -1,2 +1,2 @@
 pub mod web;
-pub use web::{users_service, add_users_streams};
+pub use web::{users_service, users_streams};
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index b5ad736d95..ce5b652dce 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -10,6 +10,7 @@ use axum::{
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
+use zbus::PropertyStream;
 use std::{collections::HashMap, pin::Pin};
 use tokio_stream::{Stream, StreamExt, StreamMap};
 use crate::{
@@ -30,24 +31,25 @@ struct UsersState<'a> {
     users: UsersClient<'a>,
 }
 
-/// Returns an stream that emits users related events coming from D-Bus.
+/// Returns streams that emits users related events coming from D-Bus.
 ///
 /// It emits the Event::RootPasswordChange, Event::RootSSHKeyChanged and Event::FirstUserChanged events.
 ///
 /// * `connection`: D-Bus connection to listen for events.
-/// * `map`: stream map to which it adds streams
-pub async fn add_users_streams(
+pub async fn users_streams(
     dbus: zbus::Connection,
-    mut map: StreamMap<&str, Pin<Box<dyn Stream<Item = Event> + Send>>>,
-) -> Result<StreamMap<&str, Pin<Box<dyn Stream<Item = Event> + Send>>>, Error> {
-    map.insert("first_user", Box::pin(first_user_changed_stream(dbus.clone()).await?));
-    map.insert("root_password", Box::pin(root_password_changed_stream(dbus.clone()).await?));
-    map.insert("root_sshkey", Box::pin(root_ssh_key_changed_stream(dbus.clone()).await?));
-    Ok(map)
+) -> Result<Vec<(String, Pin<Box<dyn Stream<Item = Event> + Send>>)>, Error> {
+    let result : Vec<(String, Pin<Box<dyn Stream<Item = Event> + Send>>)> = vec![
+      ("first_user".to_string(), Box::pin(first_user_changed_stream(dbus.clone()).await?)),
+      ("root_password".to_string(), Box::pin(root_password_changed_stream(dbus.clone()).await?)),
+      ("root_sshkey".to_string(), Box::pin(root_ssh_key_changed_stream(dbus.clone()).await?)),
+    ];
+
+    Ok(result)
 }
 
 async fn first_user_changed_stream(dbus: zbus::Connection,
-) -> Result<impl Stream<Item = Event>, Error> {
+) -> Result<impl Stream<Item = Event> + Send, Error> {
     let proxy = Users1Proxy::new(&dbus).await?;
     let stream = proxy
         .receive_first_user_changed()
@@ -69,7 +71,7 @@ async fn first_user_changed_stream(dbus: zbus::Connection,
 }
 
 async fn root_password_changed_stream(dbus: zbus::Connection,
-) -> Result<impl Stream<Item = Event>, Error> {
+) -> Result<impl Stream<Item = Event> + Send, Error> {
     let proxy = Users1Proxy::new(&dbus).await?;
     let stream = proxy
         .receive_root_password_set_changed()
@@ -85,7 +87,7 @@ async fn root_password_changed_stream(dbus: zbus::Connection,
 }
 
 async fn root_ssh_key_changed_stream(dbus: zbus::Connection,
-) -> Result<impl Stream<Item = Event>, Error> {
+) -> Result<impl Stream<Item = Event> + Send, Error> {
     let proxy = Users1Proxy::new(&dbus).await?;
     let stream = proxy
         .receive_root_sshkey_changed()
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 8278c67324..ef17ecf7b1 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -11,7 +11,7 @@ use crate::{
     network::{web::network_service, NetworkManagerAdapter},
     questions::web::{questions_service, questions_stream},
     software::web::{software_service, software_stream},
-    users::web::{users_service, add_users_streams},
+    users::web::{users_service, users_streams},
     web::common::{issues_stream, progress_stream, service_status_stream},
 };
 use axum::Router;
@@ -106,7 +106,9 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
         )
         .await?,
     );
-    stream = add_users_streams(dbus.clone(), stream).await?;
+    for (id, user_stream) in users_streams(dbus.clone()).await? {
+        stream.insert(id.as_str(), user_stream);
+    }
     stream.insert("software", software_stream(dbus.clone()).await?);
     stream.insert(
         "software-status",

From 2e6c2c2b0fa3feade4d64094cd5f6b9649987539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 07:15:09 +0000
Subject: [PATCH 140/324] Add a Firefox startup script

---
 live/startup | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 live/startup

diff --git a/live/startup b/live/startup
new file mode 100644
index 0000000000..67a13b7103
--- /dev/null
+++ b/live/startup
@@ -0,0 +1,39 @@
+#!/usr/bin/env sh
+
+FIREFOX_PROFILE=$HOME/.mozilla/firefox/profile
+COOKIES_DB=$FIREFOX_PROFILE/cookies.sqlite
+TOKEN_FILE=/run/agama/token
+
+if [ ! -f $COOKIES_DB ]; then
+  mkdir -p $FIREFOX_PROFILE
+  sqlite3 $COOKIES_DB "CREATE TABLE moz_cookies (
+    id INTEGER PRIMARY KEY,
+    originAttributes TEXT NOT NULL DEFAULT '',
+    name TEXT,
+    value TEXT,
+    host TEXT,
+    path TEXT,
+    expiry INTEGER,
+    lastAccessed INTEGER,
+    creationTime INTEGER,
+    isSecure INTEGER,
+    isHttpOnly INTEGER,
+    inBrowserElement INTEGER DEFAULT 0,
+    sameSite INTEGER DEFAULT 0,
+    rawSameSite INTEGER DEFAULT 0,
+    schemeMap INTEGER DEFAULT 0,
+    CONSTRAINT moz_uniqueid UNIQUE (name, host, path, originAttributes));"
+else
+  sqlite3 $COOKIES_DB "DELETE FROM moz_cookies WHERE name = 'agamaToken';"
+fi
+
+NOW=$(date +%s)
+VALUE=$(cat $TOKEN_FILE)
+EXPIRATION=$(date --date '1 day' +%s)
+
+sqlite3 $COOKIES_DB "INSERT INTO moz_cookies \
+  (name, value, host, path, expiry, creationTime, isSecure, isHttpOnly, inBrowserElement, sameSite, rawSameSite, schemeMap) \
+  VALUES \
+  ('agamaToken', '$VALUE', 'localhost', '/api', $EXPIRATION, $NOW, 0, 1, 0, 1, 0, 1);"
+
+firefox --kiosk --profile $HOME/.mozilla/firefox/profile http://localhost/

From 469a92c4acca90f2e3714cc532863959e89ca2bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 07:15:47 +0000
Subject: [PATCH 141/324] Optionally write the token when starting the server

---
 rust/agama-server/src/agama-web-server.rs | 26 +++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/agama-web-server.rs b/rust/agama-server/src/agama-web-server.rs
index 215250ede5..8a14168782 100644
--- a/rust/agama-server/src/agama-web-server.rs
+++ b/rust/agama-server/src/agama-web-server.rs
@@ -1,4 +1,7 @@
 use std::{
+    fs,
+    io::{self, Write},
+    os::unix::fs::OpenOptionsExt,
     path::{Path, PathBuf},
     process::{ExitCode, Termination},
 };
@@ -6,8 +9,9 @@ use std::{
 use agama_lib::connection_to;
 use agama_server::{
     l10n::helpers,
-    web::{self, run_monitor},
+    web::{self, generate_token, run_monitor},
 };
+use anyhow::Context;
 use clap::{Args, Parser, Subcommand};
 use tokio::sync::broadcast::channel;
 use tracing_subscriber::prelude::*;
@@ -35,6 +39,8 @@ pub struct ServeArgs {
     // Directory containing the web UI code.
     #[arg(long)]
     web_ui_dir: Option<PathBuf>,
+    #[arg(long)]
+    generate_token: Option<PathBuf>,
 }
 
 #[derive(Parser, Debug)]
@@ -62,7 +68,7 @@ fn find_web_ui_dir() -> PathBuf {
 ///
 /// `args`: command-line arguments.
 async fn serve_command(args: ServeArgs) -> anyhow::Result<()> {
-    let journald = tracing_journald::layer().expect("could not connect to journald");
+    let journald = tracing_journald::layer().context("could not connect to journald")?;
     tracing_subscriber::registry().with(journald).init();
 
     let listener = tokio::net::TcpListener::bind(&args.address)
@@ -73,6 +79,11 @@ async fn serve_command(args: ServeArgs) -> anyhow::Result<()> {
     run_monitor(tx.clone()).await?;
 
     let config = web::ServiceConfig::load()?;
+
+    if let Some(token_file) = args.generate_token {
+        write_token(&token_file, &config.jwt_secret).context("could not create the token file")?;
+    }
+
     let dbus = connection_to(&args.dbus_address).await?;
     let web_ui_dir = args.web_ui_dir.unwrap_or(find_web_ui_dir());
     let service = web::service(config, tx, dbus, web_ui_dir).await?;
@@ -96,6 +107,17 @@ async fn run_command(cli: Cli) -> anyhow::Result<()> {
     }
 }
 
+fn write_token(path: &PathBuf, secret: &str) -> io::Result<()> {
+    let token = generate_token(secret);
+    let mut file = fs::OpenOptions::new()
+        .create(true)
+        .write(true)
+        .mode(0o400)
+        .open(path)?;
+    file.write_all(token.as_bytes())?;
+    Ok(())
+}
+
 /// Represents the result of execution.
 pub enum CliResult {
     /// Successful execution.

From 8936558f56e8f38b697e9247f23212e45e566c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 07:31:33 +0000
Subject: [PATCH 142/324] Add the agama-web-server service

---
 rust/package/agama.spec             | 17 +++++++++++++++--
 rust/share/agama-web-server.service | 14 ++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 rust/share/agama-web-server.service

diff --git a/rust/package/agama.spec b/rust/package/agama.spec
index 2eeddf579f..828eb5095a 100644
--- a/rust/package/agama.spec
+++ b/rust/package/agama.spec
@@ -90,8 +90,8 @@ install -D -p -m 644 %{_builddir}/agama/share/agama.pam $RPM_BUILD_ROOT%{_pam_ve
 install -D -d -m 0755 %{buildroot}%{_datadir}/agama-cli
 install -m 0644 %{_builddir}/agama/agama-lib/share/profile.schema.json %{buildroot}%{_datadir}/agama-cli
 install --directory %{buildroot}%{_datadir}/dbus-1/agama-services
-install -m 0644 --target-directory=%{buildroot}%{_datadir}/dbus-1/agama-services %{_builddir}/agama/share/*.service
-
+install -m 0644 --target-directory=%{buildroot}%{_datadir}/dbus-1/agama-services %{_builddir}/agama/share/org.opensuse.Agama1.service
+install -D -m 0644 %{_builddir}/agama/share/agama-web-server.service %{buildroot}%{_unitdir}/agama-web-server.service
 
 %check
 PATH=$PWD/share/bin:$PATH
@@ -102,11 +102,24 @@ echo $PATH
 %{cargo_test}
 %endif
 
+%pre
+%service_add_pre agama-web-server.service
+
+%post
+%service_add_post agama-web-server.service
+
+%preun
+%service_del_preun agama-web-server.service
+
+%postun
+%service_del_preun agama-web-server.service
+
 %files
 %{_bindir}/agama-dbus-server
 %{_bindir}/agama-web-server
 %{_datadir}/dbus-1/agama-services
 %{_pam_vendordir}/agama
+%{_unitdir}/agama-web-server.service
 
 %files -n agama-cli
 %{_bindir}/agama
diff --git a/rust/share/agama-web-server.service b/rust/share/agama-web-server.service
new file mode 100644
index 0000000000..d858c0b21a
--- /dev/null
+++ b/rust/share/agama-web-server.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Agama Web Server
+After=network-online.target
+Requires=agama.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/agama-web-server serve --address 0.0.0.0:80 --generate-token /run/agama/token
+PIDFile=/run/agama/web.pid
+User=root
+TimeoutStopSec=5
+
+[Install]
+WantedBy=default.target

From b8ef5f5f553797148bd7761313594672a51bfc6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 16:27:15 +0000
Subject: [PATCH 143/324] Disable @typescript-eslint/no-unused-vars

---
 web/.eslintrc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/.eslintrc.json b/web/.eslintrc.json
index 0414e890f6..1e82edd3c9 100644
--- a/web/.eslintrc.json
+++ b/web/.eslintrc.json
@@ -36,7 +36,7 @@
         "no-var": "error",
         "no-multi-str": "off",
         "no-use-before-define": "off",
-        "@typescript-eslint/no-unused-vars": ["warn", { "ignoreRestSiblings": true }],
+        "@typescript-eslint/no-unused-vars": "off",
         "@typescript-eslint/no-use-before-define": "warn",
         "@typescript-eslint/ban-ts-comment": "off",
         "lines-between-class-members": ["error", "always", { "exceptAfterSingleLine": true }],

From 4bc5a752ec5ce043af7641416fa1be8649f68065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 17:10:24 +0000
Subject: [PATCH 144/324] Update the agama-web-ui.spec to the new code

---
 web/package/agama-web-ui.spec | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/package/agama-web-ui.spec b/web/package/agama-web-ui.spec
index 77b855c522..c340d698ad 100644
--- a/web/package/agama-web-ui.spec
+++ b/web/package/agama-web-ui.spec
@@ -45,14 +45,15 @@ local-npm-registry %{_sourcedir} install --with=dev --legacy-peer-deps || ( find
 NODE_ENV="production" npm run build
 
 %install
-%make_install
-
-%check
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
+install -D -m 0644 --target-directory=%{buildroot}%{_datadir}/agama/web_ui %{_builddir}/agama/dist/*.{gz,json,map,svg}
+install -D -m 0644 --target-directory=%{buildroot}%{_datadir}/agama/web_ui/fonts %{_builddir}/agama/dist/fonts/*.woff?
 
 %files
 %doc README.md
-%{_datadir}/cockpit
-%{_datadir}/metainfo/*
+%{_datadir}/agama
+%{_datadir}/agama/web_ui
+%{_datadir}/agama/web_ui/*
+%{_datadir}/agama/web_ui/fonts
+%{_datadir}/agama/web_ui/fonts/*
 
 %changelog

From ec1ad7b4c0f800b66f7d62c6778d82cb3b395d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 21:10:14 +0000
Subject: [PATCH 145/324] Serve precompressed (gz) files if they are available

---
 rust/agama-server/src/web/service.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index d28ebd3c7d..eddbe23e9e 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -84,7 +84,7 @@ impl MainServiceBuilder {
             .route("/ping", get(super::http::ping))
             .route("/auth", post(login).get(session).delete(logout));
 
-        let serve = ServeDir::new(self.public_dir);
+        let serve = ServeDir::new(self.public_dir).precompressed_gzip();
         Router::new()
             .nest_service("/", serve)
             .nest("/api", api_router)

From 2fe7df531af87423dd4ec522b74e1b72e85faf94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 25 Mar 2024 21:17:20 +0000
Subject: [PATCH 146/324] Remove the extra slash from HTTP methods

---
 web/src/client/http.js     | 6 +++---
 web/src/client/software.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/src/client/http.js b/web/src/client/http.js
index 4b3a123313..3b0d7516ce 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -98,7 +98,7 @@ class HTTPClient {
    * @return {Promise<object>} Server response.
    */
   async get(url) {
-    const response = await fetch(`${this.baseUrl}/${url}`, {
+    const response = await fetch(`${this.baseUrl}${url}`, {
       headers: {
         "Content-Type": "application/json",
       },
@@ -112,7 +112,7 @@ class HTTPClient {
    * @return {Promise<object>} Server response.
    */
   async post(url, data) {
-    const response = await fetch(`${this.baseUrl}/${url}`, {
+    const response = await fetch(`${this.baseUrl}${url}`, {
       method: "POST",
       body: JSON.stringify(data),
       headers: {
@@ -134,7 +134,7 @@ class HTTPClient {
    * @return {Promise<object>} Server response.
    */
   async put(url, data) {
-    const response = await fetch(`${this.baseUrl}/${url}`, {
+    const response = await fetch(`${this.baseUrl}${url}`, {
       method: "PUT",
       body: JSON.stringify(data),
       headers: {
diff --git a/web/src/client/software.js b/web/src/client/software.js
index 764a9d14c2..eb4996b40d 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -273,8 +273,8 @@ class SoftwareBaseClient {
  */
 class SoftwareClient extends WithIssues(
   WithProgress(
-    WithStatus(SoftwareBaseClient, "software/status", SOFTWARE_SERVICE),
-    "software/progress",
+    WithStatus(SoftwareBaseClient, "/software/status", SOFTWARE_SERVICE),
+    "/software/progress",
     SOFTWARE_SERVICE,
   ),
   "software/issues/software",

From 4b8410a60a388b1cd695c57c29555378bd637bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 26 Mar 2024 06:48:30 +0000
Subject: [PATCH 147/324] Drop cockpit.socket dependency in agama.service

---
 service/share/agama.service | 1 -
 1 file changed, 1 deletion(-)

diff --git a/service/share/agama.service b/service/share/agama.service
index bae87c7820..f9b9bcfeb3 100644
--- a/service/share/agama.service
+++ b/service/share/agama.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Agama Installer Service
-Requires=cockpit.socket
 After=network-online.target
 
 [Service]

From 51c0ff4d45cbcbee09f54c7df44acbfb05f39619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 26 Mar 2024 11:49:02 +0000
Subject: [PATCH 148/324] Add modified agama-live KIWI files

---
 live/agama-live.kiwi | 195 +++++++++++++++++++++++++++++++++++++++++++
 live/config.sh       | 133 +++++++++++++++++++++++++++++
 2 files changed, 328 insertions(+)
 create mode 100644 live/agama-live.kiwi
 create mode 100644 live/config.sh

diff --git a/live/agama-live.kiwi b/live/agama-live.kiwi
new file mode 100644
index 0000000000..3c76aa5ea2
--- /dev/null
+++ b/live/agama-live.kiwi
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- OBS-ExclusiveArch: aarch64 ppc64le x86_64 s390x -->
+<!-- OBS-Profiles: @BUILD_FLAVOR@ -->
+
+<image schemaversion="7.5" name="agama-live">
+    <description type="system">
+        <author>YaST Team</author>
+        <contact>yast2-maintainers@suse.de</contact>
+        <specification>Agama Live ISO</specification>
+    </description>
+    <profiles>
+        <profile name="openSUSE" description="openSUSE multiproduct image" import="true" />
+        <profile name="ALP" description="ALP-only image" />
+        <profile name="openSUSE-Playwright" description="openSUSE image with Playwright integration tests" arch="aarch64,x86_64" />
+        <profile name="ALP-Playwright" description="ALP image with Playwright integration tests" arch="aarch64,x86_64" />
+        <profile name="ALP-PXE" description="ALP OEM image for remote installation" />
+    </profiles>
+    <preferences>
+        <version>7.0.0</version>
+        <packagemanager>zypper</packagemanager>
+        <locale>en_US</locale>
+        <keytable>us</keytable>
+        <timezone>Europe/Berlin</timezone>
+        <rpm-excludedocs>true</rpm-excludedocs>
+        <rpm-check-signatures>false</rpm-check-signatures>
+        <bootsplash-theme>bgrt</bootsplash-theme>
+        <bootloader-theme>openSUSE</bootloader-theme>
+    </preferences>
+    <preferences arch="ppc64le" profiles="openSUSE,ALP">
+        <type image="iso" flags="dmsquash"  firmware="ofw" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
+            <bootloader name="grub2" console="serial" timeout="10"/>
+        </type>
+    </preferences>
+    <preferences arch="aarch64,x86_64" profiles="openSUSE,ALP,openSUSE-Playwright,ALP-Playwright">
+        <type image="iso" flags="dmsquash" firmware="uefi" mediacheck="true" volid="agama" editbootconfig="fix_bootconfig">
+            <bootloader name="grub2" timeout="10"/>
+        </type>
+    </preferences>
+    <preferences arch="s390x" profiles="openSUSE,ALP">
+        <type image="iso" flags="dmsquash" volid="agama" editbootconfig="fix_bootconfig">
+            <bootloader name="custom" />
+        </type>
+    </preferences>
+    <preferences arch="ppc64le" profiles="ALP-PXE">
+        <!-- For some reason the compression results on ppc64le are not as good as on the other archs -->
+        <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="ofw" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=3174400" volid="agama">
+            <bootloader name="grub2" console="serial" timeout="1"/>
+            <oemconfig>
+                <oem-skip-verify>true</oem-skip-verify>
+                <oem-unattended>true</oem-unattended>
+                <oem-unattended-id>/dev/ram1</oem-unattended-id>
+                <oem-swap>false</oem-swap>
+                <oem-multipath-scan>false</oem-multipath-scan>
+            </oemconfig>
+            <size unit="M">3000</size>
+        </type>
+    </preferences>
+    <preferences arch="s390x" profiles="ALP-PXE">
+        <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152" volid="agama">
+            <bootloader name="custom"/>
+            <oemconfig>
+                <oem-skip-verify>true</oem-skip-verify>
+                <oem-unattended>true</oem-unattended>
+                <oem-unattended-id>/dev/ram1</oem-unattended-id>
+                <oem-swap>false</oem-swap>
+                <oem-multipath-scan>false</oem-multipath-scan>
+            </oemconfig>
+            <size unit="M">1900</size>
+        </type>
+    </preferences>
+    <preferences arch="aarch64,x86_64" profiles="ALP-PXE">
+        <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="uefi" installiso="true" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152" volid="agama">
+            <bootloader name="grub2" timeout="1"/>
+            <oemconfig>
+                <oem-skip-verify>true</oem-skip-verify>
+                <oem-unattended>true</oem-unattended>
+                <oem-unattended-id>/dev/ram1</oem-unattended-id>
+                <oem-swap>false</oem-swap>
+                <oem-multipath-scan>false</oem-multipath-scan>
+            </oemconfig>
+            <size unit="M">1900</size>
+        </type>
+    </preferences>
+    <users>
+        <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/>
+    </users>
+    <repository type="rpm-md">
+        <source path="obsrepositories:/"/>
+    </repository>
+    <packages type="image" profiles="ALP-PXE">
+        <package name="dracut-kiwi-oem-repart"/>
+        <package name="dracut-kiwi-oem-dump"/>
+        <archive name="brd.tar.gz"/>
+    </packages>
+    <packages type="image">
+        <package name="avahi"/>
+        <package name="bind-utils"/>
+        <package name="patterns-openSUSE-base"/>
+        <package name="systemd"/>
+        <package name="grub2-branding-openSUSE" arch="aarch64,x86_64"/>
+        <package name="iputils"/>
+        <package name="vim"/>
+        <package name="grub2"/>
+        <package name="grub2-arm64-efi" arch="aarch64"/>
+        <package name="grub2-x86_64-efi" arch="x86_64"/>
+        <package name="grub2-i386-pc" arch="x86_64"/>
+        <package name="grub2-s390x-emu" arch="s390x" />
+        <package name="grub2-powerpc-ieee1275" arch="ppc64le"/>
+        <package name="syslinux" arch="x86_64"/>
+        <package name="fontconfig"/>
+        <package name="fonts-config"/>
+        <package name="adobe-sourcecodepro-fonts"/>
+        <package name="adobe-sourcehansans-jp-fonts"/>
+        <package name="openssh"/>
+        <package name="iproute2"/>
+        <package name="less"/>
+        <package name="bash-completion"/>
+        <package name="dhcp-client"/>
+        <package name="which"/>
+        <package name="kernel-default"/>
+        <!-- the firmware files not referenced by any kernel driver are removed from the image -->
+        <package name="kernel-firmware"/>
+        <package name="adaptec-firmware"/>
+        <package name="atmel-firmware"/>
+        <package name="bluez-firmware"/>
+        <package name="ipw-firmware"/>
+        <package name="mpt-firmware"/>
+        <package name="zd1211-firmware"/>
+        <package name="systemd-zram-service"/> <!--- needed for zram -->
+        <package name="shim" arch="aarch64,x86_64"/>
+        <package name="timezone"/>
+        <package name="dracut-kiwi-live"/>
+        <package name="blog" arch="s390x" />
+        <package name="libblogger2" arch="s390x" />
+        <package name="xauth"/>
+        <package name="patterns-base-x11"/>
+        <namedCollection name="x11"/>
+        <package name="patterns-yast-yast2_basis"/>
+        <package name="MozillaFirefox" arch="aarch64,x86_64"/>
+        <package name="MozillaFirefox-branding-openSUSE" arch="aarch64,x86_64"/>
+        <package name="libpwquality-tools"/>
+        <package name="NetworkManager"/>
+        <package name="cockpit-agama"/>
+        <package name="ruby3.3-rubygem-byebug"/>
+        <package name="ruby3.3-rubygem-agama-yast"/>
+        <package name="agama"/>
+        <package name="agama-cli"/>
+        <package name="microos-tools"/>
+        <package name="staging-build-key"/>
+        <package name="icewm-lite"/>
+        <package name="xinit"/>
+        <package name="psmisc"/>
+        <package name="joe"/>
+        <package name="checkmedia"/>
+        <package name="spice-vdagent"/>
+        <package name="libtss2-tcti-device0"/>
+        <archive name="root.tar"/>
+        <archive name="etc.tar"/>
+        <archive name="dracut-cmdline-menu.tar.xz"/>
+        <!-- just a helper script for firmware cleanup, removed from the image -->
+        <archive name="fw_cleanup.tar.xz"/>
+    </packages>
+    <!-- additional packages for the openSUSE flavors -->
+    <packages type="image" profiles="openSUSE,openSUSE-Playwright">
+      <package name="agama-products-opensuse"/>
+      <package name="openSUSE-build-key"/>
+    </packages>
+    <!-- additional packages for the ALP flavors -->
+    <packages type="image" profiles="ALP,ALP-Playwright">
+      <package name="agama-products-ALP-Dolomite"/>
+      <package name="suse-build-key"/>
+    </packages>
+    <!-- additional packages for the Playwright flavors -->
+    <packages type="image" profiles="openSUSE-Playwright,ALP-Playwright">
+        <package name="playwright"/>
+        <package name="cockpit-agama-playwright"/>
+        <!-- Playwright does not work with the openSUSE Firefox, -->
+        <!-- install the chromium browser for running the tests -->
+        <!-- unfortunately it is not available for s390x -->
+        <package name="chromium"/>
+    </packages>
+    <packages type="image">
+        <archive name="autoinstallation.tar.xz"/>
+    </packages>
+    <packages type="bootstrap">
+        <package name="udev"/>
+        <package name="filesystem"/>
+        <package name="glibc-locale"/>
+        <package name="cracklib-dict-full"/>
+        <package name="ca-certificates"/>
+        <package name="ca-certificates-mozilla"/>
+        <package name="openSUSE-release"/>
+        <package name="openSUSE-release-ftp"/>
+    </packages>
+</image>
diff --git a/live/config.sh b/live/config.sh
new file mode 100644
index 0000000000..422643bb8b
--- /dev/null
+++ b/live/config.sh
@@ -0,0 +1,133 @@
+#! /bin/bash
+
+set -x
+
+# KIWI functions
+test -f /.kconfig && . /.kconfig
+test -f /.profile && . /.profile
+
+# greeting
+echo "Configure image: [$kiwi_iname]..."
+
+# setup baseproduct link
+suseSetupProduct
+
+# activate services
+systemctl enable sshd.service
+systemctl enable NetworkManager.service
+systemctl enable avahi-daemon.service
+systemctl enable agama.service
+systemctl enable agama-auto.service
+systemctl enable agama-hostname.service
+systemctl enable agama-proxy-setup.service
+systemctl enable setup-systemd-proxy-env.path
+systemctl enable x11-autologin.service
+systemctl enable spice-vdagent.service
+systemctl enable zramswap
+
+# default target
+systemctl set-default graphical.target
+
+# adjust owner of extracted files
+chown -R root:root /root
+find /etc -user 1000 | xargs chown root:root
+
+### setup dracut for live system
+
+label=${kiwi_install_volid:-$kiwi_iname}
+arch=$(uname -m)
+
+echo "Setting default live root: live:LABEL=$label"
+mkdir /etc/cmdline.d
+echo "root=live:LABEL=$label" >/etc/cmdline.d/10-liveroot.conf
+echo "root_disk=live:LABEL=$label" >>/etc/cmdline.d/10-liveroot.conf
+# if there's a default network location, add it here
+# echo "root_net=" >> /etc/cmdline.d/10-liveroot.conf
+echo 'install_items+=" /etc/cmdline.d/10-liveroot.conf "' >/etc/dracut.conf.d/10-liveroot-file.conf
+echo 'add_dracutmodules+=" dracut-menu "' >>/etc/dracut.conf.d/10-liveroot-file.conf
+
+if [ "${arch}" = "s390x" ];then
+    # workaround for custom bootloader setting
+    touch /config.bootoptions
+fi
+
+################################################################################
+# Reducing the used space
+
+# Clean-up logs
+rm /var/log/zypper.log /var/log/zypp/history
+
+du -h -s /usr/{share,lib}/locale/
+# delete translations and unusupported languages (makes ISO about 22MiB smaller)
+# build list of ignore options for "ls" with supported languages like "-I cs* -I de* -I es* ..."
+readarray -t IGNORE_OPTS < <(ls /usr/share/cockpit/agama/po.*.js.gz | sed -e "s#/usr/share/cockpit/agama/po\.\(.*\)\.js\.gz#-I\n\\1*#")
+# additionally keep the en_US translations
+ls -1 "${IGNORE_OPTS[@]}" -I en_US /usr/share/locale/ | xargs -I% sh -c "echo 'Removing translations %...' && rm -rf /usr/share/locale/%"
+
+# delete locale definitions for unsupported languages (explicitly keep the C and en_US locales)
+ls -1 "${IGNORE_OPTS[@]}" -I "en_US*" -I "C.*" /usr/lib/locale/ | xargs -I% sh -c "echo 'Removing locale %...' && rm -rf /usr/lib/locale/%"
+
+# delete unused translations (MO files)
+for t in zypper gettext-runtime p11-kit polkit-1 xkeyboard-config; do
+    rm /usr/share/locale/*/LC_MESSAGES/$t.mo
+done
+du -h -s /usr/{share,lib}/locale/
+
+# remove documentation
+du -h -s /usr/share/doc/packages/
+rm -rf /usr/share/doc/packages/*
+# remove man pages
+du -h -s /usr/share/man
+rm -rf /usr/share/man/*
+
+## removing drivers and firmware makes the Live ISO about 370MiB smaller
+# sound related, Agama does not use sound, added by icewm dependencies
+rpm -e --nodeps alsa alsa-utils alsa-ucm-conf
+
+# driver and firmware cleanup
+# Note: openSUSE Tumbleweed Live completely removes firmware for some server
+# network cars, because you very likely won't run TW KDE Live on a server.
+# But for Agama installer it makes more sense to run on server. So we keep it
+# and remove the drivers for sound cards and TV cards instead. Those do not
+# make sense on a server.
+du -h -s /lib/modules /lib/firmware
+# delete sound drivers
+rm -rfv /lib/modules/*/kernel/sound
+# delete TV cards and radio cards
+rm -rfv /lib/modules/*/kernel/drivers/media/
+
+# remove the unused firmware (not referenced by kernel drivers)
+/fw_cleanup.rb --delete
+# remove the script, not needed anymore
+rm /fw_cleanup.rb
+du -h -s /lib/modules /lib/firmware
+
+################################################################################
+# The rest of the file was copied from the openSUSE Tumbleweed Live ISO
+# https://build.opensuse.org/package/view_file/openSUSE:Factory:Live/livecd-tumbleweed-kde/config.sh?expand=1
+#
+
+# disable the services included by dependencies
+for s in purge-kernels; do
+	systemctl -f disable $s || true
+done
+
+# Only used for OpenCL and X11 acceleration on vmwgfx (?), saves ~50MiB
+rpm -e --nodeps Mesa-gallium
+# Too big and will have to be dropped anyway (unmaintained, known security issues)
+rm -rf /usr/lib*/libmfxhw*.so.* /usr/lib*/mfx/
+
+# the new, optional nvidia gsp firmware blobs are huge - ~ 70MB
+du -h -s /lib/firmware/nvidia
+find /lib/firmware/nvidia -name gsp | xargs -r rm -rf
+du -h -s /lib/firmware/nvidia
+# The gems are unpackaged already, no need to store them twice
+du -h -s /usr/lib*/ruby/gems/*/cache/
+rm -rf /usr/lib*/ruby/gems/*/cache/
+
+# Not needed, boo#1166406
+rm -f /boot/vmlinux*.[gx]z
+rm -f /lib/modules/*/vmlinux*.[gx]z
+
+# Remove generated files (boo#1098535)
+rm -rf /var/cache/zypp/* /var/lib/zypp/AnonymousUniqueId /var/lib/systemd/random-seed

From 1650fc681c2d4a146d35432fcbaaf3f1a6d8b442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 26 Mar 2024 11:51:30 +0000
Subject: [PATCH 149/324] Add a temporary README to the 'live' directory

---
 live/README | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 live/README

diff --git a/live/README b/live/README
new file mode 100644
index 0000000000..b3419ff63e
--- /dev/null
+++ b/live/README
@@ -0,0 +1,3 @@
+This directory contains the changes that are required to make Agama Live to
+work with the HTTP-based version of Agama. In the future, it should contains all
+the files.

From a6507db75843aa802ec5bdf885378b3e5ac380ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 26 Mar 2024 12:16:33 +0000
Subject: [PATCH 150/324] Add a README.md to the live/ directory

---
 live/README    |  3 ---
 live/README.md | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 3 deletions(-)
 delete mode 100644 live/README
 create mode 100644 live/README.md

diff --git a/live/README b/live/README
deleted file mode 100644
index b3419ff63e..0000000000
--- a/live/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains the changes that are required to make Agama Live to
-work with the HTTP-based version of Agama. In the future, it should contains all
-the files.
diff --git a/live/README.md b/live/README.md
new file mode 100644
index 0000000000..b375ccb302
--- /dev/null
+++ b/live/README.md
@@ -0,0 +1,14 @@
+# Directory contents
+
+This directory contains the changes that are required to make Agama Live to
+work with the HTTP-based version of Agama. In the future, it should contains all
+the files.
+
+## Skipping the authentication
+
+In order to skip the authentication, we decided to inject a valid authentication
+token in the browser. This token is autogenerated by the `agama-web-server serve`
+command (using the `--generate-token` option).
+
+Then, the Firefox start-up script (`startup`) takes care of injecting such a token
+in the cookies database (`/root/.mozilla/firefox/profile/cookies.sqlite`).

From a9222b7c10c2150fdbc4a90edc599f52cbe45a69 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 26 Mar 2024 14:11:04 +0100
Subject: [PATCH 151/324] implement routes for first user

---
 rust/agama-lib/src/users/client.rs |  8 ++++++--
 rust/agama-server/src/users/web.rs | 31 +++++++++++++++++++++++-------
 rust/agama-server/src/web.rs       |  2 +-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/rust/agama-lib/src/users/client.rs b/rust/agama-lib/src/users/client.rs
index 6b2729a354..9e6f917bbc 100644
--- a/rust/agama-lib/src/users/client.rs
+++ b/rust/agama-lib/src/users/client.rs
@@ -3,11 +3,11 @@
 use super::proxies::{FirstUser as FirstUserFromDBus, Users1Proxy};
 use crate::error::ServiceError;
 use agama_settings::{settings::Settings, SettingValue, SettingsError};
-use serde::Serialize;
+use serde::{Serialize,Deserialize};
 use zbus::Connection;
 
 /// Represents the settings for the first user
-#[derive(Serialize, Debug, Default)]
+#[derive(Serialize, Deserialize, Debug, Default)]
 pub struct FirstUser {
     /// First user's full name
     pub full_name: String,
@@ -122,4 +122,8 @@ impl<'a> UsersClient<'a> {
             )
             .await
     }
+
+    pub async fn remove_first_user(&self) -> zbus::Result<bool> {
+        Ok(self.users_proxy.remove_first_user().await? == 0)
+    }
 }
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index ce5b652dce..c7a3ac01af 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -6,7 +6,7 @@
 
 use axum::{
     extract::State,
-    routing::{get, post, put},
+    routing::{delete, get, post, put},
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
@@ -22,7 +22,7 @@ use crate::{
 };
 use agama_lib::{
     connection, error::ServiceError, users::{
-        proxies::Users1Proxy, FirstUserSettings, UsersClient
+        proxies::Users1Proxy, FirstUser, FirstUserSettings, UsersClient
     }
 };
 
@@ -38,11 +38,14 @@ struct UsersState<'a> {
 /// * `connection`: D-Bus connection to listen for events.
 pub async fn users_streams(
     dbus: zbus::Connection,
-) -> Result<Vec<(String, Pin<Box<dyn Stream<Item = Event> + Send>>)>, Error> {
-    let result : Vec<(String, Pin<Box<dyn Stream<Item = Event> + Send>>)> = vec![
-      ("first_user".to_string(), Box::pin(first_user_changed_stream(dbus.clone()).await?)),
-      ("root_password".to_string(), Box::pin(root_password_changed_stream(dbus.clone()).await?)),
-      ("root_sshkey".to_string(), Box::pin(root_ssh_key_changed_stream(dbus.clone()).await?)),
+) -> Result<Vec<(&'static str, Pin<Box<dyn Stream<Item = Event> + Send>>)>, Error> {
+    const FIRST_USER_ID : &str = "first_user";
+    const ROOT_PASSWORD_ID : &str = "root_password";
+    const ROOT_SSHKEY_ID : &str = "root_sshkey";
+    let result : Vec<(&str, Pin<Box<dyn Stream<Item = Event> + Send>>)> = vec![
+      (FIRST_USER_ID, Box::pin(first_user_changed_stream(dbus.clone()).await?)),
+      (ROOT_PASSWORD_ID, Box::pin(root_password_changed_stream(dbus.clone()).await?)),
+      (ROOT_SSHKEY_ID, Box::pin(root_ssh_key_changed_stream(dbus.clone()).await?)),
     ];
 
     Ok(result)
@@ -113,6 +116,20 @@ pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceErro
     let users = UsersClient::new(dbus).await?;
     let state = UsersState { users };
     let router = Router::new()
+        .route("/first_user", put(set_first_user).delete(remove_first_user))
         .with_state(state);
     Ok(router)
 }
+
+async fn remove_first_user(State(state): State<UsersState<'_>>) -> Result<(), Error> {
+    state.users.remove_first_user().await?;
+    Ok(())
+}
+
+async fn set_first_user(
+        State(state): State<UsersState<'_>>,
+        Json(config) : Json<FirstUser>
+    ) -> Result<(), Error> {
+    state.users.set_first_user(&config).await?;
+    Ok(())
+}
\ No newline at end of file
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index ef17ecf7b1..4537924039 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -107,7 +107,7 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
         .await?,
     );
     for (id, user_stream) in users_streams(dbus.clone()).await? {
-        stream.insert(id.as_str(), user_stream);
+        stream.insert(id, user_stream);
     }
     stream.insert("software", software_stream(dbus.clone()).await?);
     stream.insert(

From 547dfb27bb861bb05af13a8360aed96117090d4f Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 26 Mar 2024 14:56:30 +0100
Subject: [PATCH 152/324] add root password routes

---
 rust/agama-lib/src/users/client.rs |  4 ++++
 rust/agama-server/src/users/web.rs | 35 ++++++++++++++++++++++--------
 rust/agama-server/src/web.rs       |  3 ++-
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/rust/agama-lib/src/users/client.rs b/rust/agama-lib/src/users/client.rs
index 9e6f917bbc..923a61627c 100644
--- a/rust/agama-lib/src/users/client.rs
+++ b/rust/agama-lib/src/users/client.rs
@@ -92,6 +92,10 @@ impl<'a> UsersClient<'a> {
         Ok(self.users_proxy.set_root_password(value, encrypted).await?)
     }
 
+    pub async fn remove_root_password(&self) -> Result<u32, ServiceError> {
+        Ok(self.users_proxy.remove_root_password().await?)
+    }
+
     /// Whether the root password is set or not
     pub async fn is_root_password(&self) -> Result<bool, ServiceError> {
         Ok(self.users_proxy.root_password_set().await?)
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index c7a3ac01af..b33b6686ca 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -6,22 +6,19 @@
 
 use axum::{
     extract::State,
-    routing::{delete, get, post, put},
+    routing::put,
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
-use zbus::PropertyStream;
-use std::{collections::HashMap, pin::Pin};
-use tokio_stream::{Stream, StreamExt, StreamMap};
+use std::pin::Pin;
+use tokio_stream::{Stream, StreamExt};
 use crate::{
     error::Error,
-    web::{
-        common::{issues_router, progress_router, service_status_router},
-        Event,
-    },
+    web::Event
+    ,
 };
 use agama_lib::{
-    connection, error::ServiceError, users::{
+    error::ServiceError, users::{
         proxies::Users1Proxy, FirstUser, FirstUserSettings, UsersClient
     }
 };
@@ -117,6 +114,7 @@ pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceErro
     let state = UsersState { users };
     let router = Router::new()
         .route("/first_user", put(set_first_user).delete(remove_first_user))
+        .route("/root_password", put(set_root_password).delete(remove_root_password))
         .with_state(state);
     Ok(router)
 }
@@ -132,4 +130,23 @@ async fn set_first_user(
     ) -> Result<(), Error> {
     state.users.set_first_user(&config).await?;
     Ok(())
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct RootPasswordSettings {
+    pub value: String,
+    pub encrypted: bool,
+}
+
+async fn remove_root_password(State(state): State<UsersState<'_>>) -> Result<(), Error> {
+    state.users.remove_root_password().await?;
+    Ok(())
+}
+
+async fn set_root_password(
+    State(state): State<UsersState<'_>>,
+    Json(config) : Json<RootPasswordSettings>
+) -> Result<(), Error> {
+state.users.set_root_password(&config.value, config.encrypted).await?;
+Ok(())
 }
\ No newline at end of file
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 4537924039..1e20241202 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -62,7 +62,8 @@ where
             "/network",
             network_service(dbus.clone(), network_adapter).await?,
         )
-        .add_service("/questions", questions_service(dbus).await?)
+        .add_service("/questions", questions_service(dbus.clone()).await?)
+        .add_service("/users", users_service(dbus.clone()).await?)
         .with_config(config)
         .build();
     Ok(router)

From f253377b1ce2bb041662d11457bce0d2f390fa7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 26 Mar 2024 15:01:40 +0000
Subject: [PATCH 153/324] Move l10n D-Bus bits to its own module

---
 rust/agama-server/src/l10n.rs      | 117 +---------------------------
 rust/agama-server/src/l10n/dbus.rs | 120 +++++++++++++++++++++++++++++
 2 files changed, 122 insertions(+), 115 deletions(-)
 create mode 100644 rust/agama-server/src/l10n/dbus.rs

diff --git a/rust/agama-server/src/l10n.rs b/rust/agama-server/src/l10n.rs
index afa4db98b6..95ab33916d 100644
--- a/rust/agama-server/src/l10n.rs
+++ b/rust/agama-server/src/l10n.rs
@@ -1,3 +1,4 @@
+mod dbus;
 pub mod helpers;
 mod keyboard;
 mod locale;
@@ -12,8 +13,8 @@ use locale::LocalesDatabase;
 use regex::Regex;
 use std::{io, process::Command};
 use timezone::TimezonesDatabase;
-use zbus::{dbus_interface, Connection};
 
+pub use dbus::export_dbus_objects;
 pub use keyboard::Keymap;
 pub use locale::LocaleEntry;
 pub use timezone::TimezoneEntry;
@@ -30,107 +31,6 @@ pub struct Locale {
     pub ui_keymap: KeymapId,
 }
 
-#[dbus_interface(name = "org.opensuse.Agama1.Locale")]
-impl Locale {
-    #[dbus_interface(property)]
-    fn locales(&self) -> Vec<String> {
-        self.locales.to_owned()
-    }
-
-    #[dbus_interface(property)]
-    fn set_locales(&mut self, locales: Vec<String>) -> zbus::fdo::Result<()> {
-        if locales.is_empty() {
-            return Err(zbus::fdo::Error::Failed(
-                "The locales list cannot be empty".to_string(),
-            ));
-        }
-        for loc in &locales {
-            if !self.locales_db.exists(loc.as_str()) {
-                return Err(zbus::fdo::Error::Failed(format!(
-                    "Unsupported locale value '{loc}'"
-                )));
-            }
-        }
-        self.locales = locales;
-        Ok(())
-    }
-
-    #[dbus_interface(property, name = "UILocale")]
-    fn ui_locale(&self) -> String {
-        self.ui_locale.to_string()
-    }
-
-    #[dbus_interface(property, name = "UILocale")]
-    fn set_ui_locale(&mut self, locale: &str) -> zbus::fdo::Result<()> {
-        let locale: LocaleId = locale
-            .try_into()
-            .map_err(|_e| zbus::fdo::Error::Failed(format!("Invalid locale value '{locale}'")))?;
-        helpers::set_service_locale(&locale);
-        Ok(self.translate(&locale)?)
-    }
-
-    #[dbus_interface(property)]
-    fn keymap(&self) -> String {
-        self.keymap.to_string()
-    }
-
-    #[dbus_interface(property)]
-    fn set_keymap(&mut self, keymap_id: &str) -> Result<(), zbus::fdo::Error> {
-        let keymap_id: KeymapId = keymap_id
-            .parse()
-            .map_err(|_e| zbus::fdo::Error::InvalidArgs("Cannot parse keymap ID".to_string()))?;
-
-        if !self.keymaps_db.exists(&keymap_id) {
-            return Err(zbus::fdo::Error::Failed(
-                "Cannot find this keymap".to_string(),
-            ));
-        }
-        self.keymap = keymap_id;
-        Ok(())
-    }
-
-    #[dbus_interface(property)]
-    fn timezone(&self) -> &str {
-        self.timezone.as_str()
-    }
-
-    #[dbus_interface(property)]
-    fn set_timezone(&mut self, timezone: &str) -> Result<(), zbus::fdo::Error> {
-        let timezone = timezone.to_string();
-        if !self.timezones_db.exists(&timezone) {
-            return Err(zbus::fdo::Error::Failed(format!(
-                "Unsupported timezone value '{timezone}'"
-            )));
-        }
-        self.timezone = timezone;
-        Ok(())
-    }
-
-    // TODO: what should be returned value for commit?
-    fn commit(&mut self) -> zbus::fdo::Result<()> {
-        const ROOT: &str = "/mnt";
-
-        Command::new("/usr/bin/systemd-firstboot")
-            .args([
-                "--root",
-                ROOT,
-                "--force",
-                "--locale",
-                self.locales.first().unwrap_or(&"en_US.UTF-8".to_string()),
-                "--keymap",
-                &self.keymap.to_string(),
-                "--timezone",
-                &self.timezone,
-            ])
-            .status()
-            .map_err(|e| {
-                zbus::fdo::Error::Failed(format!("Could not apply the l10n configuration: {e}"))
-            })?;
-
-        Ok(())
-    }
-}
-
 impl Locale {
     pub fn new_with_locale(ui_locale: &LocaleId) -> Result<Self, Error> {
         const DEFAULT_TIMEZONE: &str = "Europe/Berlin";
@@ -197,16 +97,3 @@ impl Locale {
         Ok(keymap)
     }
 }
-
-pub async fn export_dbus_objects(
-    connection: &Connection,
-    locale: &LocaleId,
-) -> Result<(), Box<dyn std::error::Error>> {
-    const PATH: &str = "/org/opensuse/Agama1/Locale";
-
-    // When serving, request the service name _after_ exposing the main object
-    let locale_iface = Locale::new_with_locale(locale)?;
-    connection.object_server().at(PATH, locale_iface).await?;
-
-    Ok(())
-}
diff --git a/rust/agama-server/src/l10n/dbus.rs b/rust/agama-server/src/l10n/dbus.rs
new file mode 100644
index 0000000000..6656476fae
--- /dev/null
+++ b/rust/agama-server/src/l10n/dbus.rs
@@ -0,0 +1,120 @@
+use std::process::Command;
+
+use agama_locale_data::{KeymapId, LocaleId};
+use zbus::{dbus_interface, Connection};
+
+use super::{helpers, Locale};
+
+#[dbus_interface(name = "org.opensuse.Agama1.Locale")]
+impl Locale {
+    #[dbus_interface(property)]
+    pub fn locales(&self) -> Vec<String> {
+        self.locales.to_owned()
+    }
+
+    #[dbus_interface(property)]
+    pub fn set_locales(&mut self, locales: Vec<String>) -> zbus::fdo::Result<()> {
+        if locales.is_empty() {
+            return Err(zbus::fdo::Error::Failed(
+                "The locales list cannot be empty".to_string(),
+            ));
+        }
+        for loc in &locales {
+            if !self.locales_db.exists(loc.as_str()) {
+                return Err(zbus::fdo::Error::Failed(format!(
+                    "Unsupported locale value '{loc}'"
+                )));
+            }
+        }
+        self.locales = locales;
+        Ok(())
+    }
+
+    #[dbus_interface(property, name = "UILocale")]
+    pub fn ui_locale(&self) -> String {
+        self.ui_locale.to_string()
+    }
+
+    #[dbus_interface(property, name = "UILocale")]
+    pub fn set_ui_locale(&mut self, locale: &str) -> zbus::fdo::Result<()> {
+        let locale: LocaleId = locale
+            .try_into()
+            .map_err(|_e| zbus::fdo::Error::Failed(format!("Invalid locale value '{locale}'")))?;
+        helpers::set_service_locale(&locale);
+        Ok(self.translate(&locale)?)
+    }
+
+    #[dbus_interface(property)]
+    pub fn keymap(&self) -> String {
+        self.keymap.to_string()
+    }
+
+    #[dbus_interface(property)]
+    fn set_keymap(&mut self, keymap_id: &str) -> Result<(), zbus::fdo::Error> {
+        let keymap_id: KeymapId = keymap_id
+            .parse()
+            .map_err(|_e| zbus::fdo::Error::InvalidArgs("Cannot parse keymap ID".to_string()))?;
+
+        if !self.keymaps_db.exists(&keymap_id) {
+            return Err(zbus::fdo::Error::Failed(
+                "Cannot find this keymap".to_string(),
+            ));
+        }
+        self.keymap = keymap_id;
+        Ok(())
+    }
+
+    #[dbus_interface(property)]
+    pub fn timezone(&self) -> &str {
+        self.timezone.as_str()
+    }
+
+    #[dbus_interface(property)]
+    pub fn set_timezone(&mut self, timezone: &str) -> Result<(), zbus::fdo::Error> {
+        let timezone = timezone.to_string();
+        if !self.timezones_db.exists(&timezone) {
+            return Err(zbus::fdo::Error::Failed(format!(
+                "Unsupported timezone value '{timezone}'"
+            )));
+        }
+        self.timezone = timezone;
+        Ok(())
+    }
+
+    // TODO: what should be returned value for commit?
+    pub fn commit(&mut self) -> zbus::fdo::Result<()> {
+        const ROOT: &str = "/mnt";
+
+        Command::new("/usr/bin/systemd-firstboot")
+            .args([
+                "--root",
+                ROOT,
+                "--force",
+                "--locale",
+                self.locales.first().unwrap_or(&"en_US.UTF-8".to_string()),
+                "--keymap",
+                &self.keymap.to_string(),
+                "--timezone",
+                &self.timezone,
+            ])
+            .status()
+            .map_err(|e| {
+                zbus::fdo::Error::Failed(format!("Could not apply the l10n configuration: {e}"))
+            })?;
+
+        Ok(())
+    }
+}
+
+pub async fn export_dbus_objects(
+    connection: &Connection,
+    locale: &LocaleId,
+) -> Result<(), Box<dyn std::error::Error>> {
+    const PATH: &str = "/org/opensuse/Agama1/Locale";
+
+    // When serving, request the service name _after_ exposing the main object
+    let locale_iface = Locale::new_with_locale(locale)?;
+    connection.object_server().at(PATH, locale_iface).await?;
+
+    Ok(())
+}

From 59d1cd5196d308bf840f9bee8c2605d89ec6dca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 26 Mar 2024 15:13:08 +0000
Subject: [PATCH 154/324] Rename and move Locale to l10n::L10n

---
 rust/agama-server/src/l10n.rs      | 89 +-----------------------------
 rust/agama-server/src/l10n/dbus.rs |  6 +-
 rust/agama-server/src/l10n/l10n.rs | 86 +++++++++++++++++++++++++++++
 rust/agama-server/src/l10n/web.rs  | 10 ++--
 4 files changed, 96 insertions(+), 95 deletions(-)
 create mode 100644 rust/agama-server/src/l10n/l10n.rs

diff --git a/rust/agama-server/src/l10n.rs b/rust/agama-server/src/l10n.rs
index 95ab33916d..5d65726c73 100644
--- a/rust/agama-server/src/l10n.rs
+++ b/rust/agama-server/src/l10n.rs
@@ -1,99 +1,14 @@
 mod dbus;
 pub mod helpers;
 mod keyboard;
+pub mod l10n;
 mod locale;
 mod timezone;
 pub mod web;
 
-use crate::error::Error;
-use agama_locale_data::{KeymapId, LocaleId};
-
-use keyboard::KeymapsDatabase;
-use locale::LocalesDatabase;
-use regex::Regex;
-use std::{io, process::Command};
-use timezone::TimezonesDatabase;
-
 pub use dbus::export_dbus_objects;
 pub use keyboard::Keymap;
+pub use l10n::L10n;
 pub use locale::LocaleEntry;
 pub use timezone::TimezoneEntry;
 pub use web::LocaleConfig;
-
-pub struct Locale {
-    timezone: String,
-    timezones_db: TimezonesDatabase,
-    locales: Vec<String>,
-    pub locales_db: LocalesDatabase,
-    keymap: KeymapId,
-    keymaps_db: KeymapsDatabase,
-    ui_locale: LocaleId,
-    pub ui_keymap: KeymapId,
-}
-
-impl Locale {
-    pub fn new_with_locale(ui_locale: &LocaleId) -> Result<Self, Error> {
-        const DEFAULT_TIMEZONE: &str = "Europe/Berlin";
-
-        let locale = ui_locale.to_string();
-        let mut locales_db = LocalesDatabase::new();
-        locales_db.read(&locale)?;
-
-        let mut default_locale = ui_locale.to_string();
-        if !locales_db.exists(locale.as_str()) {
-            // TODO: handle the case where the database is empty (not expected!)
-            default_locale = locales_db.entries().first().unwrap().id.to_string();
-        };
-
-        let mut timezones_db = TimezonesDatabase::new();
-        timezones_db.read(&ui_locale.language)?;
-
-        let mut default_timezone = DEFAULT_TIMEZONE.to_string();
-        if !timezones_db.exists(&default_timezone) {
-            default_timezone = timezones_db.entries().first().unwrap().code.to_string();
-        };
-
-        let mut keymaps_db = KeymapsDatabase::new();
-        keymaps_db.read()?;
-
-        let ui_keymap = Self::x11_keymap().unwrap_or("us".to_string());
-
-        let locale = Self {
-            keymap: "us".parse().unwrap(),
-            timezone: default_timezone,
-            locales: vec![default_locale],
-            locales_db,
-            timezones_db,
-            keymaps_db,
-            ui_locale: ui_locale.clone(),
-            ui_keymap: ui_keymap.parse().unwrap_or_default(),
-        };
-
-        Ok(locale)
-    }
-
-    pub fn translate(&mut self, locale: &LocaleId) -> Result<(), Error> {
-        self.timezones_db.read(&locale.language)?;
-        self.locales_db.read(&locale.language)?;
-        self.ui_locale = locale.clone();
-        Ok(())
-    }
-
-    fn x11_keymap() -> Result<String, io::Error> {
-        let output = Command::new("setxkbmap")
-            .arg("-query")
-            .env("DISPLAY", ":0")
-            .output()?;
-        let output = String::from_utf8(output.stdout)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
-
-        let keymap_regexp = Regex::new(r"(?m)^layout: (.+)$").unwrap();
-        let captures = keymap_regexp.captures(&output);
-        let keymap = captures
-            .and_then(|c| c.get(1).map(|e| e.as_str()))
-            .unwrap_or("us")
-            .to_string();
-
-        Ok(keymap)
-    }
-}
diff --git a/rust/agama-server/src/l10n/dbus.rs b/rust/agama-server/src/l10n/dbus.rs
index 6656476fae..abdb791827 100644
--- a/rust/agama-server/src/l10n/dbus.rs
+++ b/rust/agama-server/src/l10n/dbus.rs
@@ -3,10 +3,10 @@ use std::process::Command;
 use agama_locale_data::{KeymapId, LocaleId};
 use zbus::{dbus_interface, Connection};
 
-use super::{helpers, Locale};
+use super::{helpers, L10n};
 
 #[dbus_interface(name = "org.opensuse.Agama1.Locale")]
-impl Locale {
+impl L10n {
     #[dbus_interface(property)]
     pub fn locales(&self) -> Vec<String> {
         self.locales.to_owned()
@@ -113,7 +113,7 @@ pub async fn export_dbus_objects(
     const PATH: &str = "/org/opensuse/Agama1/Locale";
 
     // When serving, request the service name _after_ exposing the main object
-    let locale_iface = Locale::new_with_locale(locale)?;
+    let locale_iface = L10n::new_with_locale(locale)?;
     connection.object_server().at(PATH, locale_iface).await?;
 
     Ok(())
diff --git a/rust/agama-server/src/l10n/l10n.rs b/rust/agama-server/src/l10n/l10n.rs
new file mode 100644
index 0000000000..e2e3fba663
--- /dev/null
+++ b/rust/agama-server/src/l10n/l10n.rs
@@ -0,0 +1,86 @@
+use crate::error::Error;
+use agama_locale_data::{KeymapId, LocaleId};
+
+use super::keyboard::KeymapsDatabase;
+use super::locale::LocalesDatabase;
+use super::timezone::TimezonesDatabase;
+use regex::Regex;
+use std::{io, process::Command};
+
+pub struct L10n {
+    pub timezone: String,
+    pub timezones_db: TimezonesDatabase,
+    pub locales: Vec<String>,
+    pub locales_db: LocalesDatabase,
+    pub keymap: KeymapId,
+    pub keymaps_db: KeymapsDatabase,
+    pub ui_locale: LocaleId,
+    pub ui_keymap: KeymapId,
+}
+
+impl L10n {
+    pub fn new_with_locale(ui_locale: &LocaleId) -> Result<Self, Error> {
+        const DEFAULT_TIMEZONE: &str = "Europe/Berlin";
+
+        let locale = ui_locale.to_string();
+        let mut locales_db = LocalesDatabase::new();
+        locales_db.read(&locale)?;
+
+        let mut default_locale = ui_locale.to_string();
+        if !locales_db.exists(locale.as_str()) {
+            // TODO: handle the case where the database is empty (not expected!)
+            default_locale = locales_db.entries().first().unwrap().id.to_string();
+        };
+
+        let mut timezones_db = TimezonesDatabase::new();
+        timezones_db.read(&ui_locale.language)?;
+
+        let mut default_timezone = DEFAULT_TIMEZONE.to_string();
+        if !timezones_db.exists(&default_timezone) {
+            default_timezone = timezones_db.entries().first().unwrap().code.to_string();
+        };
+
+        let mut keymaps_db = KeymapsDatabase::new();
+        keymaps_db.read()?;
+
+        let ui_keymap = Self::x11_keymap().unwrap_or("us".to_string());
+
+        let locale = Self {
+            keymap: "us".parse().unwrap(),
+            timezone: default_timezone,
+            locales: vec![default_locale],
+            locales_db,
+            timezones_db,
+            keymaps_db,
+            ui_locale: ui_locale.clone(),
+            ui_keymap: ui_keymap.parse().unwrap_or_default(),
+        };
+
+        Ok(locale)
+    }
+
+    pub fn translate(&mut self, locale: &LocaleId) -> Result<(), Error> {
+        self.timezones_db.read(&locale.language)?;
+        self.locales_db.read(&locale.language)?;
+        self.ui_locale = locale.clone();
+        Ok(())
+    }
+
+    fn x11_keymap() -> Result<String, io::Error> {
+        let output = Command::new("setxkbmap")
+            .arg("-query")
+            .env("DISPLAY", ":0")
+            .output()?;
+        let output = String::from_utf8(output.stdout)
+            .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
+
+        let keymap_regexp = Regex::new(r"(?m)^layout: (.+)$").unwrap();
+        let captures = keymap_regexp.captures(&output);
+        let keymap = captures
+            .and_then(|c| c.get(1).map(|e| e.as_str()))
+            .unwrap_or("us")
+            .to_string();
+
+        Ok(keymap)
+    }
+}
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index 271a2bd846..215820e5d6 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -1,6 +1,6 @@
 //! This module implements the web API for the localization module.
 
-use super::{keyboard::Keymap, locale::LocaleEntry, timezone::TimezoneEntry, Locale};
+use super::{keyboard::Keymap, locale::LocaleEntry, timezone::TimezoneEntry, L10n};
 use crate::{
     error::Error,
     l10n::helpers,
@@ -32,7 +32,7 @@ pub enum LocaleError {
 
 #[derive(Clone)]
 struct LocaleState {
-    locale: Arc<RwLock<Locale>>,
+    locale: Arc<RwLock<L10n>>,
     events: EventsSender,
 }
 
@@ -41,7 +41,7 @@ struct LocaleState {
 /// * `events`: channel to send the events to the main service.
 pub fn l10n_service(events: EventsSender) -> Router {
     let id = LocaleId::default();
-    let locale = Locale::new_with_locale(&id).unwrap();
+    let locale = L10n::new_with_locale(&id).unwrap();
     let state = LocaleState {
         locale: Arc::new(RwLock::new(locale)),
         events,
@@ -180,7 +180,7 @@ async fn get_config(State(state): State<LocaleState>) -> Json<LocaleConfig> {
 
 #[cfg(test)]
 mod tests {
-    use crate::l10n::{web::LocaleState, Locale};
+    use crate::l10n::{web::LocaleState, L10n};
     use agama_locale_data::{KeymapId, LocaleId};
     use std::sync::{Arc, RwLock};
     use tokio::{sync::broadcast::channel, test};
@@ -188,7 +188,7 @@ mod tests {
     fn build_state() -> LocaleState {
         let (tx, _) = channel(16);
         let default_code = LocaleId::default();
-        let locale = Locale::new_with_locale(&default_code).unwrap();
+        let locale = L10n::new_with_locale(&default_code).unwrap();
         LocaleState {
             locale: Arc::new(RwLock::new(locale)),
             events: tx,

From ab57aed7579ef7d278bb42634dc5390be6ae4d90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 26 Mar 2024 15:20:38 +0000
Subject: [PATCH 155/324] Move LocaleError to a separate module

---
 rust/agama-server/src/error.rs      |  2 +-
 rust/agama-server/src/l10n.rs       |  2 ++
 rust/agama-server/src/l10n/error.rs | 13 +++++++++++++
 rust/agama-server/src/l10n/web.rs   | 18 ++++--------------
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 rust/agama-server/src/l10n/error.rs

diff --git a/rust/agama-server/src/error.rs b/rust/agama-server/src/error.rs
index 1c9b7a7847..21b7c0d987 100644
--- a/rust/agama-server/src/error.rs
+++ b/rust/agama-server/src/error.rs
@@ -6,7 +6,7 @@ use axum::{
 };
 use serde_json::json;
 
-use crate::{l10n::web::LocaleError, questions::QuestionsError};
+use crate::{l10n::LocaleError, questions::QuestionsError};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
diff --git a/rust/agama-server/src/l10n.rs b/rust/agama-server/src/l10n.rs
index 5d65726c73..3ef747cd47 100644
--- a/rust/agama-server/src/l10n.rs
+++ b/rust/agama-server/src/l10n.rs
@@ -1,4 +1,5 @@
 mod dbus;
+pub mod error;
 pub mod helpers;
 mod keyboard;
 pub mod l10n;
@@ -7,6 +8,7 @@ mod timezone;
 pub mod web;
 
 pub use dbus::export_dbus_objects;
+pub use error::LocaleError;
 pub use keyboard::Keymap;
 pub use l10n::L10n;
 pub use locale::LocaleEntry;
diff --git a/rust/agama-server/src/l10n/error.rs b/rust/agama-server/src/l10n/error.rs
new file mode 100644
index 0000000000..a0dd9042b4
--- /dev/null
+++ b/rust/agama-server/src/l10n/error.rs
@@ -0,0 +1,13 @@
+use agama_locale_data::InvalidKeymap;
+
+#[derive(thiserror::Error, Debug)]
+pub enum LocaleError {
+    #[error("Unknown locale code: {0}")]
+    UnknownLocale(String),
+    #[error("Unknown timezone: {0}")]
+    UnknownTimezone(String),
+    #[error("Invalid keymap: {0}")]
+    InvalidKeymap(#[from] InvalidKeymap),
+    #[error("Could not apply the changes")]
+    Commit(#[from] std::io::Error),
+}
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index 215820e5d6..33393c85c5 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -1,12 +1,14 @@
 //! This module implements the web API for the localization module.
 
-use super::{keyboard::Keymap, locale::LocaleEntry, timezone::TimezoneEntry, L10n};
+use super::{
+    error::LocaleError, keyboard::Keymap, locale::LocaleEntry, timezone::TimezoneEntry, L10n,
+};
 use crate::{
     error::Error,
     l10n::helpers,
     web::{Event, EventsSender},
 };
-use agama_locale_data::{InvalidKeymap, LocaleId};
+use agama_locale_data::LocaleId;
 use axum::{
     extract::State,
     routing::{get, put},
@@ -18,18 +20,6 @@ use std::{
     sync::{Arc, RwLock},
 };
 
-#[derive(thiserror::Error, Debug)]
-pub enum LocaleError {
-    #[error("Unknown locale code: {0}")]
-    UnknownLocale(String),
-    #[error("Unknown timezone: {0}")]
-    UnknownTimezone(String),
-    #[error("Invalid keymap: {0}")]
-    InvalidKeymap(#[from] InvalidKeymap),
-    #[error("Could not apply the changes")]
-    Commit(#[from] std::io::Error),
-}
-
 #[derive(Clone)]
 struct LocaleState {
     locale: Arc<RwLock<L10n>>,

From e51f1f4b990d0edad590415a59db1926ef13d34f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 26 Mar 2024 16:12:39 +0000
Subject: [PATCH 156/324] Move the L10n common logic to the L10n struct

* Decouple the D-Bus interface from the backend.
* Reduce the size of the L10n HTTP service.
---
 rust/agama-server/src/l10n/dbus.rs  | 90 +++++++++++++----------------
 rust/agama-server/src/l10n/error.rs |  4 +-
 rust/agama-server/src/l10n/l10n.rs  | 72 ++++++++++++++++++++++-
 rust/agama-server/src/l10n/web.rs   | 49 +++++-----------
 4 files changed, 127 insertions(+), 88 deletions(-)

diff --git a/rust/agama-server/src/l10n/dbus.rs b/rust/agama-server/src/l10n/dbus.rs
index abdb791827..67b2bcf78a 100644
--- a/rust/agama-server/src/l10n/dbus.rs
+++ b/rust/agama-server/src/l10n/dbus.rs
@@ -1,107 +1,94 @@
-use std::process::Command;
+use std::sync::{Arc, RwLock};
 
 use agama_locale_data::{KeymapId, LocaleId};
 use zbus::{dbus_interface, Connection};
 
-use super::{helpers, L10n};
+use super::L10n;
+
+struct L10nInterface {
+    backend: Arc<RwLock<L10n>>,
+}
 
 #[dbus_interface(name = "org.opensuse.Agama1.Locale")]
-impl L10n {
+impl L10nInterface {
     #[dbus_interface(property)]
     pub fn locales(&self) -> Vec<String> {
-        self.locales.to_owned()
+        let backend = self.backend.read().unwrap();
+        backend.locales.to_owned()
     }
 
     #[dbus_interface(property)]
     pub fn set_locales(&mut self, locales: Vec<String>) -> zbus::fdo::Result<()> {
+        let mut backend = self.backend.write().unwrap();
         if locales.is_empty() {
             return Err(zbus::fdo::Error::Failed(
                 "The locales list cannot be empty".to_string(),
             ));
         }
-        for loc in &locales {
-            if !self.locales_db.exists(loc.as_str()) {
-                return Err(zbus::fdo::Error::Failed(format!(
-                    "Unsupported locale value '{loc}'"
-                )));
-            }
-        }
-        self.locales = locales;
+        backend.set_locales(&locales).map_err(|e| {
+            zbus::fdo::Error::Failed(format!("Could not set the locales: {}", e.to_string()))
+        })?;
         Ok(())
     }
 
     #[dbus_interface(property, name = "UILocale")]
     pub fn ui_locale(&self) -> String {
-        self.ui_locale.to_string()
+        let backend = self.backend.read().unwrap();
+        backend.ui_locale.to_string()
     }
 
     #[dbus_interface(property, name = "UILocale")]
     pub fn set_ui_locale(&mut self, locale: &str) -> zbus::fdo::Result<()> {
+        let mut backend = self.backend.write().unwrap();
         let locale: LocaleId = locale
             .try_into()
             .map_err(|_e| zbus::fdo::Error::Failed(format!("Invalid locale value '{locale}'")))?;
-        helpers::set_service_locale(&locale);
-        Ok(self.translate(&locale)?)
+        Ok(backend.translate(&locale)?)
     }
 
     #[dbus_interface(property)]
     pub fn keymap(&self) -> String {
-        self.keymap.to_string()
+        let backend = self.backend.read().unwrap();
+        backend.keymap.to_string()
     }
 
     #[dbus_interface(property)]
     fn set_keymap(&mut self, keymap_id: &str) -> Result<(), zbus::fdo::Error> {
+        let mut backend = self.backend.write().unwrap();
         let keymap_id: KeymapId = keymap_id
             .parse()
             .map_err(|_e| zbus::fdo::Error::InvalidArgs("Cannot parse keymap ID".to_string()))?;
 
-        if !self.keymaps_db.exists(&keymap_id) {
-            return Err(zbus::fdo::Error::Failed(
-                "Cannot find this keymap".to_string(),
-            ));
-        }
-        self.keymap = keymap_id;
+        backend.set_keymap(keymap_id).map_err(|e| {
+            zbus::fdo::Error::Failed(format!("Could not set the keymap: {}", e.to_string()))
+        })?;
+
         Ok(())
     }
 
     #[dbus_interface(property)]
-    pub fn timezone(&self) -> &str {
-        self.timezone.as_str()
+    pub fn timezone(&self) -> String {
+        let backend = self.backend.read().unwrap();
+        backend.timezone.clone()
     }
 
     #[dbus_interface(property)]
     pub fn set_timezone(&mut self, timezone: &str) -> Result<(), zbus::fdo::Error> {
-        let timezone = timezone.to_string();
-        if !self.timezones_db.exists(&timezone) {
-            return Err(zbus::fdo::Error::Failed(format!(
-                "Unsupported timezone value '{timezone}'"
-            )));
-        }
-        self.timezone = timezone;
+        let mut backend = self.backend.write().unwrap();
+
+        backend.set_timezone(timezone).map_err(|e| {
+            zbus::fdo::Error::Failed(format!("Could not set the timezone: {}", e.to_string()))
+        })?;
         Ok(())
     }
 
     // TODO: what should be returned value for commit?
     pub fn commit(&mut self) -> zbus::fdo::Result<()> {
-        const ROOT: &str = "/mnt";
-
-        Command::new("/usr/bin/systemd-firstboot")
-            .args([
-                "--root",
-                ROOT,
-                "--force",
-                "--locale",
-                self.locales.first().unwrap_or(&"en_US.UTF-8".to_string()),
-                "--keymap",
-                &self.keymap.to_string(),
-                "--timezone",
-                &self.timezone,
-            ])
-            .status()
-            .map_err(|e| {
-                zbus::fdo::Error::Failed(format!("Could not apply the l10n configuration: {e}"))
-            })?;
+        let backend = self.backend.read().unwrap();
 
+        backend.commit().map_err(|e| {
+            zbus::fdo::Error::Failed(format!("Could not apply the l10n configuration: {e}"))
+        })?;
         Ok(())
     }
 }
@@ -113,7 +100,10 @@ pub async fn export_dbus_objects(
     const PATH: &str = "/org/opensuse/Agama1/Locale";
 
     // When serving, request the service name _after_ exposing the main object
-    let locale_iface = L10n::new_with_locale(locale)?;
+    let backend = L10n::new_with_locale(locale)?;
+    let locale_iface = L10nInterface {
+        backend: Arc::new(RwLock::new(backend)),
+    };
     connection.object_server().at(PATH, locale_iface).await?;
 
     Ok(())
diff --git a/rust/agama-server/src/l10n/error.rs b/rust/agama-server/src/l10n/error.rs
index a0dd9042b4..28665eb321 100644
--- a/rust/agama-server/src/l10n/error.rs
+++ b/rust/agama-server/src/l10n/error.rs
@@ -1,4 +1,4 @@
-use agama_locale_data::InvalidKeymap;
+use agama_locale_data::{InvalidKeymap, KeymapId};
 
 #[derive(thiserror::Error, Debug)]
 pub enum LocaleError {
@@ -6,6 +6,8 @@ pub enum LocaleError {
     UnknownLocale(String),
     #[error("Unknown timezone: {0}")]
     UnknownTimezone(String),
+    #[error("Unknown keymap: {0}")]
+    UnknownKeymap(KeymapId),
     #[error("Invalid keymap: {0}")]
     InvalidKeymap(#[from] InvalidKeymap),
     #[error("Could not apply the changes")]
diff --git a/rust/agama-server/src/l10n/l10n.rs b/rust/agama-server/src/l10n/l10n.rs
index e2e3fba663..324238e2aa 100644
--- a/rust/agama-server/src/l10n/l10n.rs
+++ b/rust/agama-server/src/l10n/l10n.rs
@@ -1,11 +1,14 @@
+use std::io;
+use std::process::Command;
+
 use crate::error::Error;
 use agama_locale_data::{KeymapId, LocaleId};
+use regex::Regex;
 
 use super::keyboard::KeymapsDatabase;
 use super::locale::LocalesDatabase;
 use super::timezone::TimezonesDatabase;
-use regex::Regex;
-use std::{io, process::Command};
+use super::{helpers, LocaleError};
 
 pub struct L10n {
     pub timezone: String,
@@ -59,13 +62,78 @@ impl L10n {
         Ok(locale)
     }
 
+    pub fn set_locales(&mut self, locales: &Vec<String>) -> Result<(), LocaleError> {
+        for loc in locales {
+            if !self.locales_db.exists(loc.as_str()) {
+                return Err(LocaleError::UnknownLocale(loc.to_string()))?;
+            }
+        }
+        self.locales = locales.clone();
+        Ok(())
+    }
+
+    pub fn set_timezone(&mut self, timezone: &str) -> Result<(), LocaleError> {
+        // TODO: modify exists() to receive an `&str`
+        if !self.timezones_db.exists(&timezone.to_string()) {
+            return Err(LocaleError::UnknownTimezone(timezone.to_string()))?;
+        }
+        self.timezone = timezone.to_owned();
+        Ok(())
+    }
+
+    pub fn set_keymap(&mut self, keymap_id: KeymapId) -> Result<(), LocaleError> {
+        if !self.keymaps_db.exists(&keymap_id) {
+            return Err(LocaleError::UnknownKeymap(keymap_id));
+        }
+
+        self.keymap = keymap_id;
+        Ok(())
+    }
+
+    // TODO: use LocaleError
     pub fn translate(&mut self, locale: &LocaleId) -> Result<(), Error> {
+        helpers::set_service_locale(&locale);
         self.timezones_db.read(&locale.language)?;
         self.locales_db.read(&locale.language)?;
         self.ui_locale = locale.clone();
         Ok(())
     }
 
+    // TODO: use LocaleError
+    pub fn set_ui_keymap(&mut self, keymap: KeymapId) -> Result<(), Error> {
+        let keymap = keymap.to_string();
+        Command::new("/usr/bin/localectl")
+            .args(["set-x11-keymap", &keymap])
+            .output()
+            .map_err(LocaleError::Commit)?;
+        Command::new("/usr/bin/setxkbmap")
+            .arg(keymap)
+            .env("DISPLAY", ":0")
+            .output()
+            .map_err(LocaleError::Commit)?;
+        Ok(())
+    }
+
+    // TODO: what should be returned value for commit?
+    pub fn commit(&self) -> Result<(), LocaleError> {
+        const ROOT: &str = "/mnt";
+
+        Command::new("/usr/bin/systemd-firstboot")
+            .args([
+                "--root",
+                ROOT,
+                "--force",
+                "--locale",
+                self.locales.first().unwrap_or(&"en_US.UTF-8".to_string()),
+                "--keymap",
+                &self.keymap.to_string(),
+                "--timezone",
+                &self.timezone,
+            ])
+            .status()?;
+        Ok(())
+    }
+
     fn x11_keymap() -> Result<String, io::Error> {
         let output = Command::new("setxkbmap")
             .arg("-query")
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index 33393c85c5..1fa6b9cf23 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -5,7 +5,6 @@ use super::{
 };
 use crate::{
     error::Error,
-    l10n::helpers,
     web::{Event, EventsSender},
 };
 use agama_locale_data::LocaleId;
@@ -15,10 +14,7 @@ use axum::{
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
-use std::{
-    process::Command,
-    sync::{Arc, RwLock},
-};
+use std::sync::{Arc, RwLock};
 
 #[derive(Clone)]
 struct LocaleState {
@@ -99,26 +95,19 @@ async fn set_config(
     let mut changes = LocaleConfig::default();
 
     if let Some(locales) = &value.locales {
-        for loc in locales {
-            if !data.locales_db.exists(loc.as_str()) {
-                return Err(LocaleError::UnknownLocale(loc.to_string()))?;
-            }
-        }
-        data.locales = locales.clone();
-        changes.locales = Some(data.locales.clone());
+        data.set_locales(&locales)?;
+        changes.locales = value.locales.clone();
     }
 
     if let Some(timezone) = &value.timezone {
-        if !data.timezones_db.exists(timezone) {
-            return Err(LocaleError::UnknownTimezone(timezone.to_string()))?;
-        }
-        data.timezone = timezone.to_owned();
-        changes.timezone = Some(data.timezone.clone());
+        data.set_timezone(timezone)?;
+        changes.timezone = value.timezone.clone();
     }
 
     if let Some(keymap_id) = &value.keymap {
-        data.keymap = keymap_id.parse().map_err(LocaleError::InvalidKeymap)?;
-        changes.keymap = Some(keymap_id.clone());
+        let keymap_id = keymap_id.parse().map_err(LocaleError::InvalidKeymap)?;
+        data.set_keymap(keymap_id)?;
+        changes.keymap = value.keymap.clone();
     }
 
     if let Some(ui_locale) = &value.ui_locale {
@@ -126,27 +115,17 @@ async fn set_config(
             .as_str()
             .try_into()
             .map_err(|_e| LocaleError::UnknownLocale(ui_locale.to_string()))?;
-
-        helpers::set_service_locale(&locale);
         data.translate(&locale)?;
         changes.ui_locale = Some(locale.to_string());
+
         _ = state.events.send(Event::LocaleChanged {
             locale: locale.to_string(),
         });
     }
 
     if let Some(ui_keymap) = &value.ui_keymap {
-        // data.ui_keymap = ui_keymap.parse().into::<Result<KeymapId, LocaleError>>()?;
-        data.ui_keymap = ui_keymap.parse().map_err(LocaleError::InvalidKeymap)?;
-        Command::new("/usr/bin/localectl")
-            .args(["set-x11-keymap", &ui_keymap])
-            .output()
-            .map_err(LocaleError::Commit)?;
-        Command::new("/usr/bin/setxkbmap")
-            .arg(ui_keymap)
-            .env("DISPLAY", ":0")
-            .output()
-            .map_err(LocaleError::Commit)?;
+        let ui_keymap = ui_keymap.parse().map_err(LocaleError::InvalidKeymap)?;
+        data.set_ui_keymap(ui_keymap)?;
     }
 
     _ = state.events.send(Event::L10nConfigChanged(changes));
@@ -161,9 +140,9 @@ async fn get_config(State(state): State<LocaleState>) -> Json<LocaleConfig> {
     let data = state.locale.read().unwrap();
     Json(LocaleConfig {
         locales: Some(data.locales.clone()),
-        keymap: Some(data.keymap()),
-        timezone: Some(data.timezone().to_string()),
-        ui_locale: Some(data.ui_locale().to_string()),
+        keymap: Some(data.keymap.to_string()),
+        timezone: Some(data.timezone.to_string()),
+        ui_locale: Some(data.ui_locale.to_string()),
         ui_keymap: Some(data.ui_keymap.to_string()),
     })
 }

From 20b72e7a9474f157b4c6f0d3354e9b2e6c390334 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 27 Mar 2024 10:53:00 +0100
Subject: [PATCH 157/324] add route for ssh key

---
 rust/agama-server/src/users/web.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index b33b6686ca..cef65ef2a6 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -115,6 +115,7 @@ pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceErro
     let router = Router::new()
         .route("/first_user", put(set_first_user).delete(remove_first_user))
         .route("/root_password", put(set_root_password).delete(remove_root_password))
+        .route("/root_sshkey", put(set_root_password).delete(remove_root_password))
         .with_state(state);
     Ok(router)
 }
@@ -149,4 +150,17 @@ async fn set_root_password(
 ) -> Result<(), Error> {
 state.users.set_root_password(&config.value, config.encrypted).await?;
 Ok(())
+}
+
+async fn remove_root_sshkey(State(state): State<UsersState<'_>>) -> Result<(), Error> {
+    state.users.set_root_sshkey("").await?;
+    Ok(())
+}
+
+async fn set_root_sshkey(
+    State(state): State<UsersState<'_>>,
+    Json(key) : Json<String>
+) -> Result<(), Error> {
+state.users.set_root_sshkey(key.as_str()).await?;
+Ok(())
 }
\ No newline at end of file

From 9987a22af55373a81665f075b6afb5f9388c5c38 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 27 Mar 2024 13:02:03 +0100
Subject: [PATCH 158/324] add root route for users to get info

---
 rust/agama-lib/src/users/client.rs |  2 +-
 rust/agama-server/src/users/web.rs | 38 +++++++++++++++++++++++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/rust/agama-lib/src/users/client.rs b/rust/agama-lib/src/users/client.rs
index 923a61627c..2c24e1e602 100644
--- a/rust/agama-lib/src/users/client.rs
+++ b/rust/agama-lib/src/users/client.rs
@@ -7,7 +7,7 @@ use serde::{Serialize,Deserialize};
 use zbus::Connection;
 
 /// Represents the settings for the first user
-#[derive(Serialize, Deserialize, Debug, Default)]
+#[derive(Serialize, Deserialize, Clone, Debug, Default)]
 pub struct FirstUser {
     /// First user's full name
     pub full_name: String,
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index cef65ef2a6..bc693d9795 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -6,7 +6,7 @@
 
 use axum::{
     extract::State,
-    routing::put,
+    routing::{get, put},
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
@@ -113,9 +113,10 @@ pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceErro
     let users = UsersClient::new(dbus).await?;
     let state = UsersState { users };
     let router = Router::new()
+        .route("/", get(get_info))
         .route("/first_user", put(set_first_user).delete(remove_first_user))
         .route("/root_password", put(set_root_password).delete(remove_root_password))
-        .route("/root_sshkey", put(set_root_password).delete(remove_root_password))
+        .route("/root_sshkey", put(set_root_sshkey).delete(remove_root_sshkey))
         .with_state(state);
     Ok(router)
 }
@@ -163,4 +164,35 @@ async fn set_root_sshkey(
 ) -> Result<(), Error> {
 state.users.set_root_sshkey(key.as_str()).await?;
 Ok(())
-}
\ No newline at end of file
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct RootInfo {
+    password: bool,
+    sshkey: Option<String>,
+}
+
+#[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct UsersInfo {
+    user: Option<FirstUser>,
+    root: RootInfo,
+}
+
+async fn get_info(State(state): State<UsersState<'_>>) 
+        -> Result<Json<UsersInfo>, Error> {
+    let mut result = UsersInfo::default();
+    let first_user = state.users.first_user().await?;
+    if first_user.user_name.is_empty() {
+        result.user = None;
+    } else {
+        result.user = Some(first_user);
+    }
+    result.root.password = state.users.is_root_password().await?;
+    let ssh_key = state.users.root_ssh_key().await?;
+    if ssh_key.is_empty() {
+        result.root.sshkey = None;
+    } else {
+        result.root.sshkey = Some(ssh_key);
+    }
+    Ok(Json(result))
+}

From 7d9a60d9c1ae1cb88fa962c405dc634509aca394 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 27 Mar 2024 12:48:13 +0000
Subject: [PATCH 159/324] Some fixes and changes for the http API

---
 rust/agama-server/src/network/action.rs     |  5 +---
 rust/agama-server/src/network/model.rs      |  7 +++--
 rust/agama-server/src/network/nm/adapter.rs |  4 +++
 rust/agama-server/src/network/nm/client.rs  |  7 ++++-
 rust/agama-server/src/network/system.rs     | 17 +----------
 rust/agama-server/src/network/web.rs        | 33 +++++++++++----------
 6 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index 9e0967198a..445eaee6ec 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -22,10 +22,7 @@ pub enum Action {
         Responder<Result<OwnedObjectPath, NetworkStateError>>,
     ),
     /// Add a new connection
-    NewConnection(
-        Connection,
-        Responder<Result<OwnedObjectPath, NetworkStateError>>,
-    ),
+    NewConnection(Connection, Responder<Result<(), NetworkStateError>>),
     /// Gets a connection by its id
     GetConnection(String, Responder<Option<Connection>>),
     /// Gets a connection by its Uuid
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index f4d61020d8..606f318cc4 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -407,16 +407,19 @@ pub struct GeneralState {
     pub connectivity: bool,
     pub wireless_enabled: bool,
     pub networking_enabled: bool, // pub network_state: NMSTATE
-                                  // pub dns: GlobalDnsConfiguration <HashMap>
 }
 
 /// Access Point
+#[serde_as]
 #[derive(Default, Debug, Clone, Serialize, utoipa::ToSchema)]
 pub struct AccessPoint {
+    #[serde_as(as = "DisplayFromStr")]
     pub ssid: SSID,
     pub hw_address: String,
     pub strength: u8,
-    pub security_protocols: Vec<SecurityProtocol>,
+    pub flags: u32,
+    pub rsn_flags: u32,
+    pub wpa_flags: u32,
 }
 
 /// Network device
diff --git a/rust/agama-server/src/network/nm/adapter.rs b/rust/agama-server/src/network/nm/adapter.rs
index fcd5160a9f..c580d2bc62 100644
--- a/rust/agama-server/src/network/nm/adapter.rs
+++ b/rust/agama-server/src/network/nm/adapter.rs
@@ -40,6 +40,10 @@ impl<'a> Adapter for NetworkManagerAdapter<'a> {
 
         let mut state = NetworkState::default();
 
+        if config.general_state {
+            state.general_state = general_state.clone();
+        }
+
         if config.devices {
             state.devices = self
                 .client
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index 81dc8a41c3..68510be1b4 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -120,12 +120,17 @@ impl<'a> NetworkManagerClient<'a> {
                     let ssid = SSID(wproxy.ssid().await?);
                     let hw_address = wproxy.hw_address().await?;
                     let strength = wproxy.strength().await?;
+                    let flags = wproxy.flags().await?;
+                    let rsn_flags = wproxy.rsn_flags().await?;
+                    let wpa_flags = wproxy.wpa_flags().await?;
 
                     points.push(AccessPoint {
                         ssid,
                         hw_address,
                         strength,
-                        security_protocols: vec![],
+                        flags,
+                        rsn_flags,
+                        wpa_flags,
                     })
                 }
             }
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 780f6bfbc7..4b00ac73a9 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -91,8 +91,7 @@ impl<T: Adapter> NetworkSystem<T> {
                 tx.send(self.state.access_points.clone()).unwrap();
             }
             Action::NewConnection(conn, tx) => {
-                let result = self.new_connection_action(conn).await;
-                tx.send(result).unwrap();
+                tx.send(self.state.add_connection(conn.clone())).unwrap();
             }
             Action::GetGeneralState(tx) => {
                 let config = self.state.general_state.clone();
@@ -200,20 +199,6 @@ impl<T: Adapter> NetworkSystem<T> {
         Ok(path)
     }
 
-    async fn new_connection_action(
-        &mut self,
-        conn: Connection,
-    ) -> Result<OwnedObjectPath, NetworkStateError> {
-        // TODO: handle tree handling problems
-        self.state.add_connection(conn.clone())?;
-        let mut tree = self.tree.lock().await;
-        let path = tree
-            .add_connection(&conn)
-            .await
-            .expect("Could not update the D-Bus tree");
-        Ok(path)
-    }
-
     fn set_ports_action(
         &mut self,
         uuid: Uuid,
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 9c4571c87e..e92786679b 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -9,7 +9,11 @@ use axum::{
     Json, Router,
 };
 
-use super::{error::NetworkStateError, model::GeneralState, Action, Adapter};
+use super::{
+    error::NetworkStateError,
+    model::{AccessPoint, GeneralState},
+    Action, Adapter,
+};
 
 use crate::network::{model::Connection, model::Device, NetworkSystem};
 use agama_lib::error::ServiceError;
@@ -116,9 +120,9 @@ async fn update_general_state(
 }
 
 #[utoipa::path(get, path = "/network/wifi", responses(
-  (status = 200, description = "List of wireless networks", body = Vec<String>)
+  (status = 200, description = "List of wireless networks", body = Vec<AccessPoint>)
 ))]
-async fn wifi_networks(State(state): State<NetworkState>) -> Json<Vec<String>> {
+async fn wifi_networks(State(state): State<NetworkState>) -> Json<Vec<AccessPoint>> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::RefreshScan(tx)).unwrap();
     let _ = rx.await.unwrap();
@@ -126,11 +130,12 @@ async fn wifi_networks(State(state): State<NetworkState>) -> Json<Vec<String>> {
     state.actions.send(Action::GetAccessPoints(tx)).unwrap();
 
     let access_points = rx.await.unwrap();
+
     let mut networks = vec![];
+
     for ap in access_points {
-        let ssid = ap.ssid.to_string();
-        if !ssid.is_empty() && !networks.contains(&ssid) {
-            networks.push(ssid);
+        if !ap.ssid.to_string().is_empty() {
+            networks.push(ap);
         }
     }
 
@@ -171,19 +176,14 @@ async fn add_connection(
 ) -> Result<Json<Connection>, NetworkError> {
     let (tx, rx) = oneshot::channel();
 
+    let conn = Connection::try_from(conn)?;
+    let id = conn.id.clone();
     state
         .actions
-        .send(Action::AddConnection(
-            conn.id.clone(),
-            conn.device_type(),
-            tx,
-        ))
+        .send(Action::NewConnection(conn.clone(), tx))
         .unwrap();
     let _ = rx.await.unwrap();
 
-    let conn = Connection::try_from(conn)?;
-    let id = conn.id.clone();
-
     state
         .actions
         .send(Action::UpdateConnection(Box::new(conn)))
@@ -236,17 +236,18 @@ async fn update_connection(
         .send(Action::GetConnection(id.clone(), tx))
         .unwrap();
     let current_conn = rx.await.unwrap();
+    let mut conn = Connection::try_from(conn)?;
     match current_conn {
         Some(current) => {
             if current.id != id.clone() {
                 return Err(NetworkError::UnknownConnection(id));
+            } else {
+                conn.uuid = current.uuid;
             }
         }
         None => return Err(NetworkError::UnknownConnection(id)),
     }
 
-    let conn = Connection::try_from(conn)?;
-
     state
         .actions
         .send(Action::UpdateConnection(Box::new(conn)))

From cad1e123723150d194b2407c8954afa1e7995c33 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 27 Mar 2024 12:49:16 +0000
Subject: [PATCH 160/324] Adapted wireless to use the http API

---
 web/src/client/network/index.js               | 35 +++++++++----
 web/src/client/network/model.js               | 12 ++---
 web/src/client/network/model.test.js          |  4 +-
 web/src/components/network/IpSettingsForm.jsx |  8 +--
 web/src/components/network/NetworkPage.jsx    |  3 +-
 .../components/network/WifiConnectionForm.jsx | 14 ++---
 web/src/components/network/WifiSelector.jsx   | 51 ++-----------------
 7 files changed, 51 insertions(+), 76 deletions(-)

diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index b8b887a87e..4472316066 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -22,9 +22,9 @@
 // @ts-check
 
 import DBusClient from "../dbus";
-import { NetworkManagerAdapter } from "./network_manager";
+import { NetworkManagerAdapter, securityFromFlags } from "./network_manager";
 import cockpit from "../../lib/cockpit";
-import { createConnection, ConnectionTypes, ConnectionState } from "./model";
+import { createConnection, ConnectionTypes, ConnectionState, createAccessPoint } from "./model";
 import { formatIp } from "./utils";
 
 const SERVICE_NAME = "org.opensuse.Agama1";
@@ -116,18 +116,23 @@ class NetworkClient {
   }
 
   fromApiConnection(connection) {
+    const nameservers = (connection.nameservers || []);
     const addresses = (connection.addresses || []).map((address) => {
       const [ip, netmask] = address.split("/");
       return { address: ip, prefix: netmask };
     });
 
-    return { ...connection, addresses };
+    return { ...connection, addresses, nameservers };
   }
 
   toApiConnection(connection) {
     const addresses = (connection.addresses || []).map((addr) => formatIp(addr));
+    const { iface, gateway4, gateway6, ...conn } = connection;
 
-    return { ...connection, addresses };
+    if (gateway4?.trim() !== "") conn.gateway4 = gateway4;
+    if (gateway6?.trim() !== "") conn.gateway6 = gateway6;
+
+    return { ...conn, addresses, interface: iface };
   }
 
   /**
@@ -135,8 +140,17 @@ class NetworkClient {
    *
    * @return {Promise<AccessPoint[]>}
    */
-  accessPoints() {
-    return this.client.get("/network/wifi");
+  async accessPoints() {
+    const access_points = await this.client.get("/network/wifi");
+
+    return access_points.map(ap => {
+      return createAccessPoint({
+        ssid: ap.ssid,
+        hwAddress: ap.hw_address,
+        strength: ap.strength,
+        security: securityFromFlags(ap.flags, ap.wpa_flags, ap.rsn_flags)
+      });
+    });
   }
 
   /**
@@ -145,7 +159,7 @@ class NetworkClient {
    * @param {Connection} connection - connection to be activated
    */
   async connectTo(connection) {
-    return this.client.post("/network/connections", connection);
+    return this.client.post("/network/connections", this.toApiConnection(connection));
   }
 
   /**
@@ -156,14 +170,15 @@ class NetworkClient {
    */
   async addAndConnectTo(ssid, options) {
     // duplicated code (see network manager adapter)
-    const wireless = { ssid };
+    const wireless = { ssid, mode: "infrastructure" };
     if (options.security) wireless.security = options.security;
     if (options.password) wireless.password = options.password;
     if (options.hidden) wireless.hidden = options.hidden;
+    if (options.mode) wireless.mode = options.mode;
 
     const connection = createConnection({
       id: ssid,
-      wireless
+      wireless,
     });
 
     // the connection is automatically activated when written
@@ -236,6 +251,8 @@ class NetworkClient {
 
   /*
   * Returns network general settings
+  *
+   * @return {Promise<NetworkSettings>}
   */
   settings() {
     return this.client.get("/network/state");
diff --git a/web/src/client/network/model.js b/web/src/client/network/model.js
index 9a9d76a7ad..02a931b576 100644
--- a/web/src/client/network/model.js
+++ b/web/src/client/network/model.js
@@ -82,7 +82,7 @@ const SecurityProtocols = Object.freeze({
  * @property {string} id
  * @property {string} iface
  * @property {IPAddress[]} addresses
- * @property {string[]} nameServers
+ * @property {string[]} nameservers
  * @property {string} gateway4
  * @property {string} gateway6
  * @property {string} method4
@@ -109,8 +109,8 @@ const SecurityProtocols = Object.freeze({
 /**
 * @typedef {object} NetworkSettings
 * @property {boolean} connectivity
-* @property {boolean} wirelessEnabled
-* @property {boolean} networkingEnabled
+* @property {boolean} wireless_enabled
+* @property {boolean} networking_enabled
 * @property {string} hostname
 
 /**
@@ -126,11 +126,11 @@ const SecurityProtocols = Object.freeze({
  * @param {string} [options.gateway6] - Connection IPv6 gateway
  * @param {string} [options.iface] - Connection interface
  * @param {IPAddress[]} [options.addresses] Connection addresses
- * @param {string[]} [options.nameServers] Connection nameservers
+ * @param {string[]} [options.nameservers] Connection nameservers
  * @param {object} [options.wireless] Wireless Settings
  * @return {Connection}
  */
-const createConnection = ({ id, iface, method4, method6, gateway4, gateway6, addresses, nameServers, wireless }) => {
+const createConnection = ({ id, iface, method4, method6, gateway4, gateway6, addresses, nameservers, wireless }) => {
   const connection = {
     id,
     iface,
@@ -139,7 +139,7 @@ const createConnection = ({ id, iface, method4, method6, gateway4, gateway6, add
     gateway4: gateway4 || "",
     gateway6: gateway6 || "",
     addresses: addresses || [],
-    nameServers: nameServers || []
+    nameservers: nameservers || []
   };
 
   if (wireless) connection.wireless = wireless;
diff --git a/web/src/client/network/model.test.js b/web/src/client/network/model.test.js
index 9890a3db27..b2c18747bb 100644
--- a/web/src/client/network/model.test.js
+++ b/web/src/client/network/model.test.js
@@ -34,7 +34,7 @@ describe("createConnection", () => {
       method4: "auto",
       method6: "auto",
       addresses: [],
-      nameServers: [],
+      nameservers: [],
       gateway4: "",
       gateway6: ""
     });
@@ -47,7 +47,7 @@ describe("createConnection", () => {
     expect(connection.method4).toEqual("auto");
     expect(connection.gateway4).toEqual("auto");
     expect(connection.addresses).toEqual([]);
-    expect(connection.nameServers).toEqual(addresses);
+    expect(connection.nameservers).toEqual(addresses);
   });
 });
 
diff --git a/web/src/components/network/IpSettingsForm.jsx b/web/src/components/network/IpSettingsForm.jsx
index a74589919f..23e567dd5c 100644
--- a/web/src/components/network/IpSettingsForm.jsx
+++ b/web/src/components/network/IpSettingsForm.jsx
@@ -38,7 +38,7 @@ const usingDHCP = (method) => method === METHODS.AUTO;
 export default function IpSettingsForm({ connection, onClose }) {
   const client = useInstallerClient();
   const [addresses, setAddresses] = useState(connection.addresses);
-  const [nameServers, setNameServers] = useState(connection.nameservers.map(a => {
+  const [nameservers, setNameservers] = useState(connection.nameservers.map(a => {
     return { address: a };
   }));
   const [method, setMethod] = useState(connection.method4);
@@ -95,7 +95,7 @@ export default function IpSettingsForm({ connection, onClose }) {
     e.preventDefault();
 
     const sanitizedAddresses = cleanAddresses(addresses);
-    const sanitizedNameServers = cleanAddresses(nameServers);
+    const sanitizedNameservers = cleanAddresses(nameservers);
 
     if (!validate(sanitizedAddresses)) return;
 
@@ -105,7 +105,7 @@ export default function IpSettingsForm({ connection, onClose }) {
       addresses: sanitizedAddresses,
       method4: method,
       gatewa4: gateway,
-      nameservers: sanitizedNameServers.map(s => s.address)
+      nameservers: sanitizedNameservers.map(s => s.address)
     };
 
     client.network.updateConnection(updatedConnection)
@@ -167,7 +167,7 @@ export default function IpSettingsForm({ connection, onClose }) {
           />
         </FormGroup>
 
-        <DnsDataList servers={nameServers} updateDnsServers={setNameServers} />
+        <DnsDataList servers={nameservers} updateDnsServers={setNameservers} />
       </Form>
 
       <Popup.Actions>
diff --git a/web/src/components/network/NetworkPage.jsx b/web/src/components/network/NetworkPage.jsx
index 0a7396f7c4..82b06c213a 100644
--- a/web/src/components/network/NetworkPage.jsx
+++ b/web/src/components/network/NetworkPage.jsx
@@ -93,7 +93,7 @@ export default function NetworkPage() {
   useEffect(() => {
     if (connections !== undefined) return;
 
-    client.settings().then((s) => setWifiScanSupported(s.wirelessEnabled));
+    client.settings().then((s) => setWifiScanSupported(s.wireless_enabled));
     client.connections().then(setConnections);
   }, [client, connections]);
 
@@ -106,7 +106,6 @@ export default function NetworkPage() {
   };
 
   const ready = connections !== undefined;
-  console.log(connections);
 
   const WifiConnections = () => {
     const activeWifiConnections = connections.filter(c => c.wireless);
diff --git a/web/src/components/network/WifiConnectionForm.jsx b/web/src/components/network/WifiConnectionForm.jsx
index 3a04fc92fb..2149b3808e 100644
--- a/web/src/components/network/WifiConnectionForm.jsx
+++ b/web/src/components/network/WifiConnectionForm.jsx
@@ -87,12 +87,12 @@ export default function WifiConnectionForm({ network, onCancel, onSubmitCallback
 
   return (
     <Form id={`${ssid}-connection-form`} onSubmit={accept} innerRef={formRef}>
-      { error &&
+      {error &&
         <Alert variant="warning" isInline title={_("Something went wrong")}>
           <p>{_("Please, review provided settings and try again.")}</p>
-        </Alert> }
+        </Alert>}
 
-      { network?.hidden &&
+      {network?.hidden &&
         // TRANSLATORS: SSID (Wifi network name) configuration
         <FormGroup fieldId="ssid" label={_("SSID")}>
           <TextInput
@@ -103,9 +103,9 @@ export default function WifiConnectionForm({ network, onCancel, onSubmitCallback
             value={ssid}
             onChange={(_, value) => setSsid(value)}
           />
-        </FormGroup> }
+        </FormGroup>}
 
-      { /* TRANSLATORS: Wifi security configuration (password protected or not) */ }
+      { /* TRANSLATORS: Wifi security configuration (password protected or not) */}
       <FormGroup fieldId="security" label={_("Security")}>
         <FormSelect
           id="security"
@@ -116,7 +116,7 @@ export default function WifiConnectionForm({ network, onCancel, onSubmitCallback
           {selectorOptions}
         </FormSelect>
       </FormGroup>
-      { security === "wpa-psk" &&
+      {security === "wpa-psk" &&
         // TRANSLATORS: WiFi password
         <FormGroup fieldId="password" label={_("WPA Password")}>
           <PasswordInput
@@ -126,7 +126,7 @@ export default function WifiConnectionForm({ network, onCancel, onSubmitCallback
             value={password}
             onChange={(_, value) => setPassword(value)}
           />
-        </FormGroup> }
+        </FormGroup>}
       <ActionGroup>
         <Button type="submit" variant="primary" isLoading={isConnecting} isDisabled={isConnecting}>
           {/* TRANSLATORS: button label, connect to a WiFi network */}
diff --git a/web/src/components/network/WifiSelector.jsx b/web/src/components/network/WifiSelector.jsx
index 9b68da5af6..c14e330ed9 100644
--- a/web/src/components/network/WifiSelector.jsx
+++ b/web/src/components/network/WifiSelector.jsx
@@ -35,7 +35,8 @@ function WifiSelector({ isOpen = false, onClose }) {
   const [networks, setNetworks] = useState([]);
   const [showHiddenForm, setShowHiddenForm] = useState(false);
   const [connections, setConnections] = useState([]);
-  const [activeConnections, setActiveConnections] = useState(client.network.activeConnections());
+  const [activeConnections, setActiveConnections] = useState([]);
+  const [accessPoints, setAccessPoints] = useState([]);
   const [selectedNetwork, setSelectedNetwork] = useState(null);
   const [activeNetwork, setActiveNetwork] = useState(null);
 
@@ -46,13 +47,14 @@ function WifiSelector({ isOpen = false, onClose }) {
 
   useEffect(() => {
     client.network.connections().then(setConnections);
+    client.network.accessPoints().then(setAccessPoints);
   }, [client.network]);
 
   useEffect(() => {
     const loadNetworks = async () => {
       const knownSsids = [];
 
-      return client.network.accessPoints()
+      return accessPoints
         .sort((a, b) => b.strength - a.strength)
         .reduce((networks, ap) => {
           // Do not include networks without SSID
@@ -85,50 +87,7 @@ function WifiSelector({ isOpen = false, onClose }) {
       setNetworks(data);
       setActiveNetwork(networksFromValues(data).find(d => d.connection));
     });
-  }, [client.network, connections, activeConnections, isOpen]);
-
-  useEffect(() => {
-    return client.network.onNetworkEvent(({ type, payload }) => {
-      switch (type) {
-        case NetworkEventTypes.CONNECTION_ADDED: {
-          setConnections(conns => [...conns, payload]);
-          break;
-        }
-
-        case NetworkEventTypes.CONNECTION_UPDATED: {
-          setConnections(conns => {
-            const newConnections = conns.filter(c => c.id !== payload.id);
-            return [...newConnections, payload];
-          });
-          break;
-        }
-
-        case NetworkEventTypes.CONNECTION_REMOVED: {
-          setConnections(conns => conns.filter(c => c.path !== payload.path));
-          break;
-        }
-
-        case NetworkEventTypes.ACTIVE_CONNECTION_ADDED: {
-          setActiveConnections(conns => [...conns, payload]);
-          break;
-        }
-
-        case NetworkEventTypes.ACTIVE_CONNECTION_UPDATED: {
-          setActiveConnections(conns => {
-            const newConnections = conns.filter(c => c.id !== payload.id);
-            return [...newConnections, payload];
-          });
-          break;
-        }
-
-        case NetworkEventTypes.ACTIVE_CONNECTION_REMOVED: {
-          setActiveConnections(conns => conns.filter(c => c.id !== payload.id));
-          if (selectedNetwork?.settings?.id === payload.id) switchSelectedNetwork(null);
-          break;
-        }
-      }
-    });
-  });
+  }, [client.network, connections, activeConnections, accessPoints, isOpen]);
 
   return (
     <Popup isOpen={isOpen} title={_("Connect to a Wi-Fi network")}>

From 13163847d3862c8887029da8f7595cf1e63135cc Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 27 Mar 2024 23:06:27 +0100
Subject: [PATCH 161/324] Add validation router and use it in users

---
 rust/agama-lib/src/proxies.rs       |  11 +++
 rust/agama-lib/src/users/client.rs  |   4 +-
 rust/agama-server/src/users/web.rs  | 134 +++++++++++++++++++---------
 rust/agama-server/src/web/common.rs | 105 +++++++++++++++++++++-
 rust/agama-server/src/web/docs.rs   |  11 +++
 rust/agama-server/src/web/event.rs  |  11 ++-
 6 files changed, 231 insertions(+), 45 deletions(-)

diff --git a/rust/agama-lib/src/proxies.rs b/rust/agama-lib/src/proxies.rs
index 5a64753915..d33efa6921 100644
--- a/rust/agama-lib/src/proxies.rs
+++ b/rust/agama-lib/src/proxies.rs
@@ -178,3 +178,14 @@ trait Issues {
     #[dbus_proxy(property)]
     fn all(&self) -> zbus::Result<Vec<(String, String, u32, u32)>>;
 }
+
+#[dbus_proxy(interface = "org.opensuse.Agama1.Validation", assume_defaults = true)]
+trait Validation {
+    /// Errors property
+    #[dbus_proxy(property)]
+    fn errors(&self) -> zbus::Result<Vec<String>>;
+
+    /// Valid property
+    #[dbus_proxy(property)]
+    fn valid(&self) -> zbus::Result<bool>;
+}
diff --git a/rust/agama-lib/src/users/client.rs b/rust/agama-lib/src/users/client.rs
index 2c24e1e602..37a1badb16 100644
--- a/rust/agama-lib/src/users/client.rs
+++ b/rust/agama-lib/src/users/client.rs
@@ -3,11 +3,11 @@
 use super::proxies::{FirstUser as FirstUserFromDBus, Users1Proxy};
 use crate::error::ServiceError;
 use agama_settings::{settings::Settings, SettingValue, SettingsError};
-use serde::{Serialize,Deserialize};
+use serde::{Deserialize, Serialize};
 use zbus::Connection;
 
 /// Represents the settings for the first user
-#[derive(Serialize, Deserialize, Clone, Debug, Default)]
+#[derive(Serialize, Deserialize, Clone, Debug, Default, utoipa::ToSchema)]
 pub struct FirstUser {
     /// First user's full name
     pub full_name: String,
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index bc693d9795..5b42b59c11 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -4,6 +4,17 @@
 //! * `users_service` which returns the Axum service.
 //! * `users_stream` which offers an stream that emits the users events coming from D-Bus.
 
+use crate::{
+    error::Error,
+    web::{
+        common::{service_status_router, validation_router},
+        Event,
+    },
+};
+use agama_lib::{
+    error::ServiceError,
+    users::{proxies::Users1Proxy, FirstUser, FirstUserSettings, UsersClient},
+};
 use axum::{
     extract::State,
     routing::{get, put},
@@ -12,16 +23,6 @@ use axum::{
 use serde::{Deserialize, Serialize};
 use std::pin::Pin;
 use tokio_stream::{Stream, StreamExt};
-use crate::{
-    error::Error,
-    web::Event
-    ,
-};
-use agama_lib::{
-    error::ServiceError, users::{
-        proxies::Users1Proxy, FirstUser, FirstUserSettings, UsersClient
-    }
-};
 
 #[derive(Clone)]
 struct UsersState<'a> {
@@ -36,19 +37,29 @@ struct UsersState<'a> {
 pub async fn users_streams(
     dbus: zbus::Connection,
 ) -> Result<Vec<(&'static str, Pin<Box<dyn Stream<Item = Event> + Send>>)>, Error> {
-    const FIRST_USER_ID : &str = "first_user";
-    const ROOT_PASSWORD_ID : &str = "root_password";
-    const ROOT_SSHKEY_ID : &str = "root_sshkey";
-    let result : Vec<(&str, Pin<Box<dyn Stream<Item = Event> + Send>>)> = vec![
-      (FIRST_USER_ID, Box::pin(first_user_changed_stream(dbus.clone()).await?)),
-      (ROOT_PASSWORD_ID, Box::pin(root_password_changed_stream(dbus.clone()).await?)),
-      (ROOT_SSHKEY_ID, Box::pin(root_ssh_key_changed_stream(dbus.clone()).await?)),
+    const FIRST_USER_ID: &str = "first_user";
+    const ROOT_PASSWORD_ID: &str = "root_password";
+    const ROOT_SSHKEY_ID: &str = "root_sshkey";
+    let result: Vec<(&str, Pin<Box<dyn Stream<Item = Event> + Send>>)> = vec![
+        (
+            FIRST_USER_ID,
+            Box::pin(first_user_changed_stream(dbus.clone()).await?),
+        ),
+        (
+            ROOT_PASSWORD_ID,
+            Box::pin(root_password_changed_stream(dbus.clone()).await?),
+        ),
+        (
+            ROOT_SSHKEY_ID,
+            Box::pin(root_ssh_key_changed_stream(dbus.clone()).await?),
+        ),
     ];
 
     Ok(result)
 }
 
-async fn first_user_changed_stream(dbus: zbus::Connection,
+async fn first_user_changed_stream(
+    dbus: zbus::Connection,
 ) -> Result<impl Stream<Item = Event> + Send, Error> {
     let proxy = Users1Proxy::new(&dbus).await?;
     let stream = proxy
@@ -70,7 +81,8 @@ async fn first_user_changed_stream(dbus: zbus::Connection,
     Ok(stream)
 }
 
-async fn root_password_changed_stream(dbus: zbus::Connection,
+async fn root_password_changed_stream(
+    dbus: zbus::Connection,
 ) -> Result<impl Stream<Item = Event> + Send, Error> {
     let proxy = Users1Proxy::new(&dbus).await?;
     let stream = proxy
@@ -78,7 +90,9 @@ async fn root_password_changed_stream(dbus: zbus::Connection,
         .await
         .then(|change| async move {
             if let Ok(is_set) = change.get().await {
-                return Some(Event::RootPasswordChanged { password_is_set: is_set });
+                return Some(Event::RootPasswordChanged {
+                    password_is_set: is_set,
+                });
             }
             None
         })
@@ -86,7 +100,8 @@ async fn root_password_changed_stream(dbus: zbus::Connection,
     Ok(stream)
 }
 
-async fn root_ssh_key_changed_stream(dbus: zbus::Connection,
+async fn root_ssh_key_changed_stream(
+    dbus: zbus::Connection,
 ) -> Result<impl Stream<Item = Event> + Send, Error> {
     let proxy = Users1Proxy::new(&dbus).await?;
     let stream = proxy
@@ -94,11 +109,7 @@ async fn root_ssh_key_changed_stream(dbus: zbus::Connection,
         .await
         .then(|change| async move {
             if let Ok(key) = change.get().await {
-                let value = if key.is_empty() {
-                    None 
-                } else {
-                    Some(key)
-                };
+                let value = if key.is_empty() { None } else { Some(key) };
                 return Some(Event::RootSSHKeyChanged { key: value });
             }
             None
@@ -109,27 +120,48 @@ async fn root_ssh_key_changed_stream(dbus: zbus::Connection,
 
 /// Sets up and returns the axum service for the software module.
 pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
+    const DBUS_SERVICE: &str = "org.opensuse.Agama.Users1";
+    const DBUS_PATH: &str = "/org/opensuse/Agama/Users1";
 
-    let users = UsersClient::new(dbus).await?;
+    let users = UsersClient::new(dbus.clone()).await?;
     let state = UsersState { users };
+    let validation_router = validation_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+    let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let router = Router::new()
         .route("/", get(get_info))
         .route("/first_user", put(set_first_user).delete(remove_first_user))
-        .route("/root_password", put(set_root_password).delete(remove_root_password))
-        .route("/root_sshkey", put(set_root_sshkey).delete(remove_root_sshkey))
+        .route(
+            "/root_password",
+            put(set_root_password).delete(remove_root_password),
+        )
+        .route(
+            "/root_sshkey",
+            put(set_root_sshkey).delete(remove_root_sshkey),
+        )
+        .merge(validation_router)
+        .merge(status_router)
         .with_state(state);
     Ok(router)
 }
 
+/// Removes the first user settings
+#[utoipa::path(delete, path = "/users/user", responses(
+    (status = 200, description = "Removes the first user"),
+    (status = 400, description = "The D-Bus service could not perform the action"),
+))]
 async fn remove_first_user(State(state): State<UsersState<'_>>) -> Result<(), Error> {
     state.users.remove_first_user().await?;
     Ok(())
 }
 
+#[utoipa::path(put, path = "/users/user", responses(
+    (status = 200, description = "User values are set"),
+    (status = 400, description = "The D-Bus service could not perform the action"),
+))]
 async fn set_first_user(
-        State(state): State<UsersState<'_>>,
-        Json(config) : Json<FirstUser>
-    ) -> Result<(), Error> {
+    State(state): State<UsersState<'_>>,
+    Json(config): Json<FirstUser>,
+) -> Result<(), Error> {
     state.users.set_first_user(&config).await?;
     Ok(())
 }
@@ -140,30 +172,49 @@ pub struct RootPasswordSettings {
     pub encrypted: bool,
 }
 
+#[utoipa::path(delete, path = "/users/root_password", responses(
+    (status = 200, description = "Removes the root password"),
+    (status = 400, description = "The D-Bus service could not perform the action"),
+))]
 async fn remove_root_password(State(state): State<UsersState<'_>>) -> Result<(), Error> {
     state.users.remove_root_password().await?;
     Ok(())
 }
 
+#[utoipa::path(put, path = "/users/root_password", responses(
+    (status = 200, description = "Root password is set"),
+    (status = 400, description = "The D-Bus service could not perform the action"),
+))]
 async fn set_root_password(
     State(state): State<UsersState<'_>>,
-    Json(config) : Json<RootPasswordSettings>
+    Json(config): Json<RootPasswordSettings>,
 ) -> Result<(), Error> {
-state.users.set_root_password(&config.value, config.encrypted).await?;
-Ok(())
+    state
+        .users
+        .set_root_password(&config.value, config.encrypted)
+        .await?;
+    Ok(())
 }
 
+#[utoipa::path(delete, path = "/users/root_sshkey", responses(
+    (status = 200, description = "Removes the root SSH key"),
+    (status = 400, description = "The D-Bus service could not perform the action"),
+))]
 async fn remove_root_sshkey(State(state): State<UsersState<'_>>) -> Result<(), Error> {
     state.users.set_root_sshkey("").await?;
     Ok(())
 }
 
+#[utoipa::path(put, path = "/users/root_sshkey", responses(
+    (status = 200, description = "Root SSH Key is set"),
+    (status = 400, description = "The D-Bus service could not perform the action"),
+))]
 async fn set_root_sshkey(
     State(state): State<UsersState<'_>>,
-    Json(key) : Json<String>
+    Json(key): Json<String>,
 ) -> Result<(), Error> {
-state.users.set_root_sshkey(key.as_str()).await?;
-Ok(())
+    state.users.set_root_sshkey(key.as_str()).await?;
+    Ok(())
 }
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
@@ -178,8 +229,11 @@ pub struct UsersInfo {
     root: RootInfo,
 }
 
-async fn get_info(State(state): State<UsersState<'_>>) 
-        -> Result<Json<UsersInfo>, Error> {
+#[utoipa::path(put, path = "/users/", responses(
+    (status = 200, description = "Configuration for users including root and the first user", body = UsersInfo),
+    (status = 400, description = "The D-Bus service could not perform the action"),
+))]
+async fn get_info(State(state): State<UsersState<'_>>) -> Result<Json<UsersInfo>, Error> {
     let mut result = UsersInfo::default();
     let first_user = state.users.first_user().await?;
     if first_user.user_name.is_empty() {
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 891a292f31..9477f1ea70 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -5,7 +5,7 @@ use std::{pin::Pin, task::Poll};
 use agama_lib::{
     error::ServiceError,
     progress::Progress,
-    proxies::{IssuesProxy, ProgressProxy, ServiceStatusProxy},
+    proxies::{IssuesProxy, ProgressProxy, ServiceStatusProxy, ValidationProxy},
 };
 use axum::{extract::State, routing::get, Json, Router};
 use pin_project::pin_project;
@@ -352,3 +352,106 @@ async fn build_issues_proxy<'a>(
         .await?;
     Ok(proxy)
 }
+
+/// Builds a router to the `org.opensuse.Agama1.Validation` interface of a given
+/// D-Bus object.
+///
+/// ```no_run
+/// # use axum::{extract::State, routing::get, Json, Router};
+/// # use agama_lib::connection;
+/// # use agama_server::web::common::validation_router;
+/// # use tokio_test;
+///
+/// # tokio_test::block_on(async {
+/// async fn hello(state: State<HelloWorldState>) {};
+///
+/// #[derive(Clone)]
+/// struct HelloWorldState {};
+///
+/// let dbus = connection().await.unwrap();
+/// let issues_router = validation_router(
+///   &dbus, "org.opensuse.HelloWorld", "/org/opensuse/hello"
+/// ).await.unwrap();
+/// let router: Router<HelloWorldState> = Router::new()
+///   .route("/hello", get(hello))
+///   .merge(validation_router)
+///   .with_state(HelloWorldState {});
+/// });
+/// ```
+///
+/// * `dbus`: D-Bus connection.
+/// * `destination`: D-Bus service name.
+/// * `path`: D-Bus object path.
+pub async fn validation_router<T>(
+    dbus: &zbus::Connection,
+    destination: &str,
+    path: &str,
+) -> Result<Router<T>, ServiceError> {
+    let proxy = build_validation_proxy(dbus, destination, path).await?;
+    let state = ValidationState { proxy };
+    Ok(Router::new().route("/", get(validation)).with_state(state))
+}
+
+#[derive(Clone, Serialize, utoipa::ToSchema)]
+pub struct ValidationResult {
+    valid: bool,
+    errors: Vec<String>,
+}
+
+async fn validation(
+    State(state): State<ValidationState<'_>>,
+) -> Result<Json<ValidationResult>, Error> {
+    let validation = ValidationResult {
+        valid: state.proxy.valid().await?,
+        errors: state.proxy.errors().await?,
+    };
+    Ok(Json(validation))
+}
+
+#[derive(Clone)]
+struct ValidationState<'a> {
+    proxy: ValidationProxy<'a>,
+}
+
+/// Builds a stream of the changes in the the `org.opensuse.Agama1.Issues`
+/// interface of the given D-Bus object.
+///
+/// * `dbus`: D-Bus connection.
+/// * `destination`: D-Bus service name.
+/// * `path`: D-Bus object path.
+pub async fn validation_stream(
+    dbus: zbus::Connection,
+    destination: &'static str,
+    path: &'static str,
+) -> Result<Pin<Box<dyn Stream<Item = Event> + Send>>, Error> {
+    let proxy = build_validation_proxy(&dbus, destination, path).await?;
+    let stream = proxy
+        .receive_errors_changed()
+        .await
+        .then(move |change| async move {
+            if let Ok(errors) = change.get().await {
+                Some(Event::ValidationChanged {
+                    service: destination.to_string(),
+                    path: path.to_string(),
+                    errors,
+                })
+            } else {
+                None
+            }
+        })
+        .filter_map(|e| e);
+    Ok(Box::pin(stream))
+}
+
+async fn build_validation_proxy<'a>(
+    dbus: &zbus::Connection,
+    destination: &str,
+    path: &str,
+) -> Result<ValidationProxy<'a>, zbus::Error> {
+    let proxy = ValidationProxy::builder(dbus)
+        .destination(destination.to_string())?
+        .path(path.to_string())?
+        .build()
+        .await?;
+    Ok(proxy)
+}
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index fdacf6cc86..341cbb2979 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -20,6 +20,13 @@ use utoipa::OpenApi;
         crate::manager::web::installer_status,
         crate::questions::web::list_questions,
         crate::questions::web::answer,
+        crate::users::web::get_info,
+        crate::users::web::set_first_user,
+        crate::users::web::remove_first_user,
+        crate::users::web::set_root_password,
+        crate::users::web::remove_root_password,
+        crate::users::web::set_root_sshkey,
+        crate::users::web::remove_root_sshkey,
         super::http::ping,
     ),
     components(
@@ -44,6 +51,10 @@ use utoipa::OpenApi;
         schemas(crate::questions::web::Answer),
         schemas(crate::questions::web::GenericAnswer),
         schemas(crate::questions::web::PasswordAnswer),
+        schemas(agama_lib::users::FirstUser),
+        schemas(crate::users::web::RootPasswordSettings),
+        schemas(crate::users::web::RootInfo),
+        schemas(crate::users::web::UsersInfo),
         schemas(super::http::PingResponse),
     )
 )]
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 73f2c82ce4..067e61f8f2 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -1,5 +1,7 @@
 use crate::l10n::web::LocaleConfig;
-use agama_lib::{manager::InstallationPhase, progress::Progress, software::SelectedBy, users::FirstUserSettings};
+use agama_lib::{
+    manager::InstallationPhase, progress::Progress, software::SelectedBy, users::FirstUserSettings,
+};
 use serde::Serialize;
 use std::collections::HashMap;
 use tokio::sync::broadcast::{Receiver, Sender};
@@ -23,7 +25,7 @@ pub enum Event {
     },
     FirstUserChanged(FirstUserSettings),
     RootPasswordChanged {
-        password_is_set: bool
+        password_is_set: bool,
     },
     RootSSHKeyChanged {
         key: Option<String>,
@@ -45,6 +47,11 @@ pub enum Event {
         path: String,
         issues: Vec<Issue>,
     },
+    ValidationChanged {
+        service: String,
+        path: String,
+        errors: Vec<String>,
+    },
 }
 
 pub type EventsSender = Sender<Event>;

From 7abc0b9f66bf2551ed30b2a17c9cc1a6914b9de9 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Sun, 31 Mar 2024 00:05:30 +0100
Subject: [PATCH 162/324] adapt users js code (WIP)

---
 rust/agama-server/src/users/web.rs           |  5 +-
 web/src/client/http.js                       | 17 +++++
 web/src/client/mixins.js                     | 24 +++----
 web/src/client/users.js                      | 72 ++++++++------------
 web/src/components/overview/OverviewPage.jsx |  1 +
 5 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index 5b42b59c11..e1f0205cfe 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -128,8 +128,9 @@ pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceErro
     let validation_router = validation_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let router = Router::new()
-        .route("/", get(get_info))
-        .route("/first_user", put(set_first_user).delete(remove_first_user))
+        // TODO: "/" route failing, so workaround it with /info, but it should be /api/users in the end
+        .route("/info", get(get_info))
+        .route("/user", put(set_first_user).delete(remove_first_user))
         .route(
             "/root_password",
             put(set_root_password).delete(remove_root_password),
diff --git a/web/src/client/http.js b/web/src/client/http.js
index 4b3a123313..bb9a242795 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -150,6 +150,23 @@ class HTTPClient {
     }
   }
 
+  /**
+   * @param {string} url - Endpoint URL (e.g., "/l10n/config").
+   * @return {Promise<object>} Server response.
+   */
+  async delete(url) {
+    const response = await fetch(`${this.baseUrl}/${url}`, {
+      method: "DELETE",
+    });
+
+    try {
+      return await response.json();
+    } catch (e) {
+      console.warn("Expecting a JSON response", e);
+      return response.status === 200;
+    }
+  }
+
   /**
    * Registers a handler for a given type of events.
    *
diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index c7a9b28b7d..88ca2f2ec4 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -21,11 +21,6 @@
 
 // @ts-check
 
-const ISSUES_IFACE = "org.opensuse.Agama1.Issues";
-const STATUS_IFACE = "org.opensuse.Agama1.ServiceStatus";
-const PROGRESS_IFACE = "org.opensuse.Agama1.Progress";
-const VALIDATION_IFACE = "org.opensuse.Agama1.Validation";
-
 /**
  * @typedef {new(...args: any[]) => T} GConstructor
  * @template {object} T
@@ -245,11 +240,12 @@ const createError = (message) => {
 
 /**
  * Extends the given class with methods to get validation errors over D-Bus
- * @param {string} object_path - object_path
+ * @template {!WithHTTPClient} T
  * @param {T} superclass - superclass to extend
- * @template {!WithDBusClient} T
+ * @param {string} validation_path - status resource path (e.g., "/manager/status").
+ * @param {string} service_name - service name (e.g., "org.opensuse.Agama.Manager1").
  */
-const WithValidation = (superclass, object_path) => class extends superclass {
+const WithValidation = (superclass, validation_path, service_name) => class extends superclass {
   /**
    * Returns the validation errors
    *
@@ -259,12 +255,12 @@ const WithValidation = (superclass, object_path) => class extends superclass {
     let errors;
 
     try {
-      errors = await this.client.getProperty(object_path, VALIDATION_IFACE, "Errors");
+      errors = await this.client.get(validation_path);
     } catch (error) {
-      console.error(`Could not get validation errors for ${object_path}`, error);
+      console.error(`Could not get validation errors for ${validation_path}`, error);
     }
 
-    return errors.map(createError);
+    return errors.errors.map(createError);
   }
 
   /**
@@ -274,8 +270,10 @@ const WithValidation = (superclass, object_path) => class extends superclass {
    * @return {import ("./dbus").RemoveFn} function to disable the callback
    */
   onValidationChange(handler) {
-    return this.client.onObjectChanged(object_path, VALIDATION_IFACE, () => {
-      this.getValidationErrors().then(handler);
+    return this.client.onEvent("ValidationChange", ({ service, errors }) => {
+      if (service === service_name) {
+        handler(errors);
+      }
     });
   }
 };
diff --git a/web/src/client/users.js b/web/src/client/users.js
index 2a2b46588e..8a0315050d 100644
--- a/web/src/client/users.js
+++ b/web/src/client/users.js
@@ -21,12 +21,9 @@
 
 // @ts-check
 
-import DBusClient from "./dbus";
 import { WithValidation } from "./mixins";
 
-const USERS_SERVICE = "org.opensuse.Agama.Manager1";
-const USERS_IFACE = "org.opensuse.Agama.Users1";
-const USERS_PATH = "/org/opensuse/Agama/Users1";
+const USERS_PATH = "/users/info"; // TODO: it should be /users/ when routing in rs is solved
 
 /**
 * @typedef {object} UserResult
@@ -56,10 +53,10 @@ const USERS_PATH = "/org/opensuse/Agama/Users1";
  */
 class UsersBaseClient {
   /**
-   * @param {string|undefined} address - D-Bus address; if it is undefined, it uses the system bus.
+   * @param {import("./http").HTTPClient} client - HTTP client.
    */
-  constructor(address = undefined) {
-    this.client = new DBusClient(USERS_SERVICE, address);
+  constructor(client) {
+    this.client = client;
   }
 
   /**
@@ -68,8 +65,12 @@ class UsersBaseClient {
    * @return {Promise<User>}
    */
   async getUser() {
-    const proxy = await this.client.proxy(USERS_IFACE);
-    const [fullName, userName, password, autologin] = proxy.FirstUser;
+    const proxy = await this.client.get(USERS_PATH);
+    if (proxy.user === undefined) {
+      return { fullName: "", userName: "", password: "", autologin: false };
+    }
+
+    const [fullName, userName, password, autologin] = proxy.user;
     return { fullName, userName, password, autologin };
   }
 
@@ -79,8 +80,8 @@ class UsersBaseClient {
    * @return {Promise<boolean>}
    */
   async isRootPasswordSet() {
-    const proxy = await this.client.proxy(USERS_IFACE);
-    return proxy.RootPasswordSet;
+    const proxy = await this.client.get(USERS_PATH);
+    return proxy.root.password;
   }
 
   /**
@@ -90,16 +91,9 @@ class UsersBaseClient {
    * @return {Promise<UserResult>} returns an object with the result and the issues found if error
    */
   async setUser(user) {
-    const proxy = await this.client.proxy(USERS_IFACE);
-    const [result, issues] = await proxy.SetFirstUser(
-      user.fullName,
-      user.userName,
-      user.password,
-      user.autologin,
-      {}
-    );
-
-    return { result, issues };
+    const result = await this.client.put("/users/user", user);
+
+    return { result, issues: [] }; // TODO: check how to handle issues and result. Maybe separate call to validate?
   }
 
   /**
@@ -108,9 +102,7 @@ class UsersBaseClient {
    * @return {Promise<boolean>} whether the operation was successful or not
    */
   async removeUser() {
-    const proxy = await this.client.proxy(USERS_IFACE);
-    const result = await proxy.RemoveFirstUser();
-    return result === 0;
+    return this.client.delete("/users/user");
   }
 
   /**
@@ -120,9 +112,7 @@ class UsersBaseClient {
    * @return {Promise<boolean>} whether the operation was successful or not
    */
   async setRootPassword(password) {
-    const proxy = await this.client.proxy(USERS_IFACE);
-    const result = await proxy.SetRootPassword(password, false);
-    return result === 0;
+    return this.client.put("/users/root_password", { value: password, encrypted: false });
   }
 
   /**
@@ -131,9 +121,7 @@ class UsersBaseClient {
    * @return {Promise<boolean>} whether the operation was successful or not
    */
   async removeRootPassword() {
-    const proxy = await this.client.proxy(USERS_IFACE);
-    const result = await proxy.RemoveRootPassword();
-    return result === 0;
+    return this.client.delete("/users/root_password");
   }
 
   /**
@@ -142,8 +130,8 @@ class UsersBaseClient {
    * @return {Promise<String>} SSH public key or an empty string if it is not set
    */
   async getRootSSHKey() {
-    const proxy = await this.client.proxy(USERS_IFACE);
-    return proxy.RootSSHKey;
+    const proxy = await this.client.get(USERS_PATH);
+    return proxy.root.password || "";
   }
 
   /**
@@ -153,9 +141,7 @@ class UsersBaseClient {
    * @return {Promise<boolean>} whether the operation was successful or not
    */
   async setRootSSHKey(key) {
-    const proxy = await this.client.proxy(USERS_IFACE);
-    const result = await proxy.SetRootSSHKey(key);
-    return result === 0;
+    return this.client.put("/users/root_sshkey", key);
   }
 
   /**
@@ -165,15 +151,15 @@ class UsersBaseClient {
    * @return {import ("./dbus").RemoveFn} function to disable the callback
    */
   onUsersChange(handler) {
-    return this.client.onObjectChanged(USERS_PATH, USERS_IFACE, changes => {
-      if (changes.RootPasswordSet) {
+    return this.client.ws.onEvent((event) => {
+      if (event.type === "RootPasswordChanged") {
         // @ts-ignore
-        return handler({ rootPasswordSet: changes.RootPasswordSet.v });
-      } else if (changes.RootSSHKey) {
-        return handler({ rootSSHKey: changes.RootSSHKey.v.toString() });
-      } else if (changes.FirstUser) {
+        return handler({ rootPasswordSet: event.password_is_set });
+      } else if (event.type === "RootSSHKeyChanged") {
+        return handler({ rootSSHKey: event.key.toString() });
+      } else if (event.type === "FirstUserChanged") {
         // @ts-ignore
-        const [fullName, userName, password, autologin] = changes.FirstUser.v;
+        const { fullName, userName, password, autologin } = event;
         return handler({ firstUser: { fullName, userName, password, autologin } });
       }
     });
@@ -183,6 +169,6 @@ class UsersBaseClient {
 /**
  * Client to interact with the Agama users service
  */
-class UsersClient extends WithValidation(UsersBaseClient, USERS_PATH) { }
+class UsersClient extends WithValidation(UsersBaseClient, "users/validation", "/org/opensuse/Agama/Users1") { }
 
 export { UsersClient };
diff --git a/web/src/components/overview/OverviewPage.jsx b/web/src/components/overview/OverviewPage.jsx
index 6c18505320..096aece16d 100644
--- a/web/src/components/overview/OverviewPage.jsx
+++ b/web/src/components/overview/OverviewPage.jsx
@@ -68,6 +68,7 @@ export default function OverviewPage() {
     >
       <ProductSection />
       <L10nSection />
+      <UsersSection showErrors={showErrors} />
     </Page>
   );
 }

From 20b5d05854e1c7ae2090f1086298ff15f8c9fd79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 1 Apr 2024 16:28:16 +0100
Subject: [PATCH 163/324] Synchronize values of the D-Bus Locale service

---
 rust/agama-lib/src/localization.rs        |  1 +
 rust/agama-lib/src/localization/client.rs |  9 +++
 rust/agama-server/src/l10n/web.rs         | 92 +++++++++++------------
 rust/agama-server/src/web.rs              |  2 +-
 rust/agama-server/tests/l10n.rs           | 69 +++++++++++++----
 5 files changed, 109 insertions(+), 64 deletions(-)

diff --git a/rust/agama-lib/src/localization.rs b/rust/agama-lib/src/localization.rs
index 32e5462b34..65bb1ae8bc 100644
--- a/rust/agama-lib/src/localization.rs
+++ b/rust/agama-lib/src/localization.rs
@@ -6,5 +6,6 @@ mod settings;
 mod store;
 
 pub use client::LocalizationClient;
+pub use proxies::LocaleProxy;
 pub use settings::LocalizationSettings;
 pub use store::LocalizationStore;
diff --git a/rust/agama-lib/src/localization/client.rs b/rust/agama-lib/src/localization/client.rs
index 6e59ef35de..2b15ea2c78 100644
--- a/rust/agama-lib/src/localization/client.rs
+++ b/rust/agama-lib/src/localization/client.rs
@@ -3,6 +3,7 @@ use crate::error::ServiceError;
 use zbus::Connection;
 
 /// D-Bus client for the software service
+#[derive(Clone)]
 pub struct LocalizationClient<'a> {
     localization_proxy: LocaleProxy<'a>,
 }
@@ -22,6 +23,10 @@ impl<'a> LocalizationClient<'a> {
         Ok(first)
     }
 
+    pub async fn locales(&self) -> zbus::Result<Vec<String>> {
+        self.localization_proxy.locales().await
+    }
+
     pub async fn keyboard(&self) -> Result<String, ServiceError> {
         Ok(self.localization_proxy.keymap().await?)
     }
@@ -35,6 +40,10 @@ impl<'a> LocalizationClient<'a> {
         self.localization_proxy.set_locales(&locales).await
     }
 
+    pub async fn set_locales(&self, locales: &[&str]) -> zbus::Result<()> {
+        self.localization_proxy.set_locales(locales).await
+    }
+
     pub async fn set_keyboard(&self, keyboard: &str) -> zbus::Result<()> {
         self.localization_proxy.set_keymap(keyboard).await
     }
diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index 1fa6b9cf23..847df89b38 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -7,6 +7,7 @@ use crate::{
     error::Error,
     web::{Event, EventsSender},
 };
+use agama_lib::{error::ServiceError, localization::LocaleProxy};
 use agama_locale_data::LocaleId;
 use axum::{
     extract::State,
@@ -14,38 +15,46 @@ use axum::{
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
-use std::sync::{Arc, RwLock};
+use std::sync::Arc;
+use tokio::sync::RwLock;
 
 #[derive(Clone)]
-struct LocaleState {
+struct LocaleState<'a> {
     locale: Arc<RwLock<L10n>>,
+    proxy: LocaleProxy<'a>,
     events: EventsSender,
 }
 
 /// Sets up and returns the axum service for the localization module.
 ///
 /// * `events`: channel to send the events to the main service.
-pub fn l10n_service(events: EventsSender) -> Router {
+pub async fn l10n_service(
+    dbus: zbus::Connection,
+    events: EventsSender,
+) -> Result<Router, ServiceError> {
     let id = LocaleId::default();
     let locale = L10n::new_with_locale(&id).unwrap();
+    let proxy = LocaleProxy::new(&dbus).await?;
     let state = LocaleState {
         locale: Arc::new(RwLock::new(locale)),
+        proxy,
         events,
     };
 
-    Router::new()
+    let router = Router::new()
         .route("/keymaps", get(keymaps))
         .route("/locales", get(locales))
         .route("/timezones", get(timezones))
         .route("/config", put(set_config).get(get_config))
-        .with_state(state)
+        .with_state(state);
+    Ok(router)
 }
 
 #[utoipa::path(get, path = "/l10n/locales", responses(
   (status = 200, description = "List of known locales", body = Vec<LocaleEntry>)
 ))]
-async fn locales(State(state): State<LocaleState>) -> Json<Vec<LocaleEntry>> {
-    let data = state.locale.read().unwrap();
+async fn locales(State(state): State<LocaleState<'_>>) -> Json<Vec<LocaleEntry>> {
+    let data = state.locale.read().await;
     let locales = data.locales_db.entries().to_vec();
     Json(locales)
 }
@@ -67,8 +76,8 @@ pub struct LocaleConfig {
 #[utoipa::path(get, path = "/l10n/timezones", responses(
     (status = 200, description = "List of known timezones")
 ))]
-async fn timezones(State(state): State<LocaleState>) -> Json<Vec<TimezoneEntry>> {
-    let data = state.locale.read().unwrap();
+async fn timezones(State(state): State<LocaleState<'_>>) -> Json<Vec<TimezoneEntry>> {
+    let data = state.locale.read().await;
     let timezones = data.timezones_db.entries().to_vec();
     Json(timezones)
 }
@@ -76,8 +85,8 @@ async fn timezones(State(state): State<LocaleState>) -> Json<Vec<TimezoneEntry>>
 #[utoipa::path(get, path = "/l10n/keymaps", responses(
     (status = 200, description = "List of known keymaps", body = Vec<Keymap>)
 ))]
-async fn keymaps(State(state): State<LocaleState>) -> Json<Vec<Keymap>> {
-    let data = state.locale.read().unwrap();
+async fn keymaps(State(state): State<LocaleState<'_>>) -> Json<Vec<Keymap>> {
+    let data = state.locale.read().await;
     let keymaps = data.keymaps_db.entries().to_vec();
     Json(keymaps)
 }
@@ -88,10 +97,10 @@ async fn keymaps(State(state): State<LocaleState>) -> Json<Vec<Keymap>> {
     (status = 200, description = "Set the locale configuration", body = LocaleConfig)
 ))]
 async fn set_config(
-    State(state): State<LocaleState>,
+    State(state): State<LocaleState<'_>>,
     Json(value): Json<LocaleConfig>,
 ) -> Result<Json<()>, Error> {
-    let mut data = state.locale.write().unwrap();
+    let mut data = state.locale.write().await;
     let mut changes = LocaleConfig::default();
 
     if let Some(locales) = &value.locales {
@@ -128,6 +137,9 @@ async fn set_config(
         data.set_ui_keymap(ui_keymap)?;
     }
 
+    if let Err(e) = update_dbus(&state.proxy, &changes).await {
+        log::warn!("Could not synchronize settings in the localization D-Bus service: {e}");
+    }
     _ = state.events.send(Event::L10nConfigChanged(changes));
 
     Ok(Json(()))
@@ -136,8 +148,8 @@ async fn set_config(
 #[utoipa::path(get, path = "/l10n/config", responses(
     (status = 200, description = "Localization configuration", body = LocaleConfig)
 ))]
-async fn get_config(State(state): State<LocaleState>) -> Json<LocaleConfig> {
-    let data = state.locale.read().unwrap();
+async fn get_config(State(state): State<LocaleState<'_>>) -> Json<LocaleConfig> {
+    let data = state.locale.read().await;
     Json(LocaleConfig {
         locales: Some(data.locales.clone()),
         keymap: Some(data.keymap.to_string()),
@@ -147,46 +159,26 @@ async fn get_config(State(state): State<LocaleState>) -> Json<LocaleConfig> {
     })
 }
 
-#[cfg(test)]
-mod tests {
-    use crate::l10n::{web::LocaleState, L10n};
-    use agama_locale_data::{KeymapId, LocaleId};
-    use std::sync::{Arc, RwLock};
-    use tokio::{sync::broadcast::channel, test};
-
-    fn build_state() -> LocaleState {
-        let (tx, _) = channel(16);
-        let default_code = LocaleId::default();
-        let locale = L10n::new_with_locale(&default_code).unwrap();
-        LocaleState {
-            locale: Arc::new(RwLock::new(locale)),
-            events: tx,
-        }
+pub async fn update_dbus(
+    client: &LocaleProxy<'_>,
+    config: &LocaleConfig,
+) -> Result<(), ServiceError> {
+    if let Some(locales) = &config.locales {
+        let locales: Vec<_> = locales.iter().map(|l| l.as_ref()).collect();
+        client.set_locales(&locales).await?;
     }
 
-    #[test]
-    async fn test_locales() {
-        let state = build_state();
-        let response = super::locales(axum::extract::State(state)).await;
-        let default = LocaleId::default();
-        let found = response.iter().find(|l| l.id == default);
-        assert!(found.is_some());
+    if let Some(keymap) = &config.keymap {
+        client.set_keymap(keymap.as_str()).await?;
     }
 
-    #[test]
-    async fn test_keymaps() {
-        let state = build_state();
-        let response = super::keymaps(axum::extract::State(state)).await;
-        let english: KeymapId = "us".parse().unwrap();
-        let found = response.iter().find(|k| k.id == english);
-        assert!(found.is_some());
+    if let Some(timezone) = &config.timezone {
+        client.set_timezone(&timezone).await?;
     }
 
-    #[test]
-    async fn test_timezones() {
-        let state = build_state();
-        let response = super::timezones(axum::extract::State(state)).await;
-        let found = response.iter().find(|t| t.code == "Atlantic/Canary");
-        assert!(found.is_some());
+    if let Some(ui_locale) = &config.ui_locale {
+        client.set_uilocale(ui_locale).await?;
     }
+
+    Ok(())
 }
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index c87d219594..e52abc7efc 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -54,7 +54,7 @@ where
         .expect("Could not connect to NetworkManager to read the configuration");
 
     let router = MainServiceBuilder::new(events.clone(), web_ui_dir)
-        .add_service("/l10n", l10n_service(events.clone()))
+        .add_service("/l10n", l10n_service(dbus.clone(), events.clone()).await?)
         .add_service("/manager", manager_service(dbus.clone()).await?)
         .add_service("/software", software_service(dbus.clone()).await?)
         .add_service(
diff --git a/rust/agama-server/tests/l10n.rs b/rust/agama-server/tests/l10n.rs
index b175e2814e..1be8e57539 100644
--- a/rust/agama-server/tests/l10n.rs
+++ b/rust/agama-server/tests/l10n.rs
@@ -1,34 +1,45 @@
 pub mod common;
 
-use agama_server::l10n::web::l10n_service;
+use std::{error::Error, future::pending, thread, time};
+
+use agama_lib::localization::LocalizationClient;
+use agama_locale_data::LocaleId;
+use agama_server::l10n::{export_dbus_objects, web::l10n_service};
 use axum::{
     body::Body,
     http::{Request, StatusCode},
     Router,
 };
-use common::body_to_string;
-use tokio::{sync::broadcast::channel, test};
+use common::{body_to_string, DBusServer};
+use tokio::{
+    sync::broadcast::channel,
+    test,
+    time::{sleep, Duration},
+};
 use tower::ServiceExt;
 
-fn build_service() -> Router {
+async fn build_service(dbus: zbus::Connection) -> Router {
     let (tx, _) = channel(16);
-    l10n_service(tx)
+    l10n_service(dbus, tx).await.unwrap()
 }
 
 #[test]
-async fn test_get_config() {
-    let service = build_service();
+async fn test_get_config() -> Result<(), Box<dyn Error>> {
+    let dbus_server = DBusServer::new().start().await?;
+    let service = build_service(dbus_server.connection()).await;
     let request = Request::builder()
         .uri("/config")
         .body(Body::empty())
         .unwrap();
     let response = service.oneshot(request).await.unwrap();
     assert_eq!(response.status(), StatusCode::OK);
+    Ok(())
 }
 
 #[test]
-async fn test_locales() {
-    let service = build_service();
+async fn test_locales() -> Result<(), Box<dyn Error>> {
+    let dbus_server = DBusServer::new().start().await?;
+    let service = build_service(dbus_server.connection()).await;
     let request = Request::builder()
         .uri("/locales")
         .body(Body::empty())
@@ -37,11 +48,13 @@ async fn test_locales() {
     assert_eq!(response.status(), StatusCode::OK);
     let body = body_to_string(response.into_body()).await;
     assert!(body.contains(r#""language":"English""#));
+    Ok(())
 }
 
 #[test]
-async fn test_keymaps() {
-    let service = build_service();
+async fn test_keymaps() -> Result<(), Box<dyn Error>> {
+    let dbus_server = DBusServer::new().start().await?;
+    let service = build_service(dbus_server.connection()).await;
     let request = Request::builder()
         .uri("/keymaps")
         .body(Body::empty())
@@ -50,11 +63,13 @@ async fn test_keymaps() {
     assert_eq!(response.status(), StatusCode::OK);
     let body = body_to_string(response.into_body()).await;
     assert!(body.contains(r#""id":"us""#));
+    Ok(())
 }
 
 #[test]
-async fn test_timezones() {
-    let service = build_service();
+async fn test_timezones() -> Result<(), Box<dyn Error>> {
+    let dbus_server = DBusServer::new().start().await?;
+    let service = build_service(dbus_server.connection()).await;
     let request = Request::builder()
         .uri("/timezones")
         .body(Body::empty())
@@ -63,4 +78,32 @@ async fn test_timezones() {
     assert_eq!(response.status(), StatusCode::OK);
     let body = body_to_string(response.into_body()).await;
     assert!(body.contains(r#""code":"Atlantic/Canary""#));
+    Ok(())
+}
+
+#[test]
+async fn test_set_config_locales() -> Result<(), Box<dyn Error>> {
+    let dbus_server = DBusServer::new().start().await?;
+    let service = build_service(dbus_server.connection()).await;
+
+    let content = "{\"locales\":[\"es_ES.UTF-8\"]}";
+    let body = Body::from(content);
+    let request = Request::put("/config")
+        .header("Content-Type", "application/json")
+        .body(body)?;
+    let response = service.clone().oneshot(request).await?;
+    assert_eq!(response.status(), StatusCode::OK);
+
+    // check whether the value changed
+    let request = Request::get("/config")
+        .header("Content-Type", "application/json")
+        .body(Body::empty())?;
+    let response = service.oneshot(request).await?;
+    assert_eq!(response.status(), StatusCode::OK);
+    let body = body_to_string(response.into_body()).await;
+    assert!(body.contains(r#""locales":["es_ES.UTF-8"]"#));
+
+    // TODO: check whether the D-Bus value was synchronized
+
+    Ok(())
 }

From d21d42a84e903e7f39414d830754ed93bbf0f7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Mon, 1 Apr 2024 20:29:59 +0100
Subject: [PATCH 164/324] web: Improve Patterns selector UI

For a better information layout and to reflect auto selection.
---
 web/src/assets/styles/blocks.scss             | 39 ++++++++++++++++---
 web/src/components/core/Selector.jsx          | 21 +++++++---
 web/src/components/core/Selector.test.jsx     | 15 +++++++
 .../components/software/PatternSelector.jsx   | 16 +++++---
 4 files changed, 74 insertions(+), 17 deletions(-)

diff --git a/web/src/assets/styles/blocks.scss b/web/src/assets/styles/blocks.scss
index e568ae24db..65fddee327 100644
--- a/web/src/assets/styles/blocks.scss
+++ b/web/src/assets/styles/blocks.scss
@@ -248,7 +248,7 @@ ul[data-type="agama/list"] {
 
   li {
     border: 2px solid var(--color-gray-dark);
-    padding: var(--spacer-normal);
+    padding: var(--spacer-small);
     text-align: start;
     background: var(--color-gray-light);
     margin-block-end: 0;
@@ -276,7 +276,6 @@ ul[data-type="agama/list"] {
   // not belongs to a listbox or grid list ul.
   li[aria-selected] {
     background: var(--color-gray-dark);
-    font-weight: 700;
 
     &:not(:last-child) {
       border-bottom-color: white;
@@ -314,15 +313,33 @@ ul[data-type="agama/list"][role="grid"] {
     div[role="gridcell"] {
       display: flex;
       align-items: center;
-      gap: var(--spacer-normal);
+      gap: var(--spacer-small);
 
-      & > input {
+      input {
         --size: var(--fs-h2);
+        cursor: pointer;
         block-size: var(--size);
         inline-size: var(--size);
+
+        &[data-auto-selected] {
+          accent-color: white;
+          box-shadow: 0 0 1px;
+        }
+      }
+
+      & > div:first-child {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: var(--spacer-small);
+
+        span {
+          font-size: var(--fs-small);
+          font-weight: bold;
+        }
       }
 
-      & > div {
+      & > div:last-child {
         flex: 1;
       }
     }
@@ -386,6 +403,18 @@ ul[data-type="agama/list"][role="grid"] {
   }
 }
 
+ul[data-items-type="agama/patterns"] {
+  div[role="gridcell"] {
+    & > div:first-child {
+      min-width: 65px;
+    }
+
+    & > div:last-child * {
+      margin-block-end: var(--spacer-small);
+    }
+  }
+}
+
 [role="dialog"] {
   .sticky-top-0 {
     position: sticky;
diff --git a/web/src/components/core/Selector.jsx b/web/src/components/core/Selector.jsx
index 383fc55a16..5e5763e6e1 100644
--- a/web/src/components/core/Selector.jsx
+++ b/web/src/components/core/Selector.jsx
@@ -21,6 +21,7 @@
 
 // @ts-check
 import React from "react";
+import { _ } from "~/i18n";
 import { noop } from "~/utils";
 
 /**
@@ -61,6 +62,7 @@ import { noop } from "~/utils";
  * @param {function} props.renderOption=noop - Function used for rendering options.
  * @param {string} [props.optionIdKey="id"] - Key used for retrieve options id.
  * @param {Array<*>} [props.selectedIds=[]] - Identifiers for selected options.
+ * @param {function} props.autoSelectionCheck=noop - Function used to check if option should be marked as auto selected.
  * @param {onSelectionChangeCallback} [props.onSelectionChange=noop] - Callback to be called when the selection changes.
  * @param {function|undefined} [props.onOptionClick] - Callback to be called when the selection changes.
  * @param {object} [props.props] - Other props sent to the internal selector <ul> component
@@ -72,6 +74,7 @@ const Selector = ({
   renderOption = noop,
   optionIdKey = "id",
   selectedIds = [],
+  autoSelectionCheck = noop,
   onSelectionChange = noop,
   onOptionClick,
   ...props
@@ -99,6 +102,7 @@ const Selector = ({
         const optionId = option[optionIdKey];
         const optionHtmlId = `${id}-option-${optionId}`;
         const isSelected = selectedIds.includes(optionId);
+        const isAutoSelected = isSelected && autoSelectionCheck(option);
         const onClick = () => onOptionClicked(optionId);
 
         return (
@@ -108,14 +112,19 @@ const Selector = ({
             role="row"
             onClick={onClick}
             aria-selected={isSelected || undefined}
+            data-auto-selected={isAutoSelected || undefined}
           >
             <div role="gridcell">
-              <input
-                type={isMultiple ? "checkbox" : "radio"}
-                checked={isSelected}
-                onChange={onClick}
-                aria-labelledby={optionHtmlId}
-              />
+              <div>
+                <input
+                  type={isMultiple ? "checkbox" : "radio"}
+                  checked={isSelected}
+                  onChange={onClick}
+                  aria-labelledby={optionHtmlId}
+                  data-auto-selected={isAutoSelected || undefined}
+                />
+                {isAutoSelected && <div><span>{_("auto selected")}</span></div>}
+              </div>
               {renderOption(option)}
             </div>
           </li>
diff --git a/web/src/components/core/Selector.test.jsx b/web/src/components/core/Selector.test.jsx
index 0693d790e4..96fa778cf9 100644
--- a/web/src/components/core/Selector.test.jsx
+++ b/web/src/components/core/Selector.test.jsx
@@ -71,6 +71,21 @@ describe("Selector", () => {
     expect(onChangeFn).toHaveBeenCalledWith([2]);
   });
 
+  it("sets data-auto-selected attribute to selected options for which `autoSelectionCheck` returns true", () => {
+    plainRender(
+      // Forcing a not selected option (en_GB) as auto selected for checking that it is not.
+      <TestingSelector autoSelectionCheck={o => ["es_ES", "en_GB"].includes(o.id)} />
+    );
+    const spanishRow = screen.getByRole("row", { name: "Spanish - Spain auto selected" });
+    const englishRow = screen.getByRole("row", { name: "English - United Kingdom" });
+    const spanishOption = within(spanishRow).getByRole("radio");
+    const englishOption = within(englishRow).getByRole("radio");
+    expect(spanishRow).toHaveAttribute("data-auto-selected");
+    expect(spanishOption).toHaveAttribute("data-auto-selected");
+    expect(englishRow).not.toHaveAttribute("data-auto-selected");
+    expect(englishOption).not.toHaveAttribute("data-auto-selected");
+  });
+
   describe("when set as single selector", () => {
     it("renders a radio input for each option", () => {
       plainRender(<TestingSelector />);
diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index ceedc238fd..249d5bf259 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -134,14 +134,16 @@ function PatternSelector({ patterns, onSelectionChanged = noop }) {
 
   const groups = groupPatterns(visiblePatterns);
 
-  const renderPatternOption = (pattern) => (
-    <>
+  const renderPatternOption = (pattern) => {
+    return (
       <div>
-        <b>{pattern.summary}</b>
+        <div>
+          <b>{pattern.summary}</b>
+        </div>
+        <div>{pattern.description}</div>
       </div>
-      <div>{pattern.description}</div>
-    </>
-  );
+    );
+  }
 
   const selector = sortGroups(groups).map((groupName) => {
     const selectedIds = groups[groupName].filter((p) => p.selectedBy !== SelectedBy.NONE).map((p) =>
@@ -159,6 +161,8 @@ function PatternSelector({ patterns, onSelectionChanged = noop }) {
           onOptionClick={onToggle}
           optionIdKey="name"
           selectedIds={selectedIds}
+          autoSelectionCheck={pattern => pattern.selectedBy === SelectedBy.AUTO}
+          data-items-type="agama/patterns"
         />
       </Section>
     );

From faf88f4a1f185ac72aa2b0bd547d28fd3f349086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= <dgonzalez@suse.de>
Date: Tue, 2 Apr 2024 08:03:15 +0100
Subject: [PATCH 165/324] web: please linters

---
 web/src/components/software/PatternSelector.jsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/web/src/components/software/PatternSelector.jsx b/web/src/components/software/PatternSelector.jsx
index 249d5bf259..3fe6b5cca7 100644
--- a/web/src/components/software/PatternSelector.jsx
+++ b/web/src/components/software/PatternSelector.jsx
@@ -134,16 +134,14 @@ function PatternSelector({ patterns, onSelectionChanged = noop }) {
 
   const groups = groupPatterns(visiblePatterns);
 
-  const renderPatternOption = (pattern) => {
-    return (
+  const renderPatternOption = (pattern) => (
+    <div>
       <div>
-        <div>
-          <b>{pattern.summary}</b>
-        </div>
-        <div>{pattern.description}</div>
+        <b>{pattern.summary}</b>
       </div>
-    );
-  }
+      <div>{pattern.description}</div>
+    </div>
+  );
 
   const selector = sortGroups(groups).map((groupName) => {
     const selectedIds = groups[groupName].filter((p) => p.selectedBy !== SelectedBy.NONE).map((p) =>

From 3689fd45241681a1dd784b630961506a35879e80 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 2 Apr 2024 22:40:15 +0200
Subject: [PATCH 166/324] fix UI and also backend

---
 rust/agama-server/src/users/web.rs | 2 +-
 web/src/client/index.js            | 4 ++--
 web/src/client/users.js            | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index e1f0205cfe..f857c8919c 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -120,7 +120,7 @@ async fn root_ssh_key_changed_stream(
 
 /// Sets up and returns the axum service for the software module.
 pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
-    const DBUS_SERVICE: &str = "org.opensuse.Agama.Users1";
+    const DBUS_SERVICE: &str = "org.opensuse.Agama.Manager1";
     const DBUS_PATH: &str = "/org/opensuse/Agama/Users1";
 
     let users = UsersClient::new(dbus.clone()).await?;
diff --git a/web/src/client/index.js b/web/src/client/index.js
index 206365b695..8d820e192e 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -80,7 +80,7 @@ const createClient = (url) => {
   // const network = new NetworkClient(address);
   // const software = new SoftwareClient(address);
   // const storage = new StorageClient(address);
-  // const users = new UsersClient(address);
+  const users = new UsersClient(client);
   // const questions = new QuestionsClient(address);
 
   /**
@@ -141,7 +141,7 @@ const createClient = (url) => {
     // network,
     // software,
     // storage,
-    // users,
+    users,
     // questions,
     // issues,
     onIssuesChange,
diff --git a/web/src/client/users.js b/web/src/client/users.js
index 8a0315050d..2d3f2fa28d 100644
--- a/web/src/client/users.js
+++ b/web/src/client/users.js
@@ -66,7 +66,8 @@ class UsersBaseClient {
    */
   async getUser() {
     const proxy = await this.client.get(USERS_PATH);
-    if (proxy.user === undefined) {
+    console.log(proxy.user);
+    if (proxy.user === null) {
       return { fullName: "", userName: "", password: "", autologin: false };
     }
 

From 4bdccebe0206ba9dbba4cd3bc8530b1b779c7ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 10:42:06 +0100
Subject: [PATCH 167/324] Add support to login from the query string

---
 rust/agama-server/src/web/auth.rs    | 17 +++++++++----
 rust/agama-server/src/web/http.rs    | 36 +++++++++++++++++++++++++---
 rust/agama-server/src/web/service.rs |  3 ++-
 3 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/rust/agama-server/src/web/auth.rs b/rust/agama-server/src/web/auth.rs
index 5394cc5fbc..36fad9a04e 100644
--- a/rust/agama-server/src/web/auth.rs
+++ b/rust/agama-server/src/web/auth.rs
@@ -50,6 +50,18 @@ pub struct TokenClaims {
     exp: i64,
 }
 
+impl TokenClaims {
+    /// Builds claims for a given token.
+    ///
+    /// * `token`: token to extract the claims from.
+    /// * `secret`: secret to decode the token.
+    pub fn from_token(token: &str, secret: &str) -> Result<Self, AuthError> {
+        let decoding = DecodingKey::from_secret(secret.as_ref());
+        let token_data = jsonwebtoken::decode(&token, &decoding, &Validation::default())?;
+        Ok(token_data.claims)
+    }
+}
+
 impl Default for TokenClaims {
     fn default() -> Self {
         let exp = Utc::now() + Duration::days(1);
@@ -84,10 +96,7 @@ impl FromRequestParts<ServiceState> for TokenClaims {
             }
         };
 
-        let decoding = DecodingKey::from_secret(state.config.jwt_secret.as_ref());
-        let token_data = jsonwebtoken::decode(&token, &decoding, &Validation::default())?;
-
-        Ok(token_data.claims)
+        TokenClaims::from_token(&token, &state.config.jwt_secret)
     }
 }
 
diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index dce25e517e..b9ffc8b24d 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -1,12 +1,15 @@
-//! Implements the handlers for the HTTP-based API.
+//! Implements the basic handlers for the HTTP-based API (login, logout, ping, etc.).
 
 use super::{
     auth::{generate_token, AuthError, TokenClaims},
     state::ServiceState,
 };
 use axum::{
-    extract::State,
-    http::{header::SET_COOKIE, HeaderMap},
+    extract::{Query, State},
+    http::{
+        header::{LOCATION, SET_COOKIE},
+        HeaderMap, StatusCode,
+    },
     response::IntoResponse,
     Json,
 };
@@ -69,6 +72,33 @@ pub async fn login(
     Ok((headers, content))
 }
 
+#[derive(Clone, Deserialize, utoipa::ToSchema)]
+pub struct LoginFromQueryParams {
+    /// Token to use for authentication.
+    token: String,
+}
+
+#[utoipa::path(get, path = "/login", responses(
+    (status = 301, description = "Injects the authentication cookie if correct and redirects to the web UI")
+))]
+pub async fn login_from_query(
+    State(state): State<ServiceState>,
+    Query(params): Query<LoginFromQueryParams>,
+) -> impl IntoResponse {
+    let mut headers = HeaderMap::new();
+
+    if TokenClaims::from_token(&params.token, &state.config.jwt_secret).is_ok() {
+        let cookie = format!("agamaToken={}; HttpOnly", params.token);
+        headers.insert(
+            SET_COOKIE,
+            cookie.parse().expect("could not build a valid cookie"),
+        );
+    }
+
+    headers.insert(LOCATION, "/".parse().unwrap());
+    (StatusCode::PERMANENT_REDIRECT, headers)
+}
+
 #[utoipa::path(delete, path = "/api/auth", responses(
     (status = 204, description = "The user has been logged out.")
 ))]
diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index eddbe23e9e..6aa4a6d194 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -1,4 +1,4 @@
-use super::http::{login, logout, session};
+use super::http::{login, login_from_query, logout, session};
 use super::{auth::TokenClaims, config::ServiceConfig, state::ServiceState, EventsSender};
 use axum::{
     extract::Request,
@@ -87,6 +87,7 @@ impl MainServiceBuilder {
         let serve = ServeDir::new(self.public_dir).precompressed_gzip();
         Router::new()
             .nest_service("/", serve)
+            .route("/login", get(login_from_query))
             .nest("/api", api_router)
             .layer(TraceLayer::new_for_http())
             .layer(CompressionLayer::new().br(true))

From 22f517410cff8c3e8515e1f1966d1b4eeccf408c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 11:32:15 +0100
Subject: [PATCH 168/324] Use the login endpoint to start the local browser

---
 live/startup | 38 +++-----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/live/startup b/live/startup
index 67a13b7103..0eb8960d09 100644
--- a/live/startup
+++ b/live/startup
@@ -1,39 +1,7 @@
 #!/usr/bin/env sh
+# Start a browser to connect to Agama's web user interface skipping the authentication.
 
-FIREFOX_PROFILE=$HOME/.mozilla/firefox/profile
-COOKIES_DB=$FIREFOX_PROFILE/cookies.sqlite
 TOKEN_FILE=/run/agama/token
+TOKEN=$(cat $TOKEN_FILE)
 
-if [ ! -f $COOKIES_DB ]; then
-  mkdir -p $FIREFOX_PROFILE
-  sqlite3 $COOKIES_DB "CREATE TABLE moz_cookies (
-    id INTEGER PRIMARY KEY,
-    originAttributes TEXT NOT NULL DEFAULT '',
-    name TEXT,
-    value TEXT,
-    host TEXT,
-    path TEXT,
-    expiry INTEGER,
-    lastAccessed INTEGER,
-    creationTime INTEGER,
-    isSecure INTEGER,
-    isHttpOnly INTEGER,
-    inBrowserElement INTEGER DEFAULT 0,
-    sameSite INTEGER DEFAULT 0,
-    rawSameSite INTEGER DEFAULT 0,
-    schemeMap INTEGER DEFAULT 0,
-    CONSTRAINT moz_uniqueid UNIQUE (name, host, path, originAttributes));"
-else
-  sqlite3 $COOKIES_DB "DELETE FROM moz_cookies WHERE name = 'agamaToken';"
-fi
-
-NOW=$(date +%s)
-VALUE=$(cat $TOKEN_FILE)
-EXPIRATION=$(date --date '1 day' +%s)
-
-sqlite3 $COOKIES_DB "INSERT INTO moz_cookies \
-  (name, value, host, path, expiry, creationTime, isSecure, isHttpOnly, inBrowserElement, sameSite, rawSameSite, schemeMap) \
-  VALUES \
-  ('agamaToken', '$VALUE', 'localhost', '/api', $EXPIRATION, $NOW, 0, 1, 0, 1, 0, 1);"
-
-firefox --kiosk --profile $HOME/.mozilla/firefox/profile http://localhost/
+firefox --kiosk --profile $HOME/.mozilla/firefox/profile "http://localhost/login?token=$TOKEN"

From cd270dacdf446edf105c11292afc7ad6c7eb63f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 11:32:56 +0100
Subject: [PATCH 169/324] Update the list of packages in the KIWI image

---
 live/agama-live.kiwi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/live/agama-live.kiwi b/live/agama-live.kiwi
index 3c76aa5ea2..5b03f485df 100644
--- a/live/agama-live.kiwi
+++ b/live/agama-live.kiwi
@@ -140,11 +140,11 @@
         <package name="MozillaFirefox-branding-openSUSE" arch="aarch64,x86_64"/>
         <package name="libpwquality-tools"/>
         <package name="NetworkManager"/>
-        <package name="cockpit-agama"/>
         <package name="ruby3.3-rubygem-byebug"/>
         <package name="ruby3.3-rubygem-agama-yast"/>
         <package name="agama"/>
         <package name="agama-cli"/>
+        <package name="agama-web-ui"/>
         <package name="microos-tools"/>
         <package name="staging-build-key"/>
         <package name="icewm-lite"/>
@@ -173,7 +173,7 @@
     <!-- additional packages for the Playwright flavors -->
     <packages type="image" profiles="openSUSE-Playwright,ALP-Playwright">
         <package name="playwright"/>
-        <package name="cockpit-agama-playwright"/>
+        <!-- <package name="cockpit-agama-playwright"/> -->
         <!-- Playwright does not work with the openSUSE Firefox, -->
         <!-- install the chromium browser for running the tests -->
         <!-- unfortunately it is not available for s390x -->

From e4f74963324ddf792ce0f9e2bb8dd70cc9355ef4 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 3 Apr 2024 11:44:02 +0100
Subject: [PATCH 170/324] Added the connection status to agama-settings

---
 rust/agama-lib/src/network/settings.rs |  4 ++-
 rust/agama-lib/src/network/types.rs    | 36 ++++++++++++++++++++++++++
 rust/agama-server/src/network/model.rs | 16 +++++-------
 3 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/rust/agama-lib/src/network/settings.rs b/rust/agama-lib/src/network/settings.rs
index db0321f74c..328daaa07b 100644
--- a/rust/agama-lib/src/network/settings.rs
+++ b/rust/agama-lib/src/network/settings.rs
@@ -1,6 +1,6 @@
 //! Representation of the network settings
 
-use super::types::DeviceType;
+use super::types::{DeviceType, Status};
 use agama_settings::error::ConversionError;
 use agama_settings::{SettingObject, SettingValue, Settings};
 use cidr::IpInet;
@@ -100,6 +100,8 @@ pub struct NetworkConnection {
     pub bond: Option<BondSettings>,
     #[serde(rename = "mac-address", skip_serializing_if = "Option::is_none")]
     pub mac_address: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub status: Option<Status>,
 }
 
 impl NetworkConnection {
diff --git a/rust/agama-lib/src/network/types.rs b/rust/agama-lib/src/network/types.rs
index e3ec61957a..9d83eea024 100644
--- a/rust/agama-lib/src/network/types.rs
+++ b/rust/agama-lib/src/network/types.rs
@@ -55,6 +55,42 @@ pub enum DeviceType {
     Bridge = 6,
 }
 
+#[derive(Debug, Default, Clone, Copy, PartialEq, Serialize, Deserialize)]
+pub enum Status {
+    #[default]
+    Up,
+    Down,
+    Removed,
+}
+
+impl fmt::Display for Status {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let name = match &self {
+            Status::Up => "up",
+            Status::Down => "down",
+            Status::Removed => "removed",
+        };
+        write!(f, "{}", name)
+    }
+}
+
+#[derive(Debug, Error, PartialEq)]
+#[error("Invalid status: {0}")]
+pub struct InvalidStatus(String);
+
+impl TryFrom<&str> for Status {
+    type Error = InvalidStatus;
+
+    fn try_from(value: &str) -> Result<Self, Self::Error> {
+        match value {
+            "up" => Ok(Status::Up),
+            "down" => Ok(Status::Down),
+            "removed" => Ok(Status::Removed),
+            _ => Err(InvalidStatus(value.to_string())),
+        }
+    }
+}
+
 /// Bond mode
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Copy)]
 pub enum BondMode {
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 606f318cc4..2ba46cd8b9 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -4,7 +4,7 @@
 //! agnostic from the real network service (e.g., NetworkManager).
 use crate::network::error::NetworkStateError;
 use agama_lib::network::settings::{BondSettings, NetworkConnection, WirelessSettings};
-use agama_lib::network::types::{BondMode, DeviceType, SSID};
+use agama_lib::network::types::{BondMode, DeviceType, Status, SSID};
 use cidr::IpInet;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, skip_serializing_none, DisplayFromStr};
@@ -535,6 +535,10 @@ impl TryFrom<NetworkConnection> for Connection {
             connection.ip_config.method6 = method;
         }
 
+        if let Some(status) = conn.status {
+            connection.status = status;
+        }
+
         if let Some(wireless_config) = conn.wireless {
             let config = WirelessConfig::try_from(wireless_config)?;
             connection.config = config.into();
@@ -569,9 +573,11 @@ impl TryFrom<Connection> for NetworkConnection {
         let gateway4 = conn.ip_config.gateway4.into();
         let gateway6 = conn.ip_config.gateway6.into();
         let interface = conn.interface.into();
+        let status = Some(conn.status);
 
         let mut connection = NetworkConnection {
             id,
+            status,
             method4,
             method6,
             gateway4,
@@ -692,14 +698,6 @@ impl From<InvalidMacAddress> for zbus::fdo::Error {
     }
 }
 
-#[derive(Debug, Default, Clone, Copy, PartialEq, Serialize)]
-pub enum Status {
-    #[default]
-    Up,
-    Down,
-    Removed,
-}
-
 #[skip_serializing_none]
 #[derive(Default, Debug, PartialEq, Clone, Serialize)]
 pub struct IpConfig {

From 8f8c98a7cb98d8ba80da30ba7e4cd0d4fb66feb9 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 3 Apr 2024 11:45:41 +0100
Subject: [PATCH 171/324] Some backend fixes / improvements

---
 rust/agama-server/src/network/action.rs       |  2 +-
 .../src/network/dbus/interfaces/common.rs     | 13 ++-
 rust/agama-server/src/network/error.rs        |  2 +
 rust/agama-server/src/network/nm/adapter.rs   |  9 ++
 rust/agama-server/src/network/nm/client.rs    |  5 +-
 rust/agama-server/src/network/nm/dbus.rs      | 41 +++++----
 rust/agama-server/src/network/system.rs       | 15 +++-
 rust/agama-server/src/network/web.rs          | 87 ++++++++++++++++---
 8 files changed, 134 insertions(+), 40 deletions(-)

diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index 445eaee6ec..1d830a86c0 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -59,7 +59,7 @@ pub enum Action {
         Responder<Result<(), NetworkStateError>>,
     ),
     /// Updates a connection (replacing the old one).
-    UpdateConnection(Box<Connection>),
+    UpdateConnection(Box<Connection>, Responder<Result<(), NetworkStateError>>),
     /// Updates the general network configuration
     UpdateGeneralState(GeneralState),
     /// Forces a wireless networks scan refresh
diff --git a/rust/agama-server/src/network/dbus/interfaces/common.rs b/rust/agama-server/src/network/dbus/interfaces/common.rs
index 91838a689c..a0faeebb1f 100644
--- a/rust/agama-server/src/network/dbus/interfaces/common.rs
+++ b/rust/agama-server/src/network/dbus/interfaces/common.rs
@@ -41,13 +41,15 @@ pub trait ConnectionInterface {
     where
         F: FnOnce(&mut NetworkConnection) + std::marker::Send,
     {
+        let (tx, rx) = oneshot::channel();
         let mut connection = self.get_connection().await?;
         func(&mut connection);
         let actions = self.actions().await;
         actions
-            .send(Action::UpdateConnection(Box::new(connection)))
+            .send(Action::UpdateConnection(Box::new(connection), tx))
             .unwrap();
-        Ok(())
+
+        rx.await.unwrap()
     }
 }
 
@@ -73,9 +75,12 @@ pub trait ConnectionConfigInterface: ConnectionInterface {
         func(&mut config);
         connection.config = config.into();
         let actions = self.actions().await;
+
+        let (tx, rx) = oneshot::channel();
         actions
-            .send(Action::UpdateConnection(Box::new(connection)))
+            .send(Action::UpdateConnection(Box::new(connection), tx))
             .unwrap();
-        Ok(())
+
+        rx.await.unwrap()
     }
 }
diff --git a/rust/agama-server/src/network/error.rs b/rust/agama-server/src/network/error.rs
index f8df1e916b..bccb1469bb 100644
--- a/rust/agama-server/src/network/error.rs
+++ b/rust/agama-server/src/network/error.rs
@@ -6,6 +6,8 @@ use thiserror::Error;
 pub enum NetworkStateError {
     #[error("Unknown connection '{0}'")]
     UnknownConnection(String),
+    #[error("Cannot update connection '{0}'")]
+    CannotUpdateConnection(String),
     #[error("Invalid connection UUID: '{0}'")]
     InvalidUuid(String),
     #[error("Invalid IP address: '{0}'")]
diff --git a/rust/agama-server/src/network/nm/adapter.rs b/rust/agama-server/src/network/nm/adapter.rs
index c580d2bc62..d3c38f6499 100644
--- a/rust/agama-server/src/network/nm/adapter.rs
+++ b/rust/agama-server/src/network/nm/adapter.rs
@@ -123,6 +123,15 @@ impl<'a> Adapter for NetworkManagerAdapter<'a> {
                 if old_conn == conn {
                     continue;
                 }
+            } else {
+                if conn.is_removed() {
+                    log::info!(
+                        "Connection {} ({}) does not need to be removed",
+                        conn.id,
+                        conn.uuid
+                    );
+                    continue;
+                }
             }
 
             log::info!("Updating connection {} ({})", conn.id, conn.uuid);
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index 68510be1b4..b8f4368ca0 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -189,6 +189,7 @@ impl<'a> NetworkManagerClient<'a> {
                 if let Some(iname) = &connection.interface {
                     uuids_map.insert(iname.to_string(), connection.uuid);
                 }
+
                 connections.push(connection);
             }
         }
@@ -236,7 +237,9 @@ impl<'a> NetworkManagerClient<'a> {
         if conn.is_up() {
             self.activate_connection(path).await?;
         } else {
-            self.deactivate_connection(path).await?;
+            //FIXME: This is wrong, deactivate receive an active connection path and this is a
+            //settings path
+            // self.deactivate_connection(path).await?;
         }
         Ok(())
     }
diff --git a/rust/agama-server/src/network/nm/dbus.rs b/rust/agama-server/src/network/nm/dbus.rs
index 75876ad163..99a38d0606 100644
--- a/rust/agama-server/src/network/nm/dbus.rs
+++ b/rust/agama-server/src/network/nm/dbus.rs
@@ -742,24 +742,29 @@ fn wireless_config_from_dbus(conn: &OwnedNestedHash) -> Option<WirelessConfig> {
         let key_mgmt: &str = security.get("key-mgmt")?.downcast_ref()?;
         wireless_config.security = NmKeyManagement(key_mgmt.to_string()).try_into().ok()?;
 
-        let wep_key_type = security
-            .get("wep-key-type")
-            .and_then(|alg| WEPKeyType::try_from(*alg.downcast_ref::<u32>()?).ok())
-            .unwrap_or_default();
-        let auth_alg = security
-            .get("auth-alg")
-            .and_then(|alg| WEPAuthAlg::try_from(alg.downcast_ref()?).ok())
-            .unwrap_or_default();
-        let wep_key_index = security
-            .get("wep-tx-keyidx")
-            .and_then(|idx| idx.downcast_ref::<u32>().cloned())
-            .unwrap_or_default();
-        wireless_config.wep_security = Some(WEPSecurity {
-            wep_key_type,
-            auth_alg,
-            wep_key_index,
-            ..Default::default()
-        });
+        match wireless_config.security {
+            SecurityProtocol::WEP => {
+                let wep_key_type = security
+                    .get("wep-key-type")
+                    .and_then(|alg| WEPKeyType::try_from(*alg.downcast_ref::<u32>()?).ok())
+                    .unwrap_or_default();
+                let auth_alg = security
+                    .get("auth-alg")
+                    .and_then(|alg| WEPAuthAlg::try_from(alg.downcast_ref()?).ok())
+                    .unwrap_or_default();
+                let wep_key_index = security
+                    .get("wep-tx-keyidx")
+                    .and_then(|idx| idx.downcast_ref::<u32>().cloned())
+                    .unwrap_or_default();
+                wireless_config.wep_security = Some(WEPSecurity {
+                    wep_key_type,
+                    auth_alg,
+                    wep_key_index,
+                    ..Default::default()
+                });
+            }
+            _ => wireless_config.wep_security = None,
+        }
     }
 
     Some(wireless_config)
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 4b00ac73a9..61ac7f18cc 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -106,7 +106,15 @@ impl<T: Adapter> NetworkSystem<T> {
                 tx.send(conn.cloned()).unwrap();
             }
             Action::GetConnections(tx) => {
-                tx.send(self.state.connections.clone()).unwrap();
+                let connections = self
+                    .state
+                    .connections
+                    .clone()
+                    .into_iter()
+                    .filter(|c| !c.is_removed())
+                    .collect();
+
+                tx.send(connections).unwrap();
             }
             Action::GetConnectionPath(uuid, tx) => {
                 let tree = self.tree.lock().await;
@@ -145,8 +153,9 @@ impl<T: Adapter> NetworkSystem<T> {
                 let result = self.set_ports_action(uuid, *ports);
                 rx.send(result).unwrap();
             }
-            Action::UpdateConnection(conn) => {
-                self.state.update_connection(*conn)?;
+            Action::UpdateConnection(conn, tx) => {
+                let result = self.state.update_connection(*conn);
+                tx.send(result).unwrap();
             }
             Action::UpdateGeneralState(general_state) => {
                 self.state.general_state = general_state;
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index e92786679b..365e552e85 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -82,6 +82,8 @@ pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
             "/connections/:id",
             delete(delete_connection).put(update_connection),
         )
+        .route("/connections/:id/connect", get(connect))
+        .route("/connections/:id/disconnect", get(disconnect))
         .route("/devices", get(devices))
         .route("/system/apply", put(apply))
         .route("/wifi", get(wifi_networks))
@@ -178,17 +180,13 @@ async fn add_connection(
 
     let conn = Connection::try_from(conn)?;
     let id = conn.id.clone();
+
     state
         .actions
         .send(Action::NewConnection(conn.clone(), tx))
         .unwrap();
     let _ = rx.await.unwrap();
 
-    state
-        .actions
-        .send(Action::UpdateConnection(Box::new(conn)))
-        .unwrap();
-
     let (tx, rx) = oneshot::channel();
     state
         .actions
@@ -214,12 +212,7 @@ async fn delete_connection(
         .send(Action::RemoveConnection(id, tx))
         .unwrap();
 
-    let _ = rx.await.unwrap();
-    let (tx, rx) = oneshot::channel();
-    state.actions.send(Action::Apply(tx)).unwrap();
-    let _ = rx.await.unwrap();
-
-    Ok(Json(()))
+    Ok(Json(rx.await.unwrap()?))
 }
 
 #[utoipa::path(put, path = "/network/connections/:id", responses(
@@ -248,11 +241,76 @@ async fn update_connection(
         None => return Err(NetworkError::UnknownConnection(id)),
     }
 
+    let (tx, rx) = oneshot::channel();
+    state
+        .actions
+        .send(Action::UpdateConnection(Box::new(conn), tx))
+        .unwrap();
+
+    Ok(Json(rx.await.unwrap()?))
+}
+
+#[utoipa::path(get, path = "/network/connections/:id/connect", responses(
+  (status = 200, description = "Connect to the given connection", body = String)
+))]
+async fn connect(
+    State(state): State<NetworkState>,
+    Path(id): Path<String>,
+) -> Result<Json<()>, NetworkError> {
+    let (tx, rx) = oneshot::channel();
+    state
+        .actions
+        .send(Action::GetConnection(id.clone(), tx))
+        .unwrap();
+
+    if let Some(mut current_conn) = rx.await.unwrap() {
+        current_conn.set_up();
+
+        let (tx, rx) = oneshot::channel();
+        state
+            .actions
+            .send(Action::UpdateConnection(Box::new(current_conn), tx))
+            .unwrap();
+
+        rx.await
+            .unwrap()
+            .map_err(|_| NetworkError::CannotApplyConfig)?;
+    } else {
+        return Err(NetworkError::UnknownConnection(id));
+    }
+
+    Ok(Json(()))
+}
+
+#[utoipa::path(get, path = "/network/connections/:id/disconnect", responses(
+  (status = 200, description = "Connect to the given connection", body = String)
+))]
+async fn disconnect(
+    State(state): State<NetworkState>,
+    Path(id): Path<String>,
+) -> Result<Json<()>, NetworkError> {
+    let (tx, rx) = oneshot::channel();
     state
         .actions
-        .send(Action::UpdateConnection(Box::new(conn)))
+        .send(Action::GetConnection(id.clone(), tx))
         .unwrap();
 
+    if let Some(mut current_conn) = rx.await.unwrap() {
+        current_conn.set_down();
+
+        let (tx, rx) = oneshot::channel();
+        state
+            .actions
+            .send(Action::UpdateConnection(Box::new(current_conn), tx))
+            .unwrap();
+
+        rx.await
+            .unwrap()
+            .map_err(|_| NetworkError::CannotApplyConfig)?;
+    } else {
+        return Err(NetworkError::UnknownConnection(id));
+    }
+
     Ok(Json(()))
 }
 
@@ -262,7 +320,10 @@ async fn update_connection(
 async fn apply(State(state): State<NetworkState>) -> Result<Json<()>, NetworkError> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::Apply(tx)).unwrap();
-    let _ = rx.await.map_err(|_| NetworkError::CannotApplyConfig)?;
+
+    rx.await
+        .unwrap()
+        .map_err(|_| NetworkError::CannotApplyConfig)?;
 
     Ok(Json(()))
 }

From cfe63806be17e5ed8cb0c3e6d2b3dd0be4972395 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 3 Apr 2024 11:46:20 +0100
Subject: [PATCH 172/324] Apply changes after adding / removing a connection

---
 web/src/client/network/index.js | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index 4472316066..0c1de8b732 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -159,7 +159,17 @@ class NetworkClient {
    * @param {Connection} connection - connection to be activated
    */
   async connectTo(connection) {
-    return this.client.post("/network/connections", this.toApiConnection(connection));
+    const conn = await this.addConnection(connection);
+    await this.apply();
+
+    return conn;
+  }
+
+  /**
+   * Apply network changes
+   */
+  async apply() {
+    return this.client.put("/network/system/apply");
   }
 
   /**
@@ -195,7 +205,7 @@ class NetworkClient {
    * @return {Promise<Connection>} the added connection
    */
   async addConnection(connection) {
-    return this.connectTo(connection);
+    return this.client.post("/network/connections", this.toApiConnection(connection));
   }
 
   /**
@@ -219,9 +229,10 @@ class NetworkClient {
    * @return {Promise<boolean>} - the promise resolves to true if the connection
    *   was successfully updated and to false it it does not exist.
    */
-  updateConnection(connection) {
+  async updateConnection(connection) {
     const conn = this.toApiConnection(connection);
-    return this.client.put(`/network/connections/${conn.id}`, conn);
+    await this.client.put(`/network/connections/${conn.id}`, conn);
+    return this.apply();
   }
 
   /**
@@ -233,8 +244,9 @@ class NetworkClient {
    * @return {Promise<boolean>} - the promise resolves to true if the connection
    *  was successfully deleted.
    */
-  deleteConnection(id) {
-    return this.client.delete(`/network/connections/${id}`);
+  async deleteConnection(id) {
+    await this.client.delete(`/network/connections/${id}`);
+    return this.apply();
   }
 
   /*

From 78d595d6daddc8c2a508ba3b50213bf1c68303fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 11:54:42 +0100
Subject: [PATCH 173/324] Keep uncompressed assets when building the UI

---
 web/webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/webpack.config.js b/web/webpack.config.js
index 342f4d9fad..e899a680b2 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -66,7 +66,7 @@ if (stylelint) {
 if (production) {
   plugins.unshift(new CompressionPlugin({
     test: /\.(js|html|css)$/,
-    deleteOriginalAssets: "keep-source-map"
+    deleteOriginalAssets: false
   }));
 }
 

From 8ac6eb466605e38368a4c1871edf313f934a4daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 11:55:02 +0100
Subject: [PATCH 174/324] Minor formatting change

---
 web/webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/webpack.config.js b/web/webpack.config.js
index e899a680b2..0a6864ee8f 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -25,7 +25,7 @@ const eslint = process.env.ESLINT !== '0';
 const stylelint = process.env.STYLELINT ? (process.env.STYLELINT !== '0') : development;
 
 // Agama API server. By default it connects to a local development server.
-let agamaServer= process.env.AGAMA_SERVER || "localhost:3000";
+let agamaServer = process.env.AGAMA_SERVER || "localhost:3000";
 if (!agamaServer.startsWith("http")) {
   agamaServer = "http://" + agamaServer;
 }

From 10dbd591bf0ba7a53e5c3e8b7ab8c014718394cb Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 3 Apr 2024 11:57:15 +0100
Subject: [PATCH 175/324] Applied some clippy suggestions

---
 rust/agama-server/src/network/action.rs     |  2 +-
 rust/agama-server/src/network/model.rs      | 12 ++++++------
 rust/agama-server/src/network/nm/adapter.rs | 16 +++++++---------
 rust/agama-server/src/network/system.rs     |  2 +-
 rust/agama-server/src/network/web.rs        |  2 +-
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index 1d830a86c0..c8a8981085 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -22,7 +22,7 @@ pub enum Action {
         Responder<Result<OwnedObjectPath, NetworkStateError>>,
     ),
     /// Add a new connection
-    NewConnection(Connection, Responder<Result<(), NetworkStateError>>),
+    NewConnection(Box<Connection>, Responder<Result<(), NetworkStateError>>),
     /// Gets a connection by its id
     GetConnection(String, Responder<Option<Connection>>),
     /// Gets a connection by its Uuid
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 2ba46cd8b9..cbde368d70 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -567,12 +567,12 @@ impl TryFrom<Connection> for NetworkConnection {
         let mac = conn.mac_address.to_string();
         let method4 = Some(conn.ip_config.method4.to_string());
         let method6 = Some(conn.ip_config.method6.to_string());
-        let mac_address = (!mac.is_empty()).then(|| mac);
-        let nameservers = conn.ip_config.nameservers.into();
-        let addresses = conn.ip_config.addresses.into();
-        let gateway4 = conn.ip_config.gateway4.into();
-        let gateway6 = conn.ip_config.gateway6.into();
-        let interface = conn.interface.into();
+        let mac_address = (!mac.is_empty()).then_some(mac);
+        let nameservers = conn.ip_config.nameservers;
+        let addresses = conn.ip_config.addresses;
+        let gateway4 = conn.ip_config.gateway4;
+        let gateway6 = conn.ip_config.gateway6;
+        let interface = conn.interface;
         let status = Some(conn.status);
 
         let mut connection = NetworkConnection {
diff --git a/rust/agama-server/src/network/nm/adapter.rs b/rust/agama-server/src/network/nm/adapter.rs
index d3c38f6499..f8e7d9f1d9 100644
--- a/rust/agama-server/src/network/nm/adapter.rs
+++ b/rust/agama-server/src/network/nm/adapter.rs
@@ -123,15 +123,13 @@ impl<'a> Adapter for NetworkManagerAdapter<'a> {
                 if old_conn == conn {
                     continue;
                 }
-            } else {
-                if conn.is_removed() {
-                    log::info!(
-                        "Connection {} ({}) does not need to be removed",
-                        conn.id,
-                        conn.uuid
-                    );
-                    continue;
-                }
+            } else if conn.is_removed() {
+                log::info!(
+                    "Connection {} ({}) does not need to be removed",
+                    conn.id,
+                    conn.uuid
+                );
+                continue;
             }
 
             log::info!("Updating connection {} ({})", conn.id, conn.uuid);
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 61ac7f18cc..5b53672af8 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -91,7 +91,7 @@ impl<T: Adapter> NetworkSystem<T> {
                 tx.send(self.state.access_points.clone()).unwrap();
             }
             Action::NewConnection(conn, tx) => {
-                tx.send(self.state.add_connection(conn.clone())).unwrap();
+                tx.send(self.state.add_connection(*conn)).unwrap();
             }
             Action::GetGeneralState(tx) => {
                 let config = self.state.general_state.clone();
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 365e552e85..8843ce6e6d 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -183,7 +183,7 @@ async fn add_connection(
 
     state
         .actions
-        .send(Action::NewConnection(conn.clone(), tx))
+        .send(Action::NewConnection(Box::new(conn.clone()), tx))
         .unwrap();
     let _ = rx.await.unwrap();
 

From 68cd28629bde155603a1be7b4d65787f2245d2a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 12:27:30 +0100
Subject: [PATCH 176/324] Keep uncompressed files in agama-web-ui RPM package

---
 web/package/agama-web-ui.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/package/agama-web-ui.spec b/web/package/agama-web-ui.spec
index c340d698ad..39d03cc141 100644
--- a/web/package/agama-web-ui.spec
+++ b/web/package/agama-web-ui.spec
@@ -45,15 +45,13 @@ local-npm-registry %{_sourcedir} install --with=dev --legacy-peer-deps || ( find
 NODE_ENV="production" npm run build
 
 %install
-install -D -m 0644 --target-directory=%{buildroot}%{_datadir}/agama/web_ui %{_builddir}/agama/dist/*.{gz,json,map,svg}
+install -D -m 0644 --target-directory=%{buildroot}%{_datadir}/agama/web_ui %{_builddir}/agama/dist/*.{gz,html,js,json,map,svg}
 install -D -m 0644 --target-directory=%{buildroot}%{_datadir}/agama/web_ui/fonts %{_builddir}/agama/dist/fonts/*.woff?
 
 %files
 %doc README.md
 %{_datadir}/agama
 %{_datadir}/agama/web_ui
-%{_datadir}/agama/web_ui/*
 %{_datadir}/agama/web_ui/fonts
-%{_datadir}/agama/web_ui/fonts/*
 
 %changelog

From ff670b03e371cdf7a7254a1dbf8911aecbc1ff69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 12:57:11 +0100
Subject: [PATCH 177/324] Make the login redirection temporary

---
 rust/agama-server/src/web/http.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index b9ffc8b24d..4168fe6728 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -8,7 +8,7 @@ use axum::{
     extract::{Query, State},
     http::{
         header::{LOCATION, SET_COOKIE},
-        HeaderMap, StatusCode,
+        HeaderMap, HeaderValue, StatusCode,
     },
     response::IntoResponse,
     Json,
@@ -95,8 +95,8 @@ pub async fn login_from_query(
         );
     }
 
-    headers.insert(LOCATION, "/".parse().unwrap());
-    (StatusCode::PERMANENT_REDIRECT, headers)
+    headers.insert(LOCATION, HeaderValue::from_static("/"));
+    (StatusCode::TEMPORARY_REDIRECT, headers)
 }
 
 #[utoipa::path(delete, path = "/api/auth", responses(

From 52dc81d01fe8425eb3cdafa1addeef97836aa777 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 3 Apr 2024 13:57:47 +0200
Subject: [PATCH 178/324] another bunch of fixes

---
 rust/agama-lib/src/users/client.rs  |  1 +
 rust/agama-server/src/users/web.rs  | 18 +++++++++---------
 rust/agama-server/src/web/common.rs |  2 +-
 rust/agama-server/src/web/event.rs  |  4 ++--
 web/src/client/users.js             | 16 ++++++++--------
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/rust/agama-lib/src/users/client.rs b/rust/agama-lib/src/users/client.rs
index 37a1badb16..979b788e3c 100644
--- a/rust/agama-lib/src/users/client.rs
+++ b/rust/agama-lib/src/users/client.rs
@@ -8,6 +8,7 @@ use zbus::Connection;
 
 /// Represents the settings for the first user
 #[derive(Serialize, Deserialize, Clone, Debug, Default, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct FirstUser {
     /// First user's full name
     pub full_name: String,
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index f857c8919c..d134db0ac2 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -13,7 +13,7 @@ use crate::{
 };
 use agama_lib::{
     error::ServiceError,
-    users::{proxies::Users1Proxy, FirstUser, FirstUserSettings, UsersClient},
+    users::{proxies::Users1Proxy, FirstUser, UsersClient},
 };
 use axum::{
     extract::State,
@@ -67,11 +67,12 @@ async fn first_user_changed_stream(
         .await
         .then(|change| async move {
             if let Ok(user) = change.get().await {
-                let user_struct = FirstUserSettings {
-                    full_name: Some(user.0),
-                    user_name: Some(user.1),
-                    password: Some(user.2),
-                    autologin: Some(user.3),
+                let user_struct = FirstUser {
+                    full_name: user.0,
+                    user_name: user.1,
+                    password: user.2,
+                    autologin: user.3,
+                    data: user.4
                 };
                 return Some(Event::FirstUserChanged(user_struct));
             }
@@ -128,8 +129,7 @@ pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceErro
     let validation_router = validation_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let router = Router::new()
-        // TODO: "/" route failing, so workaround it with /info, but it should be /api/users in the end
-        .route("/info", get(get_info))
+        .route("/config", get(get_info))
         .route("/user", put(set_first_user).delete(remove_first_user))
         .route(
             "/root_password",
@@ -230,7 +230,7 @@ pub struct UsersInfo {
     root: RootInfo,
 }
 
-#[utoipa::path(put, path = "/users/", responses(
+#[utoipa::path(put, path = "/users/config", responses(
     (status = 200, description = "Configuration for users including root and the first user", body = UsersInfo),
     (status = 400, description = "The D-Bus service could not perform the action"),
 ))]
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 9477f1ea70..c64905fffc 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -389,7 +389,7 @@ pub async fn validation_router<T>(
 ) -> Result<Router<T>, ServiceError> {
     let proxy = build_validation_proxy(dbus, destination, path).await?;
     let state = ValidationState { proxy };
-    Ok(Router::new().route("/", get(validation)).with_state(state))
+    Ok(Router::new().route("/validation", get(validation)).with_state(state))
 }
 
 #[derive(Clone, Serialize, utoipa::ToSchema)]
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 422497e57d..86c3625668 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -1,6 +1,6 @@
 use crate::l10n::web::LocaleConfig;
 use agama_lib::{
-    manager::InstallationPhase, progress::Progress, software::SelectedBy, users::FirstUserSettings,
+    manager::InstallationPhase, progress::Progress, software::SelectedBy, users::FirstUser,
 };
 use serde::Serialize;
 use std::collections::HashMap;
@@ -23,7 +23,7 @@ pub enum Event {
     ProductChanged {
         id: String,
     },
-    FirstUserChanged(FirstUserSettings),
+    FirstUserChanged(FirstUser),
     RootPasswordChanged {
         password_is_set: bool,
     },
diff --git a/web/src/client/users.js b/web/src/client/users.js
index 2d3f2fa28d..bc7f89cd9b 100644
--- a/web/src/client/users.js
+++ b/web/src/client/users.js
@@ -23,7 +23,7 @@
 
 import { WithValidation } from "./mixins";
 
-const USERS_PATH = "/users/info"; // TODO: it should be /users/ when routing in rs is solved
+const USERS_PATH = "/users/config";
 
 /**
 * @typedef {object} UserResult
@@ -37,6 +37,7 @@ const USERS_PATH = "/users/info"; // TODO: it should be /users/ when routing in
  * @property {string} userName - userName
  * @property {string} [password] - user password
  * @property {boolean} autologin - Whether autologin is enabled
+ * @property {object} data - additional user data
  */
 
 /**
@@ -66,13 +67,12 @@ class UsersBaseClient {
    */
   async getUser() {
     const proxy = await this.client.get(USERS_PATH);
-    console.log(proxy.user);
+
     if (proxy.user === null) {
-      return { fullName: "", userName: "", password: "", autologin: false };
+      return { fullName: "", userName: "", password: "", autologin: false, data: {} };
     }
 
-    const [fullName, userName, password, autologin] = proxy.user;
-    return { fullName, userName, password, autologin };
+    return proxy.user;
   }
 
   /**
@@ -132,7 +132,7 @@ class UsersBaseClient {
    */
   async getRootSSHKey() {
     const proxy = await this.client.get(USERS_PATH);
-    return proxy.root.password || "";
+    return proxy.root.ssh_key || "";
   }
 
   /**
@@ -160,8 +160,8 @@ class UsersBaseClient {
         return handler({ rootSSHKey: event.key.toString() });
       } else if (event.type === "FirstUserChanged") {
         // @ts-ignore
-        const { fullName, userName, password, autologin } = event;
-        return handler({ firstUser: { fullName, userName, password, autologin } });
+        const { fullName, userName, password, autologin, data } = event;
+        return handler({ firstUser: { fullName, userName, password, autologin, data } });
       }
     });
   }

From 518378bd67860b3c9a183e987c4f7287329c4620 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 3 Apr 2024 13:01:36 +0100
Subject: [PATCH 179/324] fixed wireless test

---
 rust/agama-server/src/network/nm/dbus.rs   | 5 +----
 rust/agama-server/tests/network_service.rs | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/rust/agama-server/src/network/nm/dbus.rs b/rust/agama-server/src/network/nm/dbus.rs
index 99a38d0606..874595433e 100644
--- a/rust/agama-server/src/network/nm/dbus.rs
+++ b/rust/agama-server/src/network/nm/dbus.rs
@@ -1054,10 +1054,7 @@ mod test {
                 Some(macaddr::MacAddr6::from_str("12:34:56:78:9A:BC").unwrap())
             );
             assert!(!wireless.hidden);
-            let wep_security = wireless.wep_security.as_ref().unwrap();
-            assert_eq!(wep_security.wep_key_type, WEPKeyType::Key);
-            assert_eq!(wep_security.auth_alg, WEPAuthAlg::Open);
-            assert_eq!(wep_security.wep_key_index, 1);
+            assert_eq!(wireless.wep_security, None);
         }
     }
 
diff --git a/rust/agama-server/tests/network_service.rs b/rust/agama-server/tests/network_service.rs
index be8238f5a9..5639e8af61 100644
--- a/rust/agama-server/tests/network_service.rs
+++ b/rust/agama-server/tests/network_service.rs
@@ -162,6 +162,7 @@ async fn test_network_wifis() -> Result<(), Box<dyn Error>> {
     let response = network_service.oneshot(request).await?;
     assert_eq!(response.status(), StatusCode::OK);
     let body = body_to_string(response.into_body()).await;
-    assert_eq!(body, to_string(&json!(["AgamaNetwork", "AgamaNetwork2"]))?);
+    assert!(body.contains(r#""ssid":"AgamaNetwork""#));
+    assert!(body.contains(r#""ssid":"AgamaNetwork2""#));
     Ok(())
 }

From 205b287708b6d36288f14371b5329be5590a78d2 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 3 Apr 2024 14:30:05 +0200
Subject: [PATCH 180/324] add hints for developing with two machines and
 debugging hints

---
 web/README.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/web/README.md b/web/README.md
index e903923adc..c9b54bcd96 100644
--- a/web/README.md
+++ b/web/README.md
@@ -35,6 +35,26 @@ running Agama server instance. This is especially useful if you use the Live ISO
 which does not contain any development tools, you can develop the web frontend
 easily from your workstation.
 
+Example of running from different machine:
+
+```
+  # backend machine
+  # using ip of machine instead of localhost is important to be network accessible
+  agama-web-server serve --address 10.100.1.1:3030
+
+  # frontend machine
+  # ESLINT=0 is useful during development when there is some styling issues
+  ESLINT=0 AGAMA_SERVER=10.100.1.1:3000 npm run server
+```
+
+### Debugging Hints
+
+There are more locations where to look when something does not work and require debugging.
+The first location to check when something does not work is browser console which can give
+some hints. The second location to check for errors or warnings is output of `npm run server`
+where some issues when communicating with backend can be seen. And last but on least is
+journal on backend machine where is logged backend activity `journalctl -b`.
+
 ### Special Environment Variables
 
 `AGAMA_SERVER` - When running the development server set up a proxy to

From 7149061c2f2d00cbb9193bef6c52ff641d4ba717 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 3 Apr 2024 14:34:43 +0200
Subject: [PATCH 181/324] format rust code

---
 rust/agama-server/src/users/web.rs  | 2 +-
 rust/agama-server/src/web/common.rs | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index d134db0ac2..28981e7b0e 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -72,7 +72,7 @@ async fn first_user_changed_stream(
                     user_name: user.1,
                     password: user.2,
                     autologin: user.3,
-                    data: user.4
+                    data: user.4,
                 };
                 return Some(Event::FirstUserChanged(user_struct));
             }
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index c64905fffc..d0b7672354 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -389,7 +389,9 @@ pub async fn validation_router<T>(
 ) -> Result<Router<T>, ServiceError> {
     let proxy = build_validation_proxy(dbus, destination, path).await?;
     let state = ValidationState { proxy };
-    Ok(Router::new().route("/validation", get(validation)).with_state(state))
+    Ok(Router::new()
+        .route("/validation", get(validation))
+        .with_state(state))
 }
 
 #[derive(Clone, Serialize, utoipa::ToSchema)]

From 9f8c7b22b0408dcb6b2739c60fd0f679f3588c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 13:41:04 +0100
Subject: [PATCH 182/324] Move the token creation to a function

---
 rust/agama-server/src/web/http.rs | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index 4168fe6728..b457452999 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -63,7 +63,7 @@ pub async fn login(
     });
 
     let mut headers = HeaderMap::new();
-    let cookie = format!("agamaToken={}; HttpOnly", &token);
+    let cookie = auth_cookie_from_token(&token);
     headers.insert(
         SET_COOKIE,
         cookie.parse().expect("could not build a valid cookie"),
@@ -88,7 +88,7 @@ pub async fn login_from_query(
     let mut headers = HeaderMap::new();
 
     if TokenClaims::from_token(&params.token, &state.config.jwt_secret).is_ok() {
-        let cookie = format!("agamaToken={}; HttpOnly", params.token);
+        let cookie = auth_cookie_from_token(&params.token);
         headers.insert(
             SET_COOKIE,
             cookie.parse().expect("could not build a valid cookie"),
@@ -120,3 +120,16 @@ pub async fn logout(_claims: TokenClaims) -> Result<impl IntoResponse, AuthError
 pub async fn session(_claims: TokenClaims) -> Result<(), AuthError> {
     Ok(())
 }
+
+/// Creates the cookie containing the authentication token.
+///
+/// It is a session token (no expiration date) so it should be gone
+/// when the browser is closed.
+///
+/// See https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie
+/// for further information.
+///
+/// * `token`: authentication token.
+fn auth_cookie_from_token(token: &str) -> String {
+    format!("agamaToken={}; HttpOnly", &token)
+}

From 5dfe0d5e309a944ad330e81c4b19af3a6a497ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 14:38:39 +0100
Subject: [PATCH 183/324] Add root.tar contents to agama-live directory

---
 live/root/.icewm/startup                   | 3 +++
 live/root/.mozilla/firefox/profile/user.js | 6 ++++++
 live/root/.xinitrc                         | 1 +
 3 files changed, 10 insertions(+)
 create mode 100755 live/root/.icewm/startup
 create mode 100644 live/root/.mozilla/firefox/profile/user.js
 create mode 100644 live/root/.xinitrc

diff --git a/live/root/.icewm/startup b/live/root/.icewm/startup
new file mode 100755
index 0000000000..209d5242e2
--- /dev/null
+++ b/live/root/.icewm/startup
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+BROWSER="firefox --kiosk --profile $HOME/.mozilla/firefox/profile" /usr/libexec/cockpit-desktop /cockpit/@localhost/agama/index.html
diff --git a/live/root/.mozilla/firefox/profile/user.js b/live/root/.mozilla/firefox/profile/user.js
new file mode 100644
index 0000000000..2548c9d999
--- /dev/null
+++ b/live/root/.mozilla/firefox/profile/user.js
@@ -0,0 +1,6 @@
+// Mozilla User Preferences
+
+// do not remember or generate passwords
+user_pref("signon.management.page.breach-alerts.enabled", false);
+user_pref("signon.rememberSignons", false);
+user_pref("signon.generation.enabled", false);
diff --git a/live/root/.xinitrc b/live/root/.xinitrc
new file mode 100644
index 0000000000..fd0aab570a
--- /dev/null
+++ b/live/root/.xinitrc
@@ -0,0 +1 @@
+icewm-session -c /etc/icewm/preferences.yast2

From be2b5efa4535616e01015290c9c96394752b881a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 14:44:50 +0100
Subject: [PATCH 184/324] Inject the token in Firefox's preferences

---
 live/root/.icewm/startup                   | 10 ++++++++--
 live/root/.mozilla/firefox/profile/user.js |  1 +
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/live/root/.icewm/startup b/live/root/.icewm/startup
index 209d5242e2..21440c267a 100755
--- a/live/root/.icewm/startup
+++ b/live/root/.icewm/startup
@@ -1,3 +1,9 @@
-#! /bin/sh
+#!/usr/bin/env sh
+# Start a browser to connect to Agama's web user interface skipping the authentication.
 
-BROWSER="firefox --kiosk --profile $HOME/.mozilla/firefox/profile" /usr/libexec/cockpit-desktop /cockpit/@localhost/agama/index.html
+TOKEN_FILE=/run/agama/token
+TOKEN=$(cat $TOKEN_FILE)
+PREFS=$HOME/.mozilla/firefox/profile/user.js
+
+sed -e "s/__HOMEPAGE__/http://localhost/login?token=$TOKEN" -i $PREFS
+firefox --kiosk --profile $HOME/.mozilla/firefox/profile
diff --git a/live/root/.mozilla/firefox/profile/user.js b/live/root/.mozilla/firefox/profile/user.js
index 2548c9d999..7ac0b3be95 100644
--- a/live/root/.mozilla/firefox/profile/user.js
+++ b/live/root/.mozilla/firefox/profile/user.js
@@ -4,3 +4,4 @@
 user_pref("signon.management.page.breach-alerts.enabled", false);
 user_pref("signon.rememberSignons", false);
 user_pref("signon.generation.enabled", false);
+user_pref("browser.startup.homepage", "__HOMEPAGE__");

From ce1f5ff5bb61c49edc7a91f2eacaa1565b2fd9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 14:47:03 +0100
Subject: [PATCH 185/324] Remove the startup script from the old location

---
 live/startup | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 live/startup

diff --git a/live/startup b/live/startup
deleted file mode 100644
index 0eb8960d09..0000000000
--- a/live/startup
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-# Start a browser to connect to Agama's web user interface skipping the authentication.
-
-TOKEN_FILE=/run/agama/token
-TOKEN=$(cat $TOKEN_FILE)
-
-firefox --kiosk --profile $HOME/.mozilla/firefox/profile "http://localhost/login?token=$TOKEN"

From 512e444170c2da661f265243329bef396d31c6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 14:56:39 +0100
Subject: [PATCH 186/324] Fix sed invocation

---
 live/root/.icewm/startup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/live/root/.icewm/startup b/live/root/.icewm/startup
index 21440c267a..1910dfa3b3 100755
--- a/live/root/.icewm/startup
+++ b/live/root/.icewm/startup
@@ -5,5 +5,5 @@ TOKEN_FILE=/run/agama/token
 TOKEN=$(cat $TOKEN_FILE)
 PREFS=$HOME/.mozilla/firefox/profile/user.js
 
-sed -e "s/__HOMEPAGE__/http://localhost/login?token=$TOKEN" -i $PREFS
+sed -e "s/__HOMEPAGE__/http:\/\/localhost\/login?token=$TOKEN/" -i $PREFS
 firefox --kiosk --profile $HOME/.mozilla/firefox/profile

From 16b36e06603e485d02b03f26001cfa143d1f0efd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 3 Apr 2024 16:38:44 +0100
Subject: [PATCH 187/324] Fix Firefox start-up

---
 live/root/.icewm/startup                                       | 2 +-
 .../.mozilla/firefox/profile/{user.js => user.js.template}     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename live/root/.mozilla/firefox/profile/{user.js => user.js.template} (61%)

diff --git a/live/root/.icewm/startup b/live/root/.icewm/startup
index 1910dfa3b3..7f8d091d27 100755
--- a/live/root/.icewm/startup
+++ b/live/root/.icewm/startup
@@ -5,5 +5,5 @@ TOKEN_FILE=/run/agama/token
 TOKEN=$(cat $TOKEN_FILE)
 PREFS=$HOME/.mozilla/firefox/profile/user.js
 
-sed -e "s/__HOMEPAGE__/http:\/\/localhost\/login?token=$TOKEN/" -i $PREFS
+sed -e "s/__HOMEPAGE__/http:\/\/localhost\/login?token=$TOKEN/" $PREFS.template > $PREFS
 firefox --kiosk --profile $HOME/.mozilla/firefox/profile
diff --git a/live/root/.mozilla/firefox/profile/user.js b/live/root/.mozilla/firefox/profile/user.js.template
similarity index 61%
rename from live/root/.mozilla/firefox/profile/user.js
rename to live/root/.mozilla/firefox/profile/user.js.template
index 7ac0b3be95..afe9e19ccd 100644
--- a/live/root/.mozilla/firefox/profile/user.js
+++ b/live/root/.mozilla/firefox/profile/user.js.template
@@ -4,4 +4,7 @@
 user_pref("signon.management.page.breach-alerts.enabled", false);
 user_pref("signon.rememberSignons", false);
 user_pref("signon.generation.enabled", false);
+// start always in the custom homepage
+user_pref("browser.startup.page", 1);
+// custom homepage: the value is expected to be replaced with the login URL by the startup script
 user_pref("browser.startup.homepage", "__HOMEPAGE__");

From 56d735e5ee0b4ce1321f4190572b9b68e4059498 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 3 Apr 2024 21:32:19 +0200
Subject: [PATCH 188/324] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Imobach González Sosa <igonzalezsosa@suse.com>
---
 rust/agama-server/src/users/web.rs  | 2 +-
 rust/agama-server/src/web/common.rs | 2 +-
 web/README.md                       | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index 28981e7b0e..4fed705013 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -119,7 +119,7 @@ async fn root_ssh_key_changed_stream(
     Ok(stream)
 }
 
-/// Sets up and returns the axum service for the software module.
+/// Sets up and returns the axum service for the users module.
 pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
     const DBUS_SERVICE: &str = "org.opensuse.Agama.Manager1";
     const DBUS_PATH: &str = "/org/opensuse/Agama/Users1";
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index d0b7672354..0c50cd7e95 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -415,7 +415,7 @@ struct ValidationState<'a> {
     proxy: ValidationProxy<'a>,
 }
 
-/// Builds a stream of the changes in the the `org.opensuse.Agama1.Issues`
+/// Builds a stream of the changes in the the `org.opensuse.Agama1.Validation`
 /// interface of the given D-Bus object.
 ///
 /// * `dbus`: D-Bus connection.
diff --git a/web/README.md b/web/README.md
index c9b54bcd96..94ba63a57a 100644
--- a/web/README.md
+++ b/web/README.md
@@ -43,16 +43,16 @@ Example of running from different machine:
   agama-web-server serve --address 10.100.1.1:3030
 
   # frontend machine
-  # ESLINT=0 is useful during development when there is some styling issues
+  # ESLINT=0 is useful to ignore linter problems during development
   ESLINT=0 AGAMA_SERVER=10.100.1.1:3000 npm run server
 ```
 
 ### Debugging Hints
 
-There are more locations where to look when something does not work and require debugging.
-The first location to check when something does not work is browser console which can give
+There are several places to look when something does not work and requires debugging.
+The first place is the browser's console which can give
 some hints. The second location to check for errors or warnings is output of `npm run server`
-where some issues when communicating with backend can be seen. And last but on least is
+where you can find issues when communicating with the backend. And last but on least is
 journal on backend machine where is logged backend activity `journalctl -b`.
 
 ### Special Environment Variables

From dd4af425b302ec335f9d3affd85af6bf9e74ab53 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 3 Apr 2024 21:40:10 +0200
Subject: [PATCH 189/324] changes from review

---
 rust/agama-lib/src/users/settings.rs | 2 +-
 rust/agama-server/src/users/web.rs   | 4 ++--
 rust/agama-server/src/web/docs.rs    | 3 +--
 web/src/client/mixins.js             | 6 +++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/rust/agama-lib/src/users/settings.rs b/rust/agama-lib/src/users/settings.rs
index c902896156..afc75ec317 100644
--- a/rust/agama-lib/src/users/settings.rs
+++ b/rust/agama-lib/src/users/settings.rs
@@ -17,7 +17,7 @@ pub struct UserSettings {
 /// First user settings
 ///
 /// Holds the settings for the first user.
-#[derive(Clone, Debug, Default, Settings, Serialize, Deserialize, utoipa::ToSchema)]
+#[derive(Clone, Debug, Default, Settings, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct FirstUserSettings {
     /// First user's full name
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index 4fed705013..0fd578dec4 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -129,7 +129,7 @@ pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceErro
     let validation_router = validation_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let router = Router::new()
-        .route("/config", get(get_info))
+        .route("/config", get(get_config))
         .route("/user", put(set_first_user).delete(remove_first_user))
         .route(
             "/root_password",
@@ -234,7 +234,7 @@ pub struct UsersInfo {
     (status = 200, description = "Configuration for users including root and the first user", body = UsersInfo),
     (status = 400, description = "The D-Bus service could not perform the action"),
 ))]
-async fn get_info(State(state): State<UsersState<'_>>) -> Result<Json<UsersInfo>, Error> {
+async fn get_config(State(state): State<UsersState<'_>>) -> Result<Json<UsersInfo>, Error> {
     let mut result = UsersInfo::default();
     let first_user = state.users.first_user().await?;
     if first_user.user_name.is_empty() {
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 7405b946ae..7d476344fb 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -12,7 +12,6 @@ use utoipa::OpenApi;
         crate::network::web::connections,
         crate::software::web::get_config,
         crate::software::web::patterns,
-        crate::software::web::patterns,
         crate::software::web::set_config,
         crate::manager::web::probe_action,
         crate::manager::web::install_action,
@@ -20,7 +19,7 @@ use utoipa::OpenApi;
         crate::manager::web::installer_status,
         crate::questions::web::list_questions,
         crate::questions::web::answer,
-        crate::users::web::get_info,
+        crate::users::web::get_config,
         crate::users::web::set_first_user,
         crate::users::web::remove_first_user,
         crate::users::web::set_root_password,
diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index 9cc02f9c90..6e4fb3d851 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -252,15 +252,15 @@ const WithValidation = (superclass, validation_path, service_name) => class exte
    * @return {Promise<ValidationError[]>}
    */
   async getValidationErrors() {
-    let errors;
+    let response;
 
     try {
-      errors = await this.client.get(validation_path);
+      response = await this.client.get(validation_path);
     } catch (error) {
       console.error(`Could not get validation errors for ${validation_path}`, error);
     }
 
-    return errors.errors.map(createError);
+    return response.errors.map(createError);
   }
 
   /**

From 11cda2805db61416dac8233b9ef50f01b504741e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.com>
Date: Thu, 4 Apr 2024 13:55:08 +0200
Subject: [PATCH 190/324] Provide the frontend translations via the /po.js path
 (#1126)

## Problem

- Reimplement the translation support for the web frontend

## Solution

- Route the `/po.js` path to the code which redirects to the requested
translations or returns an empty JS file if the requested language is
not found.
---
 rust/Cargo.lock                      | 12 +++++
 rust/agama-server/Cargo.toml         |  2 +-
 rust/agama-server/src/web/http.rs    | 66 ++++++++++++++++++++++++++--
 rust/agama-server/src/web/service.rs |  4 ++
 rust/agama-server/src/web/state.rs   |  2 +
 5 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index aa3ca3b46b..33d52732a8 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -508,6 +508,7 @@ dependencies = [
  "axum",
  "axum-core",
  "bytes",
+ "cookie",
  "futures-util",
  "headers",
  "http 1.1.0",
@@ -867,6 +868,17 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "cookie"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8"
+dependencies = [
+ "percent-encoding",
+ "time",
+ "version_check",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
diff --git a/rust/agama-server/Cargo.toml b/rust/agama-server/Cargo.toml
index 739926c0a6..b714ad84b8 100644
--- a/rust/agama-server/Cargo.toml
+++ b/rust/agama-server/Cargo.toml
@@ -39,7 +39,7 @@ utoipa = { version = "4.2.0", features = ["axum_extras"] }
 config = "0.14.0"
 rand = "0.8.5"
 jsonwebtoken = "9.2.0"
-axum-extra = { version = "0.9.2", features = ["typed-header"] }
+axum-extra = { version = "0.9.2", features = ["cookie", "typed-header"] }
 chrono = { version = "0.4.34", default-features = false, features = [
   "now",
   "std",
diff --git a/rust/agama-server/src/web/http.rs b/rust/agama-server/src/web/http.rs
index dce25e517e..f95e884090 100644
--- a/rust/agama-server/src/web/http.rs
+++ b/rust/agama-server/src/web/http.rs
@@ -5,11 +5,13 @@ use super::{
     state::ServiceState,
 };
 use axum::{
+    body::Body,
     extract::State,
-    http::{header::SET_COOKIE, HeaderMap},
+    http::{header, HeaderMap, HeaderValue, StatusCode},
     response::IntoResponse,
     Json,
 };
+use axum_extra::extract::cookie::CookieJar;
 use pam::Client;
 use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
@@ -62,7 +64,7 @@ pub async fn login(
     let mut headers = HeaderMap::new();
     let cookie = format!("agamaToken={}; HttpOnly", &token);
     headers.insert(
-        SET_COOKIE,
+        header::SET_COOKIE,
         cookie.parse().expect("could not build a valid cookie"),
     );
 
@@ -76,7 +78,7 @@ pub async fn logout(_claims: TokenClaims) -> Result<impl IntoResponse, AuthError
     let mut headers = HeaderMap::new();
     let cookie = "agamaToken=deleted; HttpOnly; Expires=Thu, 01 Jan 1970 00:00:00 GMT".to_string();
     headers.insert(
-        SET_COOKIE,
+        header::SET_COOKIE,
         cookie.parse().expect("could not build a valid cookie"),
     );
     Ok(headers)
@@ -90,3 +92,61 @@ pub async fn logout(_claims: TokenClaims) -> Result<impl IntoResponse, AuthError
 pub async fn session(_claims: TokenClaims) -> Result<(), AuthError> {
     Ok(())
 }
+
+// builds a response tuple for translation redirection
+fn redirect_to_file(file: &str) -> (StatusCode, HeaderMap, Body) {
+    tracing::info!("Redirecting to translation file {}", file);
+
+    let mut response_headers = HeaderMap::new();
+    // translation found, redirect to the real file
+    response_headers.insert(
+        header::LOCATION,
+        // if the file exists then the name is a valid value and unwrapping is safe
+        HeaderValue::from_str(file).unwrap(),
+    );
+
+    (
+        StatusCode::TEMPORARY_REDIRECT,
+        response_headers,
+        Body::empty(),
+    )
+}
+
+// handle the /po.js request
+// the requested language (locale) is sent in the "agamaLang" HTTP cookie
+// this reimplements the Cockpit translation support
+pub async fn po(State(state): State<ServiceState>, jar: CookieJar) -> impl IntoResponse {
+    if let Some(cookie) = jar.get("agamaLang") {
+        tracing::info!("Language cookie: {}", cookie.value());
+        // try parsing the cookie
+        if let Some((lang, region)) = cookie.value().split_once('-') {
+            // first try language + country
+            let target_file = format!("po.{}_{}.js", lang, region.to_uppercase());
+            if state.public_dir.join(&target_file).exists() {
+                return redirect_to_file(&target_file);
+            } else {
+                // then try the language only
+                let target_file = format!("po.{}.js", lang);
+                if state.public_dir.join(&target_file).exists() {
+                    return redirect_to_file(&target_file);
+                };
+            }
+        } else {
+            // use the cookie as is
+            let target_file = format!("po.{}.js", cookie.value());
+            if state.public_dir.join(&target_file).exists() {
+                return redirect_to_file(&target_file);
+            }
+        }
+    }
+
+    tracing::info!("Translation not found");
+    // fallback, return empty javascript translations if the language is not supported
+    let mut response_headers = HeaderMap::new();
+    response_headers.insert(
+        header::CONTENT_TYPE,
+        HeaderValue::from_static("text/javascript"),
+    );
+
+    (StatusCode::OK, response_headers, Body::empty())
+}
diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index d28ebd3c7d..bb00f00200 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -74,6 +74,7 @@ impl MainServiceBuilder {
         let state = ServiceState {
             config: self.config,
             events: self.events,
+            public_dir: self.public_dir.clone(),
         };
 
         let api_router = self
@@ -84,9 +85,12 @@ impl MainServiceBuilder {
             .route("/ping", get(super::http::ping))
             .route("/auth", post(login).get(session).delete(logout));
 
+        tracing::info!("Serving static files from {}", self.public_dir.display());
         let serve = ServeDir::new(self.public_dir);
+
         Router::new()
             .nest_service("/", serve)
+            .route("/po.js", get(super::http::po))
             .nest("/api", api_router)
             .layer(TraceLayer::new_for_http())
             .layer(CompressionLayer::new().br(true))
diff --git a/rust/agama-server/src/web/state.rs b/rust/agama-server/src/web/state.rs
index c35592b8c5..01cdf6f625 100644
--- a/rust/agama-server/src/web/state.rs
+++ b/rust/agama-server/src/web/state.rs
@@ -1,6 +1,7 @@
 //! Implements the web service state.
 
 use super::{config::ServiceConfig, EventsSender};
+use std::path::PathBuf;
 
 /// Web service state.
 ///
@@ -9,4 +10,5 @@ use super::{config::ServiceConfig, EventsSender};
 pub struct ServiceState {
     pub config: ServiceConfig,
     pub events: EventsSender,
+    pub public_dir: PathBuf,
 }

From bd5549ba71ba5e403c8af407541d95aefbd8d510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 4 Apr 2024 13:22:18 +0100
Subject: [PATCH 191/324] Fix agama-web-server dependency

---
 rust/share/agama-web-server.service | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rust/share/agama-web-server.service b/rust/share/agama-web-server.service
index d858c0b21a..b6cb252301 100644
--- a/rust/share/agama-web-server.service
+++ b/rust/share/agama-web-server.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Agama Web Server
-After=network-online.target
-Requires=agama.service
+After=network-online.target agama.service
 
 [Service]
 Type=simple

From a5e4c02a08404150dee077428f204be41b3e0a9d Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 4 Apr 2024 15:09:27 +0200
Subject: [PATCH 192/324] reduce number of events for root user change

---
 rust/agama-server/src/users/web.rs | 10 +++++-----
 rust/agama-server/src/web/event.rs |  8 +++-----
 web/src/client/users.js            | 13 +++++++++----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index 0fd578dec4..fbdfe83b8e 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -40,6 +40,9 @@ pub async fn users_streams(
     const FIRST_USER_ID: &str = "first_user";
     const ROOT_PASSWORD_ID: &str = "root_password";
     const ROOT_SSHKEY_ID: &str = "root_sshkey";
+    // here we have three streams, but only two events. Reason is
+    // that we have three streams from dbus about property change
+    // and munify two root user properties into single event to http API
     let result: Vec<(&str, Pin<Box<dyn Stream<Item = Event> + Send>>)> = vec![
         (
             FIRST_USER_ID,
@@ -91,9 +94,7 @@ async fn root_password_changed_stream(
         .await
         .then(|change| async move {
             if let Ok(is_set) = change.get().await {
-                return Some(Event::RootPasswordChanged {
-                    password_is_set: is_set,
-                });
+                return Some(Event::RootChanged { password: Some(is_set), sshkey: None });
             }
             None
         })
@@ -110,8 +111,7 @@ async fn root_ssh_key_changed_stream(
         .await
         .then(|change| async move {
             if let Ok(key) = change.get().await {
-                let value = if key.is_empty() { None } else { Some(key) };
-                return Some(Event::RootSSHKeyChanged { key: value });
+                return Some(Event::RootChanged { password: None, sshkey: Some(key) });
             }
             None
         })
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 86c3625668..01776da513 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -24,11 +24,9 @@ pub enum Event {
         id: String,
     },
     FirstUserChanged(FirstUser),
-    RootPasswordChanged {
-        password_is_set: bool,
-    },
-    RootSSHKeyChanged {
-        key: Option<String>,
+    RootChanged {
+        password: Option<bool>,
+        sshkey: Option<String>
     },
     // TODO: it should include the full software proposal or, at least,
     // all the relevant changes.
diff --git a/web/src/client/users.js b/web/src/client/users.js
index bc7f89cd9b..73195af559 100644
--- a/web/src/client/users.js
+++ b/web/src/client/users.js
@@ -153,11 +153,16 @@ class UsersBaseClient {
    */
   onUsersChange(handler) {
     return this.client.ws.onEvent((event) => {
-      if (event.type === "RootPasswordChanged") {
+      if (event.type === "RootChanged") {
+        const res = {};
+        if (event.password !== null) {
+          res.rootPasswordSet = event.password;
+        }
+        if (event.sshkey !== null) {
+          res.rootSSHKey = event.sshkey;
+        }
         // @ts-ignore
-        return handler({ rootPasswordSet: event.password_is_set });
-      } else if (event.type === "RootSSHKeyChanged") {
-        return handler({ rootSSHKey: event.key.toString() });
+        return handler(res);
       } else if (event.type === "FirstUserChanged") {
         // @ts-ignore
         const { fullName, userName, password, autologin, data } = event;

From 0866b9d1c1cf36e376be2c56cb61f9682ef8d659 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Thu, 4 Apr 2024 16:15:12 +0100
Subject: [PATCH 193/324] Added hostname and fixed connection disconnect

---
 rust/agama-server/src/network/model.rs      |  1 +
 rust/agama-server/src/network/nm/client.rs  | 57 +++++++++++----
 rust/agama-server/src/network/nm/proxies.rs | 77 ++++++++++++++++++++-
 3 files changed, 122 insertions(+), 13 deletions(-)

diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index cbde368d70..fc76a767ea 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -404,6 +404,7 @@ mod tests {
 #[serde_as]
 #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct GeneralState {
+    pub hostname: String,
     pub connectivity: bool,
     pub wireless_enabled: bool,
     pub networking_enabled: bool, // pub network_state: NMSTATE
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index b8f4368ca0..63d697d45b 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -7,8 +7,8 @@ use super::dbus::{
 };
 use super::model::NmDeviceType;
 use super::proxies::{
-    AccessPointProxy, ConnectionProxy, DeviceProxy, NetworkManagerProxy, SettingsProxy,
-    WirelessProxy,
+    AccessPointProxy, ActiveConnectionProxy, ConnectionProxy, DeviceProxy, NetworkManagerProxy,
+    SettingsProxy, WirelessProxy,
 };
 use crate::network::model::{AccessPoint, Connection, Device, GeneralState};
 use agama_lib::error::ServiceError;
@@ -47,6 +47,8 @@ impl<'a> NetworkManagerClient<'a> {
     }
     /// Returns the general state
     pub async fn general_state(&self) -> Result<GeneralState, ServiceError> {
+        let proxy = SettingsProxy::new(&self.connection).await?;
+        let hostname = proxy.hostname().await?;
         let wireless_enabled = self.nm_proxy.wireless_enabled().await?;
         let networking_enabled = self.nm_proxy.networking_enabled().await?;
         // TODO:: Allow to set global DNS configuration
@@ -55,6 +57,7 @@ impl<'a> NetworkManagerClient<'a> {
         let connectivity = self.nm_proxy.connectivity().await? == 4;
 
         Ok(GeneralState {
+            hostname,
             wireless_enabled,
             networking_enabled,
             connectivity,
@@ -182,7 +185,7 @@ impl<'a> NetworkManagerClient<'a> {
                 .await?;
             let settings = proxy.get_settings().await?;
 
-            if let Some(connection) = connection_from_dbus(settings.clone()) {
+            if let Some(mut connection) = connection_from_dbus(settings.clone()) {
                 if let Some(controller) = controller_from_dbus(&settings) {
                     controlled_by.insert(connection.uuid, controller.to_string());
                 }
@@ -190,6 +193,9 @@ impl<'a> NetworkManagerClient<'a> {
                     uuids_map.insert(iname.to_string(), connection.uuid);
                 }
 
+                if self.settings_active_connection(path).await?.is_none() {
+                    connection.set_down()
+                }
                 connections.push(connection);
             }
         }
@@ -239,7 +245,7 @@ impl<'a> NetworkManagerClient<'a> {
         } else {
             //FIXME: This is wrong, deactivate receive an active connection path and this is a
             //settings path
-            // self.deactivate_connection(path).await?;
+            self.deactivate_connection(path).await?;
         }
         Ok(())
     }
@@ -296,16 +302,24 @@ impl<'a> NetworkManagerClient<'a> {
     /// * `path`: D-Bus patch of the connection.
     async fn deactivate_connection(&self, path: OwnedObjectPath) -> Result<(), ServiceError> {
         let proxy = NetworkManagerProxy::new(&self.connection).await?;
-        match proxy.deactivate_connection(&path.as_ref()).await {
-            Err(e) => {
-                // Ignore ConnectionNotActive error since this just means the state is already correct
-                if e.to_string().contains("ConnectionNotActive") {
-                    Ok(())
-                } else {
-                    Err(ServiceError::DBus(e))
+
+        if let Some(active_connection) = self.settings_active_connection(path.clone()).await? {
+            match proxy
+                .deactivate_connection(&active_connection.as_ref())
+                .await
+            {
+                Err(e) => {
+                    // Ignore ConnectionNotActive error since this just means the state is already correct
+                    if e.to_string().contains("ConnectionNotActive") {
+                        Ok(())
+                    } else {
+                        Err(ServiceError::DBus(e))
+                    }
                 }
+                _ => Ok(()),
             }
-            _ => Ok(()),
+        } else {
+            Ok(())
         }
     }
 
@@ -319,4 +333,23 @@ impl<'a> NetworkManagerClient<'a> {
             .await?;
         Ok(proxy)
     }
+
+    async fn settings_active_connection(
+        &self,
+        path: OwnedObjectPath,
+    ) -> Result<Option<OwnedObjectPath>, ServiceError> {
+        for active_path in &self.nm_proxy.active_connections().await? {
+            let proxy = ActiveConnectionProxy::builder(&self.connection)
+                .path(active_path.as_str())?
+                .build()
+                .await?;
+
+            let connection = proxy.connection().await?;
+            if path == connection {
+                return Ok(Some(active_path.to_owned()));
+            };
+        }
+
+        Ok(None)
+    }
 }
diff --git a/rust/agama-server/src/network/nm/proxies.rs b/rust/agama-server/src/network/nm/proxies.rs
index 56927caa4d..4eed8d9c5d 100644
--- a/rust/agama-server/src/network/nm/proxies.rs
+++ b/rust/agama-server/src/network/nm/proxies.rs
@@ -298,7 +298,6 @@ trait AccessPoint {
     #[dbus_proxy(property)]
     fn wpa_flags(&self) -> zbus::Result<u32>;
 }
-
 /// # DBus interface proxies for: `org.freedesktop.NetworkManager.Device.Wireless`
 ///
 /// This code was generated by `zbus-xmlgen` `3.1.0` from DBus introspection data.
@@ -691,3 +690,79 @@ trait Connection {
     #[dbus_proxy(property)]
     fn unsaved(&self) -> zbus::Result<bool>;
 }
+
+#[dbus_proxy(
+    interface = "org.freedesktop.NetworkManager.Connection.Active",
+    default_service = "org.freedesktop.NetworkManager",
+    default_path = "/org/freedesktop/NetworkManager/ActiveConnection/1",
+    gen_blocking = false
+)]
+trait ActiveConnection {
+    /// Connection property
+    #[dbus_proxy(property)]
+    fn connection(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
+
+    /// Controller property
+    #[dbus_proxy(property)]
+    fn controller(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
+
+    /// Default property
+    #[dbus_proxy(property)]
+    fn default(&self) -> zbus::Result<bool>;
+
+    /// Default6 property
+    #[dbus_proxy(property)]
+    fn default6(&self) -> zbus::Result<bool>;
+
+    /// Devices property
+    #[dbus_proxy(property)]
+    fn devices(&self) -> zbus::Result<Vec<zbus::zvariant::OwnedObjectPath>>;
+
+    /// Dhcp4Config property
+    #[dbus_proxy(property)]
+    fn dhcp4_config(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
+
+    /// Dhcp6Config property
+    #[dbus_proxy(property)]
+    fn dhcp6_config(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
+
+    /// Id property
+    #[dbus_proxy(property)]
+    fn id(&self) -> zbus::Result<String>;
+
+    /// Ip4Config property
+    #[dbus_proxy(property)]
+    fn ip4_config(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
+
+    /// Ip6Config property
+    #[dbus_proxy(property)]
+    fn ip6_config(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
+
+    /// Master property
+    #[dbus_proxy(property)]
+    fn master(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
+
+    /// SpecificObject property
+    #[dbus_proxy(property)]
+    fn specific_object(&self) -> zbus::Result<zbus::zvariant::OwnedObjectPath>;
+
+    /// State property
+    #[dbus_proxy(property)]
+    fn state(&self) -> zbus::Result<u32>;
+
+    /// StateFlags property
+    #[dbus_proxy(property)]
+    fn state_flags(&self) -> zbus::Result<u32>;
+
+    /// Type property
+    #[dbus_proxy(property)]
+    fn type_(&self) -> zbus::Result<String>;
+
+    /// Uuid property
+    #[dbus_proxy(property)]
+    fn uuid(&self) -> zbus::Result<String>;
+
+    /// Vpn property
+    #[dbus_proxy(property)]
+    fn vpn(&self) -> zbus::Result<bool>;
+}

From f5f95bf59b8bf90da10254bdf3f17404c76c345b Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 4 Apr 2024 17:20:13 +0200
Subject: [PATCH 194/324] modify routing as agreed. Client part is WIP

---
 rust/agama-server/src/users/web.rs | 142 ++++++++++++-----------------
 rust/agama-server/src/web/docs.rs  |  13 +--
 rust/agama-server/src/web/event.rs |   2 +-
 3 files changed, 65 insertions(+), 92 deletions(-)

diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index fbdfe83b8e..326469e84f 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -15,11 +15,7 @@ use agama_lib::{
     error::ServiceError,
     users::{proxies::Users1Proxy, FirstUser, UsersClient},
 };
-use axum::{
-    extract::State,
-    routing::{get, put},
-    Json, Router,
-};
+use axum::{extract::State, routing::get, Json, Router};
 use serde::{Deserialize, Serialize};
 use std::pin::Pin;
 use tokio_stream::{Stream, StreamExt};
@@ -94,7 +90,10 @@ async fn root_password_changed_stream(
         .await
         .then(|change| async move {
             if let Ok(is_set) = change.get().await {
-                return Some(Event::RootChanged { password: Some(is_set), sshkey: None });
+                return Some(Event::RootChanged {
+                    password: Some(is_set),
+                    sshkey: None,
+                });
             }
             None
         })
@@ -111,7 +110,10 @@ async fn root_ssh_key_changed_stream(
         .await
         .then(|change| async move {
             if let Ok(key) = change.get().await {
-                return Some(Event::RootChanged { password: None, sshkey: Some(key) });
+                return Some(Event::RootChanged {
+                    password: None,
+                    sshkey: Some(key),
+                });
             }
             None
         })
@@ -129,16 +131,13 @@ pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceErro
     let validation_router = validation_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
     let router = Router::new()
-        .route("/config", get(get_config))
-        .route("/user", put(set_first_user).delete(remove_first_user))
-        .route(
-            "/root_password",
-            put(set_root_password).delete(remove_root_password),
-        )
         .route(
-            "/root_sshkey",
-            put(set_root_sshkey).delete(remove_root_sshkey),
+            "/first",
+            get(get_user_config)
+                .put(set_first_user)
+                .delete(remove_first_user),
         )
+        .route("/root", get(get_root_config).patch(patch_root))
         .merge(validation_router)
         .merge(status_router)
         .with_state(state);
@@ -146,7 +145,7 @@ pub async fn users_service(dbus: zbus::Connection) -> Result<Router, ServiceErro
 }
 
 /// Removes the first user settings
-#[utoipa::path(delete, path = "/users/user", responses(
+#[utoipa::path(delete, path = "/users/first", responses(
     (status = 200, description = "Removes the first user"),
     (status = 400, description = "The D-Bus service could not perform the action"),
 ))]
@@ -155,7 +154,7 @@ async fn remove_first_user(State(state): State<UsersState<'_>>) -> Result<(), Er
     Ok(())
 }
 
-#[utoipa::path(put, path = "/users/user", responses(
+#[utoipa::path(put, path = "/users/first", responses(
     (status = 200, description = "User values are set"),
     (status = 400, description = "The D-Bus service could not perform the action"),
 ))]
@@ -167,87 +166,64 @@ async fn set_first_user(
     Ok(())
 }
 
-#[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct RootPasswordSettings {
-    pub value: String,
-    pub encrypted: bool,
-}
-
-#[utoipa::path(delete, path = "/users/root_password", responses(
-    (status = 200, description = "Removes the root password"),
-    (status = 400, description = "The D-Bus service could not perform the action"),
-))]
-async fn remove_root_password(State(state): State<UsersState<'_>>) -> Result<(), Error> {
-    state.users.remove_root_password().await?;
-    Ok(())
-}
-
-#[utoipa::path(put, path = "/users/root_password", responses(
-    (status = 200, description = "Root password is set"),
+#[utoipa::path(get, path = "/users/first", responses(
+    (status = 200, description = "Configuration for the first user", body = FirstUser),
     (status = 400, description = "The D-Bus service could not perform the action"),
 ))]
-async fn set_root_password(
-    State(state): State<UsersState<'_>>,
-    Json(config): Json<RootPasswordSettings>,
-) -> Result<(), Error> {
-    state
-        .users
-        .set_root_password(&config.value, config.encrypted)
-        .await?;
-    Ok(())
+async fn get_user_config(State(state): State<UsersState<'_>>) -> Result<Json<FirstUser>, Error> {
+    Ok(Json(state.users.first_user().await?))
 }
 
-#[utoipa::path(delete, path = "/users/root_sshkey", responses(
-    (status = 200, description = "Removes the root SSH key"),
-    (status = 400, description = "The D-Bus service could not perform the action"),
-))]
-async fn remove_root_sshkey(State(state): State<UsersState<'_>>) -> Result<(), Error> {
-    state.users.set_root_sshkey("").await?;
-    Ok(())
-}
-
-#[utoipa::path(put, path = "/users/root_sshkey", responses(
-    (status = 200, description = "Root SSH Key is set"),
+#[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct RootPatchSettings {
+    /// empty string here means remove ssh key for root
+    pub sshkey: Option<String>,
+    /// empty string here means remove password for root
+    pub password: Option<String>,
+    /// specify if patched password is provided in encrypted form
+    pub password_encrypted: Option<bool>,
+}
+
+#[utoipa::path(patch, path = "/users/root", responses(
+    (status = 200, description = "Root configuration is modified", body = RootPatchSettings),
     (status = 400, description = "The D-Bus service could not perform the action"),
 ))]
-async fn set_root_sshkey(
+async fn patch_root(
     State(state): State<UsersState<'_>>,
-    Json(key): Json<String>,
+    Json(config): Json<RootPatchSettings>,
 ) -> Result<(), Error> {
-    state.users.set_root_sshkey(key.as_str()).await?;
+    if let Some(key) = config.sshkey {
+        state.users.set_root_sshkey(&key).await?;
+    }
+    if let Some(password) = config.password {
+        if password.is_empty() {
+            state.users.remove_root_password().await?;
+        } else {
+            state
+                .users
+                .set_root_password(&password, config.password_encrypted == Some(true))
+                .await?;
+        }
+    }
     Ok(())
 }
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct RootInfo {
+pub struct RootConfig {
+    /// returns if password for root is set or not
     password: bool,
-    sshkey: Option<String>,
-}
-
-#[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct UsersInfo {
-    user: Option<FirstUser>,
-    root: RootInfo,
+    /// empty string mean no sshkey is specified
+    sshkey: String,
 }
 
-#[utoipa::path(put, path = "/users/config", responses(
-    (status = 200, description = "Configuration for users including root and the first user", body = UsersInfo),
+#[utoipa::path(get, path = "/users/root", responses(
+    (status = 200, description = "Configuration for the root user", body = RootConfig),
     (status = 400, description = "The D-Bus service could not perform the action"),
 ))]
-async fn get_config(State(state): State<UsersState<'_>>) -> Result<Json<UsersInfo>, Error> {
-    let mut result = UsersInfo::default();
-    let first_user = state.users.first_user().await?;
-    if first_user.user_name.is_empty() {
-        result.user = None;
-    } else {
-        result.user = Some(first_user);
-    }
-    result.root.password = state.users.is_root_password().await?;
-    let ssh_key = state.users.root_ssh_key().await?;
-    if ssh_key.is_empty() {
-        result.root.sshkey = None;
-    } else {
-        result.root.sshkey = Some(ssh_key);
-    }
-    Ok(Json(result))
+async fn get_root_config(State(state): State<UsersState<'_>>) -> Result<Json<RootConfig>, Error> {
+    let password = state.users.is_root_password().await?;
+    let sshkey = state.users.root_ssh_key().await?;
+    let config = RootConfig { password, sshkey };
+    Ok(Json(config))
 }
diff --git a/rust/agama-server/src/web/docs.rs b/rust/agama-server/src/web/docs.rs
index 7d476344fb..8d625b0c7e 100644
--- a/rust/agama-server/src/web/docs.rs
+++ b/rust/agama-server/src/web/docs.rs
@@ -19,13 +19,11 @@ use utoipa::OpenApi;
         crate::manager::web::installer_status,
         crate::questions::web::list_questions,
         crate::questions::web::answer,
-        crate::users::web::get_config,
+        crate::users::web::get_root_config,
+        crate::users::web::get_user_config,
         crate::users::web::set_first_user,
         crate::users::web::remove_first_user,
-        crate::users::web::set_root_password,
-        crate::users::web::remove_root_password,
-        crate::users::web::set_root_sshkey,
-        crate::users::web::remove_root_sshkey,
+        crate::users::web::patch_root,
         super::http::ping,
     ),
     components(
@@ -50,9 +48,8 @@ use utoipa::OpenApi;
         schemas(crate::questions::web::GenericAnswer),
         schemas(crate::questions::web::PasswordAnswer),
         schemas(agama_lib::users::FirstUser),
-        schemas(crate::users::web::RootPasswordSettings),
-        schemas(crate::users::web::RootInfo),
-        schemas(crate::users::web::UsersInfo),
+        schemas(crate::users::web::RootConfig),
+        schemas(crate::users::web::RootPatchSettings),
         schemas(super::http::PingResponse),
     )
 )]
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 01776da513..3f23090659 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -26,7 +26,7 @@ pub enum Event {
     FirstUserChanged(FirstUser),
     RootChanged {
         password: Option<bool>,
-        sshkey: Option<String>
+        sshkey: Option<String>,
     },
     // TODO: it should include the full software proposal or, at least,
     // all the relevant changes.

From 8b9789d87f3abfefa9b5f3e1a6506921a14f08fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 06:31:31 +0100
Subject: [PATCH 195/324] Use camelCase in l10n/config

---
 rust/agama-server/src/l10n/web.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index 847df89b38..e489b81889 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -60,6 +60,7 @@ async fn locales(State(state): State<LocaleState<'_>>) -> Json<Vec<LocaleEntry>>
 }
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct LocaleConfig {
     /// Locales to install in the target system
     locales: Option<Vec<String>>,

From 44c7259ef5c2ab4f610830b1aa330f8d9ff22951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 06:31:49 +0100
Subject: [PATCH 196/324] Fix uiKeymap handling

---
 rust/agama-server/src/l10n/l10n.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/l10n/l10n.rs b/rust/agama-server/src/l10n/l10n.rs
index 324238e2aa..5c70cce1df 100644
--- a/rust/agama-server/src/l10n/l10n.rs
+++ b/rust/agama-server/src/l10n/l10n.rs
@@ -100,8 +100,14 @@ impl L10n {
     }
 
     // TODO: use LocaleError
-    pub fn set_ui_keymap(&mut self, keymap: KeymapId) -> Result<(), Error> {
-        let keymap = keymap.to_string();
+    pub fn set_ui_keymap(&mut self, keymap_id: KeymapId) -> Result<(), LocaleError> {
+        if !self.keymaps_db.exists(&keymap_id) {
+            return Err(LocaleError::UnknownKeymap(keymap_id));
+        }
+
+        let keymap = keymap_id.to_string();
+        self.ui_keymap = keymap_id;
+
         Command::new("/usr/bin/localectl")
             .args(["set-x11-keymap", &keymap])
             .output()

From 6065eafa08874676d4dcd1ff18a4bbe5b95d5cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 06:41:16 +0100
Subject: [PATCH 197/324] Use the property name when updating UILocale

---
 rust/agama-lib/src/localization/proxies.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-lib/src/localization/proxies.rs b/rust/agama-lib/src/localization/proxies.rs
index 9e271f930d..fe1550f664 100644
--- a/rust/agama-lib/src/localization/proxies.rs
+++ b/rust/agama-lib/src/localization/proxies.rs
@@ -39,6 +39,6 @@ trait Locale {
     /// UILocale property
     #[dbus_proxy(property, name = "UILocale")]
     fn uilocale(&self) -> zbus::Result<String>;
-    #[dbus_proxy(property)]
+    #[dbus_proxy(property, name = "UILocale")]
     fn set_uilocale(&self, value: &str) -> zbus::Result<()>;
 }

From bb1ec2b749b754036ce90078342fedcaaa09c131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 06:44:36 +0100
Subject: [PATCH 198/324] Use PATCH to update l10n/config

---
 rust/agama-server/src/l10n/web.rs | 14 ++++++++------
 rust/agama-server/tests/l10n.rs   |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rust/agama-server/src/l10n/web.rs b/rust/agama-server/src/l10n/web.rs
index e489b81889..0288ada8b9 100644
--- a/rust/agama-server/src/l10n/web.rs
+++ b/rust/agama-server/src/l10n/web.rs
@@ -11,7 +11,9 @@ use agama_lib::{error::ServiceError, localization::LocaleProxy};
 use agama_locale_data::LocaleId;
 use axum::{
     extract::State,
-    routing::{get, put},
+    http::StatusCode,
+    response::IntoResponse,
+    routing::{get, patch},
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
@@ -45,7 +47,7 @@ pub async fn l10n_service(
         .route("/keymaps", get(keymaps))
         .route("/locales", get(locales))
         .route("/timezones", get(timezones))
-        .route("/config", put(set_config).get(get_config))
+        .route("/config", patch(set_config).get(get_config))
         .with_state(state);
     Ok(router)
 }
@@ -94,13 +96,13 @@ async fn keymaps(State(state): State<LocaleState<'_>>) -> Json<Vec<Keymap>> {
 
 // TODO: update all or nothing
 // TODO: send only the attributes that have changed
-#[utoipa::path(put, path = "/l10n/config", responses(
-    (status = 200, description = "Set the locale configuration", body = LocaleConfig)
+#[utoipa::path(patch, path = "/l10n/config", responses(
+    (status = 204, description = "Set the locale configuration", body = LocaleConfig)
 ))]
 async fn set_config(
     State(state): State<LocaleState<'_>>,
     Json(value): Json<LocaleConfig>,
-) -> Result<Json<()>, Error> {
+) -> Result<impl IntoResponse, Error> {
     let mut data = state.locale.write().await;
     let mut changes = LocaleConfig::default();
 
@@ -143,7 +145,7 @@ async fn set_config(
     }
     _ = state.events.send(Event::L10nConfigChanged(changes));
 
-    Ok(Json(()))
+    Ok(StatusCode::NO_CONTENT)
 }
 
 #[utoipa::path(get, path = "/l10n/config", responses(
diff --git a/rust/agama-server/tests/l10n.rs b/rust/agama-server/tests/l10n.rs
index 1be8e57539..7a69a873a4 100644
--- a/rust/agama-server/tests/l10n.rs
+++ b/rust/agama-server/tests/l10n.rs
@@ -88,11 +88,11 @@ async fn test_set_config_locales() -> Result<(), Box<dyn Error>> {
 
     let content = "{\"locales\":[\"es_ES.UTF-8\"]}";
     let body = Body::from(content);
-    let request = Request::put("/config")
+    let request = Request::patch("/config")
         .header("Content-Type", "application/json")
         .body(body)?;
     let response = service.clone().oneshot(request).await?;
-    assert_eq!(response.status(), StatusCode::OK);
+    assert_eq!(response.status(), StatusCode::NO_CONTENT);
 
     // check whether the value changed
     let request = Request::get("/config")

From 1d2a8dbf65d3bce34383035232bf30981022c914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 07:07:37 +0100
Subject: [PATCH 199/324] Adapt L10n JavaScript client to latest API changes

---
 web/src/client/http.js | 15 +++++++++++++++
 web/src/client/l10n.js |  8 ++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/web/src/client/http.js b/web/src/client/http.js
index 4b3a123313..e93ee99cdb 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -150,6 +150,21 @@ class HTTPClient {
     }
   }
 
+  /**
+   * @param {string} url - Endpoint URL (e.g., "/l10n/config").
+   * @param {object} data - Data to submit
+   * @return {Promise<void>} Server response.
+   */
+  async patch(url, data) {
+    await fetch(`${this.baseUrl}/${url}`, {
+      method: "PATCH",
+      body: JSON.stringify(data),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+  }
+
   /**
    * Registers a handler for a given type of events.
    *
diff --git a/web/src/client/l10n.js b/web/src/client/l10n.js
index 37602d6478..78f159c4c3 100644
--- a/web/src/client/l10n.js
+++ b/web/src/client/l10n.js
@@ -71,7 +71,7 @@ class L10nClient {
    * @return {Promise<void>}
    */
   async setUILocale(id) {
-    return this.client.put("/l10n/config", { ui_locale: id });
+    return this.client.patch("/l10n/config", { uiLocale: id });
   }
 
   /**
@@ -83,7 +83,7 @@ class L10nClient {
    */
   async getUIKeymap() {
     const config = await this.client.get("/l10n/config");
-    return config.ui_locale;
+    return config.uiKeymap;
   }
 
   /**
@@ -95,7 +95,7 @@ class L10nClient {
    * @return {Promise<void>}
    */
   async setUIKeymap(id) {
-    return this.client.put("/l10n/config", { ui_keymap: id });
+    return this.client.patch("/l10n/config", { uiKeymap: id });
   }
 
   /**
@@ -254,7 +254,7 @@ class L10nClient {
    * @return {Promise<object>}
    */
   async setConfig(data) {
-    return this.client.put("/l10n/config", data);
+    return this.client.patch("/l10n/config", data);
   }
 
   /**

From b992107b7376a6592f5710344a6b17d57bbbb015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 09:47:22 +0100
Subject: [PATCH 200/324] Fix webpack configuration to load CockpitPoPlugin

---
 web/webpack.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/webpack.config.js b/web/webpack.config.js
index 82db9f3bb7..05f360f354 100644
--- a/web/webpack.config.js
+++ b/web/webpack.config.js
@@ -8,6 +8,7 @@ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const HtmlMinimizerPlugin = require("html-minimizer-webpack-plugin");
 const CompressionPlugin = require("compression-webpack-plugin");
 const ESLintPlugin = require('eslint-webpack-plugin');
+const CockpitPoPlugin = require("./src/lib/cockpit-po-plugin");
 const StylelintPlugin = require('stylelint-webpack-plugin');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');

From 59d2fc3d32a4061165f589bc14565269e9d5805f Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Thu, 4 Apr 2024 17:25:06 +0100
Subject: [PATCH 201/324] Serialize as lowercase

---
 rust/agama-lib/src/network/types.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rust/agama-lib/src/network/types.rs b/rust/agama-lib/src/network/types.rs
index 9d83eea024..5b4e78bb0b 100644
--- a/rust/agama-lib/src/network/types.rs
+++ b/rust/agama-lib/src/network/types.rs
@@ -56,6 +56,7 @@ pub enum DeviceType {
 }
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
 pub enum Status {
     #[default]
     Up,

From 44c941aeaf1d291e220f5d78cb7267f8c9e0f630 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Thu, 4 Apr 2024 18:29:45 +0100
Subject: [PATCH 202/324] Started with network client test changes

---
 web/src/client/network.test.js  | 111 ++++++++++++++++++++------------
 web/src/client/network/index.js |   6 +-
 2 files changed, 71 insertions(+), 46 deletions(-)

diff --git a/web/src/client/network.test.js b/web/src/client/network.test.js
index 1841530439..4cac4e328d 100644
--- a/web/src/client/network.test.js
+++ b/web/src/client/network.test.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2022] SUSE LLC
+ * Copyright (c) [2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -21,68 +21,95 @@
 
 // @ts-check
 
-import { NetworkClient, ConnectionTypes, ConnectionState } from "./network";
-const ADDRESS = "unix:path=/run/agama/bus";
+import { HTTPClient } from "./http";
+import { NetworkClient } from "./network";
+const ADDRESS = "http://localhost";
 
-const mockActiveConnection = {
-  id: "uuid-wired",
-  name: "Wired connection 1",
-  type: ConnectionTypes.ETHERNET,
-  state: ConnectionState.ACTIVATED,
-  addresses: [{ address: "192.168.122.1", prefix: 24 }]
-};
+
+const mockWiredConnection = {
+  "id": "eth0",
+  "status": "up",
+  "interface": "eth0",
+  "method4": "manual",
+  "method6": "manual",
+  "addresses": ["192.168.122.100/24"],
+  "nameservers": ["192.168.122.1"],
+  "gateway4": "192.168.122.1"
+}
+
+const mockWirelessConnection = {
+  "id": "AgamaNetwork",
+  "method4": "auto",
+  "method6": "auto",
+  "wireless": {
+    "passworkd": "agama.test",
+    "security": "wpa-psk",
+    "ssid": "Agama",
+    "mode": "infrastructure"
+  },
+  "status": "down"
+}
 
 const mockConnection = {
-  id: "uuid-wired",
-  name: "Wired connection 1",
-  type: ConnectionTypes.ETHERNET,
-  addresses: [{ address: "192.168.122.1", prefix: 24 }]
-};
+  "id": "eth0",
+  "status": "up",
+  "interface": "eth0",
+  "method4": "manual",
+  "method6": "manual",
+  "addresses": [{ address: "192.168.122.100", prefix: 24 }],
+  "nameservers": ["192.168.122.1"],
+  "gateway4": "192.168.122.1"
+}
 
-const settings = {
-  wifiScanSupported: true,
-  hostname: "localhost.localdomain"
-};
+const mockSettings = {
+  hostname: "localhost.localdomain",
+  connectivity: true,
+  wireless_enabled: true,
+  networking_enabled: true
+}
 
-jest.mock("./network/network_manager", () => {
+jest.mock("./http", () => {
   return {
-    NetworkManagerAdapter: jest.fn().mockImplementation(() => {
+    HTTPClient: jest.fn().mockImplementation(() => {
       return {
-        setUp: jest.fn(),
-        activeConnections: jest.fn().mockReturnValue([mockActiveConnection]),
-        connections: jest.fn().mockReturnValue([mockConnection]),
-        subscribe: jest.fn(),
-        getConnection: jest.fn(),
-        accessPoints: jest.fn(),
-        connectTo: jest.fn(),
-        addAndConnectTo: jest.fn(),
-        settings: jest.fn().mockReturnValue(settings),
+        get: mockGetFn,
       };
     }),
   };
 });
 
+const mockGetFn = jest.fn();
+
 describe("NetworkClient", () => {
-  describe("#activeConnections", () => {
-    it("returns the list of active connections from the adapter", () => {
-      const client = new NetworkClient(ADDRESS);
-      const connections = client.activeConnections();
-      expect(connections).toEqual([mockActiveConnection]);
+  describe("#connections", () => {
+    it("returns the list of active connections from the adapter", async () => {
+      const http = new HTTPClient(new URL(ADDRESS));
+      const client = new NetworkClient(http);
+      mockGetFn.mockResolvedValue([mockWiredConnection, mockWirelessConnection]);
+      const connections = await client.connections();
+      const eth0 = connections.find(c => c.id === "eth0");
+      expect(eth0).toEqual(mockConnection);
     });
   });
 
   describe("#addresses", () => {
-    it("returns the list of addresses", () => {
-      const client = new NetworkClient(ADDRESS);
-      expect(client.addresses()).toEqual([{ address: "192.168.122.1", prefix: 24 }]);
+    it("returns the list of addresses", async () => {
+      const http = new HTTPClient(new URL(ADDRESS));
+      const client = new NetworkClient(http);
+      mockGetFn.mockResolvedValue([mockWiredConnection, mockWirelessConnection]);
+      const addresses = await client.addresses();
+      expect(addresses).toEqual([{ address: "192.168.122.100", prefix: 24 }]);
     });
   });
 
+
   describe("#settings", () => {
-    it("returns network general settings", () => {
-      const client = new NetworkClient(ADDRESS);
-      expect(client.settings().hostname).toEqual("localhost.localdomain");
-      expect(client.settings().wifiScanSupported).toEqual(true);
+    it("returns network general settings", async () => {
+      const http = new HTTPClient(new URL(ADDRESS));
+      const client = new NetworkClient(http);
+      mockGetFn.mockResolvedValue(mockSettings);
+      const settings = await client.settings();
+      expect(settings.hostname).toEqual("localhost.localdomain");
     });
   });
 });
diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index 0c1de8b732..b693e12344 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -25,7 +25,7 @@ import DBusClient from "../dbus";
 import { NetworkManagerAdapter, securityFromFlags } from "./network_manager";
 import cockpit from "../../lib/cockpit";
 import { createConnection, ConnectionTypes, ConnectionState, createAccessPoint } from "./model";
-import { formatIp } from "./utils";
+import { formatIp, ipPrefixFor } from "./utils";
 
 const SERVICE_NAME = "org.opensuse.Agama1";
 const CONNECTIONS_IFACE = "org.opensuse.Agama1.Network.Connections";
@@ -46,7 +46,6 @@ const DeviceType = Object.freeze({
 /**
  * @typedef {import("./model").NetworkSettings} NetworkSettings
  * @typedef {import("./model").Connection} Connection
- * @typedef {import("./model").ActiveConnection} ActiveConnection
  * @typedef {import("./model").IPAddress} IPAddress
  * @typedef {import("./model").AccessPoint} AccessPoint
  */
@@ -63,7 +62,6 @@ const NetworkEventTypes = Object.freeze({
 
 /**
  * @typedef {object} NetworkAdapter
- * @property {() => ActiveConnection[]} activeConnections
  * @property {() => AccessPoint[]} accessPoints
  * @property {() => Promise<Connection[]>} connections
  * @property {(handler: (event: NetworkEvent) => void) => void} subscribe
@@ -119,7 +117,7 @@ class NetworkClient {
     const nameservers = (connection.nameservers || []);
     const addresses = (connection.addresses || []).map((address) => {
       const [ip, netmask] = address.split("/");
-      return { address: ip, prefix: netmask };
+      return { address: ip, prefix: ipPrefixFor(netmask) };
     });
 
     return { ...connection, addresses, nameservers };

From 50e20732c1be3e46cee516dfd398922dc52f9b44 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 5 Apr 2024 16:10:34 +0200
Subject: [PATCH 203/324] adapt UI code to new http api

---
 web/src/client/http.js  | 33 ++++++++++++++++++++-------------
 web/src/client/users.js | 28 ++++++++++++++--------------
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/web/src/client/http.js b/web/src/client/http.js
index bb9a242795..c8972ae5d0 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -142,29 +142,36 @@ class HTTPClient {
       },
     });
 
-    try {
-      return await response.json();
-    } catch (e) {
-      console.warn("Expecting a JSON response", e);
-      return response.status === 200;
-    }
+    return response;
   }
 
   /**
    * @param {string} url - Endpoint URL (e.g., "/l10n/config").
-   * @return {Promise<object>} Server response.
+   * @return {Promise<Response>} Server response.
    */
   async delete(url) {
     const response = await fetch(`${this.baseUrl}/${url}`, {
       method: "DELETE",
     });
 
-    try {
-      return await response.json();
-    } catch (e) {
-      console.warn("Expecting a JSON response", e);
-      return response.status === 200;
-    }
+    return response;
+  }
+
+  /**
+   * @param {string} url - Endpoint URL (e.g., "/l10n/config").
+   * @param {object} data - Data to submit
+   * @return {Promise<Response>} Server response.
+   */
+  async patch(url, data) {
+    const response = await fetch(`${this.baseUrl}/${url}`, {
+      method: "PATCH",
+      body: JSON.stringify(data),
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+
+    return response;
   }
 
   /**
diff --git a/web/src/client/users.js b/web/src/client/users.js
index 73195af559..729bc08491 100644
--- a/web/src/client/users.js
+++ b/web/src/client/users.js
@@ -23,8 +23,6 @@
 
 import { WithValidation } from "./mixins";
 
-const USERS_PATH = "/users/config";
-
 /**
 * @typedef {object} UserResult
 * @property {boolean} result - whether the action succeeded or not
@@ -66,13 +64,13 @@ class UsersBaseClient {
    * @return {Promise<User>}
    */
   async getUser() {
-    const proxy = await this.client.get(USERS_PATH);
+    const user = await this.client.get("/users/first");
 
-    if (proxy.user === null) {
+    if (user === null) {
       return { fullName: "", userName: "", password: "", autologin: false, data: {} };
     }
 
-    return proxy.user;
+    return user;
   }
 
   /**
@@ -81,8 +79,8 @@ class UsersBaseClient {
    * @return {Promise<boolean>}
    */
   async isRootPasswordSet() {
-    const proxy = await this.client.get(USERS_PATH);
-    return proxy.root.password;
+    const proxy = await this.client.get("/users/root");
+    return proxy.password;
   }
 
   /**
@@ -94,7 +92,7 @@ class UsersBaseClient {
   async setUser(user) {
     const result = await this.client.put("/users/user", user);
 
-    return { result, issues: [] }; // TODO: check how to handle issues and result. Maybe separate call to validate?
+    return { result: result.ok, issues: [] }; // TODO: check how to handle issues and result. Maybe separate call to validate?
   }
 
   /**
@@ -103,7 +101,7 @@ class UsersBaseClient {
    * @return {Promise<boolean>} whether the operation was successful or not
    */
   async removeUser() {
-    return this.client.delete("/users/user");
+    return (await this.client.delete("/users/user")).ok;
   }
 
   /**
@@ -113,7 +111,8 @@ class UsersBaseClient {
    * @return {Promise<boolean>} whether the operation was successful or not
    */
   async setRootPassword(password) {
-    return this.client.put("/users/root_password", { value: password, encrypted: false });
+    const response = await this.client.patch("/users/root", { password, password_encrypted: false });
+    return response.ok;
   }
 
   /**
@@ -122,7 +121,7 @@ class UsersBaseClient {
    * @return {Promise<boolean>} whether the operation was successful or not
    */
   async removeRootPassword() {
-    return this.client.delete("/users/root_password");
+    return this.setRootPassword("");
   }
 
   /**
@@ -131,8 +130,8 @@ class UsersBaseClient {
    * @return {Promise<String>} SSH public key or an empty string if it is not set
    */
   async getRootSSHKey() {
-    const proxy = await this.client.get(USERS_PATH);
-    return proxy.root.ssh_key || "";
+    const proxy = await this.client.get("/users/root");
+    return proxy.sshkey;
   }
 
   /**
@@ -142,7 +141,8 @@ class UsersBaseClient {
    * @return {Promise<boolean>} whether the operation was successful or not
    */
   async setRootSSHKey(key) {
-    return this.client.put("/users/root_sshkey", key);
+    const response = await this.client.patch("/users/root", { sshkey: key });
+    return response.ok;
   }
 
   /**

From 45d92ac7d057dff5f29c633f0947a1749a7bfb67 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Fri, 5 Apr 2024 15:32:16 +0100
Subject: [PATCH 204/324] Fixed network tests

---
 web/src/client/network/index.js               |  6 +-
 .../components/network/NetworkPage.test.jsx   | 56 +++++++++++--------
 .../network/WifiNetworkListItem.test.jsx      | 28 ++++++++++
 .../network/WifiNetworksList.test.jsx         | 32 +++++++++++
 4 files changed, 99 insertions(+), 23 deletions(-)

diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index b693e12344..99beae28cd 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -117,7 +117,11 @@ class NetworkClient {
     const nameservers = (connection.nameservers || []);
     const addresses = (connection.addresses || []).map((address) => {
       const [ip, netmask] = address.split("/");
-      return { address: ip, prefix: ipPrefixFor(netmask) };
+      if (netmask !== undefined) {
+        return { address: ip, prefix: ipPrefixFor(netmask) };
+      } else {
+        return { address: ip };
+      }
     });
 
     return { ...connection, addresses, nameservers };
diff --git a/web/src/components/network/NetworkPage.test.jsx b/web/src/components/network/NetworkPage.test.jsx
index 82405398da..67028fd5b8 100644
--- a/web/src/components/network/NetworkPage.test.jsx
+++ b/web/src/components/network/NetworkPage.test.jsx
@@ -30,37 +30,49 @@ jest.mock("~/client");
 jest.mock("~/components/core/Sidebar", () => () => <div>Agama sidebar</div>);
 
 const wiredConnection = {
-  id: "Wired 1",
-  uuid: "e1ce3e83-f57c-4649-97d5-ecc468b74f97",
-  type: ConnectionTypes.ETHERNET,
-  addresses: [{ address: "192.168.122.20", prefix: 24 }]
-};
+  "id": "eth0",
+  "status": "up",
+  "interface": "eth0",
+  "method4": "manual",
+  "method6": "manual",
+  "addresses": [{ address: "192.168.122.20", prefix: 24 }],
+  "nameservers": ["192.168.122.1"],
+  "gateway4": "192.168.122.1"
+}
+
 const wiFiConnection = {
-  id: "WiFi 1",
-  uuid: "a4cf03c5-cb87-469d-824e-26b855a6bcfc",
-  type: ConnectionTypes.WIFI,
-  addresses: [{ address: "192.168.69.200", prefix: 24 }]
-};
+  "id": "AgamaNetwork",
+  "method4": "auto",
+  "method6": "auto",
+  "wireless": {
+    "passworkd": "agama.test",
+    "security": "wpa-psk",
+    "ssid": "Agama",
+    "mode": "infrastructure"
+  },
+  "addresses": [{ address: "192.168.69.200", prefix: 24 }],
+  "nameservers": [],
+  "status": "down"
+}
 
 const settingsFn = jest.fn();
-const activeConnectionsFn = jest.fn();
+const connectionsFn = jest.fn();
 const activeConnections = [wiredConnection, wiFiConnection];
-const networkSettings = { wifiScanSupported: false, hostname: "test" };
+const networkSettings = { wireless_enabled: false, hostname: "test", networking_enabled: true, connectivity: true };
 
 describe("NetworkPage", () => {
   beforeEach(() => {
     settingsFn.mockReturnValue({ ...networkSettings });
-    activeConnectionsFn.mockReturnValue(activeConnections);
+    connectionsFn.mockReturnValue(activeConnections);
 
     createClient.mockImplementation(() => {
       return {
         network: {
           setUp: () => Promise.resolve(true),
-          activeConnections: () => activeConnectionsFn,
-          connections: () => Promise.resolve([]),
-          accessPoints: () => [],
+          connections: () => Promise.resolve(connectionsFn()),
+          accessPoints: () => Promise.resolve([]),
           onNetworkEvent: jest.fn(),
-          settings: settingsFn
+          settings: () => Promise.resolve(settingsFn())
         }
       };
     });
@@ -69,20 +81,20 @@ describe("NetworkPage", () => {
   it("renders section for wired connections", async () => {
     installerRender(<NetworkPage />);
     const section = await screen.findByRole("region", { name: "Wired networks" });
-    await within(section).findByText("Wired 1");
+    await within(section).findByText("eth0");
     within(section).getByText("192.168.122.20/24");
   });
 
   it("renders section for WiFi connections", async () => {
     installerRender(<NetworkPage />);
     const section = await screen.findByRole("region", { name: "WiFi networks" });
-    await within(section).findByText("WiFi 1");
+    await within(section).findByText("AgamaNetwork");
     within(section).getByText("192.168.69.200/24");
   });
 
   describe("when no wired connection is detected", () => {
     beforeEach(() => {
-      activeConnectionsFn.mockReturnValue([wiFiConnection]);
+      connectionsFn.mockReturnValue([wiFiConnection]);
     });
 
     it("renders an informative message", async () => {
@@ -95,7 +107,7 @@ describe("NetworkPage", () => {
 
   describe("when no WiFi connection is detected", () => {
     beforeEach(() => {
-      activeConnectionsFn.mockReturnValue([wiredConnection]);
+      connectionsFn.mockReturnValue([wiredConnection]);
     });
 
     it("renders an informative message", async () => {
@@ -107,7 +119,7 @@ describe("NetworkPage", () => {
 
     describe("and WiFi scan is supported", () => {
       beforeEach(() => {
-        settingsFn.mockReturnValue({ ...networkSettings, wifiScanSupported: true });
+        settingsFn.mockReturnValue({ ...networkSettings, wireless_enabled: true });
       });
 
       it("displays a button for scanning WiFi networks", async () => {
diff --git a/web/src/components/network/WifiNetworkListItem.test.jsx b/web/src/components/network/WifiNetworkListItem.test.jsx
index e14c921a93..e0543d5b81 100644
--- a/web/src/components/network/WifiNetworkListItem.test.jsx
+++ b/web/src/components/network/WifiNetworkListItem.test.jsx
@@ -28,7 +28,9 @@ import { WifiNetworkListItem } from "~/components/network";
 
 jest.mock("~/components/network/WifiConnectionForm", () => () => <div>WifiConnectionForm mock</div>);
 jest.mock("~/components/network/WifiNetworkMenu", () => () => <div>WifiNetworkMenu mock</div>);
+import { createClient } from "~/client";
 
+jest.mock("~/client");
 const onSelectCallback = jest.fn();
 const fakeNetwork = {
   ssid: "Fake Wi-Fi AP",
@@ -42,7 +44,33 @@ const fakeSettings = {
   }
 };
 
+const accessPoints = [{
+  ssid: "Fake Wi-Fi AP",
+  hw_address: "00:11:22:33:44:55",
+  strength: 61,
+  security: ["WPA2"]
+}];
+
+const settingsFn = jest.fn();
+const networkSettings = { wireless_enabled: false, hostname: "test", networking_enabled: true, connectivity: true };
+
 describe("NetworkListItem", () => {
+  beforeEach(() => {
+    settingsFn.mockReturnValue({ ...networkSettings });
+
+    createClient.mockImplementation(() => {
+      return {
+        network: {
+          setUp: () => Promise.resolve(true),
+          connections: () => Promise.resolve([]),
+          accessPoints: () => Promise.resolve(accessPoints),
+          onNetworkEvent: jest.fn(),
+          settings: () => Promise.resolve(settingsFn())
+        }
+      };
+    });
+  });
+
   it("renders an input radio for selecting the network", async () => {
     installerRender(<WifiNetworkListItem network={fakeNetwork} />);
 
diff --git a/web/src/components/network/WifiNetworksList.test.jsx b/web/src/components/network/WifiNetworksList.test.jsx
index d7b3545804..dc80fe273f 100644
--- a/web/src/components/network/WifiNetworksList.test.jsx
+++ b/web/src/components/network/WifiNetworksList.test.jsx
@@ -25,7 +25,9 @@ import { screen } from "@testing-library/react";
 import { installerRender } from "~/test-utils";
 
 import { WifiNetworksList } from "~/components/network";
+import { createClient } from "~/client";
 
+jest.mock("~/client");
 const onSelectionCallback = jest.fn();
 
 const myNetwork = {
@@ -42,8 +44,38 @@ const otherNetwork = {
 };
 
 const networksMock = [myNetwork, otherNetwork];
+const settingsFn = jest.fn();
+const accessPoints = [{
+  ssid: "My Wi-Fi Network",
+  hw_address: "00:11:22:33:44:55",
+  strength: 61,
+  security: ["WPA2"]
+},
+{
+  ssid: "My Neighbor Network",
+  hw_address: "00:12:23:34:45:55",
+  strength: 12,
+  security: ["WPA2"]
+}];
+
+const networkSettings = { wireless_enabled: false, hostname: "test", networking_enabled: true, connectivity: true };
 
 describe("WifiNetworksList", () => {
+  beforeEach(() => {
+    settingsFn.mockReturnValue({ ...networkSettings });
+
+    createClient.mockImplementation(() => {
+      return {
+        network: {
+          setUp: () => Promise.resolve(true),
+          connections: () => Promise.resolve([]),
+          accessPoints: () => Promise.resolve(accessPoints),
+          onNetworkEvent: jest.fn(),
+          settings: () => Promise.resolve(settingsFn())
+        }
+      };
+    });
+  });
   it("renders link for connect to a hidden network", () => {
     installerRender(<WifiNetworksList networks={[]} />);
     screen.getByRole("button", { name: "Connect to hidden network" });

From dc2a025391a2bdd47d73fb0ca7c5d5d2ee0bddd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= <lslezak@suse.com>
Date: Fri, 5 Apr 2024 17:56:58 +0200
Subject: [PATCH 205/324] Fix creating the self-signed certificate

---
 rust/agama-server/src/cert.rs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/rust/agama-server/src/cert.rs b/rust/agama-server/src/cert.rs
index db02bf951b..27443d6cc7 100644
--- a/rust/agama-server/src/cert.rs
+++ b/rust/agama-server/src/cert.rs
@@ -46,6 +46,7 @@ pub fn create_certificate() -> Result<(X509, PKey<Private>), ErrorStack> {
     };
     builder.set_serial_number(&serial_number)?;
     builder.set_subject_name(&x509_name)?;
+    builder.set_issuer_name(&x509_name)?;
     builder.set_pubkey(&key)?;
 
     let not_before = Asn1Time::days_from_now(0)?;
@@ -54,13 +55,6 @@ pub fn create_certificate() -> Result<(X509, PKey<Private>), ErrorStack> {
     builder.set_not_after(&not_after)?;
 
     builder.append_extension(BasicConstraints::new().critical().ca().build()?)?;
-    builder.append_extension(
-        KeyUsage::new()
-            .critical()
-            .key_cert_sign()
-            .crl_sign()
-            .build()?,
-    )?;
 
     builder.append_extension(
         SubjectAlternativeName::new()

From 809860a2b2dfef51b29f059c624cc2921328d66c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 15:40:26 +0100
Subject: [PATCH 206/324] Fix getUILocale

---
 web/src/client/l10n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/client/l10n.js b/web/src/client/l10n.js
index 78f159c4c3..c816c7d2cb 100644
--- a/web/src/client/l10n.js
+++ b/web/src/client/l10n.js
@@ -61,7 +61,7 @@ class L10nClient {
    */
   async getUILocale() {
     const config = await this.client.get("/l10n/config");
-    return config.ui_locale;
+    return config.uiLocale;
   }
 
   /**

From 9bc3d9859862f49eb51ab3b2f0a8368c932d58b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 17:25:26 +0100
Subject: [PATCH 207/324] Enable HTTPS in the agama-web-server service
 definition

---
 rust/share/agama-web-server.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/share/agama-web-server.service b/rust/share/agama-web-server.service
index b6cb252301..f11a5cf616 100644
--- a/rust/share/agama-web-server.service
+++ b/rust/share/agama-web-server.service
@@ -4,7 +4,7 @@ After=network-online.target agama.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/agama-web-server serve --address 0.0.0.0:80 --generate-token /run/agama/token
+ExecStart=/usr/bin/agama-web-server serve --address 0.0.0.0:80 --address2 0.0.0.0:443 --generate-token /run/agama/token
 PIDFile=/run/agama/web.pid
 User=root
 TimeoutStopSec=5

From 33cc3bcc689ac30e6fb106c00b160160875ecc94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 4 Apr 2024 15:25:40 +0100
Subject: [PATCH 208/324] Uncomment the client#issues function

* The part related to storage is still commented.
---
 web/src/client/index.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/web/src/client/index.js b/web/src/client/index.js
index 63b6e2b422..0dcab3bb57 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -91,13 +91,13 @@ const createClient = (url) => {
    *
    * @returns {Promise<Issues>}
    */
-  // const issues = async () => {
-  //   return {
-  //     product: await software.product.getIssues(),
-  //     storage: await storage.getIssues(),
-  //     software: await software.getIssues(),
-  //   };
-  // };
+  const issues = async () => {
+    return {
+      product: await product.getIssues(),
+      // storage: await storage.getIssues(),
+      software: await software.getIssues(),
+    };
+  };
 
   /**
    * Registers a callback to be executed when issues change.
@@ -108,15 +108,15 @@ const createClient = (url) => {
   const onIssuesChange = (handler) => {
     const unsubscribeCallbacks = [];
 
-    // unsubscribeCallbacks.push(
-    //   software.product.onIssuesChange((i) => handler({ product: i })),
-    // );
+    unsubscribeCallbacks.push(
+      product.onIssuesChange((i) => handler({ product: i })),
+    );
     // unsubscribeCallbacks.push(
     //   storage.onIssuesChange((i) => handler({ storage: i })),
     // );
-    // unsubscribeCallbacks.push(
-    //   software.onIssuesChange((i) => handler({ software: i })),
-    // );
+    unsubscribeCallbacks.push(
+      software.onIssuesChange((i) => handler({ software: i })),
+    );
 
     return () => {
       unsubscribeCallbacks.forEach((cb) => cb());
@@ -143,7 +143,7 @@ const createClient = (url) => {
     // storage,
     // users,
     // questions,
-    // issues,
+    issues,
     onIssuesChange,
     isConnected,
     onDisconnect: (handler) => {

From 99b2ec790f7247eb8db44b9ecfabef4aa2cc8137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 4 Apr 2024 15:30:00 +0100
Subject: [PATCH 209/324] Uncomment the InstallButton component

---
 web/src/components/overview/OverviewPage.jsx | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/web/src/components/overview/OverviewPage.jsx b/web/src/components/overview/OverviewPage.jsx
index b51a6129d0..a81c896391 100644
--- a/web/src/components/overview/OverviewPage.jsx
+++ b/web/src/components/overview/OverviewPage.jsx
@@ -42,19 +42,9 @@ export default function OverviewPage() {
   }
 
   // return (
-  //   <Page
-  //     icon="list_alt"
-  //     // TRANSLATORS: page title
-  //     title={_("Installation Summary")}
-  //   >
   //     <NetworkSection />
   //     <StorageSection showErrors />
   //     <UsersSection showErrors={showErrors} />
-
-  //     <Page.Actions>
-  //       <InstallButton onClick={() => setShowErrors(true)} />
-  //     </Page.Actions>
-  //   </Page>
   // );
 
   return (
@@ -66,6 +56,10 @@ export default function OverviewPage() {
       <ProductSection />
       <L10nSection />
       <SoftwareSection showErrors />
+
+      <Page.Actions>
+        <InstallButton onClick={() => setShowErrors(true)} />
+      </Page.Actions>
     </Page>
   );
 }

From 0ff4c1e862b974595fcdb541c1258ab7f6b253b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 4 Apr 2024 15:30:25 +0100
Subject: [PATCH 210/324] Fix the software and product issues paths

---
 web/src/client/software.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index eb4996b40d..e4f6989837 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -277,7 +277,7 @@ class SoftwareClient extends WithIssues(
     "/software/progress",
     SOFTWARE_SERVICE,
   ),
-  "software/issues/software",
+  "/software/issues/software",
   "/org/opensuse/Agama/Software1",
 ) {}
 
@@ -334,6 +334,6 @@ class ProductBaseClient {
 }
 
 class ProductClient
-  extends WithIssues(ProductBaseClient, "software/issues/product", PRODUCT_PATH) {}
+  extends WithIssues(ProductBaseClient, "/software/issues/product", PRODUCT_PATH) {}
 
 export { ProductClient, SelectedBy, SoftwareClient };

From 1f0d78b0ebbee3d4be67d90409be48c8e0c9f62d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 4 Apr 2024 15:31:42 +0100
Subject: [PATCH 211/324] Fix finishInstallation function to call the right
 endpoint

---
 web/src/client/manager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/client/manager.js b/web/src/client/manager.js
index 7276eae326..049b003f12 100644
--- a/web/src/client/manager.js
+++ b/web/src/client/manager.js
@@ -112,7 +112,7 @@ class ManagerBaseClient {
    * Runs cleanup when installation is done
    */
   finishInstallation() {
-    return this.client.post("/manager/install");
+    return this.client.post("/manager/finish");
   }
 
   /**

From d604eb2129762aa11b489e6fb32961fd4e6bd25c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 4 Apr 2024 15:35:26 +0100
Subject: [PATCH 212/324] Use camelCase in manager/installer

---
 rust/agama-server/src/manager/web.rs | 1 +
 web/src/client/manager.js            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index 3564dd787b..b58d9b6e1c 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -35,6 +35,7 @@ pub struct ManagerState<'a> {
 
 /// Holds information about the manager's status.
 #[derive(Clone, Serialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct InstallerStatus {
     /// Current installation phase.
     phase: InstallationPhase,
diff --git a/web/src/client/manager.js b/web/src/client/manager.js
index 049b003f12..02990abb9b 100644
--- a/web/src/client/manager.js
+++ b/web/src/client/manager.js
@@ -71,7 +71,7 @@ class ManagerBaseClient {
    */
   async canInstall() {
     const installer = await this.client.get("/manager/installer");
-    return installer.can_install;
+    return installer.canInstall;
   }
 
   /**

From 0ed6636105acde640e150c8e49e35c2cd9ca3a0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 4 Apr 2024 15:36:13 +0100
Subject: [PATCH 213/324] Do not block calling CanInstall during installation

---
 rust/agama-server/src/manager/web.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/manager/web.rs b/rust/agama-server/src/manager/web.rs
index b58d9b6e1c..404bb72f84 100644
--- a/rust/agama-server/src/manager/web.rs
+++ b/rust/agama-server/src/manager/web.rs
@@ -129,10 +129,16 @@ async fn finish_action(State(state): State<ManagerState<'_>>) -> Result<(), Erro
 async fn installer_status(
     State(state): State<ManagerState<'_>>,
 ) -> Result<Json<InstallerStatus>, Error> {
+    let phase = state.manager.current_installation_phase().await?;
+    // CanInstall gets blocked during installation
+    let can_install = match phase {
+        InstallationPhase::Install => false,
+        _ => state.manager.can_install().await?,
+    };
     let status = InstallerStatus {
-        phase: state.manager.current_installation_phase().await?,
+        phase,
+        can_install,
         busy: state.manager.busy_services().await?,
-        can_install: state.manager.can_install().await?,
         iguana: state.manager.use_iguana().await?,
     };
     Ok(Json(status))

From 79cd8e4518a9f0fea4cb643d9954e24fdc4a401a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 10:10:55 +0100
Subject: [PATCH 214/324] Adapt the questions client

* It is not fully working.
* Unit tests are not adapted yet.
---
 web/src/client/index.js     |   4 +-
 web/src/client/questions.js | 186 ++++++++++++------------------------
 2 files changed, 62 insertions(+), 128 deletions(-)

diff --git a/web/src/client/index.js b/web/src/client/index.js
index 0dcab3bb57..5515513314 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -81,7 +81,7 @@ const createClient = (url) => {
   const software = new SoftwareClient(client);
   // const storage = new StorageClient(address);
   // const users = new UsersClient(address);
-  // const questions = new QuestionsClient(address);
+  const questions = new QuestionsClient(client);
 
   /**
    * Gets all issues, grouping them by context.
@@ -142,7 +142,7 @@ const createClient = (url) => {
     software,
     // storage,
     // users,
-    // questions,
+    questions,
     issues,
     onIssuesChange,
     isConnected,
diff --git a/web/src/client/questions.js b/web/src/client/questions.js
index 5ef1d2b435..06d80063a2 100644
--- a/web/src/client/questions.js
+++ b/web/src/client/questions.js
@@ -21,86 +21,25 @@
 
 // @ts-check
 
-import DBusClient from "./dbus";
-
-const QUESTIONS_SERVICE = "org.opensuse.Agama1";
-
-const DBUS_CONFIG = {
-  questions: {
-    path: "/org/opensuse/Agama1/Questions",
-    ifaces: {
-      objectManager: "org.freedesktop.DBus.ObjectManager"
-    }
-  },
-  question: {
-    ifaces: {
-      generic: "org.opensuse.Agama1.Questions.Generic",
-      withPassword: "org.opensuse.Agama1.Questions.WithPassword"
-    }
-  }
-};
-
 const QUESTION_TYPES = {
   generic: "generic",
-  withPassword: "withPassword"
+  withPassword: "withPassword",
 };
 
 /**
- * Returns interfaces and properties from given DBus question object
- *
- * @param {Object} dbusQuestion
- * @return {Object}
- */
-const getIfacesAndProperties = (dbusQuestion) => Object.values(dbusQuestion)[0];
-
-/**
- * Returns interfaces from given DBus question object
- *
- * @param {Object} dbusQuestion
+ * @param {Object} httpQuestion
  * @return {Object}
  */
-const getIfaces = (dbusQuestion) => Object.keys(getIfacesAndProperties(dbusQuestion));
-
-/**
- * Returns the value from given object at given key
- *
- * @param {Object} ifaceProperties
- * @param {String} key
- * @return {*} the value
- */
-const fetchValue = (ifaceProperties, key) => {
-  const dbusValue = ifaceProperties[key];
-  if (dbusValue) return dbusValue.v;
-  return null;
-};
-
-/**
- * @param {Object} dbusQuestion
- * @return {Object}
-*/
-function buildQuestion(dbusQuestion) {
-  const question = {};
-  const ifaces = getIfaces(dbusQuestion);
-  const ifacesAndProperties = getIfacesAndProperties(dbusQuestion);
-
-  if (ifaces.includes(DBUS_CONFIG.question.ifaces.generic)) {
-    const dbusProperties = ifacesAndProperties[DBUS_CONFIG.question.ifaces.generic];
-
+function buildQuestion(httpQuestion) {
+  let question = {};
+  if (httpQuestion.generic) {
     question.type = QUESTION_TYPES.generic;
-    question.id = fetchValue(dbusProperties, "Id");
-    question.options = fetchValue(dbusProperties, "Options");
-    question.defaultOption = fetchValue(dbusProperties, "DefaultOption");
-    question.text = fetchValue(dbusProperties, "Text");
-    question.class = fetchValue(dbusProperties, "Class");
-    question.data = fetchValue(dbusProperties, "Data");
-    question.answer = fetchValue(dbusProperties, "Answer");
+    question = { ...httpQuestion.generic, type: QUESTION_TYPES.generic };
   }
 
-  if (ifaces.includes(DBUS_CONFIG.question.ifaces.withPassword)) {
-    const dbusProperties = ifacesAndProperties[DBUS_CONFIG.question.ifaces.withPassword];
-
+  if (httpQuestion.withPassword) {
     question.type = QUESTION_TYPES.withPassword;
-    question.password = fetchValue(dbusProperties, "Password");
+    question.password = httpQuestion.withPassword.Password;
   }
 
   return question;
@@ -111,10 +50,19 @@ function buildQuestion(dbusQuestion) {
  */
 class QuestionsClient {
   /**
-   * @param {string|undefined} address - D-Bus address; if it is undefined, it uses the system bus.
+   * @param {import("./http").HTTPClient} client - HTTP client.
    */
-  constructor(address) {
-    this.client = new DBusClient(QUESTIONS_SERVICE, address);
+  constructor(client) {
+    this.client = client;
+    this.questionIds = [];
+    this.handlers = {
+      added: [],
+      removed: [],
+    };
+    this.getQuestions().then((qs) => {
+      this.questionIds = qs.map((q) => q.id);
+    });
+    this.listenQuestions();
   }
 
   /**
@@ -123,17 +71,8 @@ class QuestionsClient {
    * @return {Promise<Array<object>>}
    */
   async getQuestions() {
-    const dbusQuestions = await this.client.call(
-      DBUS_CONFIG.questions.path,
-      DBUS_CONFIG.questions.ifaces.objectManager,
-      "GetManagedObjects",
-      null
-    );
-
-    // Note: dbusQuestions contains an empty object when there are no questions.
-    // Note: questions without id is not yet fully created with all interfaces.
-    return dbusQuestions.filter(q => Object.keys(q).length !== 0).map(buildQuestion)
-      .filter(q => "id" in q);
+    const questions = await this.client.get("/questions");
+    return questions.map(buildQuestion);
   }
 
   /**
@@ -141,37 +80,16 @@ class QuestionsClient {
    *
    * @param {Object} question
    */
-  async answer(question) {
-    const path = DBUS_CONFIG.questions.path + "/" + question.id;
-
+  answer(question) {
+    let answer;
     if (question.type === QUESTION_TYPES.withPassword) {
-      const proxy = await this.client.proxy(DBUS_CONFIG.question.ifaces.withPassword, path);
-      proxy.Password = question.password;
+      answer = { withPassword: { password: question.password } };
+    } else {
+      answer = { generic: { answer: question.answer } };
     }
 
-    const proxy = await this.client.proxy(DBUS_CONFIG.question.ifaces.generic, path);
-    proxy.Answer = question.answer;
-  }
-
-  /**
-   * Register a callback to run when the questions D-Bus object emits an Object Manager signal
-   *
-   * @param {String} member - name of the Object Manager signal
-   * @param {function} handler - callback function
-   * @return {function} function to unsubscribe
-   */
-  onObjectsChanged(member, handler) {
-    return this.client.onSignal(
-      {
-        path: DBUS_CONFIG.questions.path,
-        interface: "org.freedesktop.DBus.ObjectManager",
-        member
-      },
-      (_path, _iface, _signal, args) => {
-        const [path, changes, invalid] = args;
-        handler(path, changes, invalid);
-      }
-    );
+    const path = `/questions/${question.id}/answer`;
+    return this.client.put(path, answer);
   }
 
   /**
@@ -181,18 +99,12 @@ class QuestionsClient {
    * @return {function} function to unsubscribe
    */
   onQuestionAdded(handler) {
-    return this.onObjectsChanged("InterfacesAdded", (path, ifacesAndProperties) => {
-      const question = buildQuestion({ [path]: ifacesAndProperties });
-      // questions without id is not fully created questions
-      if ('id' in question) {
-        // and here is second tricky part. As we get new interface, but not all interfaces, we do another
-        // dbus call to get all interfaces of question
-        this.getQuestions().then(questions => {
-          const changed_question = questions.find(q => q.id === question.id);
-          handler(changed_question);
-        });
-      }
-    });
+    this.handlers.added.push(handler);
+
+    return () => {
+      const position = this.handlers.added.indexOf(handler);
+      if (position > -1) this.handlers.added.splice(position, 1);
+    };
   }
 
   /**
@@ -202,9 +114,31 @@ class QuestionsClient {
    * @return {function} function to unsubscribe
    */
   onQuestionRemoved(handler) {
-    return this.onObjectsChanged("InterfacesRemoved", path => {
-      const id = path.split("/").at(-1);
-      handler(Number(id));
+    this.handlers.removed.push(handler);
+
+    return () => {
+      const position = this.handlers.removed.indexOf(handler);
+      if (position > -1) this.handlers.removed.splice(position, 1);
+    };
+  }
+
+  async listenQuestions() {
+    return this.client.onEvent("QuestionsChanged", () => {
+      this.getQuestions().then((qs) => {
+        const updatedIds = qs.map((q) => q.id);
+
+        const newQuestions = qs.filter((q) => !this.questionIds.includes(q.id));
+        newQuestions.forEach((q) => {
+          this.handlers.added.forEach((f) => f(q));
+        });
+
+        const removed = this.questionIds.filter((id) => !updatedIds.includes(id));
+        removed.forEach((id) => {
+          this.handlers.removed.forEach((f) => f(id));
+        });
+
+        this.questionIds = updatedIds;
+      });
     });
   }
 }

From 155a3cf5ac90342461b470b52d0877afdd22359a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 5 Apr 2024 17:32:08 +0100
Subject: [PATCH 215/324] Enable IPv6 in agama-web-server

---
 rust/share/agama-web-server.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/share/agama-web-server.service b/rust/share/agama-web-server.service
index f11a5cf616..8c701d8675 100644
--- a/rust/share/agama-web-server.service
+++ b/rust/share/agama-web-server.service
@@ -4,7 +4,7 @@ After=network-online.target agama.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/agama-web-server serve --address 0.0.0.0:80 --address2 0.0.0.0:443 --generate-token /run/agama/token
+ExecStart=/usr/bin/agama-web-server serve --address :::80 --address2 :::443 --generate-token /run/agama/token
 PIDFile=/run/agama/web.pid
 User=root
 TimeoutStopSec=5

From 5bfad0462422595f2b3865d3cb2d85d6ad15a437 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Sun, 7 Apr 2024 21:36:47 +0200
Subject: [PATCH 216/324] fixes from testing

---
 web/src/client/http.js     | 15 ---------------
 web/src/client/software.js |  4 ++--
 web/src/client/users.js    |  6 +++---
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/web/src/client/http.js b/web/src/client/http.js
index 639223a212..844c6545a1 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -174,21 +174,6 @@ class HTTPClient {
     return response;
   }
 
-  /**
-   * @param {string} url - Endpoint URL (e.g., "/l10n/config").
-   * @param {object} data - Data to submit
-   * @return {Promise<void>} Server response.
-   */
-  async patch(url, data) {
-    await fetch(`${this.baseUrl}/${url}`, {
-      method: "PATCH",
-      body: JSON.stringify(data),
-      headers: {
-        "Content-Type": "application/json",
-      },
-    });
-  }
-
   /**
    * Registers a handler for a given type of events.
    *
diff --git a/web/src/client/software.js b/web/src/client/software.js
index eb4996b40d..e4f6989837 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -277,7 +277,7 @@ class SoftwareClient extends WithIssues(
     "/software/progress",
     SOFTWARE_SERVICE,
   ),
-  "software/issues/software",
+  "/software/issues/software",
   "/org/opensuse/Agama/Software1",
 ) {}
 
@@ -334,6 +334,6 @@ class ProductBaseClient {
 }
 
 class ProductClient
-  extends WithIssues(ProductBaseClient, "software/issues/product", PRODUCT_PATH) {}
+  extends WithIssues(ProductBaseClient, "/software/issues/product", PRODUCT_PATH) {}
 
 export { ProductClient, SelectedBy, SoftwareClient };
diff --git a/web/src/client/users.js b/web/src/client/users.js
index 729bc08491..ac570aad53 100644
--- a/web/src/client/users.js
+++ b/web/src/client/users.js
@@ -90,7 +90,7 @@ class UsersBaseClient {
    * @return {Promise<UserResult>} returns an object with the result and the issues found if error
    */
   async setUser(user) {
-    const result = await this.client.put("/users/user", user);
+    const result = await this.client.put("/users/first", user);
 
     return { result: result.ok, issues: [] }; // TODO: check how to handle issues and result. Maybe separate call to validate?
   }
@@ -101,7 +101,7 @@ class UsersBaseClient {
    * @return {Promise<boolean>} whether the operation was successful or not
    */
   async removeUser() {
-    return (await this.client.delete("/users/user")).ok;
+    return (await this.client.delete("/users/first")).ok;
   }
 
   /**
@@ -175,6 +175,6 @@ class UsersBaseClient {
 /**
  * Client to interact with the Agama users service
  */
-class UsersClient extends WithValidation(UsersBaseClient, "users/validation", "/org/opensuse/Agama/Users1") { }
+class UsersClient extends WithValidation(UsersBaseClient, "/users/validation", "/org/opensuse/Agama/Users1") { }
 
 export { UsersClient };

From c561a3319437569901085ec87dcc6c33c61d3368 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Mon, 8 Apr 2024 11:05:15 +0200
Subject: [PATCH 217/324] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Imobach González Sosa <igonzalezsosa@suse.com>
---
 rust/agama-server/src/users/web.rs | 4 ++--
 web/README.md                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index 326469e84f..161d9a2bd5 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -38,7 +38,7 @@ pub async fn users_streams(
     const ROOT_SSHKEY_ID: &str = "root_sshkey";
     // here we have three streams, but only two events. Reason is
     // that we have three streams from dbus about property change
-    // and munify two root user properties into single event to http API
+    // and unify two root user properties into single event to http API
     let result: Vec<(&str, Pin<Box<dyn Stream<Item = Event> + Send>>)> = vec![
         (
             FIRST_USER_ID,
@@ -155,7 +155,7 @@ async fn remove_first_user(State(state): State<UsersState<'_>>) -> Result<(), Er
 }
 
 #[utoipa::path(put, path = "/users/first", responses(
-    (status = 200, description = "User values are set"),
+    (status = 200, description = "Sets the first user"),
     (status = 400, description = "The D-Bus service could not perform the action"),
 ))]
 async fn set_first_user(
diff --git a/web/README.md b/web/README.md
index 94ba63a57a..746d1012e6 100644
--- a/web/README.md
+++ b/web/README.md
@@ -40,7 +40,7 @@ Example of running from different machine:
 ```
   # backend machine
   # using ip of machine instead of localhost is important to be network accessible
-  agama-web-server serve --address 10.100.1.1:3030
+  agama-web-server serve --address 10.100.1.1:3000
 
   # frontend machine
   # ESLINT=0 is useful to ignore linter problems during development

From 41aa843461ae3d63dfde6db306e467aae82241d8 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 8 Apr 2024 12:14:59 +0100
Subject: [PATCH 218/324] Changes based on code review

---
 rust/agama-lib/src/network/types.rs        |  2 +-
 rust/agama-server/src/network/nm/client.rs | 18 ++---
 rust/agama-server/src/network/web.rs       | 76 +++++++++++-----------
 web/src/client/http.js                     | 13 +---
 web/src/client/index.js                    |  1 -
 web/src/client/network.test.js             |  2 +-
 web/src/client/network/index.js            |  4 +-
 7 files changed, 47 insertions(+), 69 deletions(-)

diff --git a/rust/agama-lib/src/network/types.rs b/rust/agama-lib/src/network/types.rs
index 5b4e78bb0b..23487847f1 100644
--- a/rust/agama-lib/src/network/types.rs
+++ b/rust/agama-lib/src/network/types.rs
@@ -56,7 +56,7 @@ pub enum DeviceType {
 }
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
+#[serde(rename_all = "camelCase")]
 pub enum Status {
     #[default]
     Up,
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index 63d697d45b..495d664e05 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -243,8 +243,6 @@ impl<'a> NetworkManagerClient<'a> {
         if conn.is_up() {
             self.activate_connection(path).await?;
         } else {
-            //FIXME: This is wrong, deactivate receive an active connection path and this is a
-            //settings path
             self.deactivate_connection(path).await?;
         }
         Ok(())
@@ -304,23 +302,17 @@ impl<'a> NetworkManagerClient<'a> {
         let proxy = NetworkManagerProxy::new(&self.connection).await?;
 
         if let Some(active_connection) = self.settings_active_connection(path.clone()).await? {
-            match proxy
+            if let Err(e) = proxy
                 .deactivate_connection(&active_connection.as_ref())
                 .await
             {
-                Err(e) => {
-                    // Ignore ConnectionNotActive error since this just means the state is already correct
-                    if e.to_string().contains("ConnectionNotActive") {
-                        Ok(())
-                    } else {
-                        Err(ServiceError::DBus(e))
-                    }
+                // Ignore ConnectionNotActive error since this just means the state is already correct
+                if !e.to_string().contains("ConnectionNotActive") {
+                    return Err(ServiceError::DBus(e));
                 }
-                _ => Ok(()),
             }
-        } else {
-            Ok(())
         }
+        Ok(())
     }
 
     async fn get_connection_proxy(&self, uuid: Uuid) -> Result<ConnectionProxy, ServiceError> {
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 8843ce6e6d..052070cac0 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -205,14 +205,17 @@ async fn add_connection(
 async fn delete_connection(
     State(state): State<NetworkState>,
     Path(id): Path<String>,
-) -> Result<Json<()>, NetworkError> {
+) -> impl IntoResponse {
     let (tx, rx) = oneshot::channel();
     state
         .actions
         .send(Action::RemoveConnection(id, tx))
         .unwrap();
-
-    Ok(Json(rx.await.unwrap()?))
+    if rx.await.unwrap().is_ok() {
+        StatusCode::NO_CONTENT
+    } else {
+        StatusCode::NOT_FOUND
+    }
 }
 
 #[utoipa::path(put, path = "/network/connections/:id", responses(
@@ -228,17 +231,13 @@ async fn update_connection(
         .actions
         .send(Action::GetConnection(id.clone(), tx))
         .unwrap();
-    let current_conn = rx.await.unwrap();
+    let orig_conn = rx.await.unwrap();
     let mut conn = Connection::try_from(conn)?;
-    match current_conn {
-        Some(current) => {
-            if current.id != id.clone() {
-                return Err(NetworkError::UnknownConnection(id));
-            } else {
-                conn.uuid = current.uuid;
-            }
-        }
-        None => return Err(NetworkError::UnknownConnection(id)),
+    let orig_conn = orig_conn.ok_or_else(|| NetworkError::UnknownConnection(id.clone()))?;
+    if orig_conn.id != id {
+        return Err(NetworkError::UnknownConnection(id));
+    } else {
+        conn.uuid = orig_conn.uuid;
     }
 
     let (tx, rx) = oneshot::channel();
@@ -263,21 +262,20 @@ async fn connect(
         .send(Action::GetConnection(id.clone(), tx))
         .unwrap();
 
-    if let Some(mut current_conn) = rx.await.unwrap() {
-        current_conn.set_up();
+    let Some(mut conn) = rx.await.unwrap() else {
+        return Err(NetworkError::UnknownConnection(id));
+    };
+    conn.set_up();
 
-        let (tx, rx) = oneshot::channel();
-        state
-            .actions
-            .send(Action::UpdateConnection(Box::new(current_conn), tx))
-            .unwrap();
+    let (tx, rx) = oneshot::channel();
+    state
+        .actions
+        .send(Action::UpdateConnection(Box::new(conn), tx))
+        .unwrap();
 
-        rx.await
-            .unwrap()
-            .map_err(|_| NetworkError::CannotApplyConfig)?;
-    } else {
-        return Err(NetworkError::UnknownConnection(id));
-    }
+    rx.await
+        .unwrap()
+        .map_err(|_| NetworkError::CannotApplyConfig)?;
 
     Ok(Json(()))
 }
@@ -295,21 +293,21 @@ async fn disconnect(
         .send(Action::GetConnection(id.clone(), tx))
         .unwrap();
 
-    if let Some(mut current_conn) = rx.await.unwrap() {
-        current_conn.set_down();
+    let Some(mut current_conn) = rx.await.unwrap() else {
+        return Err(NetworkError::UnknownConnection(id));
+    };
 
-        let (tx, rx) = oneshot::channel();
-        state
-            .actions
-            .send(Action::UpdateConnection(Box::new(current_conn), tx))
-            .unwrap();
+    current_conn.set_down();
 
-        rx.await
-            .unwrap()
-            .map_err(|_| NetworkError::CannotApplyConfig)?;
-    } else {
-        return Err(NetworkError::UnknownConnection(id));
-    }
+    let (tx, rx) = oneshot::channel();
+    state
+        .actions
+        .send(Action::UpdateConnection(Box::new(current_conn), tx))
+        .unwrap();
+
+    rx.await
+        .unwrap()
+        .map_err(|_| NetworkError::CannotApplyConfig)?;
 
     Ok(Json(()))
 }
diff --git a/web/src/client/http.js b/web/src/client/http.js
index a44d97d82e..aa9ed3d9b6 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -152,23 +152,14 @@ class HTTPClient {
 
   /**
    * @param {string} url - Endpoint URL (e.g., "/l10n/config").
-   * @param {object} data - Data to submit
    * @return {Promise<object>} Server response.
    */
   async delete(url) {
     const response = await fetch(`${this.baseUrl}/${url}`, {
-      method: "DELETE",
-      headers: {
-        "Content-Type": "application/json",
-      },
+      method: "DELETE"
     });
 
-    try {
-      return await response.json();
-    } catch (e) {
-      console.warn("Expecting a JSON response", e);
-      return response.status === 200;
-    }
+    return response;
   }
 
   /**
diff --git a/web/src/client/index.js b/web/src/client/index.js
index 50e9ad1fa6..90ba514472 100644
--- a/web/src/client/index.js
+++ b/web/src/client/index.js
@@ -30,7 +30,6 @@ import { UsersClient } from "./users";
 import phase from "./phase";
 import { QuestionsClient } from "./questions";
 import { NetworkClient } from "./network";
-import cockpit from "../lib/cockpit";
 import { HTTPClient } from "./http";
 
 /**
diff --git a/web/src/client/network.test.js b/web/src/client/network.test.js
index 4cac4e328d..5834e08dde 100644
--- a/web/src/client/network.test.js
+++ b/web/src/client/network.test.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2024] SUSE LLC
+ * Copyright (c) [2022-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index 99beae28cd..7cdc257aeb 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -108,9 +108,7 @@ class NetworkClient {
   async connections() {
     const connections = await this.client.get("/network/connections");
 
-    return connections.map((connection) => {
-      return this.fromApiConnection(connection);
-    });
+    return connections.map(this.fromApiConnection);
   }
 
   fromApiConnection(connection) {

From 8dfb6223f97f435fd5c6145650374e6b8e119ce5 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Mon, 8 Apr 2024 13:38:09 +0200
Subject: [PATCH 219/324] adapt debugging hints

---
 web/README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/README.md b/web/README.md
index 746d1012e6..31eb0e98a3 100644
--- a/web/README.md
+++ b/web/README.md
@@ -27,7 +27,7 @@ This can work also remotely, with a Agama instance running in a different
 machine (a virtual machine as well). In that case run
 
 ```
-    AGAMA_SERVER=<IP> npm run server -- --open
+    AGAMA_SERVER=https://<IP>:<port> npm run server -- --open
 ```
 
 Where  `AGAMA_SERVER` is the IP address, the hostname or the full URL of the
@@ -40,11 +40,12 @@ Example of running from different machine:
 ```
   # backend machine
   # using ip of machine instead of localhost is important to be network accessible
-  agama-web-server serve --address 10.100.1.1:3000
+  # second address is needed for SSL which is mandatory for remote access
+  agama-web-server serve --address 10.100.1.1:3000 --address2 0.0.0.0:443
 
   # frontend machine
   # ESLINT=0 is useful to ignore linter problems during development
-  ESLINT=0 AGAMA_SERVER=10.100.1.1:3000 npm run server
+  ESLINT=0 AGAMA_SERVER=https://10.100.1.1:3000 npm run server
 ```
 
 ### Debugging Hints
@@ -54,6 +55,8 @@ The first place is the browser's console which can give
 some hints. The second location to check for errors or warnings is output of `npm run server`
 where you can find issues when communicating with the backend. And last but on least is
 journal on backend machine where is logged backend activity `journalctl -b`.
+If journal does not provide required info, there is also option to see dbus communication
+which can give hint about data flow. Command is `busctl monitor --address /run/agama/bus`
 
 ### Special Environment Variables
 

From 3123d1c7b294278c5c88a922d8a7d4739bca6d02 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Mon, 8 Apr 2024 14:22:54 +0200
Subject: [PATCH 220/324] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Ladislav Slezák <lslezak@suse.com>
Co-authored-by: Imobach González Sosa <igonzalezsosa@suse.com>
---
 web/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/README.md b/web/README.md
index 31eb0e98a3..24f3db9d1c 100644
--- a/web/README.md
+++ b/web/README.md
@@ -41,7 +41,7 @@ Example of running from different machine:
   # backend machine
   # using ip of machine instead of localhost is important to be network accessible
   # second address is needed for SSL which is mandatory for remote access
-  agama-web-server serve --address 10.100.1.1:3000 --address2 0.0.0.0:443
+  agama-web-server serve --address :::3000 --address2 :::443
 
   # frontend machine
   # ESLINT=0 is useful to ignore linter problems during development
@@ -55,8 +55,8 @@ The first place is the browser's console which can give
 some hints. The second location to check for errors or warnings is output of `npm run server`
 where you can find issues when communicating with the backend. And last but on least is
 journal on backend machine where is logged backend activity `journalctl -b`.
-If journal does not provide required info, there is also option to see dbus communication
-which can give hint about data flow. Command is `busctl monitor --address /run/agama/bus`
+If the journal does not contain the required info, you can inspect the D-Bus communication
+which can give hint about data flow. Command is `busctl monitor --address unix:path=/run/agama/bus`
 
 ### Special Environment Variables
 

From 6c20cf4fa1af84657875e034aa3da849de918c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 8 Apr 2024 14:45:06 +0100
Subject: [PATCH 221/324] Set the question answer

---
 web/src/client/questions.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/client/questions.js b/web/src/client/questions.js
index 06d80063a2..a8eae7ee98 100644
--- a/web/src/client/questions.js
+++ b/web/src/client/questions.js
@@ -35,6 +35,7 @@ function buildQuestion(httpQuestion) {
   if (httpQuestion.generic) {
     question.type = QUESTION_TYPES.generic;
     question = { ...httpQuestion.generic, type: QUESTION_TYPES.generic };
+    question.answer = httpQuestion.generic.answer;
   }
 
   if (httpQuestion.withPassword) {

From 38d993fdf6818241cd3e3d34389c6dc8d8e4df84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 8 Apr 2024 15:26:02 +0100
Subject: [PATCH 222/324] Comment code in InstallationFinished related to
 storage

---
 web/src/components/core/InstallationFinished.jsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/src/components/core/InstallationFinished.jsx b/web/src/components/core/InstallationFinished.jsx
index 98fb3d8732..8cd6abcaa3 100644
--- a/web/src/components/core/InstallationFinished.jsx
+++ b/web/src/components/core/InstallationFinished.jsx
@@ -74,7 +74,10 @@ function InstallationFinished() {
       const iguana = await client.manager.useIguana();
       // FIXME: This logic should likely not be placed here, it's too coupled to storage internals.
       // Something to fix when this whole page is refactored in a (hopefully near) future.
-      const { settings: { encryptionPassword, encryptionMethod } } = await client.storage.proposal.getResult();
+      // const { settings: { encryptionPassword, encryptionMethod } } = await client.storage.proposal.getResult();
+      // TODO: The storage client is not adapted to the HTTP API yet.
+      const encryptionPassword = null;
+      const encryptionMethod = null;
       setUsingIguana(iguana);
       setUsingTpm(encryptionPassword?.length && encryptionMethod === EncryptionMethods.TPM);
     }

From eed1a5fc8a3d3587f90af71673e1baa760c4c2dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 8 Apr 2024 15:39:07 +0100
Subject: [PATCH 223/324] Use camelCase in the questions API

---
 rust/agama-server/src/questions/web.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rust/agama-server/src/questions/web.rs b/rust/agama-server/src/questions/web.rs
index 9cb1ca2a26..24e68658b1 100644
--- a/rust/agama-server/src/questions/web.rs
+++ b/rust/agama-server/src/questions/web.rs
@@ -141,6 +141,7 @@ struct QuestionsState<'a> {
 }
 
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct Question {
     generic: GenericQuestion,
     with_password: Option<QuestionWithPassword>,
@@ -154,6 +155,7 @@ pub struct Question {
 /// question and its answer. So here it is split into GenericQuestion
 /// and GenericAnswer
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct GenericQuestion {
     id: u32,
     class: String,
@@ -171,11 +173,13 @@ pub struct GenericQuestion {
 /// Here for web API we want to have in json that separation that would
 /// allow to compose any possible future specialization of question
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct QuestionWithPassword {
     password: String,
 }
 
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct Answer {
     generic: GenericAnswer,
     with_password: Option<PasswordAnswer>,
@@ -183,15 +187,18 @@ pub struct Answer {
 
 /// Answer needed for GenericQuestion
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct GenericAnswer {
     answer: String,
 }
 
 /// Answer needed for Password specific questions.
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct PasswordAnswer {
     password: String,
 }
+
 /// Sets up and returns the axum service for the questions module.
 pub async fn questions_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
     let questions = QuestionsClient::new(dbus.clone()).await?;

From aa6fa548c3f566bf83595dd415776936cc395b46 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 8 Apr 2024 17:22:35 +0100
Subject: [PATCH 224/324] force a refresh of the connections after update

---
 web/src/components/network/IpSettingsForm.jsx | 7 ++++---
 web/src/components/network/NetworkPage.jsx    | 7 ++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/web/src/components/network/IpSettingsForm.jsx b/web/src/components/network/IpSettingsForm.jsx
index 23e567dd5c..a9c8e61240 100644
--- a/web/src/components/network/IpSettingsForm.jsx
+++ b/web/src/components/network/IpSettingsForm.jsx
@@ -35,7 +35,7 @@ const METHODS = {
 
 const usingDHCP = (method) => method === METHODS.AUTO;
 
-export default function IpSettingsForm({ connection, onClose }) {
+export default function IpSettingsForm({ connection, onClose, onSubmit }) {
   const client = useInstallerClient();
   const [addresses, setAddresses] = useState(connection.addresses);
   const [nameservers, setNameservers] = useState(connection.nameservers.map(a => {
@@ -91,7 +91,7 @@ export default function IpSettingsForm({ connection, onClose }) {
     return Object.keys(nextErrors).length === 0;
   };
 
-  const onSubmit = e => {
+  const onSubmitForm = e => {
     e.preventDefault();
 
     const sanitizedAddresses = cleanAddresses(addresses);
@@ -109,6 +109,7 @@ export default function IpSettingsForm({ connection, onClose }) {
     };
 
     client.network.updateConnection(updatedConnection)
+      .then(onSubmit)
       .then(onClose)
       // TODO: better error reporting. By now, it sets an error for the whole connection.
       .catch(({ message }) => setErrors({ object: message }));
@@ -129,7 +130,7 @@ export default function IpSettingsForm({ connection, onClose }) {
   return (
     <Popup isOpen title={sprintf(_("Edit %s"), connection.id)}>
       {renderError("object")}
-      <Form id="edit-connection" onSubmit={onSubmit}>
+      <Form id="edit-connection" onSubmit={onSubmitForm}>
         <FormGroup fieldId="method" label={_("Mode")} isRequired>
           <FormSelect
             id="method"
diff --git a/web/src/components/network/NetworkPage.jsx b/web/src/components/network/NetworkPage.jsx
index 82b06c213a..f638094407 100644
--- a/web/src/components/network/NetworkPage.jsx
+++ b/web/src/components/network/NetworkPage.jsx
@@ -103,6 +103,11 @@ export default function NetworkPage() {
 
   const forgetConnection = async ({ id }) => {
     await client.deleteConnection(id);
+    setConnections(undefined);
+  };
+
+  const updateConnections = async () => {
+    setConnections(undefined);
   };
 
   const ready = connections !== undefined;
@@ -152,7 +157,7 @@ export default function NetworkPage() {
       { /* TODO: improve the connections edition */}
       <If
         condition={selectedConnection}
-        then={<IpSettingsForm connection={selectedConnection} onClose={() => setSelectedConnection(null)} />}
+        then={<IpSettingsForm connection={selectedConnection} onClose={() => setSelectedConnection(null)} onSubmit={updateConnections} />}
       />
     </Page>
   );

From 46e925d17432b5f61f452fc9c8d56d672da6c117 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 8 Apr 2024 18:22:22 +0100
Subject: [PATCH 225/324] Disable TPM testing in InstallationFinished component

---
 web/src/components/core/InstallationFinished.test.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/src/components/core/InstallationFinished.test.jsx b/web/src/components/core/InstallationFinished.test.jsx
index a70c9d731c..3f9bc19d0c 100644
--- a/web/src/components/core/InstallationFinished.test.jsx
+++ b/web/src/components/core/InstallationFinished.test.jsx
@@ -43,15 +43,15 @@ describe("InstallationFinished", () => {
       return {
         manager: {
           finishInstallation: finishInstallationFn,
-          useIguana: () => Promise.resolve(false)
+          useIguana: () => Promise.resolve(false),
         },
         storage: {
           proposal: {
             getResult: jest.fn().mockResolvedValue({
-              settings: { encryptionMethod, encryptionPassword }
-            })
+              settings: { encryptionMethod, encryptionPassword },
+            }),
           },
-        }
+        },
       };
     });
   });
@@ -73,7 +73,7 @@ describe("InstallationFinished", () => {
     expect(finishInstallationFn).toHaveBeenCalled();
   });
 
-  describe("when TPM is set as encryption method", () => {
+  describe.skip("when TPM is set as encryption method", () => {
     beforeEach(() => {
       encryptionMethod = EncryptionMethods.TPM;
     });

From d803057146f27ba5095d731d191a10eec1e1eb37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 8 Apr 2024 18:56:12 +0100
Subject: [PATCH 226/324] Fix validation_router doctests

---
 rust/agama-server/src/web/common.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 0c50cd7e95..189c6eb180 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -369,12 +369,12 @@ async fn build_issues_proxy<'a>(
 /// struct HelloWorldState {};
 ///
 /// let dbus = connection().await.unwrap();
-/// let issues_router = validation_router(
+/// let validation_routes = validation_router(
 ///   &dbus, "org.opensuse.HelloWorld", "/org/opensuse/hello"
 /// ).await.unwrap();
 /// let router: Router<HelloWorldState> = Router::new()
 ///   .route("/hello", get(hello))
-///   .merge(validation_router)
+///   .merge(validation_routes)
 ///   .with_state(HelloWorldState {});
 /// });
 /// ```

From f5532043f01806128be0eb202deee12528f53e84 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 9 Apr 2024 10:11:26 +0200
Subject: [PATCH 227/324] unify interface of http helpers

---
 web/src/client/http.js      | 15 +++------
 web/src/client/l10n.js      | 48 ++++++++++++++++++++++------
 web/src/client/manager.js   | 31 +++++++++++++-----
 web/src/client/mixins.js    | 64 +++++++++++++++++++++++++------------
 web/src/client/questions.js |  7 +++-
 web/src/client/software.js  | 37 +++++++++++++++------
 web/src/client/users.js     | 27 ++++++++++------
 7 files changed, 161 insertions(+), 68 deletions(-)

diff --git a/web/src/client/http.js b/web/src/client/http.js
index 844c6545a1..96e1045637 100644
--- a/web/src/client/http.js
+++ b/web/src/client/http.js
@@ -95,7 +95,7 @@ class HTTPClient {
 
   /**
    * @param {string} url - Endpoint URL (e.g., "/l10n/config").
-   * @return {Promise<object>} Server response.
+   * @return {Promise<Response>} Server response.
    */
   async get(url) {
     const response = await fetch(`${this.baseUrl}${url}`, {
@@ -103,13 +103,13 @@ class HTTPClient {
         "Content-Type": "application/json",
       },
     });
-    return await response.json();
+    return response;
   }
 
   /**
    * @param {string} url - Endpoint URL (e.g., "/l10n/config").
    * @param {object} data - Data to submit
-   * @return {Promise<object>} Server response.
+   * @return {Promise<Response>} Server response.
    */
   async post(url, data) {
     const response = await fetch(`${this.baseUrl}${url}`, {
@@ -120,18 +120,13 @@ class HTTPClient {
       },
     });
 
-    try {
-      return await response.json();
-    } catch (e) {
-      console.warn("Expecting a JSON response", e);
-      return response.status === 200;
-    }
+    return response;
   }
 
   /**
    * @param {string} url - Endpoint URL (e.g., "/l10n/config").
    * @param {object} data - Data to submit
-   * @return {Promise<object>} Server response.
+   * @return {Promise<Response>} Server response.
    */
   async put(url, data) {
     const response = await fetch(`${this.baseUrl}${url}`, {
diff --git a/web/src/client/l10n.js b/web/src/client/l10n.js
index c816c7d2cb..e6b61f4c39 100644
--- a/web/src/client/l10n.js
+++ b/web/src/client/l10n.js
@@ -60,7 +60,12 @@ class L10nClient {
    * @return {Promise<String>} Locale ID.
    */
   async getUILocale() {
-    const config = await this.client.get("/l10n/config");
+    const response = await this.client.get("/l10n/config");
+    if (!response.ok) {
+      console.log("Failed to get localizaation config: ", response);
+      return "";
+    }
+    const config = await response.json();
     return config.uiLocale;
   }
 
@@ -68,7 +73,7 @@ class L10nClient {
    * Sets the locale to translate the installer UI.
    *
    * @param {String} id - Locale ID.
-   * @return {Promise<void>}
+   * @return {Promise<Response>}
    */
   async setUILocale(id) {
     return this.client.patch("/l10n/config", { uiLocale: id });
@@ -82,7 +87,12 @@ class L10nClient {
    * @return {Promise<String>} Keymap ID.
    */
   async getUIKeymap() {
-    const config = await this.client.get("/l10n/config");
+    const response = await this.client.get("/l10n/config");
+    if (!response.ok) {
+      console.log("Failed to get localizaation config: ", response);
+      return "";
+    }
+    const config = await response.json();
     return config.uiKeymap;
   }
 
@@ -92,7 +102,7 @@ class L10nClient {
    * This setting is only relevant in the local installation.
    *
    * @param {String} id - Keymap ID.
-   * @return {Promise<void>}
+   * @return {Promise<Response>}
    */
   async setUIKeymap(id) {
     return this.client.patch("/l10n/config", { uiKeymap: id });
@@ -104,7 +114,12 @@ class L10nClient {
    * @return {Promise<Array<Timezone>>}
    */
   async timezones() {
-    const timezones = await this.client.get("/l10n/timezones");
+    const response = await this.client.get("/l10n/timezones");
+    if (!response.ok) {
+      console.log("Failed to get localizaation config: ", response);
+      return [];
+    }
+    const timezones = await response.json();
     return timezones.map(this.buildTimezone);
   }
 
@@ -136,7 +151,12 @@ class L10nClient {
    * @return {Promise<Array<Locale>>}
    */
   async locales() {
-    const locales = await this.client.get("/l10n/locales");
+    const response = await this.client.get("/l10n/locales");
+    if (!response.ok) {
+      console.log("Failed to get localizaation config: ", response);
+      return [];
+    }
+    const locales = await response.json();
     return locales.map(this.buildLocale);
   }
 
@@ -169,7 +189,12 @@ class L10nClient {
    * @return {Promise<Array<Keymap>>}
    */
   async keymaps() {
-    const keymaps = await this.client.get("/l10n/keymaps");
+    const response = await this.client.get("/l10n/keymaps");
+    if (!response.ok) {
+      console.log("Failed to get localizaation config: ", response);
+      return [];
+    }
+    const keymaps = await response.json();
     return keymaps.map(this.buildKeymap);
   }
 
@@ -242,7 +267,12 @@ class L10nClient {
    * @return {Promise<object>} Localization configuration.
    */
   async getConfig() {
-    return await this.client.get("/l10n/config");
+    const response = await this.client.get("/l10n/config");
+    if (!response.ok) {
+      console.log("Failed to get localization config: ", response);
+      return {};
+    }
+    return await response.json();
   }
 
   /**
@@ -251,7 +281,7 @@ class L10nClient {
    * Convenience method to set l10n the configuration.
    *
    * @param {object} data - Configuration to update. It can just part of the configuration.
-   * @return {Promise<object>}
+   * @return {Promise<Response>}
    */
   async setConfig(data) {
     return this.client.patch("/l10n/config", data);
diff --git a/web/src/client/manager.js b/web/src/client/manager.js
index 02990abb9b..ffe8eb51be 100644
--- a/web/src/client/manager.js
+++ b/web/src/client/manager.js
@@ -44,10 +44,10 @@ class ManagerBaseClient {
    *
    * The progress of the probing process can be tracked through installer signals.
    *
-   * @return {Promise<void>}
+   * @return {Promise<Response>}
    */
   startProbing() {
-    return this.client.post("/manager/probe");
+    return this.client.post("/manager/probe", {});
   }
 
   /**
@@ -55,10 +55,10 @@ class ManagerBaseClient {
    *
    * The progress of the installation process can be tracked through installer signals.
    *
-   * @return {Promise}
+   * @return {Promise<Response>}
    */
   startInstallation() {
-    return this.client.post("/manager/install");
+    return this.client.post("/manager/install", {});
   }
 
   /**
@@ -70,7 +70,12 @@ class ManagerBaseClient {
    * @return {Promise<boolean>}
    */
   async canInstall() {
-    const installer = await this.client.get("/manager/installer");
+    const response = await this.client.get("/manager/installer");
+    if (!response.ok) {
+      console.log("Failed to get installer config: ", response);
+      return false;
+    }
+    const installer = await response.json();
     return installer.canInstall;
   }
 
@@ -90,7 +95,12 @@ class ManagerBaseClient {
    * @return {Promise<number>}
    */
   async getPhase() {
-    const installer = await this.client.get("/manager/installer");
+    const response = await this.client.get("/manager/installer");
+    if (!response.ok) {
+      console.log("Failed to get installer config: ", response);
+      return 0;
+    }
+    const installer = await response.json();
     return installer.phase;
   }
 
@@ -112,7 +122,7 @@ class ManagerBaseClient {
    * Runs cleanup when installation is done
    */
   finishInstallation() {
-    return this.client.post("/manager/finish");
+    return this.client.post("/manager/finish", {});
   }
 
   /**
@@ -121,7 +131,12 @@ class ManagerBaseClient {
    * @return {Promise<boolean>}
    */
   async useIguana() {
-    const installer = await this.client.get("/manager/installer");
+    const response = await this.client.get("/manager/installer");
+    if (!response.ok) {
+      console.log("Failed to get installer config: ", response);
+      return false;
+    }
+    const installer = await response.json();
     return installer.iguana;
   }
 }
diff --git a/web/src/client/mixins.js b/web/src/client/mixins.js
index 6e4fb3d851..d00e1382f0 100644
--- a/web/src/client/mixins.js
+++ b/web/src/client/mixins.js
@@ -92,8 +92,14 @@ const WithIssues = (superclass, issues_path, dbus_path) =>
      * @return {Promise<Issue[]>}
      */
     async getIssues() {
-      const issues = await this.client.get(issues_path);
-      return issues.map(buildIssue);
+      const response = await this.client.get(issues_path);
+      if (!response.ok) {
+        console.log("get issues failed with:", response);
+        return [];
+      } else {
+        const issues = await response.json();
+        return issues.map(buildIssue);
+      }
     }
 
     /**
@@ -137,8 +143,14 @@ const WithStatus = (superclass, status_path, service_name) =>
      * @return {Promise<number>} 0 for idle, 1 for busy
      */
     async getStatus() {
-      const status = await this.client.get(status_path);
-      return status.current;
+      const response = await this.client.get(status_path);
+      if (!response.ok) {
+        console.log("get status failed with:", response);
+        return 1; // lets use busy to be on safe side
+      } else {
+        const status = await response.json();
+        return status.current;
+      }
     }
 
     /**
@@ -187,15 +199,24 @@ const WithProgress = (superclass, progress_path, service_name) =>
      *   the current step and whether the service finished or not.
      */
     async getProgress() {
-      const { current_step, max_steps, current_title, finished } = await this.client.get(
-        progress_path,
-      );
-      return {
-        total: max_steps,
-        current: current_step,
-        message: current_title,
-        finished,
-      };
+      const response = await this.client.get(progress_path);
+      if (!response.ok) {
+        console.log("get progress failed with:", response);
+        return {
+          total: 0,
+          current: 0,
+          message: "Failed to get progress",
+          finished: false
+        };
+      } else {
+        const { current_step, max_steps, current_title, finished } = await response.json();
+        return {
+          total: max_steps,
+          current: current_step,
+          message: current_title,
+          finished,
+        };
+      }
     }
 
     /**
@@ -252,15 +273,16 @@ const WithValidation = (superclass, validation_path, service_name) => class exte
    * @return {Promise<ValidationError[]>}
    */
   async getValidationErrors() {
-    let response;
-
-    try {
-      response = await this.client.get(validation_path);
-    } catch (error) {
-      console.error(`Could not get validation errors for ${validation_path}`, error);
+    const response = await this.client.get(validation_path);
+    if (!response.ok) {
+      console.log("get validation failed with:", response);
+      return [{
+        message: "Failed to validate",
+      }];
+    } else {
+      const data = await response.json();
+      return data.errors.map(createError);
     }
-
-    return response.errors.map(createError);
   }
 
   /**
diff --git a/web/src/client/questions.js b/web/src/client/questions.js
index a8eae7ee98..e21d52855b 100644
--- a/web/src/client/questions.js
+++ b/web/src/client/questions.js
@@ -72,7 +72,12 @@ class QuestionsClient {
    * @return {Promise<Array<object>>}
    */
   async getQuestions() {
-    const questions = await this.client.get("/questions");
+    const response = await this.client.get("/questions");
+    if (!response.ok) {
+      console.log("Failed to get questions: ", response);
+      return [];
+    }
+    const questions = await response.json();
     return questions.map(buildQuestion);
   }
 
diff --git a/web/src/client/software.js b/web/src/client/software.js
index e4f6989837..0375ba2710 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -169,7 +169,7 @@ class BaseProductManager {
    * @returns {string}
    */
   registrationRequirement(value) {
-    let requirement;
+    let requirement = "unknown";
 
     switch (value) {
       case 0:
@@ -206,10 +206,10 @@ class SoftwareBaseClient {
   /**
    * Asks the service to reload the repositories metadata
    *
-   * @return {Promise<void>}
+   * @return {Promise<Response>}
    */
   probe() {
-    return this.client.post("/software/probe");
+    return this.client.post("/software/probe", {});
   }
 
   /**
@@ -217,8 +217,13 @@ class SoftwareBaseClient {
    *
    * @return {Promise<SoftwareProposal>}
    */
-  getProposal() {
-    return this.client.get("/software/proposal");
+  async getProposal() {
+    const response = await this.client.get("/software/proposal");
+    if (!response.ok) {
+      console.log("Failed to get software proposal: ", response);
+    }
+
+    return response.json();
   }
 
   /**
@@ -227,8 +232,13 @@ class SoftwareBaseClient {
    * @return {Promise<Pattern[]>}
    */
   async getPatterns() {
+    const response = await this.client.get("/software/patterns");
+    if (!response.ok) {
+      console.log("Failed to get software patterns: ", response);
+      return [];
+    }
     /** @type Array<{ name: string, category: string, summary: string, description: string, order: string, icon: string }> */
-    const patterns = await this.client.get("/software/patterns");
+    const patterns = await response.json();
     return patterns.map((pattern) => ({
       name: pattern.name,
       category: pattern.category,
@@ -249,7 +259,7 @@ class SoftwareBaseClient {
   /**
    * @param {Object.<string, boolean>} patterns - An object where the keys are the pattern names
    *   and the values whether to install them or not.
-   * @return {Promise<void>}
+   * @return {Promise<Response>}
    */
   selectPatterns(patterns) {
     return this.client.put("/software/config", { patterns });
@@ -295,8 +305,11 @@ class ProductBaseClient {
    * @return {Promise<Array<Product>>}
    */
   async getAll() {
-    const products = await this.client.get("/software/products");
-    return products;
+    const response = await this.client.get("/software/products");
+    if (!response.ok) {
+      console.log("Failed to get software products: ", response);
+    }
+    return response.json();
   }
 
   /**
@@ -305,7 +318,11 @@ class ProductBaseClient {
    * @return {Promise<string>} Selected identifier.
    */
   async getSelected() {
-    const config = await this.client.get("/software/config");
+    const response = await this.client.get("/software/config");
+    if (!response.ok) {
+      console.log("Failed to get software config: ", response);
+    }
+    const config = await response.json();
     return config.product;
   }
 
diff --git a/web/src/client/users.js b/web/src/client/users.js
index ac570aad53..a62663ba7f 100644
--- a/web/src/client/users.js
+++ b/web/src/client/users.js
@@ -64,13 +64,12 @@ class UsersBaseClient {
    * @return {Promise<User>}
    */
   async getUser() {
-    const user = await this.client.get("/users/first");
-
-    if (user === null) {
+    const response = await this.client.get("/users/first");
+    if (!response.ok) {
+      console.log("Failed to get first user config: ", response);
       return { fullName: "", userName: "", password: "", autologin: false, data: {} };
     }
-
-    return user;
+    return response.json();
   }
 
   /**
@@ -79,8 +78,13 @@ class UsersBaseClient {
    * @return {Promise<boolean>}
    */
   async isRootPasswordSet() {
-    const proxy = await this.client.get("/users/root");
-    return proxy.password;
+    const response = await this.client.get("/users/root");
+    if (!response.ok) {
+      console.log("Failed to get root config: ", response);
+      return false;
+    }
+    const config = await response.json();
+    return config.password;
   }
 
   /**
@@ -130,8 +134,13 @@ class UsersBaseClient {
    * @return {Promise<String>} SSH public key or an empty string if it is not set
    */
   async getRootSSHKey() {
-    const proxy = await this.client.get("/users/root");
-    return proxy.sshkey;
+    const response = await this.client.get("/users/root");
+    if (!response.ok) {
+      console.log("Failed to get root config: ", response);
+      return "";
+    }
+    const config = await response.json();
+    return config.sshkey;
   }
 
   /**

From cec1be03d91421ced80fefa4b90a04f7480692fb Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Tue, 9 Apr 2024 14:47:18 +0100
Subject: [PATCH 228/324] Fix failing test

---
 web/src/client/network/model.test.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/web/src/client/network/model.test.js b/web/src/client/network/model.test.js
index b2c18747bb..e953552772 100644
--- a/web/src/client/network/model.test.js
+++ b/web/src/client/network/model.test.js
@@ -45,17 +45,16 @@ describe("createConnection", () => {
     const addresses = [{ address: "192.168.0.1", prefix: 24 }];
     const connection = createConnection({ addresses, testing: 1 });
     expect(connection.method4).toEqual("auto");
-    expect(connection.gateway4).toEqual("auto");
-    expect(connection.addresses).toEqual([]);
-    expect(connection.nameservers).toEqual(addresses);
+    expect(connection.gateway4).toEqual("");
+    expect(connection.addresses).toEqual(addresses);
+    expect(connection.nameservers).toEqual([]);
   });
-});
 
-it("adds a wireless key when given", () => {
-  const wireless = { ssid: "MY_WIRELESS" };
-  const connection = createConnection({ id: "Wireless connection 1", wireless });
-  expect(connection.wireless).toEqual(wireless);
-});
+  it("adds a wireless key when given", () => {
+    const wireless = { ssid: "MY_WIRELESS" };
+    const connection = createConnection({ id: "Wireless connection 1", wireless });
+    expect(connection.wireless).toEqual(wireless);
+  });
 });
 
 describe("createAccessPoint", () => {

From 45ebc485ff4382f6ec73c0ee199d5e57be56f0cc Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 9 Apr 2024 16:25:01 +0200
Subject: [PATCH 229/324] adapt also network code and adapt working tests

---
 web/src/client/l10n.js          | 12 +++++-----
 web/src/client/manager.js       |  6 ++---
 web/src/client/network.test.js  | 17 ++++++++++----
 web/src/client/network/index.js | 41 +++++++++++++++++++++++++--------
 web/src/client/software.test.js | 15 ++++++++----
 5 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/web/src/client/l10n.js b/web/src/client/l10n.js
index e6b61f4c39..140842ee94 100644
--- a/web/src/client/l10n.js
+++ b/web/src/client/l10n.js
@@ -62,7 +62,7 @@ class L10nClient {
   async getUILocale() {
     const response = await this.client.get("/l10n/config");
     if (!response.ok) {
-      console.log("Failed to get localizaation config: ", response);
+      console.error("Failed to get localization config: ", response);
       return "";
     }
     const config = await response.json();
@@ -89,7 +89,7 @@ class L10nClient {
   async getUIKeymap() {
     const response = await this.client.get("/l10n/config");
     if (!response.ok) {
-      console.log("Failed to get localizaation config: ", response);
+      console.error("Failed to get localizaation config: ", response);
       return "";
     }
     const config = await response.json();
@@ -116,7 +116,7 @@ class L10nClient {
   async timezones() {
     const response = await this.client.get("/l10n/timezones");
     if (!response.ok) {
-      console.log("Failed to get localizaation config: ", response);
+      console.error("Failed to get localizaation config: ", response);
       return [];
     }
     const timezones = await response.json();
@@ -153,7 +153,7 @@ class L10nClient {
   async locales() {
     const response = await this.client.get("/l10n/locales");
     if (!response.ok) {
-      console.log("Failed to get localizaation config: ", response);
+      console.error("Failed to get localizaation config: ", response);
       return [];
     }
     const locales = await response.json();
@@ -191,7 +191,7 @@ class L10nClient {
   async keymaps() {
     const response = await this.client.get("/l10n/keymaps");
     if (!response.ok) {
-      console.log("Failed to get localizaation config: ", response);
+      console.error("Failed to get localizaation config: ", response);
       return [];
     }
     const keymaps = await response.json();
@@ -269,7 +269,7 @@ class L10nClient {
   async getConfig() {
     const response = await this.client.get("/l10n/config");
     if (!response.ok) {
-      console.log("Failed to get localization config: ", response);
+      console.error("Failed to get localization config: ", response);
       return {};
     }
     return await response.json();
diff --git a/web/src/client/manager.js b/web/src/client/manager.js
index ffe8eb51be..03c691d6cb 100644
--- a/web/src/client/manager.js
+++ b/web/src/client/manager.js
@@ -72,7 +72,7 @@ class ManagerBaseClient {
   async canInstall() {
     const response = await this.client.get("/manager/installer");
     if (!response.ok) {
-      console.log("Failed to get installer config: ", response);
+      console.error("Failed to get installer config: ", response);
       return false;
     }
     const installer = await response.json();
@@ -97,7 +97,7 @@ class ManagerBaseClient {
   async getPhase() {
     const response = await this.client.get("/manager/installer");
     if (!response.ok) {
-      console.log("Failed to get installer config: ", response);
+      console.error("Failed to get installer config: ", response);
       return 0;
     }
     const installer = await response.json();
@@ -133,7 +133,7 @@ class ManagerBaseClient {
   async useIguana() {
     const response = await this.client.get("/manager/installer");
     if (!response.ok) {
-      console.log("Failed to get installer config: ", response);
+      console.error("Failed to get installer config: ", response);
       return false;
     }
     const installer = await response.json();
diff --git a/web/src/client/network.test.js b/web/src/client/network.test.js
index 5834e08dde..aadbbcb345 100644
--- a/web/src/client/network.test.js
+++ b/web/src/client/network.test.js
@@ -68,6 +68,15 @@ const mockSettings = {
   networking_enabled: true
 }
 
+const mockJsonFn = jest.fn();
+
+const mockGetFn = jest.fn().mockImplementation(() => {
+  return {
+    ok: true,
+    json: mockJsonFn,
+  };
+});
+
 jest.mock("./http", () => {
   return {
     HTTPClient: jest.fn().mockImplementation(() => {
@@ -78,14 +87,12 @@ jest.mock("./http", () => {
   };
 });
 
-const mockGetFn = jest.fn();
-
 describe("NetworkClient", () => {
   describe("#connections", () => {
     it("returns the list of active connections from the adapter", async () => {
       const http = new HTTPClient(new URL(ADDRESS));
       const client = new NetworkClient(http);
-      mockGetFn.mockResolvedValue([mockWiredConnection, mockWirelessConnection]);
+      mockJsonFn.mockResolvedValue([mockWiredConnection, mockWirelessConnection]);
       const connections = await client.connections();
       const eth0 = connections.find(c => c.id === "eth0");
       expect(eth0).toEqual(mockConnection);
@@ -96,7 +103,7 @@ describe("NetworkClient", () => {
     it("returns the list of addresses", async () => {
       const http = new HTTPClient(new URL(ADDRESS));
       const client = new NetworkClient(http);
-      mockGetFn.mockResolvedValue([mockWiredConnection, mockWirelessConnection]);
+      mockJsonFn.mockResolvedValue([mockWiredConnection, mockWirelessConnection]);
       const addresses = await client.addresses();
       expect(addresses).toEqual([{ address: "192.168.122.100", prefix: 24 }]);
     });
@@ -107,7 +114,7 @@ describe("NetworkClient", () => {
     it("returns network general settings", async () => {
       const http = new HTTPClient(new URL(ADDRESS));
       const client = new NetworkClient(http);
-      mockGetFn.mockResolvedValue(mockSettings);
+      mockJsonFn.mockResolvedValue(mockSettings);
       const settings = await client.settings();
       expect(settings.hostname).toEqual("localhost.localdomain");
     });
diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index 7cdc257aeb..3eb5e52ffe 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -106,8 +106,13 @@ class NetworkClient {
    * @return {Promise<Connection[]>}
    */
   async connections() {
-    const connections = await this.client.get("/network/connections");
+    const response = await this.client.get("/network/connections");
+    if (!response.ok) {
+      console.error("Failed to get list of connections", response);
+      return [];
+    }
 
+    const connections = await response.json();
     return connections.map(this.fromApiConnection);
   }
 
@@ -141,9 +146,14 @@ class NetworkClient {
    * @return {Promise<AccessPoint[]>}
    */
   async accessPoints() {
-    const access_points = await this.client.get("/network/wifi");
-
-    return access_points.map(ap => {
+    const response = await this.client.get("/network/wifi");
+    if (!response.ok) {
+      console.error("Failed to get list of APs", response);
+      return [];
+    }
+    const access_points = await response.json();
+
+    return access_points.map((ap) => {
       return createAccessPoint({
         ssid: ap.ssid,
         hwAddress: ap.hw_address,
@@ -169,7 +179,7 @@ class NetworkClient {
    * Apply network changes
    */
   async apply() {
-    return this.client.put("/network/system/apply");
+    return this.client.put("/network/system/apply", {});
   }
 
   /**
@@ -205,7 +215,13 @@ class NetworkClient {
    * @return {Promise<Connection>} the added connection
    */
   async addConnection(connection) {
-    return this.client.post("/network/connections", this.toApiConnection(connection));
+    const response = await this.client.post("/network/connections", this.toApiConnection(connection));
+    if (!response.ok) {
+      console.error("Failed to post list of connections", response);
+      return null;
+    }
+
+    return response.json();
   }
 
   /**
@@ -232,7 +248,7 @@ class NetworkClient {
   async updateConnection(connection) {
     const conn = this.toApiConnection(connection);
     await this.client.put(`/network/connections/${conn.id}`, conn);
-    return this.apply();
+    return (await this.apply()).ok;
   }
 
   /**
@@ -246,7 +262,7 @@ class NetworkClient {
    */
   async deleteConnection(id) {
     await this.client.delete(`/network/connections/${id}`);
-    return this.apply();
+    return (await this.apply()).ok;
   }
 
   /*
@@ -266,8 +282,13 @@ class NetworkClient {
   *
    * @return {Promise<NetworkSettings>}
   */
-  settings() {
-    return this.client.get("/network/state");
+  async settings() {
+    const response = await this.client.get("/network/settings");
+    if (!response.ok) {
+      console.error("Failed to get settings", response);
+      return {};
+    }
+    return response.json();
   }
 }
 
diff --git a/web/src/client/software.test.js b/web/src/client/software.test.js
index 5aeeaf6339..c714ef4590 100644
--- a/web/src/client/software.test.js
+++ b/web/src/client/software.test.js
@@ -25,6 +25,15 @@ import DBusClient from "./dbus";
 import { HTTPClient } from "./http";
 import { ProductClient, SoftwareClient } from "./software";
 
+const mockJsonFn = jest.fn();
+
+const mockGetFn = jest.fn().mockImplementation(() => {
+  return {
+    ok: true,
+    json: mockJsonFn,
+  };
+});
+
 jest.mock("./http", () => {
   return {
     HTTPClient: jest.fn().mockImplementation(() => {
@@ -35,8 +44,6 @@ jest.mock("./http", () => {
   };
 });
 
-const mockGetFn = jest.fn();
-
 jest.mock("./dbus");
 
 const PRODUCT_IFACE = "org.opensuse.Agama.Software1.Product";
@@ -82,7 +89,7 @@ describe("ProductClient", () => {
     it.only("returns the list of available products", async () => {
       const http = new HTTPClient(new URL("http://localhost"));
       const client = new ProductClient(http);
-      mockGetFn.mockResolvedValue([tumbleweed, microos]);
+      mockJsonFn.mockResolvedValue([tumbleweed, microos]);
       const products = await client.getAll();
       expect(products).toEqual([
         { id: "Tumbleweed", name: "openSUSE Tumbleweed", description: "Tumbleweed is..." },
@@ -95,7 +102,7 @@ describe("ProductClient", () => {
     it.only("returns the selected product", async () => {
       const http = new HTTPClient(new URL("http://localhost"));
       const client = new ProductClient(http);
-      mockGetFn.mockResolvedValue({ product: "microos" });
+      mockJsonFn.mockResolvedValue({ product: "microos" });
       const selected = await client.getSelected();
       expect(selected).toEqual("microos");
     });

From 91dd51c790699a67c769d35de306aa8f3855dc14 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 9 Apr 2024 16:36:30 +0200
Subject: [PATCH 230/324] fix typo

---
 web/src/client/l10n.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/src/client/l10n.js b/web/src/client/l10n.js
index 140842ee94..2cdb210969 100644
--- a/web/src/client/l10n.js
+++ b/web/src/client/l10n.js
@@ -89,7 +89,7 @@ class L10nClient {
   async getUIKeymap() {
     const response = await this.client.get("/l10n/config");
     if (!response.ok) {
-      console.error("Failed to get localizaation config: ", response);
+      console.error("Failed to get localization config: ", response);
       return "";
     }
     const config = await response.json();
@@ -116,7 +116,7 @@ class L10nClient {
   async timezones() {
     const response = await this.client.get("/l10n/timezones");
     if (!response.ok) {
-      console.error("Failed to get localizaation config: ", response);
+      console.error("Failed to get localization config: ", response);
       return [];
     }
     const timezones = await response.json();
@@ -153,7 +153,7 @@ class L10nClient {
   async locales() {
     const response = await this.client.get("/l10n/locales");
     if (!response.ok) {
-      console.error("Failed to get localizaation config: ", response);
+      console.error("Failed to get localization config: ", response);
       return [];
     }
     const locales = await response.json();
@@ -191,7 +191,7 @@ class L10nClient {
   async keymaps() {
     const response = await this.client.get("/l10n/keymaps");
     if (!response.ok) {
-      console.error("Failed to get localizaation config: ", response);
+      console.error("Failed to get localization config: ", response);
       return [];
     }
     const keymaps = await response.json();

From 4badba9eb4620f71496756dd0585d7a78580c713 Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Thu, 11 Apr 2024 07:48:02 +0200
Subject: [PATCH 231/324] Configured TraceLayer in web server to log info about
 request/response

---
 rust/agama-server/src/web/service.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index 04300da332..a5eeb93179 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -1,9 +1,11 @@
 use super::http::{login, login_from_query, logout, session};
 use super::{auth::TokenClaims, config::ServiceConfig, state::ServiceState, EventsSender};
 use axum::{
+    body::Body,
     extract::Request,
     middleware,
     response::IntoResponse,
+    response::Response,
     routing::{get, post},
     Router,
 };
@@ -11,8 +13,10 @@ use std::{
     convert::Infallible,
     path::{Path, PathBuf},
 };
+use std::time::Duration;
 use tower::Service;
 use tower_http::{compression::CompressionLayer, services::ServeDir, trace::TraceLayer};
+use tracing::Span;
 
 /// Builder for Agama main service.
 ///
@@ -93,7 +97,14 @@ impl MainServiceBuilder {
             .route("/login", get(login_from_query))
             .route("/po.js", get(super::http::po))
             .nest("/api", api_router)
-            .layer(TraceLayer::new_for_http())
+            .layer(TraceLayer::new_for_http()
+                .on_request(|request: &Request<Body>, _span: &Span| {
+                    tracing::info!("request: {} {}", request.method(), request.uri().path())
+                })
+                .on_response(|response: &Response<Body>, latency: Duration, _span: &Span| {
+                    tracing::info!("response: {} {:?}", response.status(), latency)
+                })
+            )
             .layer(CompressionLayer::new().br(true))
             .with_state(state)
     }

From b819396c01d2f5676186b771b941c774a74ec64f Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Thu, 11 Apr 2024 08:03:56 +0200
Subject: [PATCH 232/324] Formatting

---
 rust/agama-server/src/web/service.rs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index a5eeb93179..fcf9dff091 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -97,13 +97,16 @@ impl MainServiceBuilder {
             .route("/login", get(login_from_query))
             .route("/po.js", get(super::http::po))
             .nest("/api", api_router)
-            .layer(TraceLayer::new_for_http()
-                .on_request(|request: &Request<Body>, _span: &Span| {
-                    tracing::info!("request: {} {}", request.method(), request.uri().path())
-                })
-                .on_response(|response: &Response<Body>, latency: Duration, _span: &Span| {
-                    tracing::info!("response: {} {:?}", response.status(), latency)
-                })
+            .layer(
+                TraceLayer::new_for_http()
+                    .on_request(|request: &Request<Body>, _span: &Span| {
+                        tracing::info!("request: {} {}", request.method(), request.uri().path())
+                        })
+                    .on_response(
+                        |response: &Response<Body>, latency: Duration, _span: &Span| {
+                            tracing::info!("response: {} {:?}", response.status(), latency)
+                        },
+                    ),
             )
             .layer(CompressionLayer::new().br(true))
             .with_state(state)

From 7f9f06c7b964a58953e5182d559ad0a4d0a5136e Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Thu, 11 Apr 2024 11:14:49 +0200
Subject: [PATCH 233/324] Minor tweaks

---
 rust/agama-server/src/web/service.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rust/agama-server/src/web/service.rs b/rust/agama-server/src/web/service.rs
index fcf9dff091..31af807388 100644
--- a/rust/agama-server/src/web/service.rs
+++ b/rust/agama-server/src/web/service.rs
@@ -4,16 +4,15 @@ use axum::{
     body::Body,
     extract::Request,
     middleware,
-    response::IntoResponse,
-    response::Response,
+    response::{IntoResponse, Response},
     routing::{get, post},
     Router,
 };
+use std::time::Duration;
 use std::{
     convert::Infallible,
     path::{Path, PathBuf},
 };
-use std::time::Duration;
 use tower::Service;
 use tower_http::{compression::CompressionLayer, services::ServeDir, trace::TraceLayer};
 use tracing::Span;
@@ -101,7 +100,7 @@ impl MainServiceBuilder {
                 TraceLayer::new_for_http()
                     .on_request(|request: &Request<Body>, _span: &Span| {
                         tracing::info!("request: {} {}", request.method(), request.uri().path())
-                        })
+                    })
                     .on_response(
                         |response: &Response<Body>, latency: Duration, _span: &Span| {
                             tracing::info!("response: {} {:?}", response.status(), latency)

From acb6187e67cfe8ebdbf45dd3673c77cfaa01a1af Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Thu, 11 Apr 2024 11:38:44 +0100
Subject: [PATCH 234/324] Added running configuration to the devices!

---
 rust/agama-lib/src/network/types.rs         |   3 +-
 rust/agama-server/src/network/model.rs      |  11 +-
 rust/agama-server/src/network/nm/client.rs  | 178 +++++++++++++++++++-
 rust/agama-server/src/network/nm/dbus.rs    |   2 +-
 rust/agama-server/src/network/nm/proxies.rs | 116 +++++++++++++
 5 files changed, 300 insertions(+), 10 deletions(-)

diff --git a/rust/agama-lib/src/network/types.rs b/rust/agama-lib/src/network/types.rs
index 23487847f1..75c7c8f280 100644
--- a/rust/agama-lib/src/network/types.rs
+++ b/rust/agama-lib/src/network/types.rs
@@ -44,9 +44,10 @@ impl From<SSID> for Vec<u8> {
     }
 }
 
-#[derive(Debug, PartialEq, Copy, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[derive(Default, Debug, PartialEq, Copy, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub enum DeviceType {
     Loopback = 0,
+    #[default]
     Ethernet = 1,
     Wireless = 2,
     Dummy = 3,
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 28ac1943e8..815b825005 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -424,17 +424,24 @@ pub struct AccessPoint {
 }
 
 /// Network device
-#[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
+#[serde_as]
+#[skip_serializing_none]
+#[derive(Default, Debug, Clone, Serialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct Device {
     pub name: String,
     #[serde(rename = "type")]
     pub type_: DeviceType,
+    #[serde_as(as = "DisplayFromStr")]
+    pub mac_address: MacAddress,
+    pub ip_config: Option<IpConfig>,
 }
 
 /// Represents a known network connection.
 #[serde_as]
 #[skip_serializing_none]
 #[derive(Debug, Clone, PartialEq, Serialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct Connection {
     pub id: String,
     pub uuid: Uuid,
@@ -815,6 +822,7 @@ impl From<UnknownIpMethod> for zbus::fdo::Error {
 }
 
 #[derive(Debug, PartialEq, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct IpRoute {
     pub destination: IpInet,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -884,6 +892,7 @@ pub struct VlanConfig {
 
 #[serde_as]
 #[derive(Debug, Default, PartialEq, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct WirelessConfig {
     pub mode: WirelessMode,
     #[serde_as(as = "DisplayFromStr")]
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index 495d664e05..eada04fa2e 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -1,5 +1,5 @@
 //! NetworkManager client.
-use std::collections::HashMap;
+use std::{collections::HashMap, net::IpAddr, str::FromStr};
 
 use super::dbus::{
     cleanup_dbus_connection, connection_from_dbus, connection_to_dbus, controller_from_dbus,
@@ -7,16 +7,20 @@ use super::dbus::{
 };
 use super::model::NmDeviceType;
 use super::proxies::{
-    AccessPointProxy, ActiveConnectionProxy, ConnectionProxy, DeviceProxy, NetworkManagerProxy,
-    SettingsProxy, WirelessProxy,
+    AccessPointProxy, ActiveConnectionProxy, ConnectionProxy, DeviceProxy, IP4ConfigProxy,
+    IP6ConfigProxy, NetworkManagerProxy, SettingsProxy, WirelessProxy,
+};
+use crate::network::model::{
+    AccessPoint, Connection, Device, GeneralState, IpConfig, IpRoute, MacAddress,
 };
-use crate::network::model::{AccessPoint, Connection, Device, GeneralState};
 use agama_lib::error::ServiceError;
 use agama_lib::network::types::{DeviceType, SSID};
+use cidr::IpInet;
 use log;
+use macaddr::MacAddr6;
 use uuid::Uuid;
 use zbus;
-use zbus::zvariant::{ObjectPath, OwnedObjectPath};
+use zbus::zvariant::{self, ObjectPath, OwnedObjectPath};
 
 /// Simplified NetworkManager D-Bus client.
 ///
@@ -141,6 +145,17 @@ impl<'a> NetworkManagerClient<'a> {
 
         Ok(points)
     }
+
+    pub fn mac_address_from_dbus(&self, mac: &str) -> MacAddress {
+        match MacAddress::from_str(mac) {
+            Ok(mac) => mac,
+            Err(_) => {
+                log::warn!("Unable to parse mac {}", &mac);
+                MacAddress::Unset
+            }
+        }
+    }
+
     /// Returns the list of network devices.
     pub async fn devices(&self) -> Result<Vec<Device>, ServiceError> {
         let mut devs = vec![];
@@ -152,11 +167,26 @@ impl<'a> NetworkManagerClient<'a> {
 
             let device_name = proxy.interface().await?;
             let device_type = NmDeviceType(proxy.device_type().await?);
+            let ip4_path = proxy.ip4_config().await?;
+            let ip6_path = proxy.ip6_config().await?;
+            let state = proxy.state().await?;
+            let mac_address = self.mac_address_from_dbus(proxy.hw_address().await?.as_str());
+            let ip_config = if state == 100 {
+                let config = &self.ip_config_for(&ip4_path, &ip6_path).await?;
+
+                Some(config.to_owned())
+            } else {
+                None
+            };
+
             if let Ok(device_type) = device_type.try_into() {
-                devs.push(Device {
+                let device = Device {
                     name: device_name,
                     type_: device_type,
-                });
+                    mac_address,
+                    ip_config,
+                };
+                devs.push(device);
             } else {
                 // TODO: use a logger
                 log::warn!(
@@ -170,6 +200,140 @@ impl<'a> NetworkManagerClient<'a> {
         Ok(devs)
     }
 
+    pub fn address_with_prefix_from_dbus(
+        &self,
+        address_data: HashMap<String, zbus::zvariant::OwnedValue>,
+    ) -> Option<IpInet> {
+        let addr_str: &str = address_data.get("address")?.downcast_ref()?;
+        let prefix: &u32 = address_data.get("prefix")?.downcast_ref()?;
+        let prefix = *prefix as u8;
+        let address = IpInet::new(addr_str.parse().unwrap(), prefix).ok()?;
+        Some(address)
+    }
+
+    pub fn nameserver_from_dbus(
+        &self,
+        nameserver_data: HashMap<String, zbus::zvariant::OwnedValue>,
+    ) -> Option<IpAddr> {
+        let addr_str: &str = nameserver_data.get("address")?.downcast_ref()?;
+        Some(addr_str.parse().unwrap())
+    }
+
+    pub fn route_from_dbus(
+        &self,
+        route_data: HashMap<String, zbus::zvariant::OwnedValue>,
+    ) -> Option<IpRoute> {
+        let dest_str: &str = route_data.get("dest")?.downcast_ref()?;
+        let prefix: u8 = *route_data.get("prefix")?.downcast_ref::<u32>()? as u8;
+        let destination = IpInet::new(dest_str.parse().unwrap(), prefix).ok()?;
+        let mut new_route = IpRoute {
+            destination,
+            next_hop: None,
+            metric: None,
+        };
+
+        if let Some(next_hop) = route_data.get("next-hop") {
+            let next_hop_str: &str = next_hop.downcast_ref()?;
+            new_route.next_hop = Some(IpAddr::from_str(next_hop_str).unwrap());
+        }
+        if let Some(metric) = route_data.get("metric") {
+            let metric: u32 = *metric.downcast_ref()?;
+            new_route.metric = Some(metric);
+        }
+
+        Some(new_route)
+    }
+
+    pub async fn ip_config_for(
+        &self,
+        ip4_path: &ObjectPath<'_>,
+        ip6_path: &ObjectPath<'_>,
+    ) -> Result<IpConfig, ServiceError> {
+        let ip4_proxy = IP4ConfigProxy::builder(&self.connection)
+            .path(ip4_path.as_str())?
+            .build()
+            .await?;
+
+        let ip6_proxy = IP6ConfigProxy::builder(&self.connection)
+            .path(ip6_path.as_str())?
+            .build()
+            .await?;
+
+        let address_data = ip4_proxy.address_data().await?;
+        let nameserver_data = ip4_proxy.nameserver_data().await?;
+        let mut addresses: Vec<IpInet> = vec![];
+        let mut nameservers: Vec<IpAddr> = vec![];
+
+        for addr in address_data {
+            if let Some(address) = self.address_with_prefix_from_dbus(addr) {
+                addresses.push(address)
+            }
+        }
+
+        let address_data = ip6_proxy.address_data().await?;
+        for addr in address_data {
+            if let Some(address) = self.address_with_prefix_from_dbus(addr) {
+                addresses.push(address)
+            }
+        }
+
+        for nameserver in nameserver_data {
+            if let Some(address) = self.nameserver_from_dbus(nameserver) {
+                nameservers.push(address)
+            }
+        }
+        let nameserver_data = ip6_proxy.nameservers().await?;
+        for nameserver in nameserver_data {
+            // FIXME: Convert from Vec<u8> to u16
+            dbg!(nameserver);
+        }
+        let route_data = ip4_proxy.route_data().await?;
+        let mut routes4: Vec<IpRoute> = vec![];
+        if !route_data.is_empty() {
+            for route in route_data {
+                if let Some(route) = self.route_from_dbus(route) {
+                    routes4.push(route)
+                }
+            }
+        }
+
+        let mut routes6: Vec<IpRoute> = vec![];
+        let route_data = ip6_proxy.route_data().await?;
+        if !route_data.is_empty() {
+            for route in route_data {
+                if let Some(route) = self.route_from_dbus(route) {
+                    routes6.push(route)
+                }
+            }
+        }
+
+        let ip4_gateway = ip4_proxy.gateway().await?;
+        let ip6_gateway = ip6_proxy.gateway().await?;
+
+        let mut ip_config = IpConfig {
+            addresses,
+            nameservers,
+            ..Default::default()
+        };
+
+        if !ip4_gateway.is_empty() {
+            ip_config.gateway4 = Some(ip4_gateway.parse().unwrap());
+        };
+        if !ip6_gateway.is_empty() {
+            ip_config.gateway6 = Some(ip6_gateway.parse().unwrap());
+        };
+
+        if !routes4.is_empty() {
+            ip_config.routes4 = Some(routes4);
+        }
+
+        if !routes6.is_empty() {
+            ip_config.routes6 = Some(routes6);
+        }
+
+        Ok(ip_config)
+    }
+
     /// Returns the list of network connections.
     pub async fn connections(&self) -> Result<Vec<Connection>, ServiceError> {
         let mut controlled_by: HashMap<Uuid, String> = HashMap::new();
diff --git a/rust/agama-server/src/network/nm/dbus.rs b/rust/agama-server/src/network/nm/dbus.rs
index 31d48bcaf7..d98da3360a 100644
--- a/rust/agama-server/src/network/nm/dbus.rs
+++ b/rust/agama-server/src/network/nm/dbus.rs
@@ -688,7 +688,7 @@ fn ip_config_from_dbus(conn: &OwnedNestedHash) -> Option<IpConfig> {
     Some(ip_config)
 }
 
-fn addresses_with_prefix_from_dbus(address_data: &OwnedValue) -> Option<Vec<IpInet>> {
+pub fn addresses_with_prefix_from_dbus(address_data: &OwnedValue) -> Option<Vec<IpInet>> {
     let address_data = address_data.downcast_ref::<zbus::zvariant::Array>()?;
     let mut addresses: Vec<IpInet> = vec![];
     for addr in address_data.get() {
diff --git a/rust/agama-server/src/network/nm/proxies.rs b/rust/agama-server/src/network/nm/proxies.rs
index 4eed8d9c5d..0449e8acb7 100644
--- a/rust/agama-server/src/network/nm/proxies.rs
+++ b/rust/agama-server/src/network/nm/proxies.rs
@@ -766,3 +766,119 @@ trait ActiveConnection {
     #[dbus_proxy(property)]
     fn vpn(&self) -> zbus::Result<bool>;
 }
+
+#[dbus_proxy(
+    interface = "org.freedesktop.NetworkManager.IP4Config",
+    default_service = "org.freedesktop.NetworkManager",
+    default_path = "/org/freedesktop/NetworkManager/IP4Config/1"
+)]
+trait IP4Config {
+    /// AddressData property
+    #[dbus_proxy(property)]
+    fn address_data(
+        &self,
+    ) -> zbus::Result<Vec<std::collections::HashMap<String, zbus::zvariant::OwnedValue>>>;
+
+    /// Addresses property
+    #[dbus_proxy(property)]
+    fn addresses(&self) -> zbus::Result<Vec<Vec<u32>>>;
+
+    /// DnsOptions property
+    #[dbus_proxy(property)]
+    fn dns_options(&self) -> zbus::Result<Vec<String>>;
+
+    /// DnsPriority property
+    #[dbus_proxy(property)]
+    fn dns_priority(&self) -> zbus::Result<i32>;
+
+    /// Domains property
+    #[dbus_proxy(property)]
+    fn domains(&self) -> zbus::Result<Vec<String>>;
+
+    /// Gateway property
+    #[dbus_proxy(property)]
+    fn gateway(&self) -> zbus::Result<String>;
+
+    /// NameserverData property
+    #[dbus_proxy(property)]
+    fn nameserver_data(
+        &self,
+    ) -> zbus::Result<Vec<std::collections::HashMap<String, zbus::zvariant::OwnedValue>>>;
+
+    /// Nameservers property
+    #[dbus_proxy(property)]
+    fn nameservers(&self) -> zbus::Result<Vec<u32>>;
+
+    /// RouteData property
+    #[dbus_proxy(property)]
+    fn route_data(
+        &self,
+    ) -> zbus::Result<Vec<std::collections::HashMap<String, zbus::zvariant::OwnedValue>>>;
+
+    /// Routes property
+    #[dbus_proxy(property)]
+    fn routes(&self) -> zbus::Result<Vec<Vec<u32>>>;
+
+    /// Searches property
+    #[dbus_proxy(property)]
+    fn searches(&self) -> zbus::Result<Vec<String>>;
+
+    /// WinsServerData property
+    #[dbus_proxy(property)]
+    fn wins_server_data(&self) -> zbus::Result<Vec<String>>;
+
+    /// WinsServers property
+    #[dbus_proxy(property)]
+    fn wins_servers(&self) -> zbus::Result<Vec<u32>>;
+}
+
+#[dbus_proxy(
+    interface = "org.freedesktop.NetworkManager.IP6Config",
+    default_service = "org.freedesktop.NetworkManager",
+    default_path = "/org/freedesktop/NetworkManager/IP6Config/1"
+)]
+trait IP6Config {
+    /// AddressData property
+    #[dbus_proxy(property)]
+    fn address_data(
+        &self,
+    ) -> zbus::Result<Vec<std::collections::HashMap<String, zbus::zvariant::OwnedValue>>>;
+
+    /// Addresses property
+    #[dbus_proxy(property)]
+    fn addresses(&self) -> zbus::Result<Vec<(Vec<u8>, u32, Vec<u8>)>>;
+
+    /// DnsOptions property
+    #[dbus_proxy(property)]
+    fn dns_options(&self) -> zbus::Result<Vec<String>>;
+
+    /// DnsPriority property
+    #[dbus_proxy(property)]
+    fn dns_priority(&self) -> zbus::Result<i32>;
+
+    /// Domains property
+    #[dbus_proxy(property)]
+    fn domains(&self) -> zbus::Result<Vec<String>>;
+
+    /// Gateway property
+    #[dbus_proxy(property)]
+    fn gateway(&self) -> zbus::Result<String>;
+
+    /// Nameservers property
+    #[dbus_proxy(property)]
+    fn nameservers(&self) -> zbus::Result<Vec<Vec<u8>>>;
+
+    /// RouteData property
+    #[dbus_proxy(property)]
+    fn route_data(
+        &self,
+    ) -> zbus::Result<Vec<std::collections::HashMap<String, zbus::zvariant::OwnedValue>>>;
+
+    /// Routes property
+    #[dbus_proxy(property)]
+    fn routes(&self) -> zbus::Result<Vec<(Vec<u8>, u32, Vec<u8>, u32)>>;
+
+    /// Searches property
+    #[dbus_proxy(property)]
+    fn searches(&self) -> zbus::Result<Vec<String>>;
+}

From 6b2cbcf1c465287b37b70cd2602acd8630be864a Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Thu, 11 Apr 2024 11:52:02 +0100
Subject: [PATCH 235/324] Rename NetworkState to NetworkServiceState

---
 rust/agama-server/src/network/web.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 052070cac0..38c0708398 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -49,7 +49,7 @@ impl IntoResponse for NetworkError {
 }
 
 #[derive(Clone)]
-struct NetworkState {
+struct NetworkServiceState {
     actions: UnboundedSender<Action>,
 }
 
@@ -62,7 +62,7 @@ pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
 ) -> Result<Router, ServiceError> {
     let mut network = NetworkSystem::new(dbus.clone(), adapter);
 
-    let state = NetworkState {
+    let state = NetworkServiceState {
         actions: network.actions_tx(),
     };
 
@@ -93,7 +93,7 @@ pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
 #[utoipa::path(get, path = "/network/state", responses(
   (status = 200, description = "Get general network config", body = GenereralState)
 ))]
-async fn general_state(State(state): State<NetworkState>) -> Json<GeneralState> {
+async fn general_state(State(state): State<NetworkServiceState>) -> Json<GeneralState> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::GetGeneralState(tx)).unwrap();
 
@@ -106,7 +106,7 @@ async fn general_state(State(state): State<NetworkState>) -> Json<GeneralState>
   (status = 200, description = "Update general network config", body = GenereralState)
 ))]
 async fn update_general_state(
-    State(state): State<NetworkState>,
+    State(state): State<NetworkServiceState>,
     Json(value): Json<GeneralState>,
 ) -> Result<Json<GeneralState>, NetworkError> {
     state
@@ -124,7 +124,7 @@ async fn update_general_state(
 #[utoipa::path(get, path = "/network/wifi", responses(
   (status = 200, description = "List of wireless networks", body = Vec<AccessPoint>)
 ))]
-async fn wifi_networks(State(state): State<NetworkState>) -> Json<Vec<AccessPoint>> {
+async fn wifi_networks(State(state): State<NetworkServiceState>) -> Json<Vec<AccessPoint>> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::RefreshScan(tx)).unwrap();
     let _ = rx.await.unwrap();
@@ -147,7 +147,7 @@ async fn wifi_networks(State(state): State<NetworkState>) -> Json<Vec<AccessPoin
 #[utoipa::path(get, path = "/network/devices", responses(
   (status = 200, description = "List of devices", body = Vec<Device>)
 ))]
-async fn devices(State(state): State<NetworkState>) -> Json<Vec<Device>> {
+async fn devices(State(state): State<NetworkServiceState>) -> Json<Vec<Device>> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::GetDevices(tx)).unwrap();
 
@@ -157,7 +157,7 @@ async fn devices(State(state): State<NetworkState>) -> Json<Vec<Device>> {
 #[utoipa::path(get, path = "/network/connections", responses(
   (status = 200, description = "List of known connections", body = Vec<NetworkConnection>)
 ))]
-async fn connections(State(state): State<NetworkState>) -> Json<Vec<NetworkConnection>> {
+async fn connections(State(state): State<NetworkServiceState>) -> Json<Vec<NetworkConnection>> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::GetConnections(tx)).unwrap();
     let connections = rx.await.unwrap();
@@ -173,7 +173,7 @@ async fn connections(State(state): State<NetworkState>) -> Json<Vec<NetworkConne
   (status = 200, description = "Add a new connection", body = Connection)
 ))]
 async fn add_connection(
-    State(state): State<NetworkState>,
+    State(state): State<NetworkServiceState>,
     Json(conn): Json<NetworkConnection>,
 ) -> Result<Json<Connection>, NetworkError> {
     let (tx, rx) = oneshot::channel();
@@ -203,7 +203,7 @@ async fn add_connection(
   (status = 200, description = "Delete connection", body = Connection)
 ))]
 async fn delete_connection(
-    State(state): State<NetworkState>,
+    State(state): State<NetworkServiceState>,
     Path(id): Path<String>,
 ) -> impl IntoResponse {
     let (tx, rx) = oneshot::channel();
@@ -222,7 +222,7 @@ async fn delete_connection(
   (status = 200, description = "Update connection", body = Connection)
 ))]
 async fn update_connection(
-    State(state): State<NetworkState>,
+    State(state): State<NetworkServiceState>,
     Path(id): Path<String>,
     Json(conn): Json<NetworkConnection>,
 ) -> Result<Json<()>, NetworkError> {
@@ -253,7 +253,7 @@ async fn update_connection(
   (status = 200, description = "Connect to the given connection", body = String)
 ))]
 async fn connect(
-    State(state): State<NetworkState>,
+    State(state): State<NetworkServiceState>,
     Path(id): Path<String>,
 ) -> Result<Json<()>, NetworkError> {
     let (tx, rx) = oneshot::channel();
@@ -284,7 +284,7 @@ async fn connect(
   (status = 200, description = "Connect to the given connection", body = String)
 ))]
 async fn disconnect(
-    State(state): State<NetworkState>,
+    State(state): State<NetworkServiceState>,
     Path(id): Path<String>,
 ) -> Result<Json<()>, NetworkError> {
     let (tx, rx) = oneshot::channel();
@@ -315,7 +315,7 @@ async fn disconnect(
 #[utoipa::path(put, path = "/network/system/apply", responses(
   (status = 200, description = "Apply configuration")
 ))]
-async fn apply(State(state): State<NetworkState>) -> Result<Json<()>, NetworkError> {
+async fn apply(State(state): State<NetworkServiceState>) -> Result<Json<()>, NetworkError> {
     let (tx, rx) = oneshot::channel();
     state.actions.send(Action::Apply(tx)).unwrap();
 

From 832ca757c7b82a48fe5045c49aa25b712dd0f048 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 11 Apr 2024 17:54:28 +0200
Subject: [PATCH 236/324] add missing methods  to registration client

---
 rust/agama-lib/src/product/client.rs | 34 ++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/rust/agama-lib/src/product/client.rs b/rust/agama-lib/src/product/client.rs
index 2f4e18f432..01f8bbcfdb 100644
--- a/rust/agama-lib/src/product/client.rs
+++ b/rust/agama-lib/src/product/client.rs
@@ -18,6 +18,28 @@ pub struct Product {
     pub description: String,
 }
 
+pub enum RegistrationRequirement {
+    /// Product does not require registration
+    NotRequired = 0,
+    /// Product has optional registration
+    Optional = 1,
+    /// It is mandatory to register product
+    Mandatory = 2,
+}
+
+impl TryFrom<u32> for RegistrationRequirement {
+    type Error = ();
+
+    fn try_from(v: u32) -> Result<Self, Self::Error> {
+        match v {
+            x if x == RegistrationRequirement::NotRequired as u32 => Ok(RegistrationRequirement::NotRequired),
+            x if x == RegistrationRequirement::Optional as u32 => Ok(RegistrationRequirement::Optional),
+            x if x == RegistrationRequirement::Mandatory as u32 => Ok(RegistrationRequirement::Mandatory),
+            _ => Err(()),
+        }
+    }
+}
+
 /// D-Bus client for the software service
 #[derive(Clone)]
 pub struct ProductClient<'a> {
@@ -86,6 +108,13 @@ impl<'a> ProductClient<'a> {
         Ok(self.registration_proxy.email().await?)
     }
 
+    pub async fn registration_requirement(&self) -> Result<RegistrationRequirement, ServiceError> {
+        let requirement = self.registration_proxy.requirement().await?;
+        // unknown number can happen only if we do programmer mistake
+        let result: RegistrationRequirement = requirement.try_into().unwrap();
+        Ok(result)
+    }
+
     /// register product
     pub async fn register(&self, code: &str, email: &str) -> Result<(u32, String), ServiceError> {
         let mut options: HashMap<&str, zbus::zvariant::Value> = HashMap::new();
@@ -94,4 +123,9 @@ impl<'a> ProductClient<'a> {
         }
         Ok(self.registration_proxy.register(code, options).await?)
     }
+
+    /// de-register product
+    pub async fn deregister(&self) -> Result<(u32, String), ServiceError> {
+        Ok(self.registration_proxy.deregister().await?)
+    }
 }

From 29627ef9382af160ef410b496e4a87e00cba709f Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 12 Apr 2024 09:20:27 +0200
Subject: [PATCH 237/324] add routes for registration

---
 rust/agama-lib/src/product.rs         |  2 +-
 rust/agama-lib/src/product/client.rs  | 15 ++++--
 rust/agama-server/src/software/web.rs | 74 ++++++++++++++++++++++++++-
 3 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/rust/agama-lib/src/product.rs b/rust/agama-lib/src/product.rs
index 8b352f602d..9835a6feee 100644
--- a/rust/agama-lib/src/product.rs
+++ b/rust/agama-lib/src/product.rs
@@ -5,6 +5,6 @@ mod proxies;
 mod settings;
 mod store;
 
-pub use client::{Product, ProductClient};
+pub use client::{Product, ProductClient, RegistrationRequirement};
 pub use settings::ProductSettings;
 pub use store::ProductStore;
diff --git a/rust/agama-lib/src/product/client.rs b/rust/agama-lib/src/product/client.rs
index 01f8bbcfdb..250ec500d1 100644
--- a/rust/agama-lib/src/product/client.rs
+++ b/rust/agama-lib/src/product/client.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use crate::error::ServiceError;
 use crate::software::proxies::SoftwareProductProxy;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use zbus::Connection;
 
 use super::proxies::RegistrationProxy;
@@ -18,6 +18,7 @@ pub struct Product {
     pub description: String,
 }
 
+#[derive(Clone, Debug, Serialize, Deserialize, utoipa::ToSchema)]
 pub enum RegistrationRequirement {
     /// Product does not require registration
     NotRequired = 0,
@@ -32,9 +33,15 @@ impl TryFrom<u32> for RegistrationRequirement {
 
     fn try_from(v: u32) -> Result<Self, Self::Error> {
         match v {
-            x if x == RegistrationRequirement::NotRequired as u32 => Ok(RegistrationRequirement::NotRequired),
-            x if x == RegistrationRequirement::Optional as u32 => Ok(RegistrationRequirement::Optional),
-            x if x == RegistrationRequirement::Mandatory as u32 => Ok(RegistrationRequirement::Mandatory),
+            x if x == RegistrationRequirement::NotRequired as u32 => {
+                Ok(RegistrationRequirement::NotRequired)
+            }
+            x if x == RegistrationRequirement::Optional as u32 => {
+                Ok(RegistrationRequirement::Optional)
+            }
+            x if x == RegistrationRequirement::Mandatory as u32 => {
+                Ok(RegistrationRequirement::Mandatory)
+            }
             _ => Err(()),
         }
     }
diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index 80adf97980..aeb6398ec1 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -14,7 +14,7 @@ use crate::{
 };
 use agama_lib::{
     error::ServiceError,
-    product::{Product, ProductClient},
+    product::{Product, ProductClient, RegistrationRequirement},
     software::{
         proxies::{Software1Proxy, SoftwareProductProxy},
         Pattern, SelectedBy, SoftwareClient, UnknownSelectedBy,
@@ -130,6 +130,10 @@ pub async fn software_service(dbus: zbus::Connection) -> Result<Router, ServiceE
     let router = Router::new()
         .route("/patterns", get(patterns))
         .route("/products", get(products))
+        .route(
+            "/registration",
+            get(get_registration).post(register).delete(deregister),
+        )
         .route("/proposal", get(proposal))
         .route("/config", put(set_config).get(get_config))
         .route("/probe", post(probe))
@@ -153,6 +157,74 @@ async fn products(State(state): State<SoftwareState<'_>>) -> Result<Json<Vec<Pro
     Ok(Json(products))
 }
 
+/// Information about registration configuration (product, patterns, etc.).
+#[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct RegistrationInfo {
+    /// Registration key. Empty value mean key not used or not registered.
+    key: String,
+    /// Registration email. Empty value mean email not used or not registered.
+    email: String,
+    /// if registration is required, optional or not needed for current product.
+    /// Change only if selected product is changed.
+    requirement: RegistrationRequirement,
+}
+
+/// returns registration info
+///
+/// * `state`: service state.
+#[utoipa::path(get, path = "/software/registration", responses(
+    (status = 200, description = "registration configuration", body = RegistrationInfo),
+    (status = 400, description = "The D-Bus service could not perform the action")
+))]
+async fn get_registration(
+    State(state): State<SoftwareState<'_>>,
+) -> Result<Json<RegistrationInfo>, Error> {
+    let result = RegistrationInfo {
+        key: state.product.registration_code().await?,
+        email: state.product.email().await?,
+        requirement: state.product.registration_requirement().await?,
+    };
+    Ok(Json(result))
+}
+
+/// Software service configuration (product, patterns, etc.).
+#[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct RegistrationParams {
+    /// Registration key.
+    key: String,
+    /// Registration email.
+    email: String,
+}
+
+/// Register product
+///
+/// * `state`: service state.
+#[utoipa::path(post, path = "/software/registration", responses(
+    (status = 200, description = "registration successfull"),
+    (status = 400, description = "The D-Bus service could not perform the action")
+))]
+async fn register(
+    State(state): State<SoftwareState<'_>>,
+    Json(config): Json<RegistrationParams>,
+) -> Result<Json<()>, Error> {
+    state.product.register(&config.key, &config.email).await?;
+    Ok(Json(()))
+}
+
+/// Deregister product
+///
+/// * `state`: service state.
+#[utoipa::path(delete, path = "/software/registration", responses(
+    (status = 200, description = "deregistration successfull"),
+    (status = 400, description = "The D-Bus service could not perform the action")
+))]
+async fn deregister(State(state): State<SoftwareState<'_>>) -> Result<Json<()>, Error> {
+    state.product.deregister().await?;
+    Ok(Json(()))
+}
+
 /// Returns the list of software patterns.
 ///
 /// * `state`: service state.

From d2ad0816bab708f3e947eaeb205d265ab50447d6 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 12 Apr 2024 09:54:47 +0200
Subject: [PATCH 238/324] implement registration streams

---
 rust/agama-lib/src/product.rs         |  2 +-
 rust/agama-server/src/software.rs     |  2 +-
 rust/agama-server/src/software/web.rs | 90 ++++++++++++++++++++++++---
 rust/agama-server/src/web.rs          |  6 +-
 rust/agama-server/src/web/common.rs   |  2 +
 rust/agama-server/src/web/event.rs    |  5 ++
 6 files changed, 93 insertions(+), 14 deletions(-)

diff --git a/rust/agama-lib/src/product.rs b/rust/agama-lib/src/product.rs
index 9835a6feee..c7a0a6582e 100644
--- a/rust/agama-lib/src/product.rs
+++ b/rust/agama-lib/src/product.rs
@@ -1,7 +1,7 @@
 //! Implements support for handling the product settings
 
 mod client;
-mod proxies;
+pub mod proxies;
 mod settings;
 mod store;
 
diff --git a/rust/agama-server/src/software.rs b/rust/agama-server/src/software.rs
index b882542d90..d7099be9bf 100644
--- a/rust/agama-server/src/software.rs
+++ b/rust/agama-server/src/software.rs
@@ -1,2 +1,2 @@
 pub mod web;
-pub use web::{software_service, software_stream};
+pub use web::{software_service, software_streams};
diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index aeb6398ec1..e1b8fc09d0 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -8,13 +8,13 @@
 use crate::{
     error::Error,
     web::{
-        common::{issues_router, progress_router, service_status_router},
+        common::{issues_router, progress_router, service_status_router, Streams},
         Event,
     },
 };
 use agama_lib::{
     error::ServiceError,
-    product::{Product, ProductClient, RegistrationRequirement},
+    product::{Product, ProductClient, RegistrationRequirement, proxies::RegistrationProxy},
     software::{
         proxies::{Software1Proxy, SoftwareProductProxy},
         Pattern, SelectedBy, SoftwareClient, UnknownSelectedBy,
@@ -26,7 +26,7 @@ use axum::{
     Json, Router,
 };
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, pin::Pin};
+use std::collections::HashMap;
 use tokio_stream::{Stream, StreamExt};
 
 #[derive(Clone)]
@@ -49,14 +49,33 @@ pub struct SoftwareConfig {
 /// It emits the Event::ProductChanged and Event::PatternsChanged events.
 ///
 /// * `connection`: D-Bus connection to listen for events.
-pub async fn software_stream(
+pub async fn software_streams(
     dbus: zbus::Connection,
-) -> Result<Pin<Box<dyn Stream<Item = Event> + Send>>, Error> {
-    let stream = StreamExt::merge(
-        product_changed_stream(dbus.clone()).await?,
-        patterns_changed_stream(dbus.clone()).await?,
-    );
-    Ok(Box::pin(stream))
+) -> Result<Streams, Error> {
+    let result: Streams = vec![
+        (
+            "patterns_changed",
+            Box::pin(patterns_changed_stream(dbus.clone()).await?),
+        ),
+        (
+            "product_changed",
+            Box::pin(product_changed_stream(dbus.clone()).await?),
+        ),
+        (
+            "registration_requirement_changed",
+            Box::pin(registration_requirement_changed_stream(dbus.clone()).await?),
+        ),
+        (
+            "registration_code_changed",
+            Box::pin(registration_code_changed_stream(dbus.clone()).await?),
+        ),
+        (
+            "registration_email_changed",
+            Box::pin(registration_email_changed_stream(dbus.clone()).await?),
+        ),
+    ];
+
+    Ok(result)
 }
 
 async fn product_changed_stream(
@@ -99,6 +118,57 @@ async fn patterns_changed_stream(
     Ok(stream)
 }
 
+async fn registration_requirement_changed_stream(dbus: zbus::Connection,
+) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = RegistrationProxy::new(&dbus).await?;
+    let stream = proxy
+        .receive_requirement_changed()
+        .await
+        .then(|change| async move {
+            if let Ok(id) = change.get().await {
+                // unwrap is safe as possible numbers is send by our controlled dbus
+                return Some(Event::RegistrationRequirementChanged { requirement: id.try_into().unwrap() });
+            }
+            None
+        })
+        .filter_map(|e| e);
+    Ok(stream)
+}
+
+async fn registration_email_changed_stream(dbus: zbus::Connection,
+) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = RegistrationProxy::new(&dbus).await?;
+    let stream = proxy
+        .receive_email_changed()
+        .await
+        .then(|change| async move {
+            if let Ok(_id) = change.get().await {
+                // unwrap is safe as possible numbers is send by our controlled dbus
+                return Some(Event::RegistrationChanged);
+            }
+            None
+        })
+        .filter_map(|e| e);
+    Ok(stream)
+}
+
+async fn registration_code_changed_stream(dbus: zbus::Connection,
+) -> Result<impl Stream<Item = Event>, Error> {
+    let proxy = RegistrationProxy::new(&dbus).await?;
+    let stream = proxy
+        .receive_reg_code_changed()
+        .await
+        .then(|change| async move {
+            if let Ok(_id) = change.get().await {
+                // unwrap is safe as possible numbers is send by our controlled dbus
+                return Some(Event::RegistrationChanged);
+            }
+            None
+        })
+        .filter_map(|e| e);
+    Ok(stream)
+}
+
 // Returns a hash replacing the selection "reason" from D-Bus with a SelectedBy variant.
 fn reason_to_selected_by(
     patterns: HashMap<String, u8>,
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 491716aca2..a7b52d247c 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -10,7 +10,7 @@ use crate::{
     manager::web::{manager_service, manager_stream},
     network::{web::network_service, NetworkManagerAdapter},
     questions::web::{questions_service, questions_stream},
-    software::web::{software_service, software_stream},
+    software::web::{software_service, software_streams},
     users::web::{users_service, users_streams},
     web::common::{issues_stream, progress_stream, service_status_stream},
 };
@@ -110,7 +110,9 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
     for (id, user_stream) in users_streams(dbus.clone()).await? {
         stream.insert(id, user_stream);
     }
-    stream.insert("software", software_stream(dbus.clone()).await?);
+    for (id, software_stream) in software_streams(dbus.clone()).await? {
+        stream.insert(id, software_stream);
+    }
     stream.insert(
         "software-status",
         service_status_stream(
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 189c6eb180..3475e96c69 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -17,6 +17,8 @@ use crate::error::Error;
 
 use super::Event;
 
+pub type Streams = Vec<(&'static str, Pin<Box<dyn Stream<Item = Event> + Send>>)>;
+
 /// Builds a router to the `org.opensuse.Agama1.ServiceStatus` interface of the
 /// given D-Bus object.
 ///
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 3f23090659..93bdb604ac 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -1,6 +1,7 @@
 use crate::l10n::web::LocaleConfig;
 use agama_lib::{
     manager::InstallationPhase, progress::Progress, software::SelectedBy, users::FirstUser,
+    product::RegistrationRequirement,
 };
 use serde::Serialize;
 use std::collections::HashMap;
@@ -23,6 +24,10 @@ pub enum Event {
     ProductChanged {
         id: String,
     },
+    RegistrationRequirementChanged{
+        requirement: RegistrationRequirement,
+    },
+    RegistrationChanged,
     FirstUserChanged(FirstUser),
     RootChanged {
         password: Option<bool>,

From 8fcdde1a459691a076efa6a909e151fd0255eb97 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Fri, 12 Apr 2024 12:22:35 +0100
Subject: [PATCH 239/324] Moved config from path to proxy

---
 rust/agama-server/src/network/nm/client.rs | 37 +++++++++++-----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index eada04fa2e..67c93f5487 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -20,6 +20,7 @@ use log;
 use macaddr::MacAddr6;
 use uuid::Uuid;
 use zbus;
+use zbus::fdo::DBusProxy;
 use zbus::zvariant::{self, ObjectPath, OwnedObjectPath};
 
 /// Simplified NetworkManager D-Bus client.
@@ -169,10 +170,20 @@ impl<'a> NetworkManagerClient<'a> {
             let device_type = NmDeviceType(proxy.device_type().await?);
             let ip4_path = proxy.ip4_config().await?;
             let ip6_path = proxy.ip6_config().await?;
+            let ip4_proxy = IP4ConfigProxy::builder(&self.connection)
+                .path(ip4_path.as_str())?
+                .build()
+                .await?;
+
+            let ip6_proxy = IP6ConfigProxy::builder(&self.connection)
+                .path(ip6_path.as_str())?
+                .build()
+                .await?;
+
             let state = proxy.state().await?;
             let mac_address = self.mac_address_from_dbus(proxy.hw_address().await?.as_str());
             let ip_config = if state == 100 {
-                let config = &self.ip_config_for(&ip4_path, &ip6_path).await?;
+                let config = &self.ip_config_for(ip4_proxy, ip6_proxy).await?;
 
                 Some(config.to_owned())
             } else {
@@ -246,19 +257,9 @@ impl<'a> NetworkManagerClient<'a> {
 
     pub async fn ip_config_for(
         &self,
-        ip4_path: &ObjectPath<'_>,
-        ip6_path: &ObjectPath<'_>,
+        ip4_proxy: IP4ConfigProxy<'_>,
+        ip6_proxy: IP6ConfigProxy<'_>,
     ) -> Result<IpConfig, ServiceError> {
-        let ip4_proxy = IP4ConfigProxy::builder(&self.connection)
-            .path(ip4_path.as_str())?
-            .build()
-            .await?;
-
-        let ip6_proxy = IP6ConfigProxy::builder(&self.connection)
-            .path(ip6_path.as_str())?
-            .build()
-            .await?;
-
         let address_data = ip4_proxy.address_data().await?;
         let nameserver_data = ip4_proxy.nameserver_data().await?;
         let mut addresses: Vec<IpInet> = vec![];
@@ -282,11 +283,11 @@ impl<'a> NetworkManagerClient<'a> {
                 nameservers.push(address)
             }
         }
-        let nameserver_data = ip6_proxy.nameservers().await?;
-        for nameserver in nameserver_data {
-            // FIXME: Convert from Vec<u8> to u16
-            dbg!(nameserver);
-        }
+        // FIXME: Convert from Vec<u8> to [u8; 16] and take into account big vs little endian order,
+        // in IP6Config there is no nameserver-data.
+        //
+        // let nameserver_data = ip6_proxy.nameservers().await?;
+
         let route_data = ip4_proxy.route_data().await?;
         let mut routes4: Vec<IpRoute> = vec![];
         if !route_data.is_empty() {

From 121c472fe8a2afbca0aea00f3b411fd7ddb35d9b Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 12 Apr 2024 23:23:46 +0200
Subject: [PATCH 240/324] adapt frontend

---
 rust/agama-server/src/software/web.rs      |   4 +-
 rust/agama-server/src/users/web.rs         |   6 +-
 web/src/client/software.js                 | 165 ++++++++-------------
 web/src/components/product/ProductPage.jsx |   2 +-
 web/src/context/product.jsx                |   8 +-
 5 files changed, 75 insertions(+), 110 deletions(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index e1b8fc09d0..11de4c7e9b 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -120,6 +120,7 @@ async fn patterns_changed_stream(
 
 async fn registration_requirement_changed_stream(dbus: zbus::Connection,
 ) -> Result<impl Stream<Item = Event>, Error> {
+    // TODO: move registration requirement to product in dbus and so just one event will be needed.
     let proxy = RegistrationProxy::new(&dbus).await?;
     let stream = proxy
         .receive_requirement_changed()
@@ -143,7 +144,7 @@ async fn registration_email_changed_stream(dbus: zbus::Connection,
         .await
         .then(|change| async move {
             if let Ok(_id) = change.get().await {
-                // unwrap is safe as possible numbers is send by our controlled dbus
+                // TODO: add to stream also proxy and return whole cached registration info
                 return Some(Event::RegistrationChanged);
             }
             None
@@ -160,7 +161,6 @@ async fn registration_code_changed_stream(dbus: zbus::Connection,
         .await
         .then(|change| async move {
             if let Ok(_id) = change.get().await {
-                // unwrap is safe as possible numbers is send by our controlled dbus
                 return Some(Event::RegistrationChanged);
             }
             None
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index 161d9a2bd5..e0c451daa2 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -7,7 +7,7 @@
 use crate::{
     error::Error,
     web::{
-        common::{service_status_router, validation_router},
+        common::{service_status_router, validation_router, Streams},
         Event,
     },
 };
@@ -32,14 +32,14 @@ struct UsersState<'a> {
 /// * `connection`: D-Bus connection to listen for events.
 pub async fn users_streams(
     dbus: zbus::Connection,
-) -> Result<Vec<(&'static str, Pin<Box<dyn Stream<Item = Event> + Send>>)>, Error> {
+) -> Result<Streams, Error> {
     const FIRST_USER_ID: &str = "first_user";
     const ROOT_PASSWORD_ID: &str = "root_password";
     const ROOT_SSHKEY_ID: &str = "root_sshkey";
     // here we have three streams, but only two events. Reason is
     // that we have three streams from dbus about property change
     // and unify two root user properties into single event to http API
-    let result: Vec<(&str, Pin<Box<dyn Stream<Item = Event> + Send>>)> = vec![
+    let result: Streams = vec![
         (
             FIRST_USER_ID,
             Box::pin(first_user_changed_stream(dbus.clone()).await?),
diff --git a/web/src/client/software.js b/web/src/client/software.js
index 0375ba2710..28b02b9272 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -87,106 +87,6 @@ const SelectedBy = Object.freeze({
  * @property {string} icon - Icon name (not path or file name!).
  */
 
-/**
- * Product manager.
- * @ignore
- */
-class BaseProductManager {
-  /**
-   * @param {DBusClient} client
-   */
-  constructor(client) {
-    this.client = client;
-    this.proxies = {};
-  }
-
-  /**
-   * Returns the registration of the selected product.
-   *
-   * @return {Promise<Registration>}
-   */
-  async getRegistration() {
-    const proxy = await this.client.proxy(REGISTRATION_IFACE, PRODUCT_PATH);
-    const requirement = this.registrationRequirement(proxy.Requirement);
-    const code = proxy.RegCode;
-    const email = proxy.Email;
-
-    const registration = { requirement, code, email };
-    if (code.length === 0) registration.code = null;
-    if (email.length === 0) registration.email = null;
-
-    return registration;
-  }
-
-  /**
-   * Tries to register the selected product.
-   *
-   * @param {string} code
-   * @param {string} [email]
-   * @returns {Promise<ActionResult>}
-   */
-  async register(code, email = "") {
-    const proxy = await this.client.proxy(REGISTRATION_IFACE, PRODUCT_PATH);
-    const result = await proxy.Register(code, { Email: { t: "s", v: email } });
-
-    return {
-      success: result[0] === 0,
-      message: result[1],
-    };
-  }
-
-  /**
-   * Tries to deregister the selected product.
-   *
-   * @returns {Promise<ActionResult>}
-   */
-  async deregister() {
-    const proxy = await this.client.proxy(REGISTRATION_IFACE, PRODUCT_PATH);
-    const result = await proxy.Deregister();
-
-    return {
-      success: result[0] === 0,
-      message: result[1],
-    };
-  }
-
-  /**
-   * Registers a callback to run when the registration changes.
-   *
-   * @param {(registration: Registration) => void} handler - Callback function.
-   */
-  onRegistrationChange(handler) {
-    return this.client.onObjectChanged(PRODUCT_PATH, REGISTRATION_IFACE, () => {
-      this.getRegistration().then(handler);
-    });
-  }
-
-  /**
-   * Helper method to generate the requirement representation.
-   * @private
-   *
-   * @param {number} value - D-Bus registration value.
-   * @returns {string}
-   */
-  registrationRequirement(value) {
-    let requirement = "unknown";
-
-    switch (value) {
-      case 0:
-        requirement = "not-required";
-        break;
-      case 1:
-        requirement = "optional";
-        break;
-      case 2:
-        requirement = "mandatory";
-        break;
-    }
-
-    return requirement;
-  }
-}
-
 /**
  * Software client
  *
@@ -348,6 +248,71 @@ class ProductBaseClient {
       }
     });
   }
+
+  /**
+   * Returns the registration of the selected product.
+   *
+   * @return {Promise<Registration>}
+   */
+  async getRegistration() {
+    const response = await this.client.get("/software/registration");
+    if (!response.ok) {
+      console.log("Failed to get registration config: ", response);
+      return { requirement: "unknown", code: null, email: null };
+    }
+    const config = await response.json();
+
+    const requirement = config.requirement;
+    const code = config.key;
+    const email = config.email;
+
+    const registration = { requirement, code, email };
+    if (code.length === 0) registration.code = null;
+    if (email.length === 0) registration.email = null;
+
+    return registration;
+  }
+
+  /**
+   * Tries to register the selected product.
+   *
+   * @param {string} code
+   * @param {string} [email]
+   * @returns {Promise<ActionResult>}
+   */
+  async register(code, email = "") {
+    const response = await this.client.post("/software/registration", { code, email });
+
+    return {
+      success: response.ok,
+      message: "", // TODO: pass message and code in body
+    };
+  }
+
+  /**
+   * Tries to deregister the selected product.
+   *
+   * @returns {Promise<ActionResult>}
+   */
+  async deregister() {
+    const response = await this.client.delete("/software/registration");
+
+    return {
+      success: response.ok,
+      message: "", // TODO: how to get message?
+    };
+  }
+
+  /**
+   * Registers a callback to run when the registration changes.
+   *
+   * @param {(registration: Registration) => void} handler - Callback function.
+   */
+  onRegistrationChange(handler) {
+    return this.client.onEvent("RegistrationChanged", () => {
+      this.getRegistration().then(handler);
+    });
+  }
 }
 
 class ProductClient
diff --git a/web/src/components/product/ProductPage.jsx b/web/src/components/product/ProductPage.jsx
index c85ac56d1e..726bd46ce5 100644
--- a/web/src/components/product/ProductPage.jsx
+++ b/web/src/components/product/ProductPage.jsx
@@ -382,7 +382,7 @@ const RegistrationContent = ({ isLoading = false }) => {
 const RegistrationSection = ({ isLoading = false }) => {
   const { registration } = useProduct();
 
-  const isRequired = registration?.requirement !== "not-required";
+  const isRequired = registration?.requirement !== "NotRequired";
   const isRegistered = registration?.code !== null;
 
   return (
diff --git a/web/src/context/product.jsx b/web/src/context/product.jsx
index a293ea5b72..6be4672278 100644
--- a/web/src/context/product.jsx
+++ b/web/src/context/product.jsx
@@ -42,10 +42,10 @@ function ProductProvider({ children }) {
       const productClient = client.product;
       const available = await cancellablePromise(productClient.getAll());
       const selected = await cancellablePromise(productClient.getSelected());
-      // const registration = await cancellablePromise(productManager.getRegistration());
+      const registration = await cancellablePromise(productClient.getRegistration());
       setProducts(available);
       setSelectedId(selected);
-      // setRegistration(registration);
+      setRegistration(registration);
     };
 
     if (client) {
@@ -60,9 +60,9 @@ function ProductProvider({ children }) {
   }, [client, setSelectedId]);
 
   useEffect(() => {
-    // if (!client) return;
+    if (!client) return;
 
-    // return client.product.onRegistrationChange(setRegistration);
+    return client.product.onRegistrationChange(setRegistration);
   }, [client, setRegistration]);
 
   const value = { products, selectedId, registration };

From 193aeb5c8f499b518269745d2293b03f5f3a0984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Sat, 13 Apr 2024 08:46:22 +0100
Subject: [PATCH 241/324] Split NetworkSystem in two structs (System and
 Server)

* Hide behind the API the fact that it uses a different tokio::task.
---
 rust/agama-server/src/network/dbus/service.rs |  14 +-
 rust/agama-server/src/network/system.rs       | 120 ++++++++++++------
 rust/agama-server/src/network/web.rs          |  17 +--
 3 files changed, 88 insertions(+), 63 deletions(-)

diff --git a/rust/agama-server/src/network/dbus/service.rs b/rust/agama-server/src/network/dbus/service.rs
index b085cf4855..553020b2ae 100644
--- a/rust/agama-server/src/network/dbus/service.rs
+++ b/rust/agama-server/src/network/dbus/service.rs
@@ -3,12 +3,12 @@
 //! This module defines a D-Bus service which exposes Agama's network configuration.
 use crate::network::{Adapter, NetworkSystem};
 use std::error::Error;
-use tokio;
 use zbus::Connection;
 
 /// Represents the Agama networking D-Bus service.
 ///
 /// It is responsible for starting the [NetworkSystem] on a different thread.
+/// TODO: this struct might not be needed anymore.
 pub struct NetworkService;
 
 impl NetworkService {
@@ -17,16 +17,8 @@ impl NetworkService {
         connection: &Connection,
         adapter: T,
     ) -> Result<(), Box<dyn Error>> {
-        let mut network = NetworkSystem::new(connection.clone(), adapter);
-
-        tokio::spawn(async move {
-            network
-                .setup()
-                .await
-                .expect("Could not set up the D-Bus tree");
-
-            network.listen().await;
-        });
+        let network = NetworkSystem::new(connection.clone(), adapter);
+        network.start().await?;
         Ok(())
     }
 }
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 5b53672af8..6d2371c3eb 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -1,6 +1,6 @@
 use super::{error::NetworkStateError, model::StateConfig, NetworkAdapterError};
 use crate::network::{dbus::Tree, model::Connection, Action, Adapter, NetworkState};
-use agama_lib::network::types::DeviceType;
+use agama_lib::{error::ServiceError, network::types::DeviceType};
 use std::{error::Error, sync::Arc};
 use tokio::sync::{
     mpsc::{self, UnboundedReceiver, UnboundedSender},
@@ -9,59 +9,96 @@ use tokio::sync::{
 use uuid::Uuid;
 use zbus::zvariant::OwnedObjectPath;
 
-/// Represents the network system using holding the state and setting up the D-Bus tree.
-pub struct NetworkSystem<T: Adapter> {
-    /// Network state
-    pub state: NetworkState,
-    /// Side of the channel to send actions.
-    actions_tx: UnboundedSender<Action>,
-    actions_rx: UnboundedReceiver<Action>,
-    tree: Arc<Mutex<Tree>>,
-    /// Adapter to read/write the network state.
+/// Represents the network configuration service.
+///
+/// It offers an API to start the service and interact with it by using message
+/// passing like the example below.
+///
+/// ```no_run
+/// # use agama_server::network::{Action, NetworkManagerAdapter, NetworkSystem};
+/// # use agama_lib::connection;
+/// # use tokio::sync::oneshot;
+///
+/// # tokio_test::block_on(async {
+/// let adapter = NetworkManagerAdapter::from_system()
+///     .await
+///     .expect("Could not connect to NetworkManager.");
+/// let dbus = connection()
+///     .await
+///     .expect("Could not connect to Agama's D-Bus server.");
+/// let network = NetworkSystem::new(dbus, adapter);
+///
+/// // Start the networking service and get the channel for communication.
+/// let actions = network.start()
+///     .await
+///     .expect("Could not start the networking configuration system.");
+///
+/// // Perform some action, like getting the list of devices.
+/// let (tx, rx) = oneshot::channel();
+/// actions.send(Action::GetDevices(tx)).unwrap();
+/// let devices = rx.await.unwrap();
+/// # });
+/// ```
+pub struct NetworkSystem<T: Adapter + Send> {
+    connection: zbus::Connection,
     adapter: T,
 }
 
-impl<T: Adapter> NetworkSystem<T> {
-    pub fn new(conn: zbus::Connection, adapter: T) -> Self {
-        let (actions_tx, actions_rx) = mpsc::unbounded_channel();
-        let tree = Tree::new(conn, actions_tx.clone());
+impl<T: Adapter + Send + 'static> NetworkSystem<T> {
+    /// Returns a new instance of the network configuration system.
+    ///
+    /// This function does not start the system. To get it running, you must call
+    /// the [start](Self::start) method.
+    ///
+    /// * `connection`: D-Bus connection to publish the network tree.
+    /// * `adapter`: networking configuration adapter.
+    pub fn new(connection: zbus::Connection, adapter: T) -> Self {
         Self {
-            state: NetworkState::default(),
-            actions_tx,
-            actions_rx,
-            tree: Arc::new(Mutex::new(tree)),
+            connection,
             adapter,
         }
     }
 
-    /// Writes the network configuration.
-    pub async fn write(&mut self) -> Result<(), NetworkAdapterError> {
-        self.adapter.write(&self.state).await?;
-        self.state = self.adapter.read(StateConfig::default()).await?;
-        Ok(())
-    }
+    /// Starts the network configuration service and returns a channel for communication.
+    ///
+    /// This function starts the server (using [NetworkSystemServer]) on a separate
+    /// task. All the communication is performed through the returned channel by
+    /// issuing [actions](crate::network::Action).
+    pub async fn start(self) -> Result<UnboundedSender<Action>, ServiceError> {
+        let mut state = self.adapter.read(StateConfig::default()).await.unwrap();
+        let (actions_tx, actions_rx) = mpsc::unbounded_channel();
+        let mut tree = Tree::new(self.connection, actions_tx.clone());
+        tree.set_connections(&mut state.connections).await?;
+        tree.set_devices(&state.devices).await?;
 
-    /// Returns a clone of the
-    /// [UnboundedSender](https://docs.rs/tokio/latest/tokio/sync/mpsc/struct.UnboundedSender.html)
-    /// to execute [actions](Action).
-    pub fn actions_tx(&self) -> UnboundedSender<Action> {
-        self.actions_tx.clone()
-    }
+        tokio::spawn(async move {
+            let mut server = NetworkSystemServer {
+                state,
+                input: actions_rx,
+                adapter: self.adapter,
+                tree: Arc::new(Mutex::new(tree)),
+            };
 
-    /// Populates the D-Bus tree with the known devices and connections.
-    pub async fn setup(&mut self) -> Result<(), Box<dyn Error>> {
-        self.state = self.adapter.read(StateConfig::default()).await?;
-        let mut tree = self.tree.lock().await;
-        tree.set_connections(&mut self.state.connections).await?;
-        tree.set_devices(&self.state.devices).await?;
-        Ok(())
+            server.listen().await;
+        });
+
+        Ok(actions_tx)
     }
+}
+
+struct NetworkSystemServer<T: Adapter> {
+    state: NetworkState,
+    input: UnboundedReceiver<Action>,
+    adapter: T,
+    tree: Arc<Mutex<Tree>>,
+}
 
+impl<T: Adapter> NetworkSystemServer<T> {
     /// Process incoming actions.
     ///
     /// This function is expected to be executed on a separate thread.
     pub async fn listen(&mut self) {
-        while let Some(action) = self.actions_rx.recv().await {
+        while let Some(action) = self.input.recv().await {
             if let Err(error) = self.dispatch_action(action).await {
                 eprintln!("Could not process the action: {}", error);
             }
@@ -245,4 +282,11 @@ impl<T: Adapter> NetworkSystem<T> {
         let tree = self.tree.lock().await;
         tree.connection_path(conn.uuid)
     }
+
+    /// Writes the network configuration.
+    pub async fn write(&mut self) -> Result<(), NetworkAdapterError> {
+        self.adapter.write(&self.state).await?;
+        self.state = self.adapter.read(StateConfig::default()).await?;
+        Ok(())
+    }
 }
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 052070cac0..c27c0d0681 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -60,20 +60,9 @@ pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
     dbus: zbus::Connection,
     adapter: T,
 ) -> Result<Router, ServiceError> {
-    let mut network = NetworkSystem::new(dbus.clone(), adapter);
-
-    let state = NetworkState {
-        actions: network.actions_tx(),
-    };
-
-    tokio::spawn(async move {
-        network
-            .setup()
-            .await
-            .expect("Could not set up the D-Bus tree");
-
-        network.listen().await;
-    });
+    let network = NetworkSystem::new(dbus.clone(), adapter);
+    let actions = network.start().await?;
+    let state = NetworkState { actions };
 
     Ok(Router::new()
         .route("/state", get(general_state).put(update_general_state))

From f1610110c3ba71673651412ab8120fcacd4d0610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Sat, 13 Apr 2024 10:09:42 +0100
Subject: [PATCH 242/324] Add a NetworkSystemClient for communication

---
 rust/agama-server/src/network/system.rs | 75 +++++++++++++++++++++----
 1 file changed, 63 insertions(+), 12 deletions(-)

diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 6d2371c3eb..b687a44a0e 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -1,9 +1,18 @@
-use super::{error::NetworkStateError, model::StateConfig, NetworkAdapterError};
-use crate::network::{dbus::Tree, model::Connection, Action, Adapter, NetworkState};
+use super::{
+    error::NetworkStateError,
+    model::{Device, StateConfig},
+    NetworkAdapterError,
+};
+use crate::network::{
+    dbus::Tree,
+    model::{Connection, GeneralState},
+    Action, Adapter, NetworkState,
+};
 use agama_lib::{error::ServiceError, network::types::DeviceType};
 use std::{error::Error, sync::Arc};
 use tokio::sync::{
-    mpsc::{self, UnboundedReceiver, UnboundedSender},
+    mpsc::{self, error::SendError, UnboundedReceiver, UnboundedSender},
+    oneshot::{self, error::RecvError},
     Mutex,
 };
 use uuid::Uuid;
@@ -29,14 +38,12 @@ use zbus::zvariant::OwnedObjectPath;
 /// let network = NetworkSystem::new(dbus, adapter);
 ///
 /// // Start the networking service and get the channel for communication.
-/// let actions = network.start()
+/// let client = network.start()
 ///     .await
 ///     .expect("Could not start the networking configuration system.");
 ///
 /// // Perform some action, like getting the list of devices.
-/// let (tx, rx) = oneshot::channel();
-/// actions.send(Action::GetDevices(tx)).unwrap();
-/// let devices = rx.await.unwrap();
+/// let devices = client.get_devices().await.unwrap();
 /// # });
 /// ```
 pub struct NetworkSystem<T: Adapter + Send> {
@@ -59,12 +66,11 @@ impl<T: Adapter + Send + 'static> NetworkSystem<T> {
         }
     }
 
-    /// Starts the network configuration service and returns a channel for communication.
+    /// Starts the network configuration service and returns a client for communication purposes.
     ///
     /// This function starts the server (using [NetworkSystemServer]) on a separate
-    /// task. All the communication is performed through the returned channel by
-    /// issuing [actions](crate::network::Action).
-    pub async fn start(self) -> Result<UnboundedSender<Action>, ServiceError> {
+    /// task. All the communication is performed through the returned [NetworkSystemClient].
+    pub async fn start(self) -> Result<NetworkSystemClient, ServiceError> {
         let mut state = self.adapter.read(StateConfig::default()).await.unwrap();
         let (actions_tx, actions_rx) = mpsc::unbounded_channel();
         let mut tree = Tree::new(self.connection, actions_tx.clone());
@@ -82,7 +88,52 @@ impl<T: Adapter + Send + 'static> NetworkSystem<T> {
             server.listen().await;
         });
 
-        Ok(actions_tx)
+        Ok(NetworkSystemClient {
+            actions: actions_tx,
+        })
+    }
+}
+
+/// Client to interact with the NetworkSystem once it is running.
+///
+/// It hides the details of the message-passing behind a convenient API.
+#[derive(Clone)]
+pub struct NetworkSystemClient {
+    /// Channel to talk to the server. This field is temporarily public, but it will
+    /// be set to private once web interface is adapted.
+    pub actions: UnboundedSender<Action>,
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum NetworkSystemError {
+    #[error("Network state error: {0}")]
+    StateError(#[from] NetworkStateError),
+    #[error("Could not talk to the network system: {0}")]
+    InputError(#[from] SendError<Action>),
+    #[error("Could not read an answer from the network system: {0}")]
+    OutputError(#[from] RecvError),
+}
+
+// TODO: add a NetworkSystemError type
+impl NetworkSystemClient {
+    /// Returns the general state.
+    pub async fn get_state(&self) -> Result<GeneralState, NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions.send(Action::GetGeneralState(tx))?;
+        Ok(rx.await?)
+    }
+
+    /// Updates the network general state.
+    pub fn update_state(&self, state: GeneralState) -> Result<(), NetworkSystemError> {
+        self.actions.send(Action::UpdateGeneralState(state))?;
+        Ok(())
+    }
+
+    /// Returns the collection of network devices.
+    pub async fn get_devices(&self) -> Result<Vec<Device>, NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions.send(Action::GetDevices(tx))?;
+        Ok(rx.await?)
     }
 }
 

From f0dddd19e01b8a6cd77f7c8b2d51a25731fa5c10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Sat, 13 Apr 2024 10:10:39 +0100
Subject: [PATCH 243/324] Partially adapt the network web API to the new
 NetworkSystem API

---
 rust/agama-server/src/network/web.rs | 61 +++++++++++++++++-----------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index c27c0d0681..7b78df747c 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -12,6 +12,7 @@ use axum::{
 use super::{
     error::NetworkStateError,
     model::{AccessPoint, GeneralState},
+    system::{NetworkSystemClient, NetworkSystemError},
     Action, Adapter,
 };
 
@@ -21,7 +22,7 @@ use agama_lib::network::settings::NetworkConnection;
 
 use serde_json::json;
 use thiserror::Error;
-use tokio::sync::{mpsc::UnboundedSender, oneshot};
+use tokio::sync::oneshot;
 
 #[derive(Error, Debug)]
 pub enum NetworkError {
@@ -35,8 +36,11 @@ pub enum NetworkError {
     CannotUpdate(String),
     #[error("Cannot apply configuration")]
     CannotApplyConfig,
+    // TODO: to be removed after adapting to the NetworkSystemServer API
     #[error("Network state error: {0}")]
     Error(#[from] NetworkStateError),
+    #[error("Network system error: {0}")]
+    SystemError(#[from] NetworkSystemError),
 }
 
 impl IntoResponse for NetworkError {
@@ -50,7 +54,7 @@ impl IntoResponse for NetworkError {
 
 #[derive(Clone)]
 struct NetworkState {
-    actions: UnboundedSender<Action>,
+    network: NetworkSystemClient,
 }
 
 /// Sets up and returns the axum service for the network module.
@@ -61,8 +65,8 @@ pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
     adapter: T,
 ) -> Result<Router, ServiceError> {
     let network = NetworkSystem::new(dbus.clone(), adapter);
-    let actions = network.start().await?;
-    let state = NetworkState { actions };
+    let client = network.start().await?;
+    let state = NetworkState { network: client };
 
     Ok(Router::new()
         .route("/state", get(general_state).put(update_general_state))
@@ -84,7 +88,11 @@ pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
 ))]
 async fn general_state(State(state): State<NetworkState>) -> Json<GeneralState> {
     let (tx, rx) = oneshot::channel();
-    state.actions.send(Action::GetGeneralState(tx)).unwrap();
+    state
+        .network
+        .actions
+        .send(Action::GetGeneralState(tx))
+        .unwrap();
 
     let state = rx.await.unwrap();
 
@@ -98,15 +106,8 @@ async fn update_general_state(
     State(state): State<NetworkState>,
     Json(value): Json<GeneralState>,
 ) -> Result<Json<GeneralState>, NetworkError> {
-    state
-        .actions
-        .send(Action::UpdateGeneralState(value.clone()))
-        .unwrap();
-
-    let (tx, rx) = oneshot::channel();
-    state.actions.send(Action::GetGeneralState(tx)).unwrap();
-    let state = rx.await.unwrap();
-
+    state.network.update_state(value)?;
+    let state = state.network.get_state().await?;
     Ok(Json(state))
 }
 
@@ -115,10 +116,14 @@ async fn update_general_state(
 ))]
 async fn wifi_networks(State(state): State<NetworkState>) -> Json<Vec<AccessPoint>> {
     let (tx, rx) = oneshot::channel();
-    state.actions.send(Action::RefreshScan(tx)).unwrap();
+    state.network.actions.send(Action::RefreshScan(tx)).unwrap();
     let _ = rx.await.unwrap();
     let (tx, rx) = oneshot::channel();
-    state.actions.send(Action::GetAccessPoints(tx)).unwrap();
+    state
+        .network
+        .actions
+        .send(Action::GetAccessPoints(tx))
+        .unwrap();
 
     let access_points = rx.await.unwrap();
 
@@ -136,11 +141,8 @@ async fn wifi_networks(State(state): State<NetworkState>) -> Json<Vec<AccessPoin
 #[utoipa::path(get, path = "/network/devices", responses(
   (status = 200, description = "List of devices", body = Vec<Device>)
 ))]
-async fn devices(State(state): State<NetworkState>) -> Json<Vec<Device>> {
-    let (tx, rx) = oneshot::channel();
-    state.actions.send(Action::GetDevices(tx)).unwrap();
-
-    Json(rx.await.unwrap())
+async fn devices(State(state): State<NetworkState>) -> Result<Json<Vec<Device>>, NetworkError> {
+    Ok(Json(state.network.get_devices().await?))
 }
 
 #[utoipa::path(get, path = "/network/connections", responses(
@@ -148,7 +150,11 @@ async fn devices(State(state): State<NetworkState>) -> Json<Vec<Device>> {
 ))]
 async fn connections(State(state): State<NetworkState>) -> Json<Vec<NetworkConnection>> {
     let (tx, rx) = oneshot::channel();
-    state.actions.send(Action::GetConnections(tx)).unwrap();
+    state
+        .network
+        .actions
+        .send(Action::GetConnections(tx))
+        .unwrap();
     let connections = rx.await.unwrap();
     let connections = connections
         .iter()
@@ -171,6 +177,7 @@ async fn add_connection(
     let id = conn.id.clone();
 
     state
+        .network
         .actions
         .send(Action::NewConnection(Box::new(conn.clone()), tx))
         .unwrap();
@@ -178,6 +185,7 @@ async fn add_connection(
 
     let (tx, rx) = oneshot::channel();
     state
+        .network
         .actions
         .send(Action::GetConnection(id.clone(), tx))
         .unwrap();
@@ -197,6 +205,7 @@ async fn delete_connection(
 ) -> impl IntoResponse {
     let (tx, rx) = oneshot::channel();
     state
+        .network
         .actions
         .send(Action::RemoveConnection(id, tx))
         .unwrap();
@@ -217,6 +226,7 @@ async fn update_connection(
 ) -> Result<Json<()>, NetworkError> {
     let (tx, rx) = oneshot::channel();
     state
+        .network
         .actions
         .send(Action::GetConnection(id.clone(), tx))
         .unwrap();
@@ -231,6 +241,7 @@ async fn update_connection(
 
     let (tx, rx) = oneshot::channel();
     state
+        .network
         .actions
         .send(Action::UpdateConnection(Box::new(conn), tx))
         .unwrap();
@@ -247,6 +258,7 @@ async fn connect(
 ) -> Result<Json<()>, NetworkError> {
     let (tx, rx) = oneshot::channel();
     state
+        .network
         .actions
         .send(Action::GetConnection(id.clone(), tx))
         .unwrap();
@@ -258,6 +270,7 @@ async fn connect(
 
     let (tx, rx) = oneshot::channel();
     state
+        .network
         .actions
         .send(Action::UpdateConnection(Box::new(conn), tx))
         .unwrap();
@@ -278,6 +291,7 @@ async fn disconnect(
 ) -> Result<Json<()>, NetworkError> {
     let (tx, rx) = oneshot::channel();
     state
+        .network
         .actions
         .send(Action::GetConnection(id.clone(), tx))
         .unwrap();
@@ -290,6 +304,7 @@ async fn disconnect(
 
     let (tx, rx) = oneshot::channel();
     state
+        .network
         .actions
         .send(Action::UpdateConnection(Box::new(current_conn), tx))
         .unwrap();
@@ -306,7 +321,7 @@ async fn disconnect(
 ))]
 async fn apply(State(state): State<NetworkState>) -> Result<Json<()>, NetworkError> {
     let (tx, rx) = oneshot::channel();
-    state.actions.send(Action::Apply(tx)).unwrap();
+    state.network.actions.send(Action::Apply(tx)).unwrap();
 
     rx.await
         .unwrap()

From 8dcf81695a6dbad9cde187d2b404da1a0bf76cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Sat, 13 Apr 2024 10:49:17 +0100
Subject: [PATCH 244/324] Handle errors reading the network configuration

---
 rust/agama-server/src/network/system.rs | 31 ++++++++++++++-----------
 rust/agama-server/src/network/web.rs    | 11 ++++++---
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index b687a44a0e..d679e59eae 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -18,6 +18,20 @@ use tokio::sync::{
 use uuid::Uuid;
 use zbus::zvariant::OwnedObjectPath;
 
+#[derive(thiserror::Error, Debug)]
+pub enum NetworkSystemError {
+    #[error("Network state error: {0}")]
+    Stater(#[from] NetworkStateError),
+    #[error("Could not talk to the network system: {0}")]
+    InputError(#[from] SendError<Action>),
+    #[error("Could not read an answer from the network system: {0}")]
+    OutputError(#[from] RecvError),
+    #[error("D-Bus service error: {0}")]
+    ServiceError(#[from] ServiceError),
+    #[error("Network backend error: {0}")]
+    AdapterError(#[from] NetworkAdapterError),
+}
+
 /// Represents the network configuration service.
 ///
 /// It offers an API to start the service and interact with it by using message
@@ -43,7 +57,8 @@ use zbus::zvariant::OwnedObjectPath;
 ///     .expect("Could not start the networking configuration system.");
 ///
 /// // Perform some action, like getting the list of devices.
-/// let devices = client.get_devices().await.unwrap();
+/// let devices = client.get_devices().await
+///     .expect("Could not get the list of devices.");
 /// # });
 /// ```
 pub struct NetworkSystem<T: Adapter + Send> {
@@ -70,8 +85,8 @@ impl<T: Adapter + Send + 'static> NetworkSystem<T> {
     ///
     /// This function starts the server (using [NetworkSystemServer]) on a separate
     /// task. All the communication is performed through the returned [NetworkSystemClient].
-    pub async fn start(self) -> Result<NetworkSystemClient, ServiceError> {
-        let mut state = self.adapter.read(StateConfig::default()).await.unwrap();
+    pub async fn start(self) -> Result<NetworkSystemClient, NetworkSystemError> {
+        let mut state = self.adapter.read(StateConfig::default()).await?;
         let (actions_tx, actions_rx) = mpsc::unbounded_channel();
         let mut tree = Tree::new(self.connection, actions_tx.clone());
         tree.set_connections(&mut state.connections).await?;
@@ -104,16 +119,6 @@ pub struct NetworkSystemClient {
     pub actions: UnboundedSender<Action>,
 }
 
-#[derive(thiserror::Error, Debug)]
-pub enum NetworkSystemError {
-    #[error("Network state error: {0}")]
-    StateError(#[from] NetworkStateError),
-    #[error("Could not talk to the network system: {0}")]
-    InputError(#[from] SendError<Action>),
-    #[error("Could not read an answer from the network system: {0}")]
-    OutputError(#[from] RecvError),
-}
-
 // TODO: add a NetworkSystemError type
 impl NetworkSystemClient {
     /// Returns the general state.
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 7b78df747c..78e034ea6b 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -1,6 +1,7 @@
 //! This module implements the web API for the network module.
 
 use crate::error::Error;
+use anyhow::Context;
 use axum::{
     extract::{Path, State},
     http::StatusCode,
@@ -17,8 +18,7 @@ use super::{
 };
 
 use crate::network::{model::Connection, model::Device, NetworkSystem};
-use agama_lib::error::ServiceError;
-use agama_lib::network::settings::NetworkConnection;
+use agama_lib::{error::ServiceError, network::settings::NetworkConnection};
 
 use serde_json::json;
 use thiserror::Error;
@@ -65,7 +65,12 @@ pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
     adapter: T,
 ) -> Result<Router, ServiceError> {
     let network = NetworkSystem::new(dbus.clone(), adapter);
-    let client = network.start().await?;
+    // FIXME: we are somehow abusing ServiceError. The HTTP/JSON API should have its own
+    // error type.
+    let client = network
+        .start()
+        .await
+        .context("Could not start the network configuration service.")?;
     let state = NetworkState { network: client };
 
     Ok(Router::new()

From d54eb8ea10a0a04f87465371c0ed57ffc7cccd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 15 Apr 2024 07:21:41 +0100
Subject: [PATCH 245/324] Adapt the remaining web API to the new NetworkSystem

---
 rust/agama-server/src/network/system.rs |  67 +++++++++++-
 rust/agama-server/src/network/web.rs    | 134 +++++++-----------------
 2 files changed, 102 insertions(+), 99 deletions(-)

diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index d679e59eae..6e93285fd2 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -8,7 +8,10 @@ use crate::network::{
     model::{Connection, GeneralState},
     Action, Adapter, NetworkState,
 };
-use agama_lib::{error::ServiceError, network::types::DeviceType};
+use agama_lib::{
+    error::ServiceError,
+    network::{settings::NetworkConnection, types::DeviceType},
+};
 use std::{error::Error, sync::Arc};
 use tokio::sync::{
     mpsc::{self, error::SendError, UnboundedReceiver, UnboundedSender},
@@ -21,7 +24,7 @@ use zbus::zvariant::OwnedObjectPath;
 #[derive(thiserror::Error, Debug)]
 pub enum NetworkSystemError {
     #[error("Network state error: {0}")]
-    Stater(#[from] NetworkStateError),
+    State(#[from] NetworkStateError),
     #[error("Could not talk to the network system: {0}")]
     InputError(#[from] SendError<Action>),
     #[error("Could not read an answer from the network system: {0}")]
@@ -140,6 +143,66 @@ impl NetworkSystemClient {
         self.actions.send(Action::GetDevices(tx))?;
         Ok(rx.await?)
     }
+
+    /// Returns the collection of network connections.
+    pub async fn get_connections(&self) -> Result<Vec<Connection>, NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions.send(Action::GetConnections(tx))?;
+        Ok(rx.await?)
+    }
+
+    /// Adds a new connection.
+    pub async fn add_connection(&self, connection: Connection) -> Result<(), NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions
+            .send(Action::NewConnection(Box::new(connection.clone()), tx))?;
+        let result = rx.await?;
+        Ok(result?)
+    }
+
+    /// Returns the connection with the given ID.
+    ///
+    /// * `id`: Connection ID.
+    pub async fn get_connection(&self, id: &str) -> Result<Option<Connection>, NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions
+            .send(Action::GetConnection(id.to_string(), tx))?;
+        let result = rx.await?;
+        Ok(result)
+    }
+
+    /// Updates the connection.
+    ///
+    /// * `connection`: Updated connection.
+    pub async fn update_connection(
+        &self,
+        connection: Connection,
+    ) -> Result<(), NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions
+            .send(Action::UpdateConnection(Box::new(connection), tx))?;
+        let result = rx.await?;
+        Ok(result?)
+    }
+
+    /// Removes the connection with the given ID.
+    ///
+    /// * `id`: Connection ID.
+    pub async fn remove_connection(&self, id: &str) -> Result<(), NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions
+            .send(Action::RemoveConnection(id.to_string(), tx))?;
+        let result = rx.await?;
+        Ok(result?)
+    }
+
+    /// Applies the network configuration.
+    pub async fn apply(&self) -> Result<(), NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions.send(Action::Apply(tx))?;
+        let result = rx.await?;
+        Ok(result?)
+    }
 }
 
 struct NetworkSystemServer<T: Adapter> {
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 78e034ea6b..ee2589cf53 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -153,20 +153,15 @@ async fn devices(State(state): State<NetworkState>) -> Result<Json<Vec<Device>>,
 #[utoipa::path(get, path = "/network/connections", responses(
   (status = 200, description = "List of known connections", body = Vec<NetworkConnection>)
 ))]
-async fn connections(State(state): State<NetworkState>) -> Json<Vec<NetworkConnection>> {
-    let (tx, rx) = oneshot::channel();
-    state
-        .network
-        .actions
-        .send(Action::GetConnections(tx))
-        .unwrap();
-    let connections = rx.await.unwrap();
+async fn connections(
+    State(state): State<NetworkState>,
+) -> Result<Json<Vec<NetworkConnection>>, NetworkError> {
+    let connections = state.network.get_connections().await?;
     let connections = connections
         .iter()
         .map(|c| NetworkConnection::try_from(c.clone()).unwrap())
         .collect();
-
-    Json(connections)
+    Ok(Json(connections))
 }
 
 #[utoipa::path(post, path = "/network/connections", responses(
@@ -176,26 +171,11 @@ async fn add_connection(
     State(state): State<NetworkState>,
     Json(conn): Json<NetworkConnection>,
 ) -> Result<Json<Connection>, NetworkError> {
-    let (tx, rx) = oneshot::channel();
-
     let conn = Connection::try_from(conn)?;
     let id = conn.id.clone();
 
-    state
-        .network
-        .actions
-        .send(Action::NewConnection(Box::new(conn.clone()), tx))
-        .unwrap();
-    let _ = rx.await.unwrap();
-
-    let (tx, rx) = oneshot::channel();
-    state
-        .network
-        .actions
-        .send(Action::GetConnection(id.clone(), tx))
-        .unwrap();
-
-    match rx.await.unwrap() {
+    state.network.add_connection(conn).await?;
+    match state.network.get_connection(&id).await? {
         None => Err(NetworkError::CannotAddConnection(id.clone())),
         Some(conn) => Ok(Json(conn)),
     }
@@ -208,13 +188,7 @@ async fn delete_connection(
     State(state): State<NetworkState>,
     Path(id): Path<String>,
 ) -> impl IntoResponse {
-    let (tx, rx) = oneshot::channel();
-    state
-        .network
-        .actions
-        .send(Action::RemoveConnection(id, tx))
-        .unwrap();
-    if rx.await.unwrap().is_ok() {
+    if state.network.remove_connection(&id).await.is_ok() {
         StatusCode::NO_CONTENT
     } else {
         StatusCode::NOT_FOUND
@@ -222,115 +196,81 @@ async fn delete_connection(
 }
 
 #[utoipa::path(put, path = "/network/connections/:id", responses(
-  (status = 200, description = "Update connection", body = Connection)
+  (status = 204, description = "Update connection", body = Connection)
 ))]
 async fn update_connection(
     State(state): State<NetworkState>,
     Path(id): Path<String>,
     Json(conn): Json<NetworkConnection>,
-) -> Result<Json<()>, NetworkError> {
-    let (tx, rx) = oneshot::channel();
-    state
+) -> Result<impl IntoResponse, NetworkError> {
+    let orig_conn = state
         .network
-        .actions
-        .send(Action::GetConnection(id.clone(), tx))
-        .unwrap();
-    let orig_conn = rx.await.unwrap();
+        .get_connection(&id)
+        .await?
+        .ok_or_else(|| NetworkError::UnknownConnection(id.clone()))?;
     let mut conn = Connection::try_from(conn)?;
-    let orig_conn = orig_conn.ok_or_else(|| NetworkError::UnknownConnection(id.clone()))?;
     if orig_conn.id != id {
+        // FIXME: why?
         return Err(NetworkError::UnknownConnection(id));
     } else {
         conn.uuid = orig_conn.uuid;
     }
 
-    let (tx, rx) = oneshot::channel();
-    state
-        .network
-        .actions
-        .send(Action::UpdateConnection(Box::new(conn), tx))
-        .unwrap();
-
-    Ok(Json(rx.await.unwrap()?))
+    state.network.update_connection(conn).await?;
+    Ok(StatusCode::NO_CONTENT)
 }
 
 #[utoipa::path(get, path = "/network/connections/:id/connect", responses(
-  (status = 200, description = "Connect to the given connection", body = String)
+  (status = 204, description = "Connect to the given connection", body = String)
 ))]
 async fn connect(
     State(state): State<NetworkState>,
     Path(id): Path<String>,
-) -> Result<Json<()>, NetworkError> {
-    let (tx, rx) = oneshot::channel();
-    state
-        .network
-        .actions
-        .send(Action::GetConnection(id.clone(), tx))
-        .unwrap();
-
-    let Some(mut conn) = rx.await.unwrap() else {
+) -> Result<impl IntoResponse, NetworkError> {
+    let Some(mut conn) = state.network.get_connection(&id).await? else {
         return Err(NetworkError::UnknownConnection(id));
     };
     conn.set_up();
 
-    let (tx, rx) = oneshot::channel();
     state
         .network
-        .actions
-        .send(Action::UpdateConnection(Box::new(conn), tx))
-        .unwrap();
-
-    rx.await
-        .unwrap()
+        .update_connection(conn)
+        .await
         .map_err(|_| NetworkError::CannotApplyConfig)?;
 
-    Ok(Json(()))
+    Ok(StatusCode::NO_CONTENT)
 }
 
 #[utoipa::path(get, path = "/network/connections/:id/disconnect", responses(
-  (status = 200, description = "Connect to the given connection", body = String)
+  (status = 204, description = "Connect to the given connection", body = String)
 ))]
 async fn disconnect(
     State(state): State<NetworkState>,
     Path(id): Path<String>,
-) -> Result<Json<()>, NetworkError> {
-    let (tx, rx) = oneshot::channel();
-    state
-        .network
-        .actions
-        .send(Action::GetConnection(id.clone(), tx))
-        .unwrap();
-
-    let Some(mut current_conn) = rx.await.unwrap() else {
+) -> Result<impl IntoResponse, NetworkError> {
+    let Some(mut conn) = state.network.get_connection(&id).await? else {
         return Err(NetworkError::UnknownConnection(id));
     };
+    conn.set_down();
 
-    current_conn.set_down();
-
-    let (tx, rx) = oneshot::channel();
     state
         .network
-        .actions
-        .send(Action::UpdateConnection(Box::new(current_conn), tx))
-        .unwrap();
-
-    rx.await
-        .unwrap()
+        .update_connection(conn)
+        .await
         .map_err(|_| NetworkError::CannotApplyConfig)?;
 
-    Ok(Json(()))
+    Ok(StatusCode::NO_CONTENT)
 }
 
 #[utoipa::path(put, path = "/network/system/apply", responses(
-  (status = 200, description = "Apply configuration")
+  (status = 204, description = "Apply configuration")
 ))]
-async fn apply(State(state): State<NetworkState>) -> Result<Json<()>, NetworkError> {
-    let (tx, rx) = oneshot::channel();
-    state.network.actions.send(Action::Apply(tx)).unwrap();
-
-    rx.await
-        .unwrap()
+async fn apply(State(state): State<NetworkState>) -> Result<impl IntoResponse, NetworkError> {
+    state
+        .network
+        .apply()
+        .await
         .map_err(|_| NetworkError::CannotApplyConfig)?;
 
-    Ok(Json(()))
+    Ok(StatusCode::NO_CONTENT)
 }

From fe95106d0d635b4487b691211e0636c185f81a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 15 Apr 2024 09:49:53 +0100
Subject: [PATCH 246/324] Adapt some missing web API methods to the new
 NetworkSystem

---
 rust/agama-server/src/network/system.rs | 26 ++++++++++++------
 rust/agama-server/src/network/web.rs    | 36 ++++++++-----------------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 6e93285fd2..28de1eed73 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -1,6 +1,6 @@
 use super::{
     error::NetworkStateError,
-    model::{Device, StateConfig},
+    model::{AccessPoint, Device, StateConfig},
     NetworkAdapterError,
 };
 use crate::network::{
@@ -8,10 +8,7 @@ use crate::network::{
     model::{Connection, GeneralState},
     Action, Adapter, NetworkState,
 };
-use agama_lib::{
-    error::ServiceError,
-    network::{settings::NetworkConnection, types::DeviceType},
-};
+use agama_lib::{error::ServiceError, network::types::DeviceType};
 use std::{error::Error, sync::Arc};
 use tokio::sync::{
     mpsc::{self, error::SendError, UnboundedReceiver, UnboundedSender},
@@ -117,9 +114,7 @@ impl<T: Adapter + Send + 'static> NetworkSystem<T> {
 /// It hides the details of the message-passing behind a convenient API.
 #[derive(Clone)]
 pub struct NetworkSystemClient {
-    /// Channel to talk to the server. This field is temporarily public, but it will
-    /// be set to private once web interface is adapted.
-    pub actions: UnboundedSender<Action>,
+    actions: UnboundedSender<Action>,
 }
 
 // TODO: add a NetworkSystemError type
@@ -203,6 +198,21 @@ impl NetworkSystemClient {
         let result = rx.await?;
         Ok(result?)
     }
+
+    /// Returns the collection of access points.
+    pub async fn get_access_points(&self) -> Result<Vec<AccessPoint>, NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions.send(Action::GetAccessPoints(tx))?;
+        let access_points = rx.await?;
+        Ok(access_points)
+    }
+
+    pub async fn wifi_scan(&self) -> Result<(), NetworkSystemError> {
+        let (tx, rx) = oneshot::channel();
+        self.actions.send(Action::RefreshScan(tx)).unwrap();
+        let result = rx.await?;
+        Ok(result?)
+    }
 }
 
 struct NetworkSystemServer<T: Adapter> {
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index ee2589cf53..cfec6fa602 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -91,17 +91,11 @@ pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
 #[utoipa::path(get, path = "/network/state", responses(
   (status = 200, description = "Get general network config", body = GenereralState)
 ))]
-async fn general_state(State(state): State<NetworkState>) -> Json<GeneralState> {
-    let (tx, rx) = oneshot::channel();
-    state
-        .network
-        .actions
-        .send(Action::GetGeneralState(tx))
-        .unwrap();
-
-    let state = rx.await.unwrap();
-
-    Json(state)
+async fn general_state(
+    State(state): State<NetworkState>,
+) -> Result<Json<GeneralState>, NetworkError> {
+    let general_state = state.network.get_state().await?;
+    Ok(Json(general_state))
 }
 
 #[utoipa::path(put, path = "/network/state", responses(
@@ -119,28 +113,20 @@ async fn update_general_state(
 #[utoipa::path(get, path = "/network/wifi", responses(
   (status = 200, description = "List of wireless networks", body = Vec<AccessPoint>)
 ))]
-async fn wifi_networks(State(state): State<NetworkState>) -> Json<Vec<AccessPoint>> {
-    let (tx, rx) = oneshot::channel();
-    state.network.actions.send(Action::RefreshScan(tx)).unwrap();
-    let _ = rx.await.unwrap();
-    let (tx, rx) = oneshot::channel();
-    state
-        .network
-        .actions
-        .send(Action::GetAccessPoints(tx))
-        .unwrap();
-
-    let access_points = rx.await.unwrap();
+async fn wifi_networks(
+    State(state): State<NetworkState>,
+) -> Result<Json<Vec<AccessPoint>>, NetworkError> {
+    state.network.wifi_scan().await?;
+    let access_points = state.network.get_access_points().await?;
 
     let mut networks = vec![];
-
     for ap in access_points {
         if !ap.ssid.to_string().is_empty() {
             networks.push(ap);
         }
     }
 
-    Json(networks)
+    Ok(Json(networks))
 }
 
 #[utoipa::path(get, path = "/network/devices", responses(

From 0edf191658cff2ac0b4e4886738d58e3024a849e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 15 Apr 2024 09:50:33 +0100
Subject: [PATCH 247/324] Update from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Knut Alejandro Anderssen González <kanderssen@suse.de>
---
 rust/agama-server/src/network/system.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 28de1eed73..e5ec6e4780 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -51,7 +51,7 @@ pub enum NetworkSystemError {
 ///     .expect("Could not connect to Agama's D-Bus server.");
 /// let network = NetworkSystem::new(dbus, adapter);
 ///
-/// // Start the networking service and get the channel for communication.
+/// // Start the networking service and get the client for communication.
 /// let client = network.start()
 ///     .await
 ///     .expect("Could not start the networking configuration system.");

From 06c6c35fa9c9ad177227b8019c934d3552eaaefb Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Mon, 15 Apr 2024 13:07:59 +0200
Subject: [PATCH 248/324] fix questions in UI

---
 web/src/Main.jsx | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/web/src/Main.jsx b/web/src/Main.jsx
index 92be6efc29..da74af2da1 100644
--- a/web/src/Main.jsx
+++ b/web/src/Main.jsx
@@ -21,17 +21,15 @@
 
 import React from "react";
 import { Outlet } from "react-router-dom";
-// import { Questions } from "~/components/questions";
+import { Questions } from "~/components/questions";
 
 function Main() {
-  // FIXME: adapt to the new API
-  // return (
-  //   <>
-  //     <Questions />
-  //     <Outlet />
-  //   </>
-  // );
-  return <Outlet />;
+  return (
+    <>
+      <Questions />
+      <Outlet />
+    </>
+  );
 }
 
 export default Main;

From f8b4ca5ef1f1a6857e6e044e53b65220afbfaca7 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 16 Apr 2024 13:56:46 +0200
Subject: [PATCH 249/324] fixes from manual testing

---
 web/src/client/software.js                 | 10 +++++-----
 web/src/components/product/ProductPage.jsx | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/web/src/client/software.js b/web/src/client/software.js
index 28b02b9272..3377eb4ffc 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -21,12 +21,10 @@
 
 // @ts-check
 
-import DBusClient from "./dbus";
 import { WithIssues, WithProgress, WithStatus } from "./mixins";
 
 const SOFTWARE_SERVICE = "org.opensuse.Agama.Software1";
 const PRODUCT_PATH = "/org/opensuse/Agama/Software1/Product";
-const REGISTRATION_IFACE = "org.opensuse.Agama1.Registration";
 
 /**
  * Enum for the reasons to select a pattern
@@ -281,7 +279,7 @@ class ProductBaseClient {
    * @returns {Promise<ActionResult>}
    */
   async register(code, email = "") {
-    const response = await this.client.post("/software/registration", { code, email });
+    const response = await this.client.post("/software/registration", { key: code, email });
 
     return {
       success: response.ok,
@@ -309,8 +307,10 @@ class ProductBaseClient {
    * @param {(registration: Registration) => void} handler - Callback function.
    */
   onRegistrationChange(handler) {
-    return this.client.onEvent("RegistrationChanged", () => {
-      this.getRegistration().then(handler);
+    return this.client.ws.onEvent((event) => {
+      if (event.type === "RegistrationChanged" || event.type === "RegistrationRequirementChanged") {
+        this.getRegistration().then(handler);
+      }
     });
   }
 }
diff --git a/web/src/components/product/ProductPage.jsx b/web/src/components/product/ProductPage.jsx
index 726bd46ce5..983e6533a6 100644
--- a/web/src/components/product/ProductPage.jsx
+++ b/web/src/components/product/ProductPage.jsx
@@ -43,7 +43,7 @@ import { useProduct } from "~/context/product";
  * @param {function} props.onCancel - Callback to be called when the product selection is canceled.
  */
 const ChangeProductPopup = ({ isOpen = false, onFinish = noop, onCancel = noop }) => {
-  const { manager, software } = useInstallerClient();
+  const { manager, software, product } = useInstallerClient();
   const { products, selectedProduct } = useProduct();
   const [newProductId, setNewProductId] = useState(selectedProduct?.id);
 
@@ -51,7 +51,7 @@ const ChangeProductPopup = ({ isOpen = false, onFinish = noop, onCancel = noop }
     e.preventDefault();
 
     if (newProductId !== selectedProduct?.id) {
-      await software.product.select(newProductId);
+      await product.select(newProductId);
       manager.startProbing();
     }
 
@@ -92,7 +92,7 @@ const RegisterProductPopup = ({
   onFinish = noop,
   onCancel: onCancelProp = noop
 }) => {
-  const { software } = useInstallerClient();
+  const { software, product } = useInstallerClient();
   const { selectedProduct } = useProduct();
   const [isLoading, setIsLoading] = useState(false);
   const [isFormValid, setIsFormValid] = useState(true);
@@ -100,7 +100,7 @@ const RegisterProductPopup = ({
 
   const onSubmit = async ({ code, email }) => {
     setIsLoading(true);
-    const result = await software.product.register(code, email);
+    const result = await product.register(code, email);
     setIsLoading(false);
     if (result.success) {
       software.probe();
@@ -161,14 +161,14 @@ const DeregisterProductPopup = ({
   onFinish = noop,
   onCancel: onCancelProp = noop
 }) => {
-  const { software } = useInstallerClient();
+  const { software, product } = useInstallerClient();
   const { selectedProduct } = useProduct();
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState();
 
   const onAccept = async () => {
     setIsLoading(true);
-    const result = await software.product.deregister();
+    const result = await product.deregister();
     setIsLoading(false);
     if (result.success) {
       software.probe();

From 854ff28fcebbd68d9c3ffb896dff438bb0556cfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 15 Apr 2024 13:48:29 +0100
Subject: [PATCH 250/324] Add support to add/remove network devices

---
 rust/agama-server/src/network/action.rs |  4 ++++
 rust/agama-server/src/network/model.rs  | 19 +++++++++++++++++++
 rust/agama-server/src/network/system.rs |  9 ++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index c8a8981085..deacb7cca8 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -42,6 +42,10 @@ pub enum Action {
     ),
     /// Gets all scanned access points
     GetAccessPoints(Responder<Vec<AccessPoint>>),
+    /// Adds a new device.
+    AddDevice(Device),
+    /// Removes a device.
+    RemoveDevice(String),
     /// Gets a device by its name
     GetDevice(String, Responder<Option<Device>>),
     /// Gets all the existent devices
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 815b825005..efe179c31d 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -158,6 +158,19 @@ impl NetworkState {
         Ok(())
     }
 
+    pub fn add_device(&mut self, device: Device) -> Result<(), NetworkStateError> {
+        self.devices.push(device);
+        Ok(())
+    }
+
+    pub fn remove_device(&mut self, name: &str) -> Result<(), NetworkStateError> {
+        // TODO: return an error if the device does not exist
+        if let Some(position) = self.devices.iter().position(|d| &d.name == name) {
+            self.devices.remove(position);
+        }
+        Ok(())
+    }
+
     /// Sets a controller's ports.
     ///
     /// If the connection is not a controller, returns an error.
@@ -1268,3 +1281,9 @@ impl fmt::Display for InfinibandTransportMode {
         write!(f, "{}", name)
     }
 }
+
+#[derive(Debug, Clone, Serialize)]
+pub enum NetworkChange {
+    DeviceAdded(Device),
+    DeviceRemoved(String),
+}
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index e5ec6e4780..e431131c47 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -1,6 +1,7 @@
 use super::{
     error::NetworkStateError,
-    model::{AccessPoint, Device, StateConfig},
+    model::{AccessPoint, Device, NetworkChange, StateConfig},
+    nm::NetworkManagerWatcher,
     NetworkAdapterError,
 };
 use crate::network::{
@@ -299,6 +300,12 @@ impl<T: Adapter> NetworkSystemServer<T> {
                 let device = self.state.get_device(name.as_str());
                 tx.send(device.cloned()).unwrap();
             }
+            Action::AddDevice(device) => {
+                self.state.add_device(device.clone())?;
+            }
+            Action::RemoveDevice(name) => {
+                self.state.remove_device(&name)?;
+            }
             Action::GetDevicePath(name, tx) => {
                 let tree = self.tree.lock().await;
                 let path = tree.device_path(name.as_str());

From 90c252245cdc63c85ac471c2a565140e37b9b80d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 16 Apr 2024 13:55:40 +0100
Subject: [PATCH 251/324] Add a Watcher trait to listen for network changes

---
 rust/agama-server/src/network/adapter.rs | 37 ++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/rust/agama-server/src/network/adapter.rs b/rust/agama-server/src/network/adapter.rs
index c6002faee7..1e2a226b3d 100644
--- a/rust/agama-server/src/network/adapter.rs
+++ b/rust/agama-server/src/network/adapter.rs
@@ -1,8 +1,8 @@
-use crate::network::model::StateConfig;
-use crate::network::NetworkState;
+use crate::network::{model::StateConfig, Action, NetworkState};
 use agama_lib::error::ServiceError;
 use async_trait::async_trait;
 use thiserror::Error;
+use tokio::sync::mpsc::UnboundedSender;
 
 #[derive(Error, Debug)]
 pub enum NetworkAdapterError {
@@ -14,11 +14,17 @@ pub enum NetworkAdapterError {
     Checkpoint(ServiceError), // only relevant for adapters that implement a checkpoint mechanism
 }
 
-/// A trait for the ability to read/write from/to a network service
+/// A trait for the ability to read/write from/to a network service.
 #[async_trait]
 pub trait Adapter {
     async fn read(&self, config: StateConfig) -> Result<NetworkState, NetworkAdapterError>;
     async fn write(&self, network: &NetworkState) -> Result<(), NetworkAdapterError>;
+    /// Returns the watcher, which is responsible for listening for network changes.
+    ///
+    /// TODO: should we return a Option?
+    fn watcher(&self) -> Box<dyn Watcher + Send> {
+        Box::new(DummyWatcher {})
+    }
 }
 
 impl From<NetworkAdapterError> for zbus::fdo::Error {
@@ -26,3 +32,28 @@ impl From<NetworkAdapterError> for zbus::fdo::Error {
         zbus::fdo::Error::Failed(value.to_string())
     }
 }
+
+#[async_trait]
+/// A trait for the ability to listen for network changes.
+pub trait Watcher {
+    /// Listens for network changes and emit actions to update the state.
+    ///
+    /// * `actions`: channel to emit the actions.
+    async fn run(
+        mut self: Box<Self>,
+        actions: UnboundedSender<Action>,
+    ) -> Result<(), NetworkAdapterError>;
+}
+
+/// A dummy watcher for those adapters that do not implement one.
+struct DummyWatcher {}
+
+#[async_trait]
+impl Watcher for DummyWatcher {
+    async fn run(
+        mut self: Box<Self>,
+        _actions: UnboundedSender<Action>,
+    ) -> Result<(), NetworkAdapterError> {
+        Ok(())
+    }
+}

From 0eb7c0d8d592bd6f9bf51b3bba501e744e8ec876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 16 Apr 2024 13:56:44 +0100
Subject: [PATCH 252/324] Add a PoC of a Watcher for NetworkManager

---
 rust/agama-server/src/network/nm.rs         |   2 +
 rust/agama-server/src/network/nm/adapter.rs |  13 +-
 rust/agama-server/src/network/nm/watcher.rs | 171 ++++++++++++++++++++
 3 files changed, 183 insertions(+), 3 deletions(-)
 create mode 100644 rust/agama-server/src/network/nm/watcher.rs

diff --git a/rust/agama-server/src/network/nm.rs b/rust/agama-server/src/network/nm.rs
index e841e0f407..162d8e4852 100644
--- a/rust/agama-server/src/network/nm.rs
+++ b/rust/agama-server/src/network/nm.rs
@@ -10,6 +10,8 @@ mod dbus;
 mod error;
 mod model;
 mod proxies;
+mod watcher;
 
 pub use adapter::NetworkManagerAdapter;
 pub use client::NetworkManagerClient;
+pub use watcher::NetworkManagerWatcher;
diff --git a/rust/agama-server/src/network/nm/adapter.rs b/rust/agama-server/src/network/nm/adapter.rs
index f8e7d9f1d9..6e5e0dcb40 100644
--- a/rust/agama-server/src/network/nm/adapter.rs
+++ b/rust/agama-server/src/network/nm/adapter.rs
@@ -1,6 +1,7 @@
 use crate::network::{
+    adapter::Watcher,
     model::{Connection, NetworkState, StateConfig},
-    nm::NetworkManagerClient,
+    nm::{NetworkManagerClient, NetworkManagerWatcher},
     Adapter, NetworkAdapterError,
 };
 use agama_lib::error::ServiceError;
@@ -12,13 +13,15 @@ use std::thread;
 /// An adapter for NetworkManager
 pub struct NetworkManagerAdapter<'a> {
     client: NetworkManagerClient<'a>,
+    connection: zbus::Connection,
 }
 
 impl<'a> NetworkManagerAdapter<'a> {
     /// Returns the adapter for system's NetworkManager.
     pub async fn from_system() -> Result<NetworkManagerAdapter<'a>, ServiceError> {
-        let client = NetworkManagerClient::from_system().await?;
-        Ok(Self { client })
+        let connection = zbus::Connection::system().await?;
+        let client = NetworkManagerClient::new(connection.clone()).await?;
+        Ok(Self { client, connection })
     }
 
     /// Determines whether the write operation is supported for a connection
@@ -158,6 +161,10 @@ impl<'a> Adapter for NetworkManagerAdapter<'a> {
             .map_err(NetworkAdapterError::Checkpoint)?;
         Ok(())
     }
+
+    fn watcher(&self) -> Box<dyn Watcher + Send> {
+        Box::new(NetworkManagerWatcher::new(&self.connection))
+    }
 }
 
 /// Returns the connections in the order they should be processed.
diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
new file mode 100644
index 0000000000..2265e4e9ca
--- /dev/null
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -0,0 +1,171 @@
+use crate::network::{
+    adapter::Watcher, model::Device, nm::proxies::DeviceProxy, Action, NetworkAdapterError,
+};
+use agama_lib::{error::ServiceError, network::types::DeviceType};
+use async_trait::async_trait;
+use pin_project::pin_project;
+use std::{
+    collections::HashMap,
+    pin::Pin,
+    task::{Context, Poll},
+};
+use tokio::sync::mpsc::UnboundedSender;
+use tokio_stream::{Stream, StreamExt, StreamMap};
+use zbus::{fdo::ObjectManagerProxy, zvariant::OwnedObjectPath, Connection};
+
+pub struct NetworkManagerWatcher<'a> {
+    connection: zbus::Connection,
+    devices: HashMap<OwnedObjectPath, DeviceProxy<'a>>,
+}
+
+impl<'a> NetworkManagerWatcher<'a> {
+    pub fn new(connection: &zbus::Connection) -> Self {
+        Self {
+            connection: connection.clone(),
+            devices: HashMap::new(),
+        }
+    }
+
+    async fn build_device_proxy(
+        &self,
+        path: OwnedObjectPath,
+    ) -> Result<DeviceProxy<'a>, ServiceError> {
+        let proxy = DeviceProxy::builder(&self.connection)
+            .path(path.clone())?
+            .build()
+            .await?;
+        Ok(proxy)
+    }
+}
+
+#[async_trait]
+impl<'a> Watcher for NetworkManagerWatcher<'a> {
+    async fn run(
+        mut self: Box<Self>,
+        actions: UnboundedSender<Action>,
+    ) -> Result<(), NetworkAdapterError> {
+        let mut stream = AddedAndRemovedStream::new(&self.connection).await.unwrap();
+
+        while let Some(change) = stream.next().await {
+            match change {
+                DeviceChange::DeviceAdded(path) => {
+                    if let Ok(proxy) = self.build_device_proxy(path.clone()).await {
+                        let device = Device {
+                            name: proxy.interface().await.unwrap().to_string(),
+                            type_: DeviceType::Ethernet,
+                            ..Default::default()
+                        };
+                        self.devices.insert(path, proxy);
+                        _ = actions.send(Action::AddDevice(device));
+                        // _ = changes_tx.send(NetworkChange::DeviceAdded(device));
+                    }
+                }
+                DeviceChange::DeviceRemoved(path) => {
+                    if let Some(proxy) = self.devices.remove(&path) {
+                        let name = proxy.interface().await.unwrap().to_string();
+                        // _ = changes_tx.send(NetworkChange::DeviceRemoved(name));
+                        _ = actions.send(Action::RemoveDevice(name));
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+}
+
+#[derive(Debug)]
+pub enum DeviceChange {
+    DeviceAdded(OwnedObjectPath),
+    DeviceRemoved(OwnedObjectPath),
+}
+
+/// Stream of addded and removed devices.
+///
+/// This is a private stream that detects when a device was added or removed
+/// from NetworkManager. It is implemented as a struct because it needs to
+/// keep the ObjectManagerProxy alive.
+#[pin_project]
+struct AddedAndRemovedStream<'a> {
+    #[pin]
+    objects: ObjectManagerProxy<'a>,
+    #[pin]
+    inner: StreamMap<&'static str, Pin<Box<dyn Stream<Item = DeviceChange> + Send>>>,
+}
+
+impl<'a> AddedAndRemovedStream<'a> {
+    pub async fn new(connection: &Connection) -> Result<Self, ServiceError> {
+        let objects = ObjectManagerProxy::builder(&connection)
+            .destination("org.freedesktop.NetworkManager")?
+            .path("/org/freedesktop")?
+            .build()
+            .await?;
+
+        let mut inner = StreamMap::new();
+        inner.insert("added", Self::added_stream(&objects).await?);
+        inner.insert("removed", Self::removed_stream(&objects).await?);
+        Ok(Self { objects, inner })
+    }
+
+    async fn added_stream(
+        objects: &ObjectManagerProxy<'_>,
+    ) -> Result<Pin<Box<dyn Stream<Item = DeviceChange> + Send>>, ServiceError> {
+        let stream = objects
+            .receive_interfaces_added()
+            .await?
+            .filter_map(|added| {
+                let Ok(args) = added.args() else {
+                    return None;
+                };
+
+                let interfaces: Vec<String> = args
+                    .interfaces_and_properties()
+                    .keys()
+                    .into_iter()
+                    .map(|i| i.to_string())
+                    .collect();
+
+                if interfaces.contains(&"org.freedesktop.NetworkManager.Device".to_string()) {
+                    let path = OwnedObjectPath::from(args.object_path().clone());
+                    return Some(DeviceChange::DeviceAdded(path));
+                }
+
+                None
+            });
+        Ok(Box::pin(stream))
+    }
+
+    async fn removed_stream(
+        objects: &ObjectManagerProxy<'_>,
+    ) -> Result<Pin<Box<dyn Stream<Item = DeviceChange> + Send>>, ServiceError> {
+        let stream = objects
+            .receive_interfaces_removed()
+            .await?
+            .filter_map(|removed| {
+                let Ok(args) = removed.args() else {
+                    return None;
+                };
+
+                if args
+                    .interfaces
+                    .contains(&"org.freedesktop.NetworkManager.Device")
+                {
+                    let path = OwnedObjectPath::from(args.object_path().clone());
+                    return Some(DeviceChange::DeviceRemoved(path));
+                }
+                None
+            });
+        Ok(Box::pin(stream))
+    }
+}
+
+impl<'a> Stream for AddedAndRemovedStream<'a> {
+    type Item = DeviceChange;
+
+    fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
+        let pinned = self.project();
+        match pinned.inner.poll_next(cx) {
+            Poll::Ready(Some((_, change))) => Poll::Ready(Some(change)),
+            _ => Poll::Pending,
+        }
+    }
+}

From b1a6b760c97a7ac926490161570700a0a1c58c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 16 Apr 2024 14:00:00 +0100
Subject: [PATCH 253/324] Emit network changes through the WebSocket

---
 rust/agama-server/src/network/dbus/service.rs |  2 +-
 rust/agama-server/src/network/system.rs       | 44 ++++++++++++++++---
 rust/agama-server/src/network/web.rs          | 18 +++++++-
 rust/agama-server/src/web.rs                  |  2 +-
 rust/agama-server/src/web/event.rs            |  6 ++-
 rust/agama-server/tests/network.rs            |  1 +
 6 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/rust/agama-server/src/network/dbus/service.rs b/rust/agama-server/src/network/dbus/service.rs
index 553020b2ae..64785fc85c 100644
--- a/rust/agama-server/src/network/dbus/service.rs
+++ b/rust/agama-server/src/network/dbus/service.rs
@@ -13,7 +13,7 @@ pub struct NetworkService;
 
 impl NetworkService {
     /// Starts listening and dispatching events on the D-Bus connection.
-    pub async fn start<T: Adapter + std::marker::Send + 'static>(
+    pub async fn start<T: Adapter + Send + Sync + 'static>(
         connection: &Connection,
         adapter: T,
     ) -> Result<(), Box<dyn Error>> {
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index e431131c47..d52ae67485 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -12,7 +12,8 @@ use crate::network::{
 use agama_lib::{error::ServiceError, network::types::DeviceType};
 use std::{error::Error, sync::Arc};
 use tokio::sync::{
-    mpsc::{self, error::SendError, UnboundedReceiver, UnboundedSender},
+    broadcast::{self, Receiver, Sender},
+    mpsc::{self, error::SendError, unbounded_channel, UnboundedReceiver, UnboundedSender},
     oneshot::{self, error::RecvError},
     Mutex,
 };
@@ -67,7 +68,7 @@ pub struct NetworkSystem<T: Adapter + Send> {
     adapter: T,
 }
 
-impl<T: Adapter + Send + 'static> NetworkSystem<T> {
+impl<T: Adapter + Send + Sync + 'static> NetworkSystem<T> {
     /// Returns a new instance of the network configuration system.
     ///
     /// This function does not start the system. To get it running, you must call
@@ -89,14 +90,25 @@ impl<T: Adapter + Send + 'static> NetworkSystem<T> {
     pub async fn start(self) -> Result<NetworkSystemClient, NetworkSystemError> {
         let mut state = self.adapter.read(StateConfig::default()).await?;
         let (actions_tx, actions_rx) = mpsc::unbounded_channel();
+        let connection = zbus::Connection::system().await.unwrap();
+        let (updates_tx, _updates_rx) = broadcast::channel(16);
+
+        let watcher = self.adapter.watcher();
+        let actions_tx_clone = actions_tx.clone();
+        tokio::spawn(async move {
+            watcher.run(actions_tx_clone).await.unwrap();
+        });
+
         let mut tree = Tree::new(self.connection, actions_tx.clone());
         tree.set_connections(&mut state.connections).await?;
         tree.set_devices(&state.devices).await?;
 
+        let updates_tx_clone = updates_tx.clone();
         tokio::spawn(async move {
             let mut server = NetworkSystemServer {
                 state,
                 input: actions_rx,
+                output: updates_tx_clone,
                 adapter: self.adapter,
                 tree: Arc::new(Mutex::new(tree)),
             };
@@ -106,6 +118,7 @@ impl<T: Adapter + Send + 'static> NetworkSystem<T> {
 
         Ok(NetworkSystemClient {
             actions: actions_tx,
+            updates: updates_tx,
         })
     }
 }
@@ -116,10 +129,15 @@ impl<T: Adapter + Send + 'static> NetworkSystem<T> {
 #[derive(Clone)]
 pub struct NetworkSystemClient {
     actions: UnboundedSender<Action>,
+    updates: broadcast::Sender<NetworkChange>,
 }
 
 // TODO: add a NetworkSystemError type
 impl NetworkSystemClient {
+    pub fn subscribe(&self) -> Receiver<NetworkChange> {
+        self.updates.subscribe()
+    }
+
     /// Returns the general state.
     pub async fn get_state(&self) -> Result<GeneralState, NetworkSystemError> {
         let (tx, rx) = oneshot::channel();
@@ -219,6 +237,7 @@ impl NetworkSystemClient {
 struct NetworkSystemServer<T: Adapter> {
     state: NetworkState,
     input: UnboundedReceiver<Action>,
+    output: broadcast::Sender<NetworkChange>,
     adapter: T,
     tree: Arc<Mutex<Tree>>,
 }
@@ -229,14 +248,23 @@ impl<T: Adapter> NetworkSystemServer<T> {
     /// This function is expected to be executed on a separate thread.
     pub async fn listen(&mut self) {
         while let Some(action) = self.input.recv().await {
-            if let Err(error) = self.dispatch_action(action).await {
-                eprintln!("Could not process the action: {}", error);
+            match self.dispatch_action(action).await {
+                Ok(Some(update)) => {
+                    _ = self.output.send(update);
+                }
+                Err(error) => {
+                    eprintln!("Could not process the action: {}", error);
+                }
+                _ => {}
             }
         }
     }
 
     /// Dispatch an action.
-    pub async fn dispatch_action(&mut self, action: Action) -> Result<(), Box<dyn Error>> {
+    pub async fn dispatch_action(
+        &mut self,
+        action: Action,
+    ) -> Result<Option<NetworkChange>, Box<dyn Error>> {
         match action {
             Action::AddConnection(name, ty, tx) => {
                 let result = self.add_connection_action(name, ty).await;
@@ -302,9 +330,11 @@ impl<T: Adapter> NetworkSystemServer<T> {
             }
             Action::AddDevice(device) => {
                 self.state.add_device(device.clone())?;
+                return Ok(Some(NetworkChange::DeviceAdded(device)));
             }
             Action::RemoveDevice(name) => {
                 self.state.remove_device(&name)?;
+                return Ok(Some(NetworkChange::DeviceRemoved(name)));
             }
             Action::GetDevicePath(name, tx) => {
                 let tree = self.tree.lock().await;
@@ -343,7 +373,7 @@ impl<T: Adapter> NetworkSystemServer<T> {
                 let failed = result.is_err();
                 tx.send(result).unwrap();
                 if failed {
-                    return Ok(());
+                    return Ok(None);
                 }
 
                 // TODO: re-creating the tree is kind of brute-force and it sends signals about
@@ -362,7 +392,7 @@ impl<T: Adapter> NetworkSystemServer<T> {
             }
         }
 
-        Ok(())
+        Ok(None)
     }
 
     async fn add_connection_action(
diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index 8edb018233..d583bfbf59 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -1,6 +1,9 @@
 //! This module implements the web API for the network module.
 
-use crate::error::Error;
+use crate::{
+    error::Error,
+    web::{Event, EventsSender},
+};
 use anyhow::Context;
 use axum::{
     extract::{Path, State},
@@ -59,9 +62,10 @@ struct NetworkServiceState {
 /// Sets up and returns the axum service for the network module.
 ///
 /// * `dbus`: zbus Connection.
-pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
+pub async fn network_service<T: Adapter + Send + Sync + 'static>(
     dbus: zbus::Connection,
     adapter: T,
+    events: EventsSender,
 ) -> Result<Router, ServiceError> {
     let network = NetworkSystem::new(dbus.clone(), adapter);
     // FIXME: we are somehow abusing ServiceError. The HTTP/JSON API should have its own
@@ -70,6 +74,16 @@ pub async fn network_service<T: Adapter + std::marker::Send + 'static>(
         .start()
         .await
         .context("Could not start the network configuration service.")?;
+
+    let mut changes = client.subscribe();
+    tokio::spawn(async move {
+        while let Ok(message) = changes.recv().await {
+            if let Err(e) = events.send(Event::NetworkChange { change: message }) {
+                eprintln!("Could not send the event: {}", e);
+            }
+        }
+    });
+
     let state = NetworkServiceState { network: client };
 
     Ok(Router::new()
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 491716aca2..daf8581c57 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -60,7 +60,7 @@ where
         .add_service("/software", software_service(dbus.clone()).await?)
         .add_service(
             "/network",
-            network_service(dbus.clone(), network_adapter).await?,
+            network_service(dbus.clone(), network_adapter, events).await?,
         )
         .add_service("/questions", questions_service(dbus.clone()).await?)
         .add_service("/users", users_service(dbus.clone()).await?)
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 3f23090659..a2ed849e7b 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -1,4 +1,4 @@
-use crate::l10n::web::LocaleConfig;
+use crate::{l10n::web::LocaleConfig, network::model::NetworkChange};
 use agama_lib::{
     manager::InstallationPhase, progress::Progress, software::SelectedBy, users::FirstUser,
 };
@@ -28,6 +28,10 @@ pub enum Event {
         password: Option<bool>,
         sshkey: Option<String>,
     },
+    NetworkChange {
+        #[serde(flatten)]
+        change: NetworkChange,
+    },
     // TODO: it should include the full software proposal or, at least,
     // all the relevant changes.
     SoftwareProposalChanged {
diff --git a/rust/agama-server/tests/network.rs b/rust/agama-server/tests/network.rs
index 5e783a14af..ed607187d7 100644
--- a/rust/agama-server/tests/network.rs
+++ b/rust/agama-server/tests/network.rs
@@ -39,6 +39,7 @@ async fn test_read_connections() -> Result<(), Box<dyn Error>> {
     let device = model::Device {
         name: String::from("eth0"),
         type_: DeviceType::Ethernet,
+        ..Default::default()
     };
     let eth0 = model::Connection::new("eth0".to_string(), DeviceType::Ethernet);
     let state = NetworkState::new(general_state, vec![], vec![device], vec![eth0]);

From fe944b800e690e4403b9ba38cfd0d66f671cf150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 16 Apr 2024 15:58:33 +0100
Subject: [PATCH 254/324] Adapter's watchers are optional

---
 rust/agama-server/src/network/adapter.rs    | 19 ++-----------------
 rust/agama-server/src/network/nm/adapter.rs |  4 ++--
 rust/agama-server/src/network/system.rs     | 11 ++++++-----
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/rust/agama-server/src/network/adapter.rs b/rust/agama-server/src/network/adapter.rs
index 1e2a226b3d..dee00d780c 100644
--- a/rust/agama-server/src/network/adapter.rs
+++ b/rust/agama-server/src/network/adapter.rs
@@ -20,10 +20,8 @@ pub trait Adapter {
     async fn read(&self, config: StateConfig) -> Result<NetworkState, NetworkAdapterError>;
     async fn write(&self, network: &NetworkState) -> Result<(), NetworkAdapterError>;
     /// Returns the watcher, which is responsible for listening for network changes.
-    ///
-    /// TODO: should we return a Option?
-    fn watcher(&self) -> Box<dyn Watcher + Send> {
-        Box::new(DummyWatcher {})
+    fn watcher(&self) -> Option<Box<dyn Watcher + Send>> {
+        None
     }
 }
 
@@ -44,16 +42,3 @@ pub trait Watcher {
         actions: UnboundedSender<Action>,
     ) -> Result<(), NetworkAdapterError>;
 }
-
-/// A dummy watcher for those adapters that do not implement one.
-struct DummyWatcher {}
-
-#[async_trait]
-impl Watcher for DummyWatcher {
-    async fn run(
-        mut self: Box<Self>,
-        _actions: UnboundedSender<Action>,
-    ) -> Result<(), NetworkAdapterError> {
-        Ok(())
-    }
-}
diff --git a/rust/agama-server/src/network/nm/adapter.rs b/rust/agama-server/src/network/nm/adapter.rs
index 6e5e0dcb40..af7b525c16 100644
--- a/rust/agama-server/src/network/nm/adapter.rs
+++ b/rust/agama-server/src/network/nm/adapter.rs
@@ -162,8 +162,8 @@ impl<'a> Adapter for NetworkManagerAdapter<'a> {
         Ok(())
     }
 
-    fn watcher(&self) -> Box<dyn Watcher + Send> {
-        Box::new(NetworkManagerWatcher::new(&self.connection))
+    fn watcher(&self) -> Option<Box<dyn Watcher + Send>> {
+        Some(Box::new(NetworkManagerWatcher::new(&self.connection)))
     }
 }
 
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index d52ae67485..93a9b38840 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -93,11 +93,12 @@ impl<T: Adapter + Send + Sync + 'static> NetworkSystem<T> {
         let connection = zbus::Connection::system().await.unwrap();
         let (updates_tx, _updates_rx) = broadcast::channel(16);
 
-        let watcher = self.adapter.watcher();
-        let actions_tx_clone = actions_tx.clone();
-        tokio::spawn(async move {
-            watcher.run(actions_tx_clone).await.unwrap();
-        });
+        if let Some(watcher) = self.adapter.watcher() {
+            let actions_tx_clone = actions_tx.clone();
+            tokio::spawn(async move {
+                watcher.run(actions_tx_clone).await.unwrap();
+            });
+        }
 
         let mut tree = Tree::new(self.connection, actions_tx.clone());
         tree.set_connections(&mut state.connections).await?;

From d28cfbdfea744474e8e07437bc96d3b61c635234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 16 Apr 2024 15:58:51 +0100
Subject: [PATCH 255/324] Removed an unused 'connection' variable

---
 rust/agama-server/src/network/system.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 93a9b38840..b1171d53ed 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -90,7 +90,6 @@ impl<T: Adapter + Send + Sync + 'static> NetworkSystem<T> {
     pub async fn start(self) -> Result<NetworkSystemClient, NetworkSystemError> {
         let mut state = self.adapter.read(StateConfig::default()).await?;
         let (actions_tx, actions_rx) = mpsc::unbounded_channel();
-        let connection = zbus::Connection::system().await.unwrap();
         let (updates_tx, _updates_rx) = broadcast::channel(16);
 
         if let Some(watcher) = self.adapter.watcher() {

From 3d536a000ec62a77c7879b7af32c5e90bf8d298b Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 16 Apr 2024 22:10:12 +0200
Subject: [PATCH 256/324] format rust code

---
 rust/agama-server/src/software/web.rs | 19 +++++++++++--------
 rust/agama-server/src/users/web.rs    |  4 +---
 rust/agama-server/src/web/event.rs    |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index 11de4c7e9b..e5ae39f01d 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -14,7 +14,7 @@ use crate::{
 };
 use agama_lib::{
     error::ServiceError,
-    product::{Product, ProductClient, RegistrationRequirement, proxies::RegistrationProxy},
+    product::{proxies::RegistrationProxy, Product, ProductClient, RegistrationRequirement},
     software::{
         proxies::{Software1Proxy, SoftwareProductProxy},
         Pattern, SelectedBy, SoftwareClient, UnknownSelectedBy,
@@ -49,9 +49,7 @@ pub struct SoftwareConfig {
 /// It emits the Event::ProductChanged and Event::PatternsChanged events.
 ///
 /// * `connection`: D-Bus connection to listen for events.
-pub async fn software_streams(
-    dbus: zbus::Connection,
-) -> Result<Streams, Error> {
+pub async fn software_streams(dbus: zbus::Connection) -> Result<Streams, Error> {
     let result: Streams = vec![
         (
             "patterns_changed",
@@ -118,7 +116,8 @@ async fn patterns_changed_stream(
     Ok(stream)
 }
 
-async fn registration_requirement_changed_stream(dbus: zbus::Connection,
+async fn registration_requirement_changed_stream(
+    dbus: zbus::Connection,
 ) -> Result<impl Stream<Item = Event>, Error> {
     // TODO: move registration requirement to product in dbus and so just one event will be needed.
     let proxy = RegistrationProxy::new(&dbus).await?;
@@ -128,7 +127,9 @@ async fn registration_requirement_changed_stream(dbus: zbus::Connection,
         .then(|change| async move {
             if let Ok(id) = change.get().await {
                 // unwrap is safe as possible numbers is send by our controlled dbus
-                return Some(Event::RegistrationRequirementChanged { requirement: id.try_into().unwrap() });
+                return Some(Event::RegistrationRequirementChanged {
+                    requirement: id.try_into().unwrap(),
+                });
             }
             None
         })
@@ -136,7 +137,8 @@ async fn registration_requirement_changed_stream(dbus: zbus::Connection,
     Ok(stream)
 }
 
-async fn registration_email_changed_stream(dbus: zbus::Connection,
+async fn registration_email_changed_stream(
+    dbus: zbus::Connection,
 ) -> Result<impl Stream<Item = Event>, Error> {
     let proxy = RegistrationProxy::new(&dbus).await?;
     let stream = proxy
@@ -153,7 +155,8 @@ async fn registration_email_changed_stream(dbus: zbus::Connection,
     Ok(stream)
 }
 
-async fn registration_code_changed_stream(dbus: zbus::Connection,
+async fn registration_code_changed_stream(
+    dbus: zbus::Connection,
 ) -> Result<impl Stream<Item = Event>, Error> {
     let proxy = RegistrationProxy::new(&dbus).await?;
     let stream = proxy
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index e0c451daa2..e1f6027e8f 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -30,9 +30,7 @@ struct UsersState<'a> {
 /// It emits the Event::RootPasswordChange, Event::RootSSHKeyChanged and Event::FirstUserChanged events.
 ///
 /// * `connection`: D-Bus connection to listen for events.
-pub async fn users_streams(
-    dbus: zbus::Connection,
-) -> Result<Streams, Error> {
+pub async fn users_streams(dbus: zbus::Connection) -> Result<Streams, Error> {
     const FIRST_USER_ID: &str = "first_user";
     const ROOT_PASSWORD_ID: &str = "root_password";
     const ROOT_SSHKEY_ID: &str = "root_sshkey";
diff --git a/rust/agama-server/src/web/event.rs b/rust/agama-server/src/web/event.rs
index 93bdb604ac..0c45dfff47 100644
--- a/rust/agama-server/src/web/event.rs
+++ b/rust/agama-server/src/web/event.rs
@@ -1,7 +1,7 @@
 use crate::l10n::web::LocaleConfig;
 use agama_lib::{
-    manager::InstallationPhase, progress::Progress, software::SelectedBy, users::FirstUser,
-    product::RegistrationRequirement,
+    manager::InstallationPhase, product::RegistrationRequirement, progress::Progress,
+    software::SelectedBy, users::FirstUser,
 };
 use serde::Serialize;
 use std::collections::HashMap;
@@ -24,7 +24,7 @@ pub enum Event {
     ProductChanged {
         id: String,
     },
-    RegistrationRequirementChanged{
+    RegistrationRequirementChanged {
         requirement: RegistrationRequirement,
     },
     RegistrationChanged,

From 0b1b4423707ac867f6c6d39b69916a19553fb91b Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 17 Apr 2024 09:48:39 +0100
Subject: [PATCH 257/324] Added devices running config to the UI

---
 rust/agama-server/src/network/model.rs        |  1 +
 rust/agama-server/src/network/nm/client.rs    | 16 ++++++
 web/src/client/network/index.js               | 54 ++++++++++++++++++-
 web/src/client/network/model.js               | 44 +++++++++++++--
 .../components/overview/NetworkSection.jsx    | 35 +++++++-----
 5 files changed, 133 insertions(+), 17 deletions(-)

diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index efe179c31d..d6e9950368 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -448,6 +448,7 @@ pub struct Device {
     #[serde_as(as = "DisplayFromStr")]
     pub mac_address: MacAddress,
     pub ip_config: Option<IpConfig>,
+    pub connection: Option<String>,
 }
 
 /// Represents a known network connection.
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index 67c93f5487..59406b2652 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -190,12 +190,18 @@ impl<'a> NetworkManagerClient<'a> {
                 None
             };
 
+            let connection = match proxy.get_applied_connection(0).await {
+                Ok((conn, _)) => self.connection_id(conn),
+                Err(_) => None,
+            };
+
             if let Ok(device_type) = device_type.try_into() {
                 let device = Device {
                     name: device_name,
                     type_: device_type,
                     mac_address,
                     ip_config,
+                    connection,
                 };
                 devs.push(device);
             } else {
@@ -211,6 +217,16 @@ impl<'a> NetworkManagerClient<'a> {
         Ok(devs)
     }
 
+    pub fn connection_id(
+        &self,
+        connection_data: HashMap<String, HashMap<String, zbus::zvariant::OwnedValue>>,
+    ) -> Option<String> {
+        let connection = connection_data.get("connection")?;
+        let id: &str = connection.get("id")?.downcast_ref()?;
+
+        Some(id.to_string())
+    }
+
     pub fn address_with_prefix_from_dbus(
         &self,
         address_data: HashMap<String, zbus::zvariant::OwnedValue>,
diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index 3eb5e52ffe..eafde9e063 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -24,7 +24,7 @@
 import DBusClient from "../dbus";
 import { NetworkManagerAdapter, securityFromFlags } from "./network_manager";
 import cockpit from "../../lib/cockpit";
-import { createConnection, ConnectionTypes, ConnectionState, createAccessPoint } from "./model";
+import { createConnection, ConnectionTypes, ConnectionState, createAccessPoint, createDevice } from "./model";
 import { formatIp, ipPrefixFor } from "./utils";
 
 const SERVICE_NAME = "org.opensuse.Agama1";
@@ -46,6 +46,8 @@ const DeviceType = Object.freeze({
 /**
  * @typedef {import("./model").NetworkSettings} NetworkSettings
  * @typedef {import("./model").Connection} Connection
+ * @typedef {import("./model").Connection} Device
+ * @typedef {import("./model").Connection} Route
  * @typedef {import("./model").IPAddress} IPAddress
  * @typedef {import("./model").AccessPoint} AccessPoint
  */
@@ -100,6 +102,56 @@ class NetworkClient {
     this.client = client;
   }
 
+  /**
+   * Returns the devices running configuration
+   *
+   * @return {Promise<Device[]>}
+   */
+  async devices() {
+    const response = await this.client.get("/network/devices");
+    if (!response.ok) {
+      return [];
+    }
+
+    const devices = await response.json();
+    return devices.map(this.fromApiDevice);
+  }
+
+  /**
+   * Returns the device settings
+   *
+   * @param {object} device - device settings from the API server
+   * @return {Device}
+   */
+  fromApiDevice(device) {
+    const nameservers = (device?.ipConfig?.nameservers || []);
+    const { ipConfig = {}, ...dev } = device;
+    const routes4 = (ipConfig.routes4 || []).map((route) => {
+      const [ip, netmask] = route.destination.split("/");
+      const destination = { address: ip, prefix: ipPrefixFor(netmask) };
+
+      return { ...route, destination };
+    });
+
+    const routes6 = (ipConfig.routes6 || []).map((route) => {
+      const [ip, netmask] = route.destination.split("/");
+      const destination = (netmask !== undefined) ? { address: ip, prefix: ipPrefixFor(netmask) } : { address: ip };
+
+      return { ...route, destination };
+    });
+
+    const addresses = (ipConfig.addresses || []).map((address) => {
+      const [ip, netmask] = address.split("/");
+      if (netmask !== undefined) {
+        return { address: ip, prefix: ipPrefixFor(netmask) };
+      } else {
+        return { address: ip };
+      }
+    });
+
+    return { ...dev, ...ipConfig, addresses, nameservers, routes4, routes6 };
+  }
+
   /**
    * Returns the connection settings
    *
diff --git a/web/src/client/network/model.js b/web/src/client/network/model.js
index 02a931b576..bc4c23b919 100644
--- a/web/src/client/network/model.js
+++ b/web/src/client/network/model.js
@@ -77,6 +77,28 @@ const SecurityProtocols = Object.freeze({
  * @property {number|string} prefix - like "16"
  */
 
+/**
+ * @typedef {object} Device
+ * @property {string} name
+ * @property {IPAddress[]} addresses
+ * @property {string[]} nameservers
+ * @property {string} gateway4
+ * @property {string} gateway6
+ * @property {string} method4
+ * @property {string} method6
+ * @property {Route[]} routes4
+ * @property {Route[]} routes6
+ * @property {string} macAddress
+ * @property {string} [connection]
+ */
+
+/**
+ * @typedef {object} Route
+ * @property {IPAddress} destination
+ * @property {string} next_hop
+ * @property {number} metric
+ */
+
 /**
  * @typedef {object} Connection
  * @property {string} id
@@ -109,8 +131,8 @@ const SecurityProtocols = Object.freeze({
 /**
 * @typedef {object} NetworkSettings
 * @property {boolean} connectivity
-* @property {boolean} wireless_enabled
-* @property {boolean} networking_enabled
+* @property {boolean} wirelessEnabled
+* @property {boolean} networkingEnabled
 * @property {string} hostname
 
 /**
@@ -147,6 +169,21 @@ const createConnection = ({ id, iface, method4, method6, gateway4, gateway6, add
   return connection;
 };
 
+const createDevice = ({ name, macAddress, method4, method6, gateway4, gateway6, addresses, nameservers, routes4, routes6 }) => {
+  return {
+    name,
+    macAddress,
+    method4: method4 || "auto",
+    method6: method6 || "auto",
+    gateway4: gateway4 || "",
+    gateway6: gateway6 || "",
+    addresses: addresses || [],
+    nameservers: nameservers || [],
+    routes4: routes4 || [],
+    routes6: routes6 || []
+  };
+};
+
 /**
  * Returns an access point object
  *
@@ -167,8 +204,9 @@ const createAccessPoint = ({ ssid, hwAddress, strength, security }) => (
 );
 
 export {
-  createConnection,
   createAccessPoint,
+  createConnection,
+  createDevice,
   connectionHumanState,
   ConnectionState,
   ConnectionTypes,
diff --git a/web/src/components/overview/NetworkSection.jsx b/web/src/components/overview/NetworkSection.jsx
index 3fd4f3e0c2..2ee0dfcf6e 100644
--- a/web/src/components/overview/NetworkSection.jsx
+++ b/web/src/components/overview/NetworkSection.jsx
@@ -23,35 +23,44 @@ import React, { useEffect, useState } from "react";
 import { sprintf } from "sprintf-js";
 
 import { Em, Section, SectionSkeleton } from "~/components/core";
-import { ConnectionTypes } from "~/client/network";
 import { useInstallerClient } from "~/context/installer";
 import { formatIp } from "~/client/network/utils";
 import { _, n_ } from "~/i18n";
 
 export default function NetworkSection() {
   const { network: client } = useInstallerClient();
-  const [connections, setConnections] = useState(undefined);
+  const [devices, setDevices] = useState(undefined);
 
   useEffect(() => {
-    if (connections !== undefined) return;
+    if (devices !== undefined) return;
 
-    client.connections().then(setConnections);
-  }, [client, connections]);
+    client.devices().then(setDevices);
+  }, [client, devices]);
+
+  const deviceSummary = (device) => {
+    if ((device?.addresses || []).length === 0) {
+      return (
+        <Em key={device.name}>{device.name}</Em>
+      );
+    } else {
+      return (
+        <Em key={device.name}>{device.name} - {device.addresses.map(formatIp).join(", ")}</Em>
+      );
+    }
+  };
 
   const Content = () => {
-    if (connections === undefined) return <SectionSkeleton />;
+    if (devices === undefined) return <SectionSkeleton />;
 
-    if (connections.length === 0) return _("No network connections detected");
+    if (devices.length === 0) return _("No network devices detected");
 
-    const summary = connections.map(connection => (
-      <Em key={connection.id}>{connection.id} - {connection.addresses.map(formatIp).join(", ")}</Em>
-    ));
+    const summary = devices.map(deviceSummary);
 
     const msg = sprintf(
       // TRANSLATORS: header for the list of active network connections,
       // %d is replaced by the number of active connections
-      n_("%d connection set:", "%d connections set:", connections.length),
-      connections.length
+      n_("%d device set:", "%d devices set:", devices.length),
+      devices.length
     );
 
     return (
@@ -67,7 +76,7 @@ export default function NetworkSection() {
       // TRANSLATORS: page section title
       title={_("Network")}
       icon="settings_ethernet"
-      loading={!connections}
+      loading={!devices}
       path="/network"
       id="network"
     >

From e622e164c2a37114003697a169578133dd96c10a Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 17 Apr 2024 13:46:37 +0200
Subject: [PATCH 258/324] fix software js tests

---
 web/src/client/software.test.js | 144 ++++++++++++++------------------
 1 file changed, 62 insertions(+), 82 deletions(-)

diff --git a/web/src/client/software.test.js b/web/src/client/software.test.js
index c714ef4590..007271894a 100644
--- a/web/src/client/software.test.js
+++ b/web/src/client/software.test.js
@@ -34,32 +34,33 @@ const mockGetFn = jest.fn().mockImplementation(() => {
   };
 });
 
+const mockPostFn = jest.fn().mockImplementation(() => {
+  return {
+    ok: true,
+  };
+});
+
+const mockDeleteFn = jest.fn().mockImplementation(() => {
+  return {
+    ok: true,
+  };
+});
+
 jest.mock("./http", () => {
   return {
     HTTPClient: jest.fn().mockImplementation(() => {
       return {
         get: mockGetFn,
+        post: mockPostFn,
+        delete: mockDeleteFn,
       };
     }),
   };
 });
 
-jest.mock("./dbus");
-
 const PRODUCT_IFACE = "org.opensuse.Agama.Software1.Product";
 const REGISTRATION_IFACE = "org.opensuse.Agama1.Registration";
 
-const productProxy = {
-  wait: jest.fn(),
-  AvailableProducts: [
-    ["MicroOS", "openSUSE MicroOS", {}],
-    ["Tumbleweed", "openSUSE Tumbleweed", {}],
-  ],
-  SelectedProduct: "MicroOS",
-};
-
-const registrationProxy = {};
-
 const tumbleweed = {
   id: "Tumbleweed",
   name: "openSUSE Tumbleweed",
@@ -72,21 +73,9 @@ const microos = {
   description: "MicroOS is...",
 };
 
-beforeEach(() => {
-  // @ts-ignore
-  DBusClient.mockImplementation(() => {
-    return {
-      proxy: (iface) => {
-        if (iface === PRODUCT_IFACE) return productProxy;
-        if (iface === REGISTRATION_IFACE) return registrationProxy;
-      },
-    };
-  });
-});
-
 describe("ProductClient", () => {
   describe("#getAll", () => {
-    it.only("returns the list of available products", async () => {
+    it("returns the list of available products", async () => {
       const http = new HTTPClient(new URL("http://localhost"));
       const client = new ProductClient(http);
       mockJsonFn.mockResolvedValue([tumbleweed, microos]);
@@ -99,7 +88,7 @@ describe("ProductClient", () => {
   });
 
   describe("#getSelected", () => {
-    it.only("returns the selected product", async () => {
+    it("returns the selected product", async () => {
       const http = new HTTPClient(new URL("http://localhost"));
       const client = new ProductClient(http);
       mockJsonFn.mockResolvedValue({ product: "microos" });
@@ -110,64 +99,58 @@ describe("ProductClient", () => {
 
   describe("#getRegistration", () => {
     describe("if the product is not registered yet", () => {
-      beforeEach(() => {
-        registrationProxy.RegCode = "";
-        registrationProxy.Email = "";
-        registrationProxy.Requirement = 1;
-      });
-
       it("returns the expected registration result", async () => {
-        const client = new SoftwareClient();
-        const registration = await client.product.getRegistration();
+        mockJsonFn.mockResolvedValue({
+          key: "",
+          email: "",
+          requirement: "Optional"
+        });
+        const http = new HTTPClient(new URL("http://localhost"));
+        const client = new ProductClient(http);
+        const registration = await client.getRegistration();
         expect(registration).toStrictEqual({
           code: null,
           email: null,
-          requirement: "optional",
+          requirement: "Optional",
         });
       });
     });
 
     describe("if the product is registered", () => {
-      beforeEach(() => {
-        registrationProxy.RegCode = "111222";
-        registrationProxy.Email = "test@test.com";
-        registrationProxy.Requirement = 2;
-      });
-
       it("returns the expected registration", async () => {
-        const client = new SoftwareClient();
-        const registration = await client.product.getRegistration();
+        mockJsonFn.mockResolvedValue({
+          key: "111222",
+          email: "test@test.com",
+          requirement: "Mandatory"
+        });
+        const http = new HTTPClient(new URL("http://localhost"));
+        const client = new ProductClient(http);
+        const registration = await client.getRegistration();
         expect(registration).toStrictEqual({
           code: "111222",
           email: "test@test.com",
-          requirement: "mandatory",
+          requirement: "Mandatory",
         });
       });
     });
   });
 
   describe("#register", () => {
-    beforeEach(() => {
-      registrationProxy.Register = jest.fn().mockResolvedValue([0, ""]);
-    });
-
-    it("performs the expected D-Bus call", async () => {
-      const client = new SoftwareClient();
-      await client.product.register("111222", "test@test.com");
-      expect(registrationProxy.Register).toHaveBeenCalledWith(
-        "111222",
-        { Email: { t: "s", v: "test@test.com" } },
-      );
+    it("performs the backend call", async () => {
+      const http = new HTTPClient(new URL("http://localhost"));
+      const client = new ProductClient(http);
+      await client.register("111222", "test@test.com");
+      expect(mockPostFn).toHaveBeenCalledWith("/software/registration", {
+        key: "111222",
+        email: "test@test.com",
+      });
     });
 
     describe("when the action is correctly done", () => {
-      beforeEach(() => {
-        registrationProxy.Register = jest.fn().mockResolvedValue([0, ""]);
-      });
-
       it("returns a successful result", async () => {
-        const client = new SoftwareClient();
-        const result = await client.product.register("111222", "test@test.com");
+        const http = new HTTPClient(new URL("http://localhost"));
+        const client = new ProductClient(http);
+        const result = await client.register("111222", "test@test.com");
         expect(result).toStrictEqual({
           success: true,
           message: "",
@@ -176,16 +159,16 @@ describe("ProductClient", () => {
     });
 
     describe("when the action fails", () => {
-      beforeEach(() => {
-        registrationProxy.Register = jest.fn().mockResolvedValue([1, "error message"]);
-      });
-
       it("returns an unsuccessful result", async () => {
-        const client = new SoftwareClient();
-        const result = await client.product.register("111222", "test@test.com");
+        mockPostFn.mockImplementationOnce(() => {
+          return { ok: false };
+        });
+        const http = new HTTPClient(new URL("http://localhost"));
+        const client = new ProductClient(http);
+        const result = await client.register("111222", "test@test.com");
         expect(result).toStrictEqual({
           success: false,
-          message: "error message",
+          message: "",
         });
       });
     });
@@ -193,13 +176,10 @@ describe("ProductClient", () => {
 
   describe("#deregister", () => {
     describe("when the action is correctly done", () => {
-      beforeEach(() => {
-        registrationProxy.Deregister = jest.fn().mockResolvedValue([0, ""]);
-      });
-
       it("returns a successful result", async () => {
-        const client = new SoftwareClient();
-        const result = await client.product.deregister();
+        const http = new HTTPClient(new URL("http://localhost"));
+        const client = new ProductClient(http);
+        const result = await client.deregister();
         expect(result).toStrictEqual({
           success: true,
           message: "",
@@ -208,16 +188,16 @@ describe("ProductClient", () => {
     });
 
     describe("when the action fails", () => {
-      beforeEach(() => {
-        registrationProxy.Deregister = jest.fn().mockResolvedValue([1, "error message"]);
-      });
-
       it("returns an unsuccessful result", async () => {
-        const client = new SoftwareClient();
-        const result = await client.product.deregister();
+        mockDeleteFn.mockImplementationOnce(() => {
+          return { ok: false };
+        });
+        const http = new HTTPClient(new URL("http://localhost"));
+        const client = new ProductClient(http);
+        const result = await client.deregister();
         expect(result).toStrictEqual({
           success: false,
-          message: "error message",
+          message: "",
         });
       });
     });

From 21236b9586f5b82d3023e77660653b353f847eb1 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 17 Apr 2024 14:00:15 +0200
Subject: [PATCH 259/324] fix product page js test

---
 .../components/product/ProductPage.test.jsx   | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/web/src/components/product/ProductPage.test.jsx b/web/src/components/product/ProductPage.test.jsx
index e838cc5230..e7ffef6c74 100644
--- a/web/src/components/product/ProductPage.test.jsx
+++ b/web/src/components/product/ProductPage.test.jsx
@@ -30,6 +30,7 @@ import { createClient } from "~/client";
 let mockManager;
 let mockSoftware;
 let mockProducts;
+let mockProduct;
 let mockRegistration;
 
 const products = [
@@ -69,11 +70,12 @@ beforeEach(() => {
     probe: jest.fn(),
     getStatus: jest.fn().mockResolvedValue(),
     onStatusChange: jest.fn(),
-    product: {
-      getSelected: selectedProduct.id,
-      select: jest.fn().mockResolvedValue(),
-      onChange: jest.fn()
-    }
+  };
+
+  mockProduct = {
+    getSelected: selectedProduct.id,
+    select: jest.fn().mockResolvedValue(),
+    onChange: jest.fn()
   };
 
   mockProducts = products;
@@ -87,7 +89,8 @@ beforeEach(() => {
   createClient.mockImplementation(() => (
     {
       manager: mockManager,
-      software: mockSoftware
+      software: mockSoftware,
+      product: mockProduct,
     }
   ));
 });
@@ -132,7 +135,7 @@ describe("if the product is already registered", () => {
 
 describe("if the product does not require registration", () => {
   beforeEach(() => {
-    mockRegistration.requirement = "not-required";
+    mockRegistration.requirement = "NotRequired";
   });
 
   it("does not show a button to register the product", async () => {
@@ -208,7 +211,7 @@ describe("when the button for changing the product is clicked", () => {
       const accept = within(popup).getByRole("button", { name: "Accept" });
       await user.click(accept);
 
-      expect(mockSoftware.product.select).toHaveBeenCalledWith("Test-Product2");
+      expect(mockProduct.select).toHaveBeenCalledWith("Test-Product2");
       expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
     });
 
@@ -226,7 +229,7 @@ describe("when the button for changing the product is clicked", () => {
         const cancel = within(popup).getByRole("button", { name: "Cancel" });
         await user.click(cancel);
 
-        expect(mockSoftware.product.select).not.toHaveBeenCalled();
+        expect(mockProduct.select).not.toHaveBeenCalled();
         expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
       });
     });
@@ -259,7 +262,7 @@ describe("when the button for registering the product is clicked", () => {
   beforeEach(() => {
     mockRegistration.requirement = "mandatory";
     mockRegistration.code = null;
-    mockSoftware.product.register = jest.fn().mockResolvedValue({ success: true });
+    mockProduct.register = jest.fn().mockResolvedValue({ success: true });
   });
 
   it("opens a popup for registering the product", async () => {
@@ -278,7 +281,7 @@ describe("when the button for registering the product is clicked", () => {
     const accept = within(popup).getByRole("button", { name: "Accept" });
     await user.click(accept);
 
-    expect(mockSoftware.product.register).toHaveBeenCalledWith("111222", "test@test.com");
+    expect(mockProduct.register).toHaveBeenCalledWith("111222", "test@test.com");
     expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
   });
 
@@ -293,14 +296,14 @@ describe("when the button for registering the product is clicked", () => {
       const cancel = within(popup).getByRole("button", { name: "Cancel" });
       await user.click(cancel);
 
-      expect(mockSoftware.product.register).not.toHaveBeenCalled();
+      expect(mockProduct.register).not.toHaveBeenCalled();
       expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
     });
   });
 
   describe("if there is an error registering the product", () => {
     beforeEach(() => {
-      mockSoftware.product.register = jest.fn().mockResolvedValue({
+      mockProduct.register = jest.fn().mockResolvedValue({
         success: false,
         message: "Error registering product"
       });
@@ -329,7 +332,7 @@ describe("when the button to perform product de-registration is clicked", () =>
   beforeEach(() => {
     mockRegistration.requirement = "mandatory";
     mockRegistration.code = "111222";
-    mockSoftware.product.deregister = jest.fn().mockResolvedValue({ success: true });
+    mockProduct.deregister = jest.fn().mockResolvedValue({ success: true });
   });
 
   it("opens a popup to deregister the product", async () => {
@@ -344,7 +347,7 @@ describe("when the button to perform product de-registration is clicked", () =>
     const accept = within(popup).getByRole("button", { name: "Accept" });
     await user.click(accept);
 
-    expect(mockSoftware.product.deregister).toHaveBeenCalled();
+    expect(mockProduct.deregister).toHaveBeenCalled();
     expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
   });
 
@@ -359,14 +362,14 @@ describe("when the button to perform product de-registration is clicked", () =>
       const cancel = within(popup).getByRole("button", { name: "Cancel" });
       await user.click(cancel);
 
-      expect(mockSoftware.product.deregister).not.toHaveBeenCalled();
+      expect(mockProduct.deregister).not.toHaveBeenCalled();
       expect(screen.queryByRole("dialog")).not.toBeInTheDocument();
     });
   });
 
   describe("if there is an error performing the product de-registration", () => {
     beforeEach(() => {
-      mockSoftware.product.deregister = jest.fn().mockResolvedValue({
+      mockProduct.deregister = jest.fn().mockResolvedValue({
         success: false,
         message: "Product cannot be deregistered"
       });

From a20fabcbc1f58235b63d9db8e1e3ef03b51dd4cc Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 17 Apr 2024 14:36:28 +0100
Subject: [PATCH 260/324] Some small fixes

---
 rust/agama-lib/src/network/types.rs        | 1 +
 rust/agama-server/src/network/model.rs     | 4 ++++
 web/src/client/network/index.js            | 9 +++++++++
 web/src/client/network/model.js            | 9 +++++++--
 web/src/components/network/NetworkPage.jsx | 2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/rust/agama-lib/src/network/types.rs b/rust/agama-lib/src/network/types.rs
index 75c7c8f280..f6dfd2e235 100644
--- a/rust/agama-lib/src/network/types.rs
+++ b/rust/agama-lib/src/network/types.rs
@@ -45,6 +45,7 @@ impl From<SSID> for Vec<u8> {
 }
 
 #[derive(Default, Debug, PartialEq, Copy, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub enum DeviceType {
     Loopback = 0,
     #[default]
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index d6e9950368..46c6d6c573 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -426,6 +426,7 @@ pub struct GeneralState {
 /// Access Point
 #[serde_as]
 #[derive(Default, Debug, Clone, Serialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct AccessPoint {
     #[serde_as(as = "DisplayFromStr")]
     pub ssid: SSID,
@@ -723,6 +724,7 @@ impl From<InvalidMacAddress> for zbus::fdo::Error {
 
 #[skip_serializing_none]
 #[derive(Default, Debug, PartialEq, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub struct IpConfig {
     pub method4: Ipv4Method,
     pub method6: Ipv6Method,
@@ -754,6 +756,7 @@ pub struct MatchConfig {
 pub struct UnknownIpMethod(String);
 
 #[derive(Debug, Default, Copy, Clone, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub enum Ipv4Method {
     #[default]
     Disabled = 0,
@@ -789,6 +792,7 @@ impl FromStr for Ipv4Method {
 }
 
 #[derive(Debug, Default, Copy, Clone, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub enum Ipv6Method {
     #[default]
     Disabled = 0,
diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index eafde9e063..bf387fd0f1 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -182,6 +182,15 @@ class NetworkClient {
     return { ...connection, addresses, nameservers };
   }
 
+  connectionType(connection) {
+    if (connection.wireless) return ConnectionTypes.WIFI;
+    if (connection.bond) return ConnectionTypes.BOND;
+    if (connection.vlan) return ConnectionTypes.VLAN;
+    if (connection.iface === "lo") return ConnectionTypes.LOOPBACK;
+
+    return ConnectionTypes.ETHERNET;
+  }
+
   toApiConnection(connection) {
     const addresses = (connection.addresses || []).map((addr) => formatIp(addr));
     const { iface, gateway4, gateway6, ...conn } = connection;
diff --git a/web/src/client/network/model.js b/web/src/client/network/model.js
index bc4c23b919..da895b0a74 100644
--- a/web/src/client/network/model.js
+++ b/web/src/client/network/model.js
@@ -49,8 +49,13 @@ const connectionHumanState = (state) => {
 };
 
 const ConnectionTypes = Object.freeze({
-  ETHERNET: "802-3-ethernet",
-  WIFI: "802-11-wireless"
+  ETHERNET: "ethernet",
+  WIFI: "wireless",
+  LOOPBACK: "loopback",
+  BOND: "bond",
+  BRIDGE: "bridge",
+  VLAN: "vlan",
+  UNKNOWN: "unknown"
 });
 
 const SecurityProtocols = Object.freeze({
diff --git a/web/src/components/network/NetworkPage.jsx b/web/src/components/network/NetworkPage.jsx
index f638094407..c14ad8f285 100644
--- a/web/src/components/network/NetworkPage.jsx
+++ b/web/src/components/network/NetworkPage.jsx
@@ -127,7 +127,7 @@ export default function NetworkPage() {
   };
 
   const WiredConnections = () => {
-    const activeWiredConnections = connections.filter(c => !c.wireless);
+    const activeWiredConnections = connections.filter(c => !c.wireless && (c.id !== "lo"));
 
     if (activeWiredConnections.length === 0) return <NoWiredConnections />;
 

From 57731976fbd9b970aad5ddded95de1d29a6ad433 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 17 Apr 2024 15:55:05 +0200
Subject: [PATCH 261/324] fix product section test and re-enable again issues

---
 web/src/components/overview/ProductSection.jsx      | 8 ++++----
 web/src/components/overview/ProductSection.test.jsx | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/web/src/components/overview/ProductSection.jsx b/web/src/components/overview/ProductSection.jsx
index 26b54d0ccc..4ef26e2520 100644
--- a/web/src/components/overview/ProductSection.jsx
+++ b/web/src/components/overview/ProductSection.jsx
@@ -51,15 +51,15 @@ const Content = ({ isLoading = false }) => {
 };
 
 export default function ProductSection() {
-  const { software } = useInstallerClient();
+  const { product } = useInstallerClient();
   const [issues, setIssues] = useState([]);
   const { selectedProduct } = useProduct();
   const { cancellablePromise } = useCancellablePromise();
 
   useEffect(() => {
-    // cancellablePromise(software.product.getIssues()).then(setIssues);
-    // return software.product.onIssuesChange(setIssues);
-  }, [cancellablePromise, setIssues, software]);
+    cancellablePromise(product.getIssues()).then(setIssues);
+    return product.onIssuesChange(setIssues);
+  }, [cancellablePromise, setIssues, product]);
 
   const isLoading = !selectedProduct;
   const errors = isLoading ? [] : errorsFrom(issues);
diff --git a/web/src/components/overview/ProductSection.test.jsx b/web/src/components/overview/ProductSection.test.jsx
index 17edd0b62f..a55279e1cf 100644
--- a/web/src/components/overview/ProductSection.test.jsx
+++ b/web/src/components/overview/ProductSection.test.jsx
@@ -49,11 +49,9 @@ beforeEach(() => {
 
   createClient.mockImplementation(() => {
     return {
-      software: {
-        product: {
-          getIssues: jest.fn().mockResolvedValue(issues),
-          onIssuesChange: jest.fn()
-        }
+      product: {
+        getIssues: jest.fn().mockResolvedValue(issues),
+        onIssuesChange: jest.fn()
       }
     };
   });

From 809221b161c8316c76a69cd5302da5db2e619345 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 17 Apr 2024 16:00:25 +0200
Subject: [PATCH 262/324] fix product selection js test

---
 .../product/ProductSelectionPage.test.jsx      | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/web/src/components/product/ProductSelectionPage.test.jsx b/web/src/components/product/ProductSelectionPage.test.jsx
index bee8636981..60a8ad176b 100644
--- a/web/src/components/product/ProductSelectionPage.test.jsx
+++ b/web/src/components/product/ProductSelectionPage.test.jsx
@@ -54,20 +54,18 @@ const managerMock = {
   startProbing: jest.fn()
 };
 
-const softwareMock = {
-  product: {
-    getAll: () => Promise.resolve(products),
-    getSelected: jest.fn(() => Promise.resolve(products[0])),
-    select: jest.fn().mockResolvedValue(),
-    onChange: jest.fn()
-  }
+const productMock = {
+  getAll: () => Promise.resolve(products),
+  getSelected: jest.fn(() => Promise.resolve(products[0])),
+  select: jest.fn().mockResolvedValue(),
+  onChange: jest.fn()
 };
 
 beforeEach(() => {
   createClient.mockImplementation(() => {
     return {
       manager: managerMock,
-      software: softwareMock
+      product: productMock,
     };
   });
 });
@@ -79,7 +77,7 @@ describe("when the user chooses a product", () => {
     const selectButton = screen.getByRole("button", { name: "Select" });
     await user.click(productOption);
     await user.click(selectButton);
-    expect(softwareMock.product.select).toHaveBeenCalledWith("MicroOS");
+    expect(productMock.select).toHaveBeenCalledWith("MicroOS");
     expect(managerMock.startProbing).toHaveBeenCalled();
     expect(mockNavigateFn).toHaveBeenCalledWith("/");
   });
@@ -91,7 +89,7 @@ describe("when the user chooses does not change the product", () => {
     screen.getByText("openSUSE Tumbleweed");
     const selectButton = await screen.findByRole("button", { name: "Select" });
     await user.click(selectButton);
-    expect(softwareMock.product.select).not.toHaveBeenCalled();
+    expect(productMock.select).not.toHaveBeenCalled();
     expect(managerMock.startProbing).not.toHaveBeenCalled();
     expect(mockNavigateFn).toHaveBeenCalledWith("/");
   });

From 905785a27804d648d36da62cc0dca80392bfb80f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 17 Apr 2024 22:27:21 +0100
Subject: [PATCH 263/324] Refactor the NetworkManagerWatcher

* It is still a work in progress, but now it detects IP configuration
  changes too.
* Avoid deadlocks when dispatching the action.
---
 rust/agama-server/src/network/adapter.rs    |   2 +-
 rust/agama-server/src/network/nm/watcher.rs | 309 +++++++++++++-------
 2 files changed, 210 insertions(+), 101 deletions(-)

diff --git a/rust/agama-server/src/network/adapter.rs b/rust/agama-server/src/network/adapter.rs
index dee00d780c..ba6e84a253 100644
--- a/rust/agama-server/src/network/adapter.rs
+++ b/rust/agama-server/src/network/adapter.rs
@@ -38,7 +38,7 @@ pub trait Watcher {
     ///
     /// * `actions`: channel to emit the actions.
     async fn run(
-        mut self: Box<Self>,
+        self: Box<Self>,
         actions: UnboundedSender<Action>,
     ) -> Result<(), NetworkAdapterError>;
 }
diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
index 2265e4e9ca..81ed85d3e9 100644
--- a/rust/agama-server/src/network/nm/watcher.rs
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -1,53 +1,101 @@
+//! Implements the mechanism to listen for NetworkManager changes.
+//!
+//! Monitors NetworkManager's D-Bus service and emit [actions](crate::network::Action] to update
+//! the NetworkSystem state when devices or active connections change.
+
 use crate::network::{
     adapter::Watcher, model::Device, nm::proxies::DeviceProxy, Action, NetworkAdapterError,
 };
 use agama_lib::{error::ServiceError, network::types::DeviceType};
 use async_trait::async_trait;
+use futures_util::ready;
 use pin_project::pin_project;
 use std::{
     collections::HashMap,
     pin::Pin,
+    sync::Arc,
     task::{Context, Poll},
 };
-use tokio::sync::mpsc::UnboundedSender;
+use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender};
 use tokio_stream::{Stream, StreamExt, StreamMap};
-use zbus::{fdo::ObjectManagerProxy, zvariant::OwnedObjectPath, Connection};
+use zbus::{
+    fdo::{InterfacesAdded, InterfacesRemoved, PropertiesChanged},
+    zvariant::OwnedObjectPath,
+    MatchRule, Message, MessageStream, MessageType,
+};
 
-pub struct NetworkManagerWatcher<'a> {
+/// Implements a [crate::network::adapter::Watcher] for NetworkManager.
+///
+/// It detects the following changes by monitoring NetworkManager's D-Bus API:
+///
+/// * A device is added or removed.
+/// * The IPv4 or IPv6 configuration changes.
+pub struct NetworkManagerWatcher {
     connection: zbus::Connection,
-    devices: HashMap<OwnedObjectPath, DeviceProxy<'a>>,
 }
 
-impl<'a> NetworkManagerWatcher<'a> {
+impl NetworkManagerWatcher {
+    /// Builds a new watcher over a D-Bus connection.
     pub fn new(connection: &zbus::Connection) -> Self {
         Self {
             connection: connection.clone(),
-            devices: HashMap::new(),
         }
     }
-
-    async fn build_device_proxy(
-        &self,
-        path: OwnedObjectPath,
-    ) -> Result<DeviceProxy<'a>, ServiceError> {
-        let proxy = DeviceProxy::builder(&self.connection)
-            .path(path.clone())?
-            .build()
-            .await?;
-        Ok(proxy)
-    }
 }
 
 #[async_trait]
-impl<'a> Watcher for NetworkManagerWatcher<'a> {
+impl Watcher for NetworkManagerWatcher {
     async fn run(
-        mut self: Box<Self>,
+        self: Box<Self>,
         actions: UnboundedSender<Action>,
     ) -> Result<(), NetworkAdapterError> {
-        let mut stream = AddedAndRemovedStream::new(&self.connection).await.unwrap();
+        let (tx, rx) = unbounded_channel();
+
+        // Process the DeviceChangedStream in a separate task.
+        let connection = self.connection.clone();
+        tokio::spawn(async move {
+            let mut stream = DeviceChangedStream::new(&connection).await.unwrap();
 
-        while let Some(change) = stream.next().await {
-            match change {
+            while let Some(change) = stream.next().await {
+                if let Err(e) = tx.send(change) {
+                    tracing::error!("Could not dispatch a network change: {e}");
+                }
+            }
+        });
+
+        // Turn the changes into actions in a separate task.
+        let connection = self.connection.clone();
+        let mut dispatcher = ActionDispatcher::new(connection, rx, actions);
+        dispatcher.run().await;
+
+        Ok(())
+    }
+}
+
+struct ActionDispatcher<'a> {
+    connection: zbus::Connection,
+    devices: HashMap<OwnedObjectPath, DeviceProxy<'a>>,
+    updates: UnboundedReceiver<DeviceChange>,
+    actions: UnboundedSender<Action>,
+}
+
+impl<'a> ActionDispatcher<'a> {
+    pub fn new(
+        connection: zbus::Connection,
+        updates: UnboundedReceiver<DeviceChange>,
+        actions: UnboundedSender<Action>,
+    ) -> Self {
+        Self {
+            connection,
+            updates,
+            actions,
+            devices: HashMap::new(),
+        }
+    }
+
+    pub async fn run(&mut self) {
+        while let Some(update) = self.updates.recv().await {
+            match update {
                 DeviceChange::DeviceAdded(path) => {
                     if let Ok(proxy) = self.build_device_proxy(path.clone()).await {
                         let device = Device {
@@ -56,27 +104,35 @@ impl<'a> Watcher for NetworkManagerWatcher<'a> {
                             ..Default::default()
                         };
                         self.devices.insert(path, proxy);
-                        _ = actions.send(Action::AddDevice(device));
-                        // _ = changes_tx.send(NetworkChange::DeviceAdded(device));
+                        _ = self.actions.send(Action::AddDevice(device));
                     }
                 }
+
                 DeviceChange::DeviceRemoved(path) => {
                     if let Some(proxy) = self.devices.remove(&path) {
-                        let name = proxy.interface().await.unwrap().to_string();
-                        // _ = changes_tx.send(NetworkChange::DeviceRemoved(name));
-                        _ = actions.send(Action::RemoveDevice(name));
+                        if let Ok(name) = proxy.interface().await {
+                            _ = self.actions.send(Action::RemoveDevice(name));
+                        }
                     }
                 }
+
+                _ => {
+                    println!("Unhandled message");
+                }
             }
         }
-        Ok(())
     }
-}
 
-#[derive(Debug)]
-pub enum DeviceChange {
-    DeviceAdded(OwnedObjectPath),
-    DeviceRemoved(OwnedObjectPath),
+    async fn build_device_proxy(
+        &self,
+        path: OwnedObjectPath,
+    ) -> Result<DeviceProxy<'a>, ServiceError> {
+        let proxy = DeviceProxy::builder(&self.connection.clone())
+            .path(path.clone())?
+            .build()
+            .await?;
+        Ok(proxy)
+    }
 }
 
 /// Stream of addded and removed devices.
@@ -85,87 +141,140 @@ pub enum DeviceChange {
 /// from NetworkManager. It is implemented as a struct because it needs to
 /// keep the ObjectManagerProxy alive.
 #[pin_project]
-struct AddedAndRemovedStream<'a> {
-    #[pin]
-    objects: ObjectManagerProxy<'a>,
+struct DeviceChangedStream {
+    connection: zbus::Connection,
     #[pin]
-    inner: StreamMap<&'static str, Pin<Box<dyn Stream<Item = DeviceChange> + Send>>>,
+    inner: StreamMap<&'static str, MessageStream>,
 }
 
-impl<'a> AddedAndRemovedStream<'a> {
-    pub async fn new(connection: &Connection) -> Result<Self, ServiceError> {
-        let objects = ObjectManagerProxy::builder(&connection)
-            .destination("org.freedesktop.NetworkManager")?
-            .path("/org/freedesktop")?
-            .build()
-            .await?;
-
+impl DeviceChangedStream {
+    pub async fn new(connection: &zbus::Connection) -> Result<Self, ServiceError> {
+        let connection = connection.clone();
         let mut inner = StreamMap::new();
-        inner.insert("added", Self::added_stream(&objects).await?);
-        inner.insert("removed", Self::removed_stream(&objects).await?);
-        Ok(Self { objects, inner })
+        inner.insert(
+            "object_manager",
+            build_added_and_removed_stream(&connection).await?,
+        );
+        inner.insert(
+            "properties",
+            build_properties_changed_stream(&connection).await?,
+        );
+        Ok(Self { connection, inner })
     }
 
-    async fn added_stream(
-        objects: &ObjectManagerProxy<'_>,
-    ) -> Result<Pin<Box<dyn Stream<Item = DeviceChange> + Send>>, ServiceError> {
-        let stream = objects
-            .receive_interfaces_added()
-            .await?
-            .filter_map(|added| {
-                let Ok(args) = added.args() else {
-                    return None;
-                };
-
-                let interfaces: Vec<String> = args
-                    .interfaces_and_properties()
-                    .keys()
-                    .into_iter()
-                    .map(|i| i.to_string())
-                    .collect();
-
-                if interfaces.contains(&"org.freedesktop.NetworkManager.Device".to_string()) {
-                    let path = OwnedObjectPath::from(args.object_path().clone());
-                    return Some(DeviceChange::DeviceAdded(path));
-                }
+    fn handle_added(message: InterfacesAdded) -> Option<DeviceChange> {
+        let args = message.args().ok()?;
+        let interfaces: Vec<String> = args
+            .interfaces_and_properties()
+            .keys()
+            .into_iter()
+            .map(|i| i.to_string())
+            .collect();
+
+        if interfaces.contains(&"org.freedesktop.NetworkManager.Device".to_string()) {
+            let path = OwnedObjectPath::from(args.object_path().clone());
+            return Some(DeviceChange::DeviceAdded(path));
+        }
 
-                None
-            });
-        Ok(Box::pin(stream))
+        None
     }
 
-    async fn removed_stream(
-        objects: &ObjectManagerProxy<'_>,
-    ) -> Result<Pin<Box<dyn Stream<Item = DeviceChange> + Send>>, ServiceError> {
-        let stream = objects
-            .receive_interfaces_removed()
-            .await?
-            .filter_map(|removed| {
-                let Ok(args) = removed.args() else {
-                    return None;
-                };
-
-                if args
-                    .interfaces
-                    .contains(&"org.freedesktop.NetworkManager.Device")
-                {
-                    let path = OwnedObjectPath::from(args.object_path().clone());
-                    return Some(DeviceChange::DeviceRemoved(path));
-                }
-                None
-            });
-        Ok(Box::pin(stream))
+    fn handle_removed(message: InterfacesRemoved) -> Option<DeviceChange> {
+        let args = message.args().ok()?;
+
+        if args
+            .interfaces
+            .contains(&"org.freedesktop.NetworkManager.Device")
+        {
+            let path = OwnedObjectPath::from(args.object_path().clone());
+            return Some(DeviceChange::DeviceRemoved(path));
+        }
+
+        None
+    }
+
+    fn handle_changed(message: PropertiesChanged) -> Option<DeviceChange> {
+        let path = OwnedObjectPath::from(message.path()?);
+        let args = message.args().ok()?;
+
+        match args.interface_name.as_str() {
+            "org.freedesktop.NetworkManager.IP4Config" => {
+                Some(DeviceChange::IP4ConfigChanged(path))
+            }
+            "org.freedesktop.NetworkManager.IP6Config" => {
+                Some(DeviceChange::IP6ConfigChanged(path))
+            }
+            _ => None,
+        }
+    }
+
+    fn handle_message(message: Result<Arc<Message>, zbus::Error>) -> Option<DeviceChange> {
+        let Ok(message) = message else {
+            return None;
+        };
+
+        if let Some(added) = InterfacesAdded::from_message(message.clone()) {
+            return Self::handle_added(added);
+        }
+
+        if let Some(removed) = InterfacesRemoved::from_message(message.clone()) {
+            return Self::handle_removed(removed);
+        }
+
+        if let Some(changed) = PropertiesChanged::from_message(message.clone()) {
+            return Self::handle_changed(changed);
+        }
+
+        None
     }
 }
 
-impl<'a> Stream for AddedAndRemovedStream<'a> {
+impl Stream for DeviceChangedStream {
     type Item = DeviceChange;
 
     fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-        let pinned = self.project();
-        match pinned.inner.poll_next(cx) {
-            Poll::Ready(Some((_, change))) => Poll::Ready(Some(change)),
-            _ => Poll::Pending,
-        }
+        let mut pinned = self.project();
+        Poll::Ready(loop {
+            let item = ready!(pinned.inner.as_mut().poll_next(cx));
+            let next_value = match item {
+                Some((_, message)) => Self::handle_message(message),
+                _ => None,
+            };
+            if next_value.is_some() {
+                break next_value;
+            }
+        })
     }
 }
+
+async fn build_added_and_removed_stream(
+    connection: &zbus::Connection,
+) -> Result<MessageStream, ServiceError> {
+    let rule = MatchRule::builder()
+        .msg_type(MessageType::Signal)
+        .path("/org/freedesktop")?
+        .interface("org.freedesktop.DBus.ObjectManager")?
+        .build();
+    let stream = MessageStream::for_match_rule(rule, &connection, Some(1)).await?;
+    Ok(stream)
+}
+
+async fn build_properties_changed_stream(
+    connection: &zbus::Connection,
+) -> Result<MessageStream, ServiceError> {
+    let rule = MatchRule::builder()
+        .msg_type(MessageType::Signal)
+        .interface("org.freedesktop.DBus.Properties")?
+        .member("PropertiesChanged")?
+        .build();
+    let stream = MessageStream::for_match_rule(rule, &connection, Some(1)).await?;
+    Ok(stream)
+}
+
+#[derive(Debug, Clone)]
+pub enum DeviceChange {
+    DeviceAdded(OwnedObjectPath),
+    DeviceRemoved(OwnedObjectPath),
+    IP4ConfigChanged(OwnedObjectPath),
+    IP6ConfigChanged(OwnedObjectPath),
+}

From f8839171c76b27085da32629a8ac9eaea090e2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 12:40:24 +0100
Subject: [PATCH 264/324] Add support to update network devices information

* Partially working only.
---
 rust/agama-server/src/network/action.rs     |  4 +-
 rust/agama-server/src/network/error.rs      |  2 +
 rust/agama-server/src/network/model.rs      | 17 +++++
 rust/agama-server/src/network/nm.rs         |  1 +
 rust/agama-server/src/network/nm/watcher.rs | 76 ++++++++++++++++++---
 rust/agama-server/src/network/system.rs     |  8 ++-
 6 files changed, 97 insertions(+), 11 deletions(-)

diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index deacb7cca8..4b4a8f547c 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -43,7 +43,9 @@ pub enum Action {
     /// Gets all scanned access points
     GetAccessPoints(Responder<Vec<AccessPoint>>),
     /// Adds a new device.
-    AddDevice(Device),
+    AddDevice(Box<Device>),
+    /// Updates a device.
+    UpdateDevice(Box<Device>),
     /// Removes a device.
     RemoveDevice(String),
     /// Gets a device by its name
diff --git a/rust/agama-server/src/network/error.rs b/rust/agama-server/src/network/error.rs
index bccb1469bb..348f0494f6 100644
--- a/rust/agama-server/src/network/error.rs
+++ b/rust/agama-server/src/network/error.rs
@@ -8,6 +8,8 @@ pub enum NetworkStateError {
     UnknownConnection(String),
     #[error("Cannot update connection '{0}'")]
     CannotUpdateConnection(String),
+    #[error("Unknown device '{0}'")]
+    UnknownDevice(String),
     #[error("Invalid connection UUID: '{0}'")]
     InvalidUuid(String),
     #[error("Invalid IP address: '{0}'")]
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 46c6d6c573..06cbdf4aa1 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -112,6 +112,13 @@ impl NetworkState {
         self.connections.iter_mut().find(|c| c.id == id)
     }
 
+    /// Get a device by name as mutable
+    ///
+    /// * `name`: device name
+    pub fn get_device_mut(&mut self, name: &str) -> Option<&mut Device> {
+        self.devices.iter_mut().find(|c| c.name == name)
+    }
+
     pub fn get_controlled_by(&mut self, uuid: Uuid) -> Vec<&Connection> {
         let uuid = Some(uuid);
         self.connections
@@ -163,6 +170,15 @@ impl NetworkState {
         Ok(())
     }
 
+    pub fn update_device(&mut self, device: Device) -> Result<(), NetworkStateError> {
+        let Some(old_device) = self.get_device_mut(&device.name) else {
+            return Err(NetworkStateError::UnknownDevice(device.name.clone()));
+        };
+        *old_device = device;
+
+        Ok(())
+    }
+
     pub fn remove_device(&mut self, name: &str) -> Result<(), NetworkStateError> {
         // TODO: return an error if the device does not exist
         if let Some(position) = self.devices.iter().position(|d| &d.name == name) {
@@ -1291,4 +1307,5 @@ impl fmt::Display for InfinibandTransportMode {
 pub enum NetworkChange {
     DeviceAdded(Device),
     DeviceRemoved(String),
+    DeviceUpdated(Device),
 }
diff --git a/rust/agama-server/src/network/nm.rs b/rust/agama-server/src/network/nm.rs
index 162d8e4852..9f844f2cc0 100644
--- a/rust/agama-server/src/network/nm.rs
+++ b/rust/agama-server/src/network/nm.rs
@@ -5,6 +5,7 @@
 //! internally, so the API is focused on Agama's use cases.
 
 mod adapter;
+mod builder;
 mod client;
 mod dbus;
 mod error;
diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
index 81ed85d3e9..9dc29aa4cb 100644
--- a/rust/agama-server/src/network/nm/watcher.rs
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -24,6 +24,8 @@ use zbus::{
     MatchRule, Message, MessageStream, MessageType,
 };
 
+use super::{builder::DeviceFromProxyBuilder, proxies::NetworkManagerProxy};
+
 /// Implements a [crate::network::adapter::Watcher] for NetworkManager.
 ///
 /// It detects the following changes by monitoring NetworkManager's D-Bus API:
@@ -94,17 +96,16 @@ impl<'a> ActionDispatcher<'a> {
     }
 
     pub async fn run(&mut self) {
+        self.read_devices().await.unwrap();
         while let Some(update) = self.updates.recv().await {
+            let builder = DeviceFromProxyBuilder::new(self.connection.clone());
             match update {
                 DeviceChange::DeviceAdded(path) => {
                     if let Ok(proxy) = self.build_device_proxy(path.clone()).await {
-                        let device = Device {
-                            name: proxy.interface().await.unwrap().to_string(),
-                            type_: DeviceType::Ethernet,
-                            ..Default::default()
-                        };
+                        if let Some(device) = builder.build(&proxy).await.unwrap() {
+                            _ = self.actions.send(Action::AddDevice(Box::new(device)));
+                        }
                         self.devices.insert(path, proxy);
-                        _ = self.actions.send(Action::AddDevice(device));
                     }
                 }
 
@@ -116,13 +117,72 @@ impl<'a> ActionDispatcher<'a> {
                     }
                 }
 
-                _ => {
-                    println!("Unhandled message");
+                DeviceChange::IP4ConfigChanged(path) => {
+                    if let Some(device_proxy) = self.find_ip4_config_device(&path).await {
+                        // TODO: be careful
+                        if let Some(device) = builder.build(&device_proxy).await.unwrap() {
+                            _ = self.actions.send(Action::UpdateDevice(Box::new(device)));
+                        }
+                    } else {
+                        tracing::warn!("Could not find the matching device for Ip4Config {path}");
+                    }
+                }
+
+                DeviceChange::IP6ConfigChanged(path) => {
+                    if let Some(device_proxy) = self.find_ip6_config_device(&path).await {
+                        println!("found proxy: {}", device_proxy.interface().await.unwrap());
+                    } else {
+                        tracing::warn!("Could not find the matching device for Ip6Config {path}");
+                    }
                 }
             }
         }
     }
 
+    async fn read_devices(&mut self) -> Result<(), ServiceError> {
+        let nm_proxy = NetworkManagerProxy::new(&self.connection).await?;
+        for path in nm_proxy.get_devices().await? {
+            let cloned_path = path.clone();
+            let proxy = DeviceProxy::builder(&self.connection)
+                .path(path.to_string())
+                .unwrap()
+                .build()
+                .await
+                .unwrap();
+            self.devices.insert(cloned_path.to_owned(), proxy);
+        }
+        Ok(())
+    }
+
+    async fn find_ip4_config_device(
+        &self,
+        ip4_config_path: &OwnedObjectPath,
+    ) -> Option<&DeviceProxy> {
+        for (_, proxy) in &self.devices {
+            if let Ok(path) = proxy.ip4_config().await {
+                if path == *ip4_config_path {
+                    return Some(&proxy);
+                }
+            }
+        }
+        None
+    }
+
+    // TODO: reduce code duplication
+    async fn find_ip6_config_device(
+        &self,
+        ip6_config_path: &OwnedObjectPath,
+    ) -> Option<&DeviceProxy> {
+        for (_, proxy) in &self.devices {
+            if let Ok(path) = proxy.ip6_config().await {
+                if path == *ip6_config_path {
+                    return Some(&proxy);
+                }
+            }
+        }
+        None
+    }
+
     async fn build_device_proxy(
         &self,
         path: OwnedObjectPath,
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index b1171d53ed..50a15e9526 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -329,8 +329,12 @@ impl<T: Adapter> NetworkSystemServer<T> {
                 tx.send(device.cloned()).unwrap();
             }
             Action::AddDevice(device) => {
-                self.state.add_device(device.clone())?;
-                return Ok(Some(NetworkChange::DeviceAdded(device)));
+                self.state.add_device(*device.clone())?;
+                return Ok(Some(NetworkChange::DeviceAdded(*device)));
+            }
+            Action::UpdateDevice(device) => {
+                self.state.update_device(*device.clone())?;
+                return Ok(Some(NetworkChange::DeviceUpdated(*device)));
             }
             Action::RemoveDevice(name) => {
                 self.state.remove_device(&name)?;

From 27323c00a384025b5b9e668d3455a1a9b8e14d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 14:01:33 +0100
Subject: [PATCH 265/324] Make NetworkChange serialization camelCase

---
 rust/agama-server/src/network/model.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 06cbdf4aa1..709eb6868b 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -1304,6 +1304,7 @@ impl fmt::Display for InfinibandTransportMode {
 }
 
 #[derive(Debug, Clone, Serialize)]
+#[serde(rename_all = "camelCase")]
 pub enum NetworkChange {
     DeviceAdded(Device),
     DeviceRemoved(String),

From ba777791a8ffb59300ace07b8328c5bfe226b970 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 14:39:29 +0100
Subject: [PATCH 266/324] Add a forgotten file from the previous commit

---
 rust/agama-server/src/network/nm/builder.rs | 199 ++++++++++++++++++++
 1 file changed, 199 insertions(+)
 create mode 100644 rust/agama-server/src/network/nm/builder.rs

diff --git a/rust/agama-server/src/network/nm/builder.rs b/rust/agama-server/src/network/nm/builder.rs
new file mode 100644
index 0000000000..80a7be84a0
--- /dev/null
+++ b/rust/agama-server/src/network/nm/builder.rs
@@ -0,0 +1,199 @@
+//! Conversion mechanism between proxies and model structs.
+
+use std::{collections::HashMap, net::IpAddr, str::FromStr};
+
+use agama_lib::error::ServiceError;
+use cidr::IpInet;
+
+use crate::network::model::{Device, IpConfig, IpRoute};
+
+use super::{
+    model::NmDeviceType,
+    proxies::{DeviceProxy, IP4ConfigProxy, IP6ConfigProxy},
+};
+
+pub struct DeviceFromProxyBuilder {
+    connection: zbus::Connection,
+}
+
+impl DeviceFromProxyBuilder {
+    pub fn new(connection: zbus::Connection) -> Self {
+        Self { connection }
+    }
+
+    pub async fn build(&self, proxy: &DeviceProxy<'_>) -> Result<Option<Device>, ServiceError> {
+        let device_type = NmDeviceType(proxy.device_type().await?);
+        let Ok(type_) = device_type.try_into() else {
+            return Ok(None);
+        };
+
+        let mut device = Device {
+            name: proxy.interface().await?,
+            type_,
+            ..Default::default()
+        };
+
+        let state = proxy.state().await?;
+        if state == 100 {
+            device.ip_config = self.build_ip_config(&proxy).await?;
+        }
+
+        Ok(Some(device))
+    }
+
+    async fn build_ip_config(
+        &self,
+        proxy: &DeviceProxy<'_>,
+    ) -> Result<Option<IpConfig>, ServiceError> {
+        let ip4_path = proxy.ip4_config().await?;
+        let ip6_path = proxy.ip6_config().await?;
+
+        let ip4_proxy = IP4ConfigProxy::builder(&self.connection)
+            .path(ip4_path.as_str())?
+            .build()
+            .await;
+
+        let Ok(ip4_proxy) = ip4_proxy else {
+            return Ok(None);
+        };
+
+        let ip6_proxy = IP6ConfigProxy::builder(&self.connection)
+            .path(ip6_path.as_str())?
+            .build()
+            .await;
+
+        let Ok(ip6_proxy) = ip6_proxy else {
+            return Ok(None);
+        };
+
+        let result = self
+            .build_ip_config_from_proxies(ip4_proxy, ip6_proxy)
+            .await
+            .ok();
+        Ok(result)
+    }
+
+    async fn build_ip_config_from_proxies(
+        &self,
+        ip4_proxy: IP4ConfigProxy<'_>,
+        ip6_proxy: IP6ConfigProxy<'_>,
+    ) -> Result<IpConfig, ServiceError> {
+        let address_data = ip4_proxy.address_data().await?;
+        let nameserver_data = ip4_proxy.nameserver_data().await?;
+        let mut addresses: Vec<IpInet> = vec![];
+        let mut nameservers: Vec<IpAddr> = vec![];
+
+        for addr in address_data {
+            if let Some(address) = self.address_with_prefix_from_dbus(addr) {
+                addresses.push(address)
+            }
+        }
+
+        let address_data = ip6_proxy.address_data().await?;
+        for addr in address_data {
+            if let Some(address) = self.address_with_prefix_from_dbus(addr) {
+                addresses.push(address)
+            }
+        }
+
+        for nameserver in nameserver_data {
+            if let Some(address) = self.nameserver_from_dbus(nameserver) {
+                nameservers.push(address)
+            }
+        }
+        // FIXME: Convert from Vec<u8> to [u8; 16] and take into account big vs little endian order,
+        // in IP6Config there is no nameserver-data.
+        //
+        // let nameserver_data = ip6_proxy.nameservers().await?;
+
+        let route_data = ip4_proxy.route_data().await?;
+        let mut routes4: Vec<IpRoute> = vec![];
+        if !route_data.is_empty() {
+            for route in route_data {
+                if let Some(route) = self.route_from_dbus(route) {
+                    routes4.push(route)
+                }
+            }
+        }
+
+        let mut routes6: Vec<IpRoute> = vec![];
+        let route_data = ip6_proxy.route_data().await?;
+        if !route_data.is_empty() {
+            for route in route_data {
+                if let Some(route) = self.route_from_dbus(route) {
+                    routes6.push(route)
+                }
+            }
+        }
+
+        let ip4_gateway = ip4_proxy.gateway().await?;
+        let ip6_gateway = ip6_proxy.gateway().await?;
+
+        let mut ip_config = IpConfig {
+            addresses,
+            nameservers,
+            ..Default::default()
+        };
+
+        if !ip4_gateway.is_empty() {
+            ip_config.gateway4 = Some(ip4_gateway.parse().unwrap());
+        };
+        if !ip6_gateway.is_empty() {
+            ip_config.gateway6 = Some(ip6_gateway.parse().unwrap());
+        };
+
+        if !routes4.is_empty() {
+            ip_config.routes4 = Some(routes4);
+        }
+
+        if !routes6.is_empty() {
+            ip_config.routes6 = Some(routes6);
+        }
+
+        Ok(ip_config)
+    }
+
+    pub fn address_with_prefix_from_dbus(
+        &self,
+        address_data: HashMap<String, zbus::zvariant::OwnedValue>,
+    ) -> Option<IpInet> {
+        let addr_str: &str = address_data.get("address")?.downcast_ref()?;
+        let prefix: &u32 = address_data.get("prefix")?.downcast_ref()?;
+        let prefix = *prefix as u8;
+        let address = IpInet::new(addr_str.parse().unwrap(), prefix).ok()?;
+        Some(address)
+    }
+
+    pub fn nameserver_from_dbus(
+        &self,
+        nameserver_data: HashMap<String, zbus::zvariant::OwnedValue>,
+    ) -> Option<IpAddr> {
+        let addr_str: &str = nameserver_data.get("address")?.downcast_ref()?;
+        Some(addr_str.parse().unwrap())
+    }
+
+    pub fn route_from_dbus(
+        &self,
+        route_data: HashMap<String, zbus::zvariant::OwnedValue>,
+    ) -> Option<IpRoute> {
+        let dest_str: &str = route_data.get("dest")?.downcast_ref()?;
+        let prefix: u8 = *route_data.get("prefix")?.downcast_ref::<u32>()? as u8;
+        let destination = IpInet::new(dest_str.parse().unwrap(), prefix).ok()?;
+        let mut new_route = IpRoute {
+            destination,
+            next_hop: None,
+            metric: None,
+        };
+
+        if let Some(next_hop) = route_data.get("next-hop") {
+            let next_hop_str: &str = next_hop.downcast_ref()?;
+            new_route.next_hop = Some(IpAddr::from_str(next_hop_str).unwrap());
+        }
+        if let Some(metric) = route_data.get("metric") {
+            let metric: u32 = *metric.downcast_ref()?;
+            new_route.metric = Some(metric);
+        }
+
+        Some(new_route)
+    }
+}

From e0c0c116a0903fa4b5e063eb145044029e14b926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 14:39:43 +0100
Subject: [PATCH 267/324] Proper handling of update network devices

---
 rust/agama-server/src/network/action.rs     |  2 +-
 rust/agama-server/src/network/model.rs      |  6 ++--
 rust/agama-server/src/network/nm/watcher.rs | 37 +++++++++++++++++++--
 rust/agama-server/src/network/system.rs     |  6 ++--
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index 4b4a8f547c..f7736ebe2a 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -45,7 +45,7 @@ pub enum Action {
     /// Adds a new device.
     AddDevice(Box<Device>),
     /// Updates a device.
-    UpdateDevice(Box<Device>),
+    UpdateDevice(String, Box<Device>),
     /// Removes a device.
     RemoveDevice(String),
     /// Gets a device by its name
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 709eb6868b..cc829d21ee 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -170,8 +170,8 @@ impl NetworkState {
         Ok(())
     }
 
-    pub fn update_device(&mut self, device: Device) -> Result<(), NetworkStateError> {
-        let Some(old_device) = self.get_device_mut(&device.name) else {
+    pub fn update_device(&mut self, name: &str, device: Device) -> Result<(), NetworkStateError> {
+        let Some(old_device) = self.get_device_mut(name) else {
             return Err(NetworkStateError::UnknownDevice(device.name.clone()));
         };
         *old_device = device;
@@ -1308,5 +1308,5 @@ impl fmt::Display for InfinibandTransportMode {
 pub enum NetworkChange {
     DeviceAdded(Device),
     DeviceRemoved(String),
-    DeviceUpdated(Device),
+    DeviceUpdated(String, Device),
 }
diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
index 9dc29aa4cb..98e4b71e1b 100644
--- a/rust/agama-server/src/network/nm/watcher.rs
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -77,6 +77,7 @@ impl Watcher for NetworkManagerWatcher {
 struct ActionDispatcher<'a> {
     connection: zbus::Connection,
     devices: HashMap<OwnedObjectPath, DeviceProxy<'a>>,
+    names: HashMap<OwnedObjectPath, String>,
     updates: UnboundedReceiver<DeviceChange>,
     actions: UnboundedSender<Action>,
 }
@@ -92,6 +93,7 @@ impl<'a> ActionDispatcher<'a> {
             updates,
             actions,
             devices: HashMap::new(),
+            names: HashMap::new(),
         }
     }
 
@@ -105,10 +107,29 @@ impl<'a> ActionDispatcher<'a> {
                         if let Some(device) = builder.build(&proxy).await.unwrap() {
                             _ = self.actions.send(Action::AddDevice(Box::new(device)));
                         }
+                        self.names
+                            .insert(path.clone(), proxy.interface().await.unwrap());
                         self.devices.insert(path, proxy);
                     }
                 }
 
+                DeviceChange::DeviceUpdated(path) => {
+                    if let Ok(proxy) = self.build_device_proxy(path.clone()).await {
+                        if let Some(old_name) = self.names.get(&path) {
+                            if let Ok(device) = builder.build(&proxy).await {
+                                if let Some(device) = device {
+                                    _ = self.actions.send(Action::UpdateDevice(
+                                        old_name.clone(),
+                                        Box::new(device),
+                                    ));
+                                }
+                                let name = proxy.interface().await.unwrap();
+                                self.names.insert(path, name);
+                            }
+                        }
+                    }
+                }
+
                 DeviceChange::DeviceRemoved(path) => {
                     if let Some(proxy) = self.devices.remove(&path) {
                         if let Ok(name) = proxy.interface().await {
@@ -120,8 +141,12 @@ impl<'a> ActionDispatcher<'a> {
                 DeviceChange::IP4ConfigChanged(path) => {
                     if let Some(device_proxy) = self.find_ip4_config_device(&path).await {
                         // TODO: be careful
-                        if let Some(device) = builder.build(&device_proxy).await.unwrap() {
-                            _ = self.actions.send(Action::UpdateDevice(Box::new(device)));
+                        if let Some(old_name) = self.names.get(&path) {
+                            if let Some(device) = builder.build(&device_proxy).await.unwrap() {
+                                _ = self
+                                    .actions
+                                    .send(Action::UpdateDevice(old_name.clone(), Box::new(device)));
+                            }
                         }
                     } else {
                         tracing::warn!("Could not find the matching device for Ip4Config {path}");
@@ -149,7 +174,11 @@ impl<'a> ActionDispatcher<'a> {
                 .build()
                 .await
                 .unwrap();
-            self.devices.insert(cloned_path.to_owned(), proxy);
+            let name = proxy.interface().await;
+            self.devices.insert(cloned_path.clone(), proxy);
+            if let Ok(name) = name {
+                self.names.insert(cloned_path, name);
+            }
         }
         Ok(())
     }
@@ -264,6 +293,7 @@ impl DeviceChangedStream {
             "org.freedesktop.NetworkManager.IP6Config" => {
                 Some(DeviceChange::IP6ConfigChanged(path))
             }
+            "org.freedesktop.NetworkManager.Device" => Some(DeviceChange::DeviceUpdated(path)),
             _ => None,
         }
     }
@@ -334,6 +364,7 @@ async fn build_properties_changed_stream(
 #[derive(Debug, Clone)]
 pub enum DeviceChange {
     DeviceAdded(OwnedObjectPath),
+    DeviceUpdated(OwnedObjectPath),
     DeviceRemoved(OwnedObjectPath),
     IP4ConfigChanged(OwnedObjectPath),
     IP6ConfigChanged(OwnedObjectPath),
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 50a15e9526..52dd3d771d 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -332,9 +332,9 @@ impl<T: Adapter> NetworkSystemServer<T> {
                 self.state.add_device(*device.clone())?;
                 return Ok(Some(NetworkChange::DeviceAdded(*device)));
             }
-            Action::UpdateDevice(device) => {
-                self.state.update_device(*device.clone())?;
-                return Ok(Some(NetworkChange::DeviceUpdated(*device)));
+            Action::UpdateDevice(name, device) => {
+                self.state.update_device(&name, *device.clone())?;
+                return Ok(Some(NetworkChange::DeviceUpdated(name, *device)));
             }
             Action::RemoveDevice(name) => {
                 self.state.remove_device(&name)?;

From 013701ee9b25c8771fe5207f0940e5253579f0c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 21:28:37 +0100
Subject: [PATCH 268/324] Refactor the NetworkManagerWatcher

---
 rust/agama-server/src/network/adapter.rs    |   2 +
 rust/agama-server/src/network/nm/watcher.rs | 297 ++++++++++++--------
 2 files changed, 176 insertions(+), 123 deletions(-)

diff --git a/rust/agama-server/src/network/adapter.rs b/rust/agama-server/src/network/adapter.rs
index ba6e84a253..9c755a0141 100644
--- a/rust/agama-server/src/network/adapter.rs
+++ b/rust/agama-server/src/network/adapter.rs
@@ -12,6 +12,8 @@ pub enum NetworkAdapterError {
     Write(ServiceError),
     #[error("Checkpoint handling error: {0}")]
     Checkpoint(ServiceError), // only relevant for adapters that implement a checkpoint mechanism
+    #[error("The network watcher cannot run: {0}")]
+    Watcher(ServiceError),
 }
 
 /// A trait for the ability to read/write from/to a network service.
diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
index 98e4b71e1b..14e9bb5b4d 100644
--- a/rust/agama-server/src/network/nm/watcher.rs
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -6,12 +6,12 @@
 use crate::network::{
     adapter::Watcher, model::Device, nm::proxies::DeviceProxy, Action, NetworkAdapterError,
 };
-use agama_lib::{error::ServiceError, network::types::DeviceType};
+use agama_lib::error::ServiceError;
 use async_trait::async_trait;
 use futures_util::ready;
 use pin_project::pin_project;
 use std::{
-    collections::HashMap,
+    collections::{hash_map::Entry, HashMap},
     pin::Pin,
     sync::Arc,
     task::{Context, Poll},
@@ -28,9 +28,18 @@ use super::{builder::DeviceFromProxyBuilder, proxies::NetworkManagerProxy};
 
 /// Implements a [crate::network::adapter::Watcher] for NetworkManager.
 ///
-/// It detects the following changes by monitoring NetworkManager's D-Bus API:
+/// This process is composed of the following pieces:
 ///
-/// * A device is added or removed.
+/// * A stream of potentially useful D-Bus signals (see [DeviceChangedStream]).
+/// * A dispatcher that receives the signals from the stream and turns them into
+///   [network system actions](crate::network::Action).
+///
+/// To avoid deadlocks, the stream runs on a separate Tokio task and it communicates
+/// with the dispatcher through a multi-producer single-consumer (mpsc) channel.
+///
+/// At this point, it detects the following changes:
+///
+/// * A device is added, changed or removed.
 /// * The IPv4 or IPv6 configuration changes.
 pub struct NetworkManagerWatcher {
     connection: zbus::Connection,
@@ -68,159 +77,131 @@ impl Watcher for NetworkManagerWatcher {
         // Turn the changes into actions in a separate task.
         let connection = self.connection.clone();
         let mut dispatcher = ActionDispatcher::new(connection, rx, actions);
-        dispatcher.run().await;
-
-        Ok(())
+        dispatcher.run().await.map_err(NetworkAdapterError::Watcher)
     }
 }
 
+/// Receives the updates and turns them into [network actions](crate::network::Action).
+///
+/// See [ActionDispatcher::run] for further details.
 struct ActionDispatcher<'a> {
     connection: zbus::Connection,
-    devices: HashMap<OwnedObjectPath, DeviceProxy<'a>>,
-    names: HashMap<OwnedObjectPath, String>,
-    updates: UnboundedReceiver<DeviceChange>,
-    actions: UnboundedSender<Action>,
+    proxies: ProxiesRegistry<'a>,
+    updates_rx: UnboundedReceiver<DeviceChange>,
+    actions_tx: UnboundedSender<Action>,
 }
 
 impl<'a> ActionDispatcher<'a> {
+    /// Returns a new dispatcher.
+    ///
+    /// * `connection`: D-Bus connection to NetworkManager.
+    /// * `updates_rx`: Channel to receive the updates.
+    /// * `actions_tx`: Channel to dispatch the network actions.
     pub fn new(
         connection: zbus::Connection,
-        updates: UnboundedReceiver<DeviceChange>,
-        actions: UnboundedSender<Action>,
+        updates_rx: UnboundedReceiver<DeviceChange>,
+        actions_tx: UnboundedSender<Action>,
     ) -> Self {
         Self {
+            proxies: ProxiesRegistry::new(&connection),
             connection,
-            updates,
-            actions,
-            devices: HashMap::new(),
-            names: HashMap::new(),
+            updates_rx,
+            actions_tx,
         }
     }
 
-    pub async fn run(&mut self) {
-        self.read_devices().await.unwrap();
-        while let Some(update) = self.updates.recv().await {
-            let builder = DeviceFromProxyBuilder::new(self.connection.clone());
-            match update {
-                DeviceChange::DeviceAdded(path) => {
-                    if let Ok(proxy) = self.build_device_proxy(path.clone()).await {
-                        if let Some(device) = builder.build(&proxy).await.unwrap() {
-                            _ = self.actions.send(Action::AddDevice(Box::new(device)));
-                        }
-                        self.names
-                            .insert(path.clone(), proxy.interface().await.unwrap());
-                        self.devices.insert(path, proxy);
-                    }
-                }
-
-                DeviceChange::DeviceUpdated(path) => {
-                    if let Ok(proxy) = self.build_device_proxy(path.clone()).await {
-                        if let Some(old_name) = self.names.get(&path) {
-                            if let Ok(device) = builder.build(&proxy).await {
-                                if let Some(device) = device {
-                                    _ = self.actions.send(Action::UpdateDevice(
-                                        old_name.clone(),
-                                        Box::new(device),
-                                    ));
-                                }
-                                let name = proxy.interface().await.unwrap();
-                                self.names.insert(path, name);
-                            }
-                        }
-                    }
-                }
-
-                DeviceChange::DeviceRemoved(path) => {
-                    if let Some(proxy) = self.devices.remove(&path) {
-                        if let Ok(name) = proxy.interface().await {
-                            _ = self.actions.send(Action::RemoveDevice(name));
-                        }
-                    }
-                }
-
-                DeviceChange::IP4ConfigChanged(path) => {
-                    if let Some(device_proxy) = self.find_ip4_config_device(&path).await {
-                        // TODO: be careful
-                        if let Some(old_name) = self.names.get(&path) {
-                            if let Some(device) = builder.build(&device_proxy).await.unwrap() {
-                                _ = self
-                                    .actions
-                                    .send(Action::UpdateDevice(old_name.clone(), Box::new(device)));
-                            }
-                        }
-                    } else {
-                        tracing::warn!("Could not find the matching device for Ip4Config {path}");
-                    }
-                }
+    /// Processes the updates.
+    ///
+    /// It runs until the updates channel is closed.
+    pub async fn run(&mut self) -> Result<(), ServiceError> {
+        self.read_devices().await?;
+        while let Some(update) = self.updates_rx.recv().await {
+            let result = match update {
+                DeviceChange::DeviceAdded(path) => self.handle_device_added(path).await,
+                DeviceChange::DeviceUpdated(path) => self.handle_device_updated(path).await,
+                DeviceChange::DeviceRemoved(path) => self.handle_device_removed(path).await,
+                DeviceChange::IP4ConfigChanged(path) => self.handle_ip4_config_changed(path).await,
+                DeviceChange::IP6ConfigChanged(path) => self.handle_ip6_config_changed(path).await,
+            };
 
-                DeviceChange::IP6ConfigChanged(path) => {
-                    if let Some(device_proxy) = self.find_ip6_config_device(&path).await {
-                        println!("found proxy: {}", device_proxy.interface().await.unwrap());
-                    } else {
-                        tracing::warn!("Could not find the matching device for Ip6Config {path}");
-                    }
-                }
+            if let Err(error) = result {
+                tracing::warn!("Could not process a network update: {error}]")
             }
         }
+        Ok(())
     }
 
+    /// Reads the devices.
     async fn read_devices(&mut self) -> Result<(), ServiceError> {
         let nm_proxy = NetworkManagerProxy::new(&self.connection).await?;
         for path in nm_proxy.get_devices().await? {
-            let cloned_path = path.clone();
-            let proxy = DeviceProxy::builder(&self.connection)
-                .path(path.to_string())
-                .unwrap()
-                .build()
-                .await
-                .unwrap();
-            let name = proxy.interface().await;
-            self.devices.insert(cloned_path.clone(), proxy);
-            if let Ok(name) = name {
-                self.names.insert(cloned_path, name);
-            }
+            self.proxies.find_or_create_device(&path).await?;
         }
         Ok(())
     }
 
-    async fn find_ip4_config_device(
-        &self,
-        ip4_config_path: &OwnedObjectPath,
-    ) -> Option<&DeviceProxy> {
-        for (_, proxy) in &self.devices {
-            if let Ok(path) = proxy.ip4_config().await {
-                if path == *ip4_config_path {
-                    return Some(&proxy);
-                }
-            }
+    async fn handle_device_added(&mut self, path: OwnedObjectPath) -> Result<(), ServiceError> {
+        let (_, proxy) = self.proxies.find_or_create_device(&path).await?;
+        if let Ok(device) = Self::device_from_proxy(&self.connection, proxy.clone()).await {
+            _ = self.actions_tx.send(Action::AddDevice(Box::new(device)));
         }
-        None
+        // TODO: report an error if the device cannot get generated
+
+        Ok(())
     }
 
-    // TODO: reduce code duplication
-    async fn find_ip6_config_device(
-        &self,
-        ip6_config_path: &OwnedObjectPath,
-    ) -> Option<&DeviceProxy> {
-        for (_, proxy) in &self.devices {
-            if let Ok(path) = proxy.ip6_config().await {
-                if path == *ip6_config_path {
-                    return Some(&proxy);
-                }
-            }
+    async fn handle_device_updated(&mut self, path: OwnedObjectPath) -> Result<(), ServiceError> {
+        let (old_name, proxy) = self.proxies.find_or_create_device(&path).await?;
+        let device = Self::device_from_proxy(&self.connection, proxy.clone()).await?;
+        let new_name = device.name.clone();
+        _ = self
+            .actions_tx
+            .send(Action::UpdateDevice(old_name.to_string(), Box::new(device)));
+        self.proxies.update_device_name(&path, &new_name);
+        Ok(())
+    }
+
+    async fn handle_device_removed(&mut self, path: OwnedObjectPath) -> Result<(), ServiceError> {
+        if let Some((name, _)) = self.proxies.remove_device(&path) {
+            _ = self.actions_tx.send(Action::RemoveDevice(name));
         }
-        None
+        Ok(())
     }
 
-    async fn build_device_proxy(
-        &self,
+    async fn handle_ip4_config_changed(
+        &mut self,
+        path: OwnedObjectPath,
+    ) -> Result<(), ServiceError> {
+        if let Some((name, proxy)) = self.proxies.find_device_for_ip4(&path).await {
+            let device = Self::device_from_proxy(&self.connection, proxy.clone()).await?;
+            _ = self
+                .actions_tx
+                .send(Action::UpdateDevice(name.to_string(), Box::new(device)));
+        }
+        Ok(())
+    }
+
+    async fn handle_ip6_config_changed(
+        &mut self,
         path: OwnedObjectPath,
-    ) -> Result<DeviceProxy<'a>, ServiceError> {
-        let proxy = DeviceProxy::builder(&self.connection.clone())
-            .path(path.clone())?
-            .build()
-            .await?;
-        Ok(proxy)
+    ) -> Result<(), ServiceError> {
+        if let Some((name, proxy)) = self.proxies.find_device_for_ip6(&path).await {
+            let device = Self::device_from_proxy(&self.connection, proxy.clone()).await?;
+            _ = self
+                .actions_tx
+                .send(Action::UpdateDevice(name.to_string(), Box::new(device)));
+        }
+        Ok(())
+    }
+
+    // TODO: improve after DeviceFromProxyBuilder API is improved
+    async fn device_from_proxy(
+        connection: &zbus::Connection,
+        proxy: DeviceProxy<'_>,
+    ) -> Result<Device, ServiceError> {
+        let builder = DeviceFromProxyBuilder::new(connection.clone());
+        let result = builder.build(&proxy).await?;
+        Ok(result.unwrap())
     }
 }
 
@@ -362,10 +343,80 @@ async fn build_properties_changed_stream(
 }
 
 #[derive(Debug, Clone)]
-pub enum DeviceChange {
+enum DeviceChange {
     DeviceAdded(OwnedObjectPath),
     DeviceUpdated(OwnedObjectPath),
     DeviceRemoved(OwnedObjectPath),
     IP4ConfigChanged(OwnedObjectPath),
     IP6ConfigChanged(OwnedObjectPath),
 }
+
+struct ProxiesRegistry<'a> {
+    connection: zbus::Connection,
+    devices: HashMap<OwnedObjectPath, (String, DeviceProxy<'a>)>,
+}
+
+impl<'a> ProxiesRegistry<'a> {
+    pub fn new(connection: &zbus::Connection) -> Self {
+        Self {
+            connection: connection.clone(),
+            devices: HashMap::new(),
+        }
+    }
+    pub async fn find_or_create_device(
+        &mut self,
+        path: &OwnedObjectPath,
+    ) -> Result<&(String, DeviceProxy<'a>), ServiceError> {
+        // Cannot use entry(...).or_insert_with(...) because of the async call.
+        match self.devices.entry(path.clone()) {
+            Entry::Vacant(entry) => {
+                let proxy = DeviceProxy::builder(&self.connection.clone())
+                    .path(path.clone())?
+                    .build()
+                    .await?;
+                let name = proxy.interface().await?;
+
+                Ok(entry.insert((name, proxy)))
+            }
+            Entry::Occupied(entry) => Ok(entry.into_mut()),
+        }
+    }
+
+    pub fn remove_device(&mut self, path: &OwnedObjectPath) -> Option<(String, DeviceProxy)> {
+        self.devices.remove(&path)
+    }
+
+    pub fn update_device_name(&mut self, path: &OwnedObjectPath, new_name: &str) {
+        if let Some(value) = self.devices.get_mut(path) {
+            value.0 = new_name.to_string();
+        };
+    }
+
+    pub async fn find_device_for_ip4(
+        &self,
+        ip4_config_path: &OwnedObjectPath,
+    ) -> Option<&(String, DeviceProxy<'_>)> {
+        for (_, device) in &self.devices {
+            if let Ok(path) = device.1.ip4_config().await {
+                if path == *ip4_config_path {
+                    return Some(&device);
+                }
+            }
+        }
+        None
+    }
+
+    pub async fn find_device_for_ip6(
+        &self,
+        ip4_config_path: &OwnedObjectPath,
+    ) -> Option<&(String, DeviceProxy<'_>)> {
+        for (_, device) in &self.devices {
+            if let Ok(path) = device.1.ip4_config().await {
+                if path == *ip4_config_path {
+                    return Some(&device);
+                }
+            }
+        }
+        None
+    }
+}

From 8d609a7e7fe19cacf264873a757e0f74d9ae7797 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 18 Apr 2024 22:53:52 +0200
Subject: [PATCH 269/324] Update rust/agama-lib/src/product/client.rs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Imobach González Sosa <igonzalezsosa@suse.com>
---
 rust/agama-lib/src/product/client.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-lib/src/product/client.rs b/rust/agama-lib/src/product/client.rs
index 250ec500d1..a75824e8f1 100644
--- a/rust/agama-lib/src/product/client.rs
+++ b/rust/agama-lib/src/product/client.rs
@@ -24,7 +24,7 @@ pub enum RegistrationRequirement {
     NotRequired = 0,
     /// Product has optional registration
     Optional = 1,
-    /// It is mandatory to register product
+    /// It is mandatory to register the product
     Mandatory = 2,
 }
 

From c08a679275a3e75b12a5806d45cbf0404b3b6185 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 18 Apr 2024 16:22:02 +0200
Subject: [PATCH 270/324] implement better error handling for registration and
 deregistration

---
 rust/agama-server/src/software/web.rs | 42 ++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index e5ae39f01d..ff6ecb7364 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -22,6 +22,8 @@ use agama_lib::{
 };
 use axum::{
     extract::State,
+    http::StatusCode,
+    response::IntoResponse,
     routing::{get, post, put},
     Json, Router,
 };
@@ -263,7 +265,6 @@ async fn get_registration(
 
 /// Software service configuration (product, patterns, etc.).
 #[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
-#[serde(rename_all = "camelCase")]
 pub struct RegistrationParams {
     /// Registration key.
     key: String,
@@ -271,19 +272,35 @@ pub struct RegistrationParams {
     email: String,
 }
 
+#[derive(Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct FailureDetails {
+    /// ID of error. See dbus API for possible values
+    id: u32,
+    /// human readable error string intended to be displayed to user
+    message: String,
+}
 /// Register product
 ///
 /// * `state`: service state.
 #[utoipa::path(post, path = "/software/registration", responses(
-    (status = 200, description = "registration successfull"),
+    (status = 204, description = "registration successfull"),
+    (status = 422, description = "Registration failed. Details are in body", body=FailureDetails),
     (status = 400, description = "The D-Bus service could not perform the action")
 ))]
 async fn register(
     State(state): State<SoftwareState<'_>>,
     Json(config): Json<RegistrationParams>,
-) -> Result<Json<()>, Error> {
-    state.product.register(&config.key, &config.email).await?;
-    Ok(Json(()))
+) -> Result<impl IntoResponse, Error> {
+    let (id, message) = state.product.register(&config.key, &config.email).await?;
+    let details = FailureDetails { id, message };
+    if id == 0 {
+        Ok((StatusCode::NO_CONTENT, ().into_response()))
+    } else {
+        Ok((
+            StatusCode::UNPROCESSABLE_ENTITY,
+            Json(details).into_response(),
+        ))
+    }
 }
 
 /// Deregister product
@@ -291,11 +308,20 @@ async fn register(
 /// * `state`: service state.
 #[utoipa::path(delete, path = "/software/registration", responses(
     (status = 200, description = "deregistration successfull"),
+    (status = 422, description = "De-registration failed. Details are in body", body=FailureDetails),
     (status = 400, description = "The D-Bus service could not perform the action")
 ))]
-async fn deregister(State(state): State<SoftwareState<'_>>) -> Result<Json<()>, Error> {
-    state.product.deregister().await?;
-    Ok(Json(()))
+async fn deregister(State(state): State<SoftwareState<'_>>) -> Result<impl IntoResponse, Error> {
+    let (id, message) = state.product.deregister().await?;
+    let details = FailureDetails { id, message };
+    if id == 0 {
+        Ok((StatusCode::NO_CONTENT, ().into_response()))
+    } else {
+        Ok((
+            StatusCode::UNPROCESSABLE_ENTITY,
+            Json(details).into_response(),
+        ))
+    }
 }
 
 /// Returns the list of software patterns.

From fcb2222b3b8d84ed8d05fa6c6663a22cc071931f Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 18 Apr 2024 22:54:33 +0200
Subject: [PATCH 271/324] changes from review

---
 rust/agama-server/src/software/web.rs |  6 ++---
 rust/agama-server/src/users/web.rs    |  7 +++--
 rust/agama-server/src/web/common.rs   |  2 +-
 web/src/client/software.js            | 37 +++++++++++++++++++++------
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/rust/agama-server/src/software/web.rs b/rust/agama-server/src/software/web.rs
index ff6ecb7364..7181fbf370 100644
--- a/rust/agama-server/src/software/web.rs
+++ b/rust/agama-server/src/software/web.rs
@@ -8,7 +8,7 @@
 use crate::{
     error::Error,
     web::{
-        common::{issues_router, progress_router, service_status_router, Streams},
+        common::{issues_router, progress_router, service_status_router, EventStreams},
         Event,
     },
 };
@@ -51,8 +51,8 @@ pub struct SoftwareConfig {
 /// It emits the Event::ProductChanged and Event::PatternsChanged events.
 ///
 /// * `connection`: D-Bus connection to listen for events.
-pub async fn software_streams(dbus: zbus::Connection) -> Result<Streams, Error> {
-    let result: Streams = vec![
+pub async fn software_streams(dbus: zbus::Connection) -> Result<EventStreams, Error> {
+    let result: EventStreams = vec![
         (
             "patterns_changed",
             Box::pin(patterns_changed_stream(dbus.clone()).await?),
diff --git a/rust/agama-server/src/users/web.rs b/rust/agama-server/src/users/web.rs
index e1f6027e8f..ea5aaf2909 100644
--- a/rust/agama-server/src/users/web.rs
+++ b/rust/agama-server/src/users/web.rs
@@ -7,7 +7,7 @@
 use crate::{
     error::Error,
     web::{
-        common::{service_status_router, validation_router, Streams},
+        common::{service_status_router, validation_router, EventStreams},
         Event,
     },
 };
@@ -17,7 +17,6 @@ use agama_lib::{
 };
 use axum::{extract::State, routing::get, Json, Router};
 use serde::{Deserialize, Serialize};
-use std::pin::Pin;
 use tokio_stream::{Stream, StreamExt};
 
 #[derive(Clone)]
@@ -30,14 +29,14 @@ struct UsersState<'a> {
 /// It emits the Event::RootPasswordChange, Event::RootSSHKeyChanged and Event::FirstUserChanged events.
 ///
 /// * `connection`: D-Bus connection to listen for events.
-pub async fn users_streams(dbus: zbus::Connection) -> Result<Streams, Error> {
+pub async fn users_streams(dbus: zbus::Connection) -> Result<EventStreams, Error> {
     const FIRST_USER_ID: &str = "first_user";
     const ROOT_PASSWORD_ID: &str = "root_password";
     const ROOT_SSHKEY_ID: &str = "root_sshkey";
     // here we have three streams, but only two events. Reason is
     // that we have three streams from dbus about property change
     // and unify two root user properties into single event to http API
-    let result: Streams = vec![
+    let result: EventStreams = vec![
         (
             FIRST_USER_ID,
             Box::pin(first_user_changed_stream(dbus.clone()).await?),
diff --git a/rust/agama-server/src/web/common.rs b/rust/agama-server/src/web/common.rs
index 3475e96c69..06da4f88e5 100644
--- a/rust/agama-server/src/web/common.rs
+++ b/rust/agama-server/src/web/common.rs
@@ -17,7 +17,7 @@ use crate::error::Error;
 
 use super::Event;
 
-pub type Streams = Vec<(&'static str, Pin<Box<dyn Stream<Item = Event> + Send>>)>;
+pub type EventStreams = Vec<(&'static str, Pin<Box<dyn Stream<Item = Event> + Send>>)>;
 
 /// Builds a router to the `org.opensuse.Agama1.ServiceStatus` interface of the
 /// given D-Bus object.
diff --git a/web/src/client/software.js b/web/src/client/software.js
index 3377eb4ffc..7bbf0d31cf 100644
--- a/web/src/client/software.js
+++ b/web/src/client/software.js
@@ -56,6 +56,12 @@ const SelectedBy = Object.freeze({
  * @property {string|null} email - Registration email, if any.
  */
 
+/**
+ * @typedef {object} RegistrationFailure
+ * @property {Number} id - ID of error.
+ * @property {string} message - Failure message.
+ */
+
 /**
  * @typedef {object} ActionResult
  * @property {boolean} success - Whether the action was successfully done.
@@ -255,14 +261,12 @@ class ProductBaseClient {
   async getRegistration() {
     const response = await this.client.get("/software/registration");
     if (!response.ok) {
-      console.log("Failed to get registration config: ", response);
+      console.log("Failed to get registration config:", response);
       return { requirement: "unknown", code: null, email: null };
     }
     const config = await response.json();
 
-    const requirement = config.requirement;
-    const code = config.key;
-    const email = config.email;
+    const { requirement, key: code, email } = config;
 
     const registration = { requirement, code, email };
     if (code.length === 0) registration.code = null;
@@ -280,10 +284,18 @@ class ProductBaseClient {
    */
   async register(code, email = "") {
     const response = await this.client.post("/software/registration", { key: code, email });
+    if (response.status === 422) {
+      /**  @type RegistrationFailure */
+      const body = await response.json();
+      return {
+        success: false,
+        message: body.message,
+      };
+    }
 
     return {
-      success: response.ok,
-      message: "", // TODO: pass message and code in body
+      success: response.ok, // still we can fail 400 due to dbus issue or 500 if backend stop working. maybe some message for this case?
+      message: ""
     };
   }
 
@@ -295,9 +307,18 @@ class ProductBaseClient {
   async deregister() {
     const response = await this.client.delete("/software/registration");
 
+    if (response.status === 422) {
+      /**  @type RegistrationFailure */
+      const body = await response.json();
+      return {
+        success: false,
+        message: body.message,
+      };
+    }
+
     return {
-      success: response.ok,
-      message: "", // TODO: how to get message?
+      success: response.ok, // still we can fail 400 due to dbus issue or 500 if backend stop working. maybe some message for this case?
+      message: ""
     };
   }
 

From caece556a143201c160d043d025dc1f58364e75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 22:13:34 +0100
Subject: [PATCH 272/324] Refactor the DeviceFromProxyBuilder

---
 rust/agama-server/src/network/nm/builder.rs | 60 ++++++++++-----------
 rust/agama-server/src/network/nm/watcher.rs |  5 +-
 2 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/rust/agama-server/src/network/nm/builder.rs b/rust/agama-server/src/network/nm/builder.rs
index 80a7be84a0..0c9a0ac74b 100644
--- a/rust/agama-server/src/network/nm/builder.rs
+++ b/rust/agama-server/src/network/nm/builder.rs
@@ -1,52 +1,52 @@
 //! Conversion mechanism between proxies and model structs.
 
-use std::{collections::HashMap, net::IpAddr, str::FromStr};
-
-use agama_lib::error::ServiceError;
-use cidr::IpInet;
-
-use crate::network::model::{Device, IpConfig, IpRoute};
-
-use super::{
-    model::NmDeviceType,
-    proxies::{DeviceProxy, IP4ConfigProxy, IP6ConfigProxy},
+use crate::network::{
+    model::{Device, IpConfig, IpRoute},
+    nm::{
+        model::NmDeviceType,
+        proxies::{DeviceProxy, IP4ConfigProxy, IP6ConfigProxy},
+    },
 };
+use agama_lib::{error::ServiceError, network::types::DeviceType};
+use anyhow::Context;
+use cidr::IpInet;
+use std::{collections::HashMap, net::IpAddr, str::FromStr};
 
-pub struct DeviceFromProxyBuilder {
+/// Builder to create a [Device] from its corresponding NetworkManager D-Bus representation.
+pub struct DeviceFromProxyBuilder<'a> {
     connection: zbus::Connection,
+    proxy: &'a DeviceProxy<'a>,
 }
 
-impl DeviceFromProxyBuilder {
-    pub fn new(connection: zbus::Connection) -> Self {
-        Self { connection }
+impl<'a> DeviceFromProxyBuilder<'a> {
+    pub fn new(connection: zbus::Connection, proxy: &'a DeviceProxy<'a>) -> Self {
+        Self { connection, proxy }
     }
 
-    pub async fn build(&self, proxy: &DeviceProxy<'_>) -> Result<Option<Device>, ServiceError> {
-        let device_type = NmDeviceType(proxy.device_type().await?);
-        let Ok(type_) = device_type.try_into() else {
-            return Ok(None);
-        };
-
+    /// Creates a [Device] starting on the [DeviceProxy].
+    pub async fn build(&self) -> Result<Device, ServiceError> {
+        let device_type = NmDeviceType(self.proxy.device_type().await?);
+        // TODO: we need to check the errors hierarchy to not abuse ServiceError.
+         let type_: DeviceType = device_type
+            .try_into()
+            .context("Unsupported device type: {device_type}")?;
         let mut device = Device {
-            name: proxy.interface().await?,
+            name: self.proxy.interface().await?,
             type_,
             ..Default::default()
         };
+        let state = self.proxy.state().await?;
 
-        let state = proxy.state().await?;
         if state == 100 {
-            device.ip_config = self.build_ip_config(&proxy).await?;
+            device.ip_config = self.build_ip_config().await?;
         }
 
-        Ok(Some(device))
+        Ok(device)
     }
 
-    async fn build_ip_config(
-        &self,
-        proxy: &DeviceProxy<'_>,
-    ) -> Result<Option<IpConfig>, ServiceError> {
-        let ip4_path = proxy.ip4_config().await?;
-        let ip6_path = proxy.ip6_config().await?;
+    async fn build_ip_config(&self) -> Result<Option<IpConfig>, ServiceError> {
+        let ip4_path = self.proxy.ip4_config().await?;
+        let ip6_path = self.proxy.ip6_config().await?;
 
         let ip4_proxy = IP4ConfigProxy::builder(&self.connection)
             .path(ip4_path.as_str())?
diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
index 14e9bb5b4d..61c870a939 100644
--- a/rust/agama-server/src/network/nm/watcher.rs
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -199,9 +199,8 @@ impl<'a> ActionDispatcher<'a> {
         connection: &zbus::Connection,
         proxy: DeviceProxy<'_>,
     ) -> Result<Device, ServiceError> {
-        let builder = DeviceFromProxyBuilder::new(connection.clone());
-        let result = builder.build(&proxy).await?;
-        Ok(result.unwrap())
+        let builder = DeviceFromProxyBuilder::new(connection.clone(), &proxy);
+        Ok(builder.build().await?)
     }
 }
 

From 6e6ea754e04fa77a71726fc408717c9bb1b19743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 22:37:25 +0100
Subject: [PATCH 273/324] Remove duplicated code from NetworkManagerClient

---
 rust/agama-server/src/network/nm/builder.rs |  36 +++-
 rust/agama-server/src/network/nm/client.rs  | 191 +-------------------
 rust/agama-server/src/network/nm/watcher.rs |   2 +-
 3 files changed, 38 insertions(+), 191 deletions(-)

diff --git a/rust/agama-server/src/network/nm/builder.rs b/rust/agama-server/src/network/nm/builder.rs
index 0c9a0ac74b..ff54dee6f2 100644
--- a/rust/agama-server/src/network/nm/builder.rs
+++ b/rust/agama-server/src/network/nm/builder.rs
@@ -1,7 +1,7 @@
 //! Conversion mechanism between proxies and model structs.
 
 use crate::network::{
-    model::{Device, IpConfig, IpRoute},
+    model::{Device, IpConfig, IpRoute, MacAddress},
     nm::{
         model::NmDeviceType,
         proxies::{DeviceProxy, IP4ConfigProxy, IP6ConfigProxy},
@@ -19,8 +19,11 @@ pub struct DeviceFromProxyBuilder<'a> {
 }
 
 impl<'a> DeviceFromProxyBuilder<'a> {
-    pub fn new(connection: zbus::Connection, proxy: &'a DeviceProxy<'a>) -> Self {
-        Self { connection, proxy }
+    pub fn new(connection: &zbus::Connection, proxy: &'a DeviceProxy<'a>) -> Self {
+        Self {
+            connection: connection.clone(),
+            proxy,
+        }
     }
 
     /// Creates a [Device] starting on the [DeviceProxy].
@@ -35,12 +38,17 @@ impl<'a> DeviceFromProxyBuilder<'a> {
             type_,
             ..Default::default()
         };
-        let state = self.proxy.state().await?;
 
+        let state = self.proxy.state().await?;
         if state == 100 {
             device.ip_config = self.build_ip_config().await?;
         }
 
+        device.mac_address = self.mac_address_from_dbus(self.proxy.hw_address().await?.as_str());
+        if let Ok((connection, _)) = self.proxy.get_applied_connection(0).await {
+            device.connection = self.connection_id(connection);
+        }
+
         Ok(device)
     }
 
@@ -196,4 +204,24 @@ impl<'a> DeviceFromProxyBuilder<'a> {
 
         Some(new_route)
     }
+
+    fn mac_address_from_dbus(&self, mac: &str) -> MacAddress {
+        match MacAddress::from_str(mac) {
+            Ok(mac) => mac,
+            Err(_) => {
+                log::warn!("Unable to parse mac {}", &mac);
+                MacAddress::Unset
+            }
+        }
+    }
+
+    pub fn connection_id(
+        &self,
+        connection_data: HashMap<String, HashMap<String, zbus::zvariant::OwnedValue>>,
+    ) -> Option<String> {
+        let connection = connection_data.get("connection")?;
+        let id: &str = connection.get("id")?.downcast_ref()?;
+
+        Some(id.to_string())
+    }
 }
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index 59406b2652..daefbaaf27 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -1,6 +1,7 @@
 //! NetworkManager client.
 use std::{collections::HashMap, net::IpAddr, str::FromStr};
 
+use super::builder::DeviceFromProxyBuilder;
 use super::dbus::{
     cleanup_dbus_connection, connection_from_dbus, connection_to_dbus, controller_from_dbus,
     merge_dbus_connections,
@@ -147,16 +148,6 @@ impl<'a> NetworkManagerClient<'a> {
         Ok(points)
     }
 
-    pub fn mac_address_from_dbus(&self, mac: &str) -> MacAddress {
-        match MacAddress::from_str(mac) {
-            Ok(mac) => mac,
-            Err(_) => {
-                log::warn!("Unable to parse mac {}", &mac);
-                MacAddress::Unset
-            }
-        }
-    }
-
     /// Returns the list of network devices.
     pub async fn devices(&self) -> Result<Vec<Device>, ServiceError> {
         let mut devs = vec![];
@@ -166,191 +157,19 @@ impl<'a> NetworkManagerClient<'a> {
                 .build()
                 .await?;
 
-            let device_name = proxy.interface().await?;
-            let device_type = NmDeviceType(proxy.device_type().await?);
-            let ip4_path = proxy.ip4_config().await?;
-            let ip6_path = proxy.ip6_config().await?;
-            let ip4_proxy = IP4ConfigProxy::builder(&self.connection)
-                .path(ip4_path.as_str())?
+            if let Ok(device) = DeviceFromProxyBuilder::new(&self.connection, &proxy)
                 .build()
-                .await?;
-
-            let ip6_proxy = IP6ConfigProxy::builder(&self.connection)
-                .path(ip6_path.as_str())?
-                .build()
-                .await?;
-
-            let state = proxy.state().await?;
-            let mac_address = self.mac_address_from_dbus(proxy.hw_address().await?.as_str());
-            let ip_config = if state == 100 {
-                let config = &self.ip_config_for(ip4_proxy, ip6_proxy).await?;
-
-                Some(config.to_owned())
-            } else {
-                None
-            };
-
-            let connection = match proxy.get_applied_connection(0).await {
-                Ok((conn, _)) => self.connection_id(conn),
-                Err(_) => None,
-            };
-
-            if let Ok(device_type) = device_type.try_into() {
-                let device = Device {
-                    name: device_name,
-                    type_: device_type,
-                    mac_address,
-                    ip_config,
-                    connection,
-                };
+                .await
+            {
                 devs.push(device);
             } else {
-                // TODO: use a logger
-                log::warn!(
-                    "Ignoring network device '{}' (unsupported type '{}')",
-                    &device_name,
-                    &device_type
-                );
+                tracing::warn!("Ignoring network device: ");
             }
         }
 
         Ok(devs)
     }
 
-    pub fn connection_id(
-        &self,
-        connection_data: HashMap<String, HashMap<String, zbus::zvariant::OwnedValue>>,
-    ) -> Option<String> {
-        let connection = connection_data.get("connection")?;
-        let id: &str = connection.get("id")?.downcast_ref()?;
-
-        Some(id.to_string())
-    }
-
-    pub fn address_with_prefix_from_dbus(
-        &self,
-        address_data: HashMap<String, zbus::zvariant::OwnedValue>,
-    ) -> Option<IpInet> {
-        let addr_str: &str = address_data.get("address")?.downcast_ref()?;
-        let prefix: &u32 = address_data.get("prefix")?.downcast_ref()?;
-        let prefix = *prefix as u8;
-        let address = IpInet::new(addr_str.parse().unwrap(), prefix).ok()?;
-        Some(address)
-    }
-
-    pub fn nameserver_from_dbus(
-        &self,
-        nameserver_data: HashMap<String, zbus::zvariant::OwnedValue>,
-    ) -> Option<IpAddr> {
-        let addr_str: &str = nameserver_data.get("address")?.downcast_ref()?;
-        Some(addr_str.parse().unwrap())
-    }
-
-    pub fn route_from_dbus(
-        &self,
-        route_data: HashMap<String, zbus::zvariant::OwnedValue>,
-    ) -> Option<IpRoute> {
-        let dest_str: &str = route_data.get("dest")?.downcast_ref()?;
-        let prefix: u8 = *route_data.get("prefix")?.downcast_ref::<u32>()? as u8;
-        let destination = IpInet::new(dest_str.parse().unwrap(), prefix).ok()?;
-        let mut new_route = IpRoute {
-            destination,
-            next_hop: None,
-            metric: None,
-        };
-
-        if let Some(next_hop) = route_data.get("next-hop") {
-            let next_hop_str: &str = next_hop.downcast_ref()?;
-            new_route.next_hop = Some(IpAddr::from_str(next_hop_str).unwrap());
-        }
-        if let Some(metric) = route_data.get("metric") {
-            let metric: u32 = *metric.downcast_ref()?;
-            new_route.metric = Some(metric);
-        }
-
-        Some(new_route)
-    }
-
-    pub async fn ip_config_for(
-        &self,
-        ip4_proxy: IP4ConfigProxy<'_>,
-        ip6_proxy: IP6ConfigProxy<'_>,
-    ) -> Result<IpConfig, ServiceError> {
-        let address_data = ip4_proxy.address_data().await?;
-        let nameserver_data = ip4_proxy.nameserver_data().await?;
-        let mut addresses: Vec<IpInet> = vec![];
-        let mut nameservers: Vec<IpAddr> = vec![];
-
-        for addr in address_data {
-            if let Some(address) = self.address_with_prefix_from_dbus(addr) {
-                addresses.push(address)
-            }
-        }
-
-        let address_data = ip6_proxy.address_data().await?;
-        for addr in address_data {
-            if let Some(address) = self.address_with_prefix_from_dbus(addr) {
-                addresses.push(address)
-            }
-        }
-
-        for nameserver in nameserver_data {
-            if let Some(address) = self.nameserver_from_dbus(nameserver) {
-                nameservers.push(address)
-            }
-        }
-        // FIXME: Convert from Vec<u8> to [u8; 16] and take into account big vs little endian order,
-        // in IP6Config there is no nameserver-data.
-        //
-        // let nameserver_data = ip6_proxy.nameservers().await?;
-
-        let route_data = ip4_proxy.route_data().await?;
-        let mut routes4: Vec<IpRoute> = vec![];
-        if !route_data.is_empty() {
-            for route in route_data {
-                if let Some(route) = self.route_from_dbus(route) {
-                    routes4.push(route)
-                }
-            }
-        }
-
-        let mut routes6: Vec<IpRoute> = vec![];
-        let route_data = ip6_proxy.route_data().await?;
-        if !route_data.is_empty() {
-            for route in route_data {
-                if let Some(route) = self.route_from_dbus(route) {
-                    routes6.push(route)
-                }
-            }
-        }
-
-        let ip4_gateway = ip4_proxy.gateway().await?;
-        let ip6_gateway = ip6_proxy.gateway().await?;
-
-        let mut ip_config = IpConfig {
-            addresses,
-            nameservers,
-            ..Default::default()
-        };
-
-        if !ip4_gateway.is_empty() {
-            ip_config.gateway4 = Some(ip4_gateway.parse().unwrap());
-        };
-        if !ip6_gateway.is_empty() {
-            ip_config.gateway6 = Some(ip6_gateway.parse().unwrap());
-        };
-
-        if !routes4.is_empty() {
-            ip_config.routes4 = Some(routes4);
-        }
-
-        if !routes6.is_empty() {
-            ip_config.routes6 = Some(routes6);
-        }
-
-        Ok(ip_config)
-    }
-
     /// Returns the list of network connections.
     pub async fn connections(&self) -> Result<Vec<Connection>, ServiceError> {
         let mut controlled_by: HashMap<Uuid, String> = HashMap::new();
diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
index 61c870a939..8cabd76a0d 100644
--- a/rust/agama-server/src/network/nm/watcher.rs
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -199,7 +199,7 @@ impl<'a> ActionDispatcher<'a> {
         connection: &zbus::Connection,
         proxy: DeviceProxy<'_>,
     ) -> Result<Device, ServiceError> {
-        let builder = DeviceFromProxyBuilder::new(connection.clone(), &proxy);
+        let builder = DeviceFromProxyBuilder::new(&connection, &proxy);
         Ok(builder.build().await?)
     }
 }

From e0bb48ca040d4bee0374cf79bff4d3703fbf7639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 22:52:35 +0100
Subject: [PATCH 274/324] Remove unneeded "use" statements

---
 rust/agama-server/src/cert.rs              |  4 +---
 rust/agama-server/src/network/nm/client.rs | 15 +++++----------
 rust/agama-server/src/network/system.rs    |  5 ++---
 rust/agama-server/tests/l10n.rs            | 12 +++---------
 rust/agama-server/tests/network_service.rs | 15 ++++++---------
 5 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/rust/agama-server/src/cert.rs b/rust/agama-server/src/cert.rs
index 27443d6cc7..d1e00550d0 100644
--- a/rust/agama-server/src/cert.rs
+++ b/rust/agama-server/src/cert.rs
@@ -4,9 +4,7 @@ use openssl::error::ErrorStack;
 use openssl::hash::MessageDigest;
 use openssl::pkey::{PKey, Private};
 use openssl::rsa::Rsa;
-use openssl::x509::extension::{
-    BasicConstraints, KeyUsage, SubjectAlternativeName, SubjectKeyIdentifier,
-};
+use openssl::x509::extension::{BasicConstraints, SubjectAlternativeName, SubjectKeyIdentifier};
 use openssl::x509::{X509NameBuilder, X509};
 
 // TODO: move the certificate related functions into a struct
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index daefbaaf27..a239669583 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -1,5 +1,5 @@
 //! NetworkManager client.
-use std::{collections::HashMap, net::IpAddr, str::FromStr};
+use std::collections::HashMap;
 
 use super::builder::DeviceFromProxyBuilder;
 use super::dbus::{
@@ -8,21 +8,16 @@ use super::dbus::{
 };
 use super::model::NmDeviceType;
 use super::proxies::{
-    AccessPointProxy, ActiveConnectionProxy, ConnectionProxy, DeviceProxy, IP4ConfigProxy,
-    IP6ConfigProxy, NetworkManagerProxy, SettingsProxy, WirelessProxy,
-};
-use crate::network::model::{
-    AccessPoint, Connection, Device, GeneralState, IpConfig, IpRoute, MacAddress,
+    AccessPointProxy, ActiveConnectionProxy, ConnectionProxy, DeviceProxy, NetworkManagerProxy,
+    SettingsProxy, WirelessProxy,
 };
+use crate::network::model::{AccessPoint, Connection, Device, GeneralState};
 use agama_lib::error::ServiceError;
 use agama_lib::network::types::{DeviceType, SSID};
-use cidr::IpInet;
 use log;
-use macaddr::MacAddr6;
 use uuid::Uuid;
 use zbus;
-use zbus::fdo::DBusProxy;
-use zbus::zvariant::{self, ObjectPath, OwnedObjectPath};
+use zbus::zvariant::{ObjectPath, OwnedObjectPath};
 
 /// Simplified NetworkManager D-Bus client.
 ///
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 52dd3d771d..5360bee274 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -1,7 +1,6 @@
 use super::{
     error::NetworkStateError,
     model::{AccessPoint, Device, NetworkChange, StateConfig},
-    nm::NetworkManagerWatcher,
     NetworkAdapterError,
 };
 use crate::network::{
@@ -12,8 +11,8 @@ use crate::network::{
 use agama_lib::{error::ServiceError, network::types::DeviceType};
 use std::{error::Error, sync::Arc};
 use tokio::sync::{
-    broadcast::{self, Receiver, Sender},
-    mpsc::{self, error::SendError, unbounded_channel, UnboundedReceiver, UnboundedSender},
+    broadcast::{self, Receiver},
+    mpsc::{self, error::SendError, UnboundedReceiver, UnboundedSender},
     oneshot::{self, error::RecvError},
     Mutex,
 };
diff --git a/rust/agama-server/tests/l10n.rs b/rust/agama-server/tests/l10n.rs
index 7a69a873a4..8509776867 100644
--- a/rust/agama-server/tests/l10n.rs
+++ b/rust/agama-server/tests/l10n.rs
@@ -1,21 +1,15 @@
 pub mod common;
 
-use std::{error::Error, future::pending, thread, time};
+use std::error::Error;
 
-use agama_lib::localization::LocalizationClient;
-use agama_locale_data::LocaleId;
-use agama_server::l10n::{export_dbus_objects, web::l10n_service};
+use agama_server::l10n::web::l10n_service;
 use axum::{
     body::Body,
     http::{Request, StatusCode},
     Router,
 };
 use common::{body_to_string, DBusServer};
-use tokio::{
-    sync::broadcast::channel,
-    test,
-    time::{sleep, Duration},
-};
+use tokio::{sync::broadcast::channel, test};
 use tower::ServiceExt;
 
 async fn build_service(dbus: zbus::Connection) -> Router {
diff --git a/rust/agama-server/tests/network_service.rs b/rust/agama-server/tests/network_service.rs
index 5639e8af61..ed10f1ac15 100644
--- a/rust/agama-server/tests/network_service.rs
+++ b/rust/agama-server/tests/network_service.rs
@@ -6,24 +6,21 @@ use agama_lib::network::types::{DeviceType, SSID};
 use agama_server::network::web::network_service;
 use agama_server::network::{
     self,
-    model::{self, AccessPoint, GeneralState, Ipv4Method, Ipv6Method, StateConfig},
-    Adapter, NetworkAdapterError, NetworkService, NetworkState,
+    model::{self, AccessPoint, GeneralState, StateConfig},
+    Adapter, NetworkAdapterError, NetworkState,
 };
-use agama_server::web::{generate_token, MainServiceBuilder, ServiceConfig};
 
 use async_trait::async_trait;
 use axum::http::header;
 use axum::{
     body::Body,
     http::{Method, Request, StatusCode},
-    response::Response,
-    routing::{get, put},
-    Json, Router,
+    Router,
 };
 use common::body_to_string;
-use serde_json::{json, to_string};
-use std::{error::Error, path::PathBuf};
-use tokio::{sync::broadcast::channel, test};
+use serde_json::to_string;
+use std::error::Error;
+use tokio::{sync::broadcast, test};
 use tower::ServiceExt;
 
 fn public_dir() -> PathBuf {

From 362bd5762bae486997cfc974819ef3aa6fc7efcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 22:53:24 +0100
Subject: [PATCH 275/324] Remove NetworkManagerClient::from_system

---
 rust/agama-server/src/network/nm/client.rs | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index a239669583..5e8550601a 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -29,12 +29,6 @@ pub struct NetworkManagerClient<'a> {
 }
 
 impl<'a> NetworkManagerClient<'a> {
-    /// Creates a NetworkManagerClient connecting to the system bus.
-    pub async fn from_system() -> Result<NetworkManagerClient<'a>, ServiceError> {
-        let connection = zbus::Connection::system().await?;
-        Self::new(connection).await
-    }
-
     /// Creates a NetworkManagerClient using the given D-Bus connection.
     ///
     /// * `connection`: D-Bus connection.

From 138d433a7b4c724aeda4a08849aff02673e32793 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 22:53:55 +0100
Subject: [PATCH 276/324] Fix agama-server tests

---
 rust/agama-server/src/network/model.rs     | 1 -
 rust/agama-server/tests/network.rs         | 1 +
 rust/agama-server/tests/network_service.rs | 7 +++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index cc829d21ee..0b1af7e19f 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -338,7 +338,6 @@ mod tests {
     fn test_remove_connection() {
         let mut state = NetworkState::default();
         let conn0 = Connection::new("eth0".to_string(), DeviceType::Ethernet);
-        let uuid = conn0.uuid;
         state.add_connection(conn0).unwrap();
         state.remove_connection("eth0".as_ref()).unwrap();
         let found = state.get_connection("eth0").unwrap();
diff --git a/rust/agama-server/tests/network.rs b/rust/agama-server/tests/network.rs
index ed607187d7..c29411c11d 100644
--- a/rust/agama-server/tests/network.rs
+++ b/rust/agama-server/tests/network.rs
@@ -150,6 +150,7 @@ async fn test_update_connection() -> Result<(), Box<dyn Error>> {
     let device = model::Device {
         name: String::from("eth0"),
         type_: DeviceType::Ethernet,
+        ..Default::default()
     };
     let eth0 = model::Connection::new("eth0".to_string(), DeviceType::Ethernet);
     let state = NetworkState::new(general_state, vec![], vec![device], vec![eth0]);
diff --git a/rust/agama-server/tests/network_service.rs b/rust/agama-server/tests/network_service.rs
index ed10f1ac15..e2a686dfba 100644
--- a/rust/agama-server/tests/network_service.rs
+++ b/rust/agama-server/tests/network_service.rs
@@ -23,14 +23,12 @@ use std::error::Error;
 use tokio::{sync::broadcast, test};
 use tower::ServiceExt;
 
-fn public_dir() -> PathBuf {
-    std::env::current_dir().unwrap().join("public")
-}
 async fn build_state() -> NetworkState {
     let general_state = GeneralState::default();
     let device = model::Device {
         name: String::from("eth0"),
         type_: DeviceType::Ethernet,
+        ..Default::default()
     };
     let eth0 = model::Connection::new("eth0".to_string(), DeviceType::Ethernet);
 
@@ -41,7 +39,8 @@ async fn build_service(state: NetworkState) -> Result<Router, ServiceError> {
     let dbus = DBusServer::new().start().await?.connection();
 
     let adapter = NetworkTestAdapter(state);
-    Ok(network_service(dbus, adapter).await?)
+    let (tx, _rx) = broadcast::channel(16);
+    Ok(network_service(dbus, adapter, tx).await?)
 }
 
 #[derive(Default)]

From 691743ededda590874d3d1319de113094b608686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Thu, 18 Apr 2024 23:32:32 +0100
Subject: [PATCH 277/324] Filter network events depending on specific
 properties

---
 rust/agama-server/src/network/nm/watcher.rs | 30 +++++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
index 8cabd76a0d..1ef0766e99 100644
--- a/rust/agama-server/src/network/nm/watcher.rs
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -263,19 +263,39 @@ impl DeviceChangedStream {
     }
 
     fn handle_changed(message: PropertiesChanged) -> Option<DeviceChange> {
+        const IP_CONFIG_PROPS: &[&str] = &["AddressData", "Gateway", "NameserverData", "RouteData"];
+        const DEVICE_PROPS: &[&str] = &["DeviceType", "HwAddress", "Interface", "State"];
+
         let path = OwnedObjectPath::from(message.path()?);
         let args = message.args().ok()?;
 
         match args.interface_name.as_str() {
             "org.freedesktop.NetworkManager.IP4Config" => {
-                Some(DeviceChange::IP4ConfigChanged(path))
+                if Self::include_properties(IP_CONFIG_PROPS, &args.changed_properties) {
+                    return Some(DeviceChange::IP4ConfigChanged(path));
+                }
             }
             "org.freedesktop.NetworkManager.IP6Config" => {
-                Some(DeviceChange::IP6ConfigChanged(path))
+                if Self::include_properties(IP_CONFIG_PROPS, &args.changed_properties) {
+                    return Some(DeviceChange::IP6ConfigChanged(path));
+                }
             }
-            "org.freedesktop.NetworkManager.Device" => Some(DeviceChange::DeviceUpdated(path)),
-            _ => None,
-        }
+            "org.freedesktop.NetworkManager.Device" => {
+                if Self::include_properties(DEVICE_PROPS, &args.changed_properties) {
+                    return Some(DeviceChange::DeviceUpdated(path));
+                }
+            }
+            _ => {}
+        };
+        None
+    }
+
+    fn include_properties(
+        wanted: &[&str],
+        changed: &HashMap<&'_ str, zbus::zvariant::Value<'_>>,
+    ) -> bool {
+        let properties: Vec<_> = changed.keys().collect();
+        wanted.iter().any(|i| properties.contains(&i))
     }
 
     fn handle_message(message: Result<Arc<Message>, zbus::Error>) -> Option<DeviceChange> {

From 1fc9fcdfc82b326164a4e7ff0cbe6ad5d26ead61 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Fri, 19 Apr 2024 11:01:53 +0100
Subject: [PATCH 278/324] First adaptations for reacting to network events

---
 web/src/client/network/index.js               | 52 +++++++++++--------
 .../components/network/ConnectionsTable.jsx   | 11 +++-
 web/src/components/network/NetworkPage.jsx    | 15 ++++--
 .../components/overview/NetworkSection.jsx    | 27 ++++++++++
 4 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index bf387fd0f1..89d0a51fd0 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -21,20 +21,10 @@
 
 // @ts-check
 
-import DBusClient from "../dbus";
-import { NetworkManagerAdapter, securityFromFlags } from "./network_manager";
-import cockpit from "../../lib/cockpit";
-import { createConnection, ConnectionTypes, ConnectionState, createAccessPoint, createDevice } from "./model";
+import { securityFromFlags } from "./network_manager";
+import { createConnection, ConnectionTypes, ConnectionState, createAccessPoint } from "./model";
 import { formatIp, ipPrefixFor } from "./utils";
 
-const SERVICE_NAME = "org.opensuse.Agama1";
-const CONNECTIONS_IFACE = "org.opensuse.Agama1.Network.Connections";
-const CONNECTIONS_PATH = "/org/opensuse/Agama1/Network/connections";
-const CONNECTION_IFACE = "org.opensuse.Agama1.Network.Connection";
-const CONNECTIONS_NAMESPACE = "/org/opensuse/Agama1/Network/connections";
-const IP_IFACE = "org.opensuse.Agama1.Network.Connection.IP";
-const WIRELESS_IFACE = "org.opensuse.Agama1.Network.Connection.Wireless";
-
 const DeviceType = Object.freeze({
   LOOPBACK: 0,
   ETHERNET: 1,
@@ -53,13 +43,13 @@ const DeviceType = Object.freeze({
  */
 
 const NetworkEventTypes = Object.freeze({
-  ACTIVE_CONNECTION_ADDED: "active_connection_added",
-  ACTIVE_CONNECTION_UPDATED: "active_connection_updated",
-  ACTIVE_CONNECTION_REMOVED: "active_connection_removed",
-  CONNECTION_ADDED: "connection_added",
-  CONNECTION_UPDATED: "connection_updated",
-  CONNECTION_REMOVED: "connection_removed",
-  SETTINGS_UPDATED: "settings_updated"
+  DEVICE_ADDED: "deviceAdded",
+  DEVICE_REMOVED: "deviceRemoved",
+  DEVICE_UPDATED: "deviceUpdated",
+  CONNECTION_ADDED: "connectionAdded",
+  CONNECTION_UPDATED: "connectionUpdated",
+  CONNECTION_REMOVED: "connectionRemoved",
+  SETTINGS_UPDATED: "settingsUpdated"
 });
 
 /**
@@ -344,13 +334,33 @@ class NetworkClient {
    * @return {Promise<NetworkSettings>}
   */
   async settings() {
-    const response = await this.client.get("/network/settings");
+    const response = await this.client.get("/network/state");
     if (!response.ok) {
-      console.error("Failed to get settings", response);
       return {};
     }
     return response.json();
   }
+
+  /**
+   * Registers a callback to run when the network config change.
+   *
+   * @param {(handler: NetworkEvent) => void} handler - Callback function.
+   * @return {import ("../http").RemoveFn} Function to remove the callback.
+   */
+  onNetworkChange(handler) {
+    return this.client.onEvent("NetworkChange", ({ type, ...data }) => {
+      const subtype = Object.values(NetworkEventTypes).find((event) => data[event]);
+
+      if (subtype === undefined) {
+        console.error("Unknown subevent:", data);
+      } else {
+        const payload = data[subtype];
+        if (payload) {
+          handler({ type: subtype, payload });
+        }
+      }
+    });
+  }
 }
 
 export {
diff --git a/web/src/components/network/ConnectionsTable.jsx b/web/src/components/network/ConnectionsTable.jsx
index 9b9f421f7d..12522f090e 100644
--- a/web/src/components/network/ConnectionsTable.jsx
+++ b/web/src/components/network/ConnectionsTable.jsx
@@ -44,11 +44,20 @@ import { _ } from "~/i18n";
  */
 export default function ConnectionsTable({
   connections,
+  devices,
   onEdit,
   onForget
 }) {
   if (connections.length === 0) return null;
 
+  const connectionDevice = ({ id }) => devices.find(({ connection }) => id === connection);
+  const connectionAddresses = (connection) => {
+    const device = connectionDevice(connection);
+    const addresses = device ? device.addresses : connection.addresses;
+
+    return addresses?.map(formatIp).join(", ");
+  };
+
   return (
     <Table variant="compact">
       <Thead>
@@ -84,7 +93,7 @@ export default function ConnectionsTable({
           return (
             <Tr key={connection.id}>
               <Td dataLabel={_("Name")}>{connection.id}</Td>
-              <Td dataLabel={_("IP addresses")}>{connection.addresses?.map(formatIp).join(", ")}</Td>
+              <Td dataLabel={_("IP addresses")}>{connectionAddresses(connection)}</Td>
               <Td isActionCell>
                 <RowActions
                   id={`actions-for-connection-${connection.id}`}
diff --git a/web/src/components/network/NetworkPage.jsx b/web/src/components/network/NetworkPage.jsx
index c14ad8f285..7f26dd4a19 100644
--- a/web/src/components/network/NetworkPage.jsx
+++ b/web/src/components/network/NetworkPage.jsx
@@ -23,7 +23,6 @@ import React, { useEffect, useState } from "react";
 import { Button, Skeleton } from "@patternfly/react-core";
 import { Icon } from "~/components/layout";
 import { useInstallerClient } from "~/context/installer";
-import { ConnectionTypes, NetworkEventTypes } from "~/client/network";
 import { If, Page, Section } from "~/components/core";
 import { ConnectionsTable, IpSettingsForm, NetworkPageMenu, WifiSelector } from "~/components/network";
 import { _ } from "~/i18n";
@@ -83,6 +82,7 @@ const NoWifiConnections = ({ wifiScanSupported, openWifiSelector }) => {
 export default function NetworkPage() {
   const { network: client } = useInstallerClient();
   const [connections, setConnections] = useState(undefined);
+  const [devices, setDevices] = useState(undefined);
   const [selectedConnection, setSelectedConnection] = useState(null);
   const [wifiScanSupported, setWifiScanSupported] = useState(false);
   const [wifiSelectorOpen, setWifiSelectorOpen] = useState(false);
@@ -97,6 +97,12 @@ export default function NetworkPage() {
     client.connections().then(setConnections);
   }, [client, connections]);
 
+  useEffect(() => {
+    if (devices !== undefined) return;
+
+    client.devices().then(setDevices);
+  }, [client, devices]);
+
   const selectConnection = ({ id }) => {
     client.getConnection(id).then(setSelectedConnection);
   };
@@ -108,9 +114,10 @@ export default function NetworkPage() {
 
   const updateConnections = async () => {
     setConnections(undefined);
+    setDevices(undefined);
   };
 
-  const ready = connections !== undefined;
+  const ready = (connections !== undefined) && (devices !== undefined);
 
   const WifiConnections = () => {
     const activeWifiConnections = connections.filter(c => c.wireless);
@@ -122,7 +129,7 @@ export default function NetworkPage() {
     }
 
     return (
-      <ConnectionsTable connections={activeWifiConnections} onEdit={selectConnection} onForget={forgetConnection} />
+      <ConnectionsTable connections={activeWifiConnections} devices={devices} onEdit={selectConnection} onForget={forgetConnection} />
     );
   };
 
@@ -131,7 +138,7 @@ export default function NetworkPage() {
 
     if (activeWiredConnections.length === 0) return <NoWiredConnections />;
 
-    return <ConnectionsTable connections={activeWiredConnections} onEdit={selectConnection} />;
+    return <ConnectionsTable connections={activeWiredConnections} devices={devices} onEdit={selectConnection} />;
   };
 
   return (
diff --git a/web/src/components/overview/NetworkSection.jsx b/web/src/components/overview/NetworkSection.jsx
index 2ee0dfcf6e..015ac26eaf 100644
--- a/web/src/components/overview/NetworkSection.jsx
+++ b/web/src/components/overview/NetworkSection.jsx
@@ -24,6 +24,7 @@ import { sprintf } from "sprintf-js";
 
 import { Em, Section, SectionSkeleton } from "~/components/core";
 import { useInstallerClient } from "~/context/installer";
+import { NetworkEventTypes } from "~/client/network";
 import { formatIp } from "~/client/network/utils";
 import { _, n_ } from "~/i18n";
 
@@ -31,6 +32,32 @@ export default function NetworkSection() {
   const { network: client } = useInstallerClient();
   const [devices, setDevices] = useState(undefined);
 
+  useEffect(() => {
+    return client.onNetworkChange(({ type, payload }) => {
+      switch (type) {
+        case NetworkEventTypes.DEVICE_ADDED: {
+          const newDevices = devices.filter((d) => d.name !== payload.name);
+          console.log(newDevices);
+          console.log(client.fromApiDevice(payload));
+          setDevices([...newDevices, client.fromApiDevice(payload)]);
+          break;
+        }
+
+        case NetworkEventTypes.DEVICE_UPDATED: {
+          const newDevices = devices.filter((d) => d.name !== payload.name);
+          setDevices(newDevices, payload);
+          break;
+        }
+
+        case NetworkEventTypes.DEVICE_REMOVED: {
+          const newDevices = devices.filter((d) => d.name !== payload);
+          setDevices(newDevices);
+          break;
+        }
+      }
+    });
+  }, [client, devices]);
+
   useEffect(() => {
     if (devices !== undefined) return;
 

From 355121b247d3de8528ce85106b9cbb3188d459e5 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Fri, 19 Apr 2024 12:03:15 +0100
Subject: [PATCH 279/324] Handle devices update event correctly

---
 web/src/components/overview/NetworkSection.jsx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/src/components/overview/NetworkSection.jsx b/web/src/components/overview/NetworkSection.jsx
index 015ac26eaf..cfa009d011 100644
--- a/web/src/components/overview/NetworkSection.jsx
+++ b/web/src/components/overview/NetworkSection.jsx
@@ -36,22 +36,24 @@ export default function NetworkSection() {
     return client.onNetworkChange(({ type, payload }) => {
       switch (type) {
         case NetworkEventTypes.DEVICE_ADDED: {
-          const newDevices = devices.filter((d) => d.name !== payload.name);
-          console.log(newDevices);
-          console.log(client.fromApiDevice(payload));
-          setDevices([...newDevices, client.fromApiDevice(payload)]);
+          setDevices((devs) => {
+            const newDevices = devs.filter((d) => d.name !== payload.name);
+            return [...newDevices, client.fromApiDevice(payload)];
+          });
           break;
         }
 
         case NetworkEventTypes.DEVICE_UPDATED: {
-          const newDevices = devices.filter((d) => d.name !== payload.name);
-          setDevices(newDevices, payload);
+          const [name, data] = payload;
+          setDevices(devs => {
+            const newDevices = devs.filter((d) => d.name !== name);
+            return [...newDevices, client.fromApiDevice(data)];
+          });
           break;
         }
 
         case NetworkEventTypes.DEVICE_REMOVED: {
-          const newDevices = devices.filter((d) => d.name !== payload);
-          setDevices(newDevices);
+          setDevices(devs => devs.filter((d) => d.name !== payload));
           break;
         }
       }

From 4c46fbcbc18d1d4f968cbe56acaf961412cc30c8 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Fri, 19 Apr 2024 16:07:52 +0100
Subject: [PATCH 280/324] Adapted NetworkSection test

---
 .../components/overview/NetworkSection.jsx    | 10 +-
 .../overview/NetworkSection.test.jsx          | 92 ++++++++++---------
 2 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/web/src/components/overview/NetworkSection.jsx b/web/src/components/overview/NetworkSection.jsx
index cfa009d011..d31095e3a5 100644
--- a/web/src/components/overview/NetworkSection.jsx
+++ b/web/src/components/overview/NetworkSection.jsx
@@ -66,14 +66,20 @@ export default function NetworkSection() {
     client.devices().then(setDevices);
   }, [client, devices]);
 
+  const nameFor = (device) => {
+    if (device.connection === undefined || device.connection.trim() === "") return device.name;
+
+    return device.connection;
+  };
+
   const deviceSummary = (device) => {
     if ((device?.addresses || []).length === 0) {
       return (
-        <Em key={device.name}>{device.name}</Em>
+        <Em key={device.name}>{nameFor(device)}</Em>
       );
     } else {
       return (
-        <Em key={device.name}>{device.name} - {device.addresses.map(formatIp).join(", ")}</Em>
+        <Em key={device.name}>{nameFor(device)} - {device.addresses.map(formatIp).join(", ")}</Em>
       );
     }
   };
diff --git a/web/src/components/overview/NetworkSection.test.jsx b/web/src/components/overview/NetworkSection.test.jsx
index c1eaad1366..3297572986 100644
--- a/web/src/components/overview/NetworkSection.test.jsx
+++ b/web/src/components/overview/NetworkSection.test.jsx
@@ -27,39 +27,39 @@ import { ConnectionTypes, NetworkEventTypes } from "~/client/network";
 import { createClient } from "~/client";
 
 jest.mock("~/client");
-
 jest.mock('~/components/core/SectionSkeleton', () => () => <div>Section Skeleton</div>);
 
-const wiredConnection = {
-  id: "Wired 1",
-  uuid: "d59200d4-838d-4051-99a0-fde8121a242c",
+const ethernetDevice = {
+  name: "eth0",
+  connection: "Wired 1",
   type: ConnectionTypes.ETHERNET,
-  addresses: [{ address: "192.168.122.20", prefix: 24 }]
+  addresses: [{ address: "192.168.122.20", prefix: 24 }],
+  macAddress: "00:11:22:33:44::55"
 };
-const wifiConnection = {
-  id: "WiFi 1",
-  uuid: "0c00dccb-a6ae-40b2-8495-0de721006bc0",
+const wifiDevice = {
+  name: "wlan0",
+  connection: "WiFi 1",
   type: ConnectionTypes.WIFI,
-  addresses: [{ address: "192.168.69.200", prefix: 24 }]
+  addresses: [{ address: "192.168.69.200", prefix: 24 }],
+  macAddress: "AA:11:22:33:44::FF"
 };
 
-const setUpFn = jest.fn();
-const activeConnectionsFn = jest.fn();
-let onNetworkEventFn = jest.fn();
+const devicesFn = jest.fn();
+let onNetworkChangeEventFn = jest.fn();
+const fromApiDeviceFn = (data) => data;
 
 beforeEach(() => {
-  setUpFn.mockResolvedValue(true);
-  activeConnectionsFn.mockReturnValue([wiredConnection, wifiConnection]);
+  devicesFn.mockResolvedValue([ethernetDevice, wifiDevice]);
 
   // if defined outside, the mock is cleared automatically
   createClient.mockImplementation(() => {
     return {
       network: {
-        setUp: setUpFn,
-        activeConnections: activeConnectionsFn,
-        onNetworkEvent: onNetworkEventFn,
+        devices: devicesFn,
+        onNetworkChange: onNetworkChangeEventFn,
+        fromApiDevice: fromApiDeviceFn
       }
-    };
+    }
   });
 });
 
@@ -71,20 +71,20 @@ describe("when is not ready", () => {
 });
 
 describe("when is ready", () => {
-  it("renders the number of connections found", async () => {
+  it("renders the number of devices found", async () => {
     installerRender(<NetworkSection />);
 
-    await screen.findByText(/2 connection/i);
+    await screen.findByText(/2 devices/i);
   });
 
-  it("renders connections names", async () => {
+  it("renders devices names", async () => {
     installerRender(<NetworkSection />);
 
     await screen.findByText(/Wired 1/i);
     await screen.findByText(/WiFi 1/i);
   });
 
-  it("renders connections addresses", async () => {
+  it("renders devices addresses", async () => {
     installerRender(<NetworkSection />);
 
     await screen.findByText(/192.168.122.20/i);
@@ -92,44 +92,46 @@ describe("when is ready", () => {
   });
 
   describe("but none active connection was found", () => {
-    beforeEach(() => activeConnectionsFn.mockReturnValue([]));
+    beforeEach(() => devicesFn.mockResolvedValue([]));
 
     it("renders info about it", async () => {
       installerRender(<NetworkSection />);
 
-      await screen.findByText("No network connections detected");
+      await screen.findByText("No network devices detected");
     });
   });
 });
 
-describe("when connection is added", () => {
-  it("renders the added connection", async () => {
+describe("when a device is added", () => {
+  it("renders the added device", async () => {
     const [mockFunction, callbacks] = createCallbackMock();
-    onNetworkEventFn = mockFunction;
+    onNetworkChangeEventFn = mockFunction;
     installerRender(<NetworkSection />);
     await screen.findByText(/Wired 1/);
     await screen.findByText(/WiFi 1/);
 
     // add a new connection
-    const addedConnection = {
-      id: "New Wired Network",
-      uuid: "b143c0a6-ee61-49dc-94aa-e62230afc199",
+    const addedDevice = {
+      name: "eth1",
+      connection: "New Wired Network",
       type: ConnectionTypes.ETHERNET,
-      addresses: [{ address: "192.168.168.192", prefix: 24 }]
+      addresses: [{ address: "192.168.168.192", prefix: 24 }],
+      macAddress: "AA:BB:CC:DD:EE:00"
     };
-    activeConnectionsFn.mockReturnValue([wiredConnection, wifiConnection, addedConnection]);
+
+    devicesFn.mockResolvedValue([ethernetDevice, wifiDevice, addedDevice]);
 
     const [cb] = callbacks;
     act(() => {
       cb({
-        type: NetworkEventTypes.ACTIVE_CONNECTION_ADDED,
-        payload: addedConnection
+        type: NetworkEventTypes.DEVICE_ADDED,
+        payload: addedDevice
       });
     });
 
     await screen.findByText(/Wired 1/);
-    await screen.findByText(/WiFi 1/);
     await screen.findByText(/New Wired Network/);
+    await screen.findByText(/WiFi 1/);
     await screen.findByText(/192.168.168.192/);
   });
 });
@@ -137,18 +139,18 @@ describe("when connection is added", () => {
 describe("when connection is removed", () => {
   it("stops rendering its details", async () => {
     const [mockFunction, callbacks] = createCallbackMock();
-    onNetworkEventFn = mockFunction;
+    onNetworkChangeEventFn = mockFunction;
     installerRender(<NetworkSection />);
     await screen.findByText(/Wired 1/);
     await screen.findByText(/WiFi 1/);
 
     // remove a connection
-    activeConnectionsFn.mockReturnValue([wifiConnection]);
+    devicesFn.mockResolvedValue([wifiDevice]);
     const [cb] = callbacks;
     act(() => {
       cb({
-        type: NetworkEventTypes.ACTIVE_CONNECTION_REMOVED,
-        payload: { ...wiredConnection }
+        type: NetworkEventTypes.DEVICE_REMOVED,
+        payload: ethernetDevice.name
       });
     });
 
@@ -161,24 +163,24 @@ describe("when connection is removed", () => {
 describe("when connection is updated", () => {
   it("re-renders the updated connection", async () => {
     const [mockFunction, callbacks] = createCallbackMock();
-    onNetworkEventFn = mockFunction;
+    onNetworkChangeEventFn = mockFunction;
     installerRender(<NetworkSection />);
     await screen.findByText(/Wired 1/);
     await screen.findByText(/WiFi 1/);
 
     // update a connection
-    const updatedConnection = { ...wiredConnection, id: "My Wired Connection" };
-    activeConnectionsFn.mockReturnValue([updatedConnection, wifiConnection]);
+    const updatedDevice = { ...ethernetDevice, name: "enp2s0f0", connection: "Wired renamed" };
+    devicesFn.mockResolvedValue([updatedDevice, wifiDevice]);
     const [cb] = callbacks;
     act(() => {
       cb({
-        type: NetworkEventTypes.ACTIVE_CONNECTION_UPDATED,
-        payload: { ...wiredConnection, id: "My Wired Connection" }
+        type: NetworkEventTypes.DEVICE_UPDATED,
+        payload: ["eth0", updatedDevice]
       });
     });
 
-    await screen.findByText(/My Wired Connection/);
     await screen.findByText(/WiFi 1/);
+    await screen.findByText(/Wired renamed/);
 
     const formerWiredName = screen.queryByText(/Wired 1/);
     expect(formerWiredName).toBeNull();

From 79b11a5346b88987097e9a764e6f58d9b3281dbb Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 19 Apr 2024 17:47:26 +0200
Subject: [PATCH 281/324] initial storage web service

---
 rust/agama-lib/src/storage/client.rs |  1 +
 rust/agama-server/src/lib.rs         |  1 +
 rust/agama-server/src/storage.rs     |  2 ++
 rust/agama-server/src/storage/web.rs | 46 ++++++++++++++++++++++++++++
 rust/agama-server/src/web.rs         |  5 +++
 5 files changed, 55 insertions(+)
 create mode 100644 rust/agama-server/src/storage.rs
 create mode 100644 rust/agama-server/src/storage/web.rs

diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 06455992b8..f7679aa2f1 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -17,6 +17,7 @@ pub struct StorageDevice {
 }
 
 /// D-Bus client for the storage service
+#[derive(Clone)]
 pub struct StorageClient<'a> {
     pub connection: Connection,
     calculator_proxy: ProposalCalculatorProxy<'a>,
diff --git a/rust/agama-server/src/lib.rs b/rust/agama-server/src/lib.rs
index 8c2602f7b9..46f0cfc909 100644
--- a/rust/agama-server/src/lib.rs
+++ b/rust/agama-server/src/lib.rs
@@ -5,6 +5,7 @@ pub mod manager;
 pub mod network;
 pub mod questions;
 pub mod software;
+pub mod storage;
 pub mod users;
 pub mod web;
 pub use web::service;
diff --git a/rust/agama-server/src/storage.rs b/rust/agama-server/src/storage.rs
new file mode 100644
index 0000000000..f5d9826611
--- /dev/null
+++ b/rust/agama-server/src/storage.rs
@@ -0,0 +1,2 @@
+pub mod web;
+pub use web::{storage_service, storage_streams};
\ No newline at end of file
diff --git a/rust/agama-server/src/storage/web.rs b/rust/agama-server/src/storage/web.rs
new file mode 100644
index 0000000000..1e6024395b
--- /dev/null
+++ b/rust/agama-server/src/storage/web.rs
@@ -0,0 +1,46 @@
+//! This module implements the web API for the storage service.
+//!
+//! The module offers two public functions:
+//!
+//! * `storage_service` which returns the Axum service.
+//! * `storage_stream` which offers an stream that emits the storage events coming from D-Bus.
+
+use agama_lib::{error::ServiceError, storage::StorageClient};
+use axum::Router;
+
+use crate::{
+    error::Error,
+    web::{
+        common::{issues_router, progress_router, service_status_router, EventStreams},
+        Event,
+    },
+};
+
+pub async fn storage_streams(dbus: zbus::Connection) -> Result<EventStreams, Error> {
+    let result: EventStreams = vec![]; // TODO:
+    Ok(result)
+}
+
+#[derive(Clone)]
+struct StorageState<'a> {
+    client: StorageClient<'a>,
+}
+
+/// Sets up and returns the axum service for the software module.
+pub async fn storage_service(dbus: zbus::Connection) -> Result<Router, ServiceError> {
+    const DBUS_SERVICE: &str = "org.opensuse.Agama.Storage1";
+    const DBUS_PATH: &str = "/org/opensuse/Agama/Storage1";
+
+    let status_router = service_status_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+    let progress_router = progress_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+    let issues_router = issues_router(&dbus, DBUS_SERVICE, DBUS_PATH).await?;
+
+    let client = StorageClient::new(dbus.clone()).await?;
+    let state = StorageState { client };
+    let router = Router::new()
+        .merge(status_router)
+        .merge(progress_router)
+        .nest("/issues", issues_router)
+        .with_state(state);
+    Ok(router)
+}
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index a7b52d247c..0be99711f5 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -10,6 +10,7 @@ use crate::{
     manager::web::{manager_service, manager_stream},
     network::{web::network_service, NetworkManagerAdapter},
     questions::web::{questions_service, questions_stream},
+    storage::web::{storage_service, storage_streams},
     software::web::{software_service, software_streams},
     users::web::{users_service, users_streams},
     web::common::{issues_stream, progress_stream, service_status_stream},
@@ -58,6 +59,7 @@ where
         .add_service("/l10n", l10n_service(dbus.clone(), events.clone()).await?)
         .add_service("/manager", manager_service(dbus.clone()).await?)
         .add_service("/software", software_service(dbus.clone()).await?)
+        .add_service("/storage", storage_service(dbus.clone()).await?)
         .add_service(
             "/network",
             network_service(dbus.clone(), network_adapter).await?,
@@ -110,6 +112,9 @@ async fn run_events_monitor(dbus: zbus::Connection, events: EventsSender) -> Res
     for (id, user_stream) in users_streams(dbus.clone()).await? {
         stream.insert(id, user_stream);
     }
+    for (id, storage_stream) in storage_streams(dbus.clone()).await? {
+        stream.insert(id, storage_stream);
+    }
     for (id, software_stream) in software_streams(dbus.clone()).await? {
         stream.insert(id, software_stream);
     }

From ed67ffae575bd2972ad756e1766eb5f2b624d3f6 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 19 Apr 2024 23:12:42 +0200
Subject: [PATCH 282/324] implement dirty devices bit in API

---
 rust/agama-lib/src/storage/client.rs | 4 ++++
 rust/agama-server/src/storage/web.rs | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index f7679aa2f1..8aa60de391 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -41,6 +41,10 @@ impl<'a> StorageClient<'a> {
         Ok(ProposalProxy::new(&self.connection).await?)
     }
 
+    pub async fn devices_dirty_bit(&self) -> Result<bool, ServiceError> {
+        Ok(self.storage_proxy.deprecated_system().await?)
+    }
+
     /// Returns the available devices
     ///
     /// These devices can be used for installing the system.
diff --git a/rust/agama-server/src/storage/web.rs b/rust/agama-server/src/storage/web.rs
index 1e6024395b..624c3b6cc5 100644
--- a/rust/agama-server/src/storage/web.rs
+++ b/rust/agama-server/src/storage/web.rs
@@ -6,7 +6,7 @@
 //! * `storage_stream` which offers an stream that emits the storage events coming from D-Bus.
 
 use agama_lib::{error::ServiceError, storage::StorageClient};
-use axum::Router;
+use axum::{extract::State, routing::get, Json, Router};
 
 use crate::{
     error::Error,
@@ -38,9 +38,14 @@ pub async fn storage_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
     let client = StorageClient::new(dbus.clone()).await?;
     let state = StorageState { client };
     let router = Router::new()
+        .route("/devices/dirty", get(devices_dirty))
         .merge(status_router)
         .merge(progress_router)
         .nest("/issues", issues_router)
         .with_state(state);
     Ok(router)
 }
+
+async fn devices_dirty(State(state): State<StorageState<'_>>) -> Result<Json<bool>, Error> {
+    Ok(Json(state.client.devices_dirty_bit().await?))
+}
\ No newline at end of file

From f2893f8ebb340185239ee577e3b9bd265aa06943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 22 Apr 2024 07:21:27 +0100
Subject: [PATCH 283/324] Fix a formatting issue

---
 rust/agama-server/src/network/nm/builder.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/network/nm/builder.rs b/rust/agama-server/src/network/nm/builder.rs
index ff54dee6f2..f79897720f 100644
--- a/rust/agama-server/src/network/nm/builder.rs
+++ b/rust/agama-server/src/network/nm/builder.rs
@@ -30,7 +30,7 @@ impl<'a> DeviceFromProxyBuilder<'a> {
     pub async fn build(&self) -> Result<Device, ServiceError> {
         let device_type = NmDeviceType(self.proxy.device_type().await?);
         // TODO: we need to check the errors hierarchy to not abuse ServiceError.
-         let type_: DeviceType = device_type
+        let type_: DeviceType = device_type
             .try_into()
             .context("Unsupported device type: {device_type}")?;
         let mut device = Device {

From 781da92dae76d4a7a7c8ff2f96f7cd9e93c6f8bb Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 22 Apr 2024 11:52:13 +0100
Subject: [PATCH 284/324] Expose device state in the backend

---
 rust/agama-lib/src/network/client.rs        |  4 +-
 rust/agama-lib/src/network/proxies.rs       |  3 +
 rust/agama-lib/src/network/settings.rs      |  3 +-
 rust/agama-lib/src/network/types.rs         | 66 +++++++++++++++++++++
 rust/agama-server/src/network/model.rs      |  3 +-
 rust/agama-server/src/network/nm/builder.rs | 15 ++++-
 6 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/rust/agama-lib/src/network/client.rs b/rust/agama-lib/src/network/client.rs
index b8a6b427a4..09857563db 100644
--- a/rust/agama-lib/src/network/client.rs
+++ b/rust/agama-lib/src/network/client.rs
@@ -3,7 +3,7 @@ use super::proxies::{
     WirelessProxy,
 };
 use super::settings::{BondSettings, MatchSettings, NetworkConnection, WirelessSettings};
-use super::types::{Device, DeviceType, SSID};
+use super::types::{Device, DeviceState, DeviceType, SSID};
 use crate::error::ServiceError;
 use tokio_stream::StreamExt;
 use zbus::zvariant::OwnedObjectPath;
@@ -86,10 +86,12 @@ impl<'a> NetworkClient<'a> {
             .await?;
         let name = device_proxy.name().await?;
         let device_type = device_proxy.type_().await?;
+        let state = DeviceState::try_from(device_proxy.state().await?).unwrap();
 
         Ok(Device {
             name,
             type_: DeviceType::try_from(device_type).unwrap(),
+            state,
         })
     }
 
diff --git a/rust/agama-lib/src/network/proxies.rs b/rust/agama-lib/src/network/proxies.rs
index 9710980885..8a26459d29 100644
--- a/rust/agama-lib/src/network/proxies.rs
+++ b/rust/agama-lib/src/network/proxies.rs
@@ -25,6 +25,9 @@ trait Device {
     /// Type property
     #[dbus_proxy(property)]
     fn type_(&self) -> zbus::Result<u8>;
+    /// Type property
+    #[dbus_proxy(property)]
+    fn state(&self) -> zbus::Result<u8>;
 }
 
 #[dbus_proxy(
diff --git a/rust/agama-lib/src/network/settings.rs b/rust/agama-lib/src/network/settings.rs
index 328daaa07b..444e9c0b2d 100644
--- a/rust/agama-lib/src/network/settings.rs
+++ b/rust/agama-lib/src/network/settings.rs
@@ -1,6 +1,6 @@
 //! Representation of the network settings
 
-use super::types::{DeviceType, Status};
+use super::types::{DeviceState, DeviceType, Status};
 use agama_settings::error::ConversionError;
 use agama_settings::{SettingObject, SettingValue, Settings};
 use cidr::IpInet;
@@ -71,6 +71,7 @@ impl Default for BondSettings {
 pub struct NetworkDevice {
     pub id: String,
     pub type_: DeviceType,
+    pub state: DeviceState,
 }
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize)]
diff --git a/rust/agama-lib/src/network/types.rs b/rust/agama-lib/src/network/types.rs
index f6dfd2e235..9fb565d6f3 100644
--- a/rust/agama-lib/src/network/types.rs
+++ b/rust/agama-lib/src/network/types.rs
@@ -13,6 +13,7 @@ use zbus;
 pub struct Device {
     pub name: String,
     pub type_: DeviceType,
+    pub state: DeviceState,
 }
 
 #[derive(Debug, Default, PartialEq, Clone, Serialize, Deserialize)]
@@ -57,6 +58,71 @@ pub enum DeviceType {
     Bridge = 6,
 }
 
+#[derive(Debug, Default, Clone, Copy, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum DeviceState {
+    #[default]
+    Unknown = 0,
+    Unmanaged = 10,
+    Unavailable = 20,
+    Disconnected = 30,
+    Prepare = 40,
+    Config = 50,
+    NeedAuth = 60,
+    IpConfig = 70,
+    IpCheck = 80,
+    Secondaries = 90,
+    Activated = 100,
+    Deactivating = 110,
+    Failed = 120,
+}
+#[derive(Debug, Error, PartialEq)]
+#[error("Invalid state: {0}")]
+pub struct InvalidDeviceState(String);
+
+impl TryFrom<u8> for DeviceState {
+    type Error = InvalidDeviceState;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(DeviceState::Unknown),
+            10 => Ok(DeviceState::Unmanaged),
+            20 => Ok(DeviceState::Unavailable),
+            30 => Ok(DeviceState::Disconnected),
+            40 => Ok(DeviceState::Prepare),
+            50 => Ok(DeviceState::Config),
+            60 => Ok(DeviceState::NeedAuth),
+            70 => Ok(DeviceState::IpConfig),
+            80 => Ok(DeviceState::IpCheck),
+            90 => Ok(DeviceState::Secondaries),
+            100 => Ok(DeviceState::Activated),
+            110 => Ok(DeviceState::Deactivating),
+            120 => Ok(DeviceState::Failed),
+            _ => Err(InvalidDeviceState(value.to_string())),
+        }
+    }
+}
+impl fmt::Display for DeviceState {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let name = match &self {
+            DeviceState::Unknown => "unknown",
+            DeviceState::Unmanaged => "unmanaged",
+            DeviceState::Unavailable => "unavailable",
+            DeviceState::Disconnected => "disconnected",
+            DeviceState::Prepare => "prepare",
+            DeviceState::Config => "config",
+            DeviceState::NeedAuth => "need_auth",
+            DeviceState::IpConfig => "ip_config",
+            DeviceState::IpCheck => "ip_check",
+            DeviceState::Secondaries => "secondaries",
+            DeviceState::Activated => "activated",
+            DeviceState::Deactivating => "deactivating",
+            DeviceState::Failed => "failed",
+        };
+        write!(f, "{}", name)
+    }
+}
+
 #[derive(Debug, Default, Clone, Copy, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum Status {
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 0b1af7e19f..a6df0a0a3e 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -4,7 +4,7 @@
 //! agnostic from the real network service (e.g., NetworkManager).
 use crate::network::error::NetworkStateError;
 use agama_lib::network::settings::{BondSettings, NetworkConnection, WirelessSettings};
-use agama_lib::network::types::{BondMode, DeviceType, Status, SSID};
+use agama_lib::network::types::{BondMode, DeviceState, DeviceType, Status, SSID};
 use cidr::IpInet;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, skip_serializing_none, DisplayFromStr};
@@ -465,6 +465,7 @@ pub struct Device {
     pub mac_address: MacAddress,
     pub ip_config: Option<IpConfig>,
     pub connection: Option<String>,
+    pub state: DeviceState,
 }
 
 /// Represents a known network connection.
diff --git a/rust/agama-server/src/network/nm/builder.rs b/rust/agama-server/src/network/nm/builder.rs
index f79897720f..737e33f117 100644
--- a/rust/agama-server/src/network/nm/builder.rs
+++ b/rust/agama-server/src/network/nm/builder.rs
@@ -7,7 +7,10 @@ use crate::network::{
         proxies::{DeviceProxy, IP4ConfigProxy, IP6ConfigProxy},
     },
 };
-use agama_lib::{error::ServiceError, network::types::DeviceType};
+use agama_lib::{
+    error::ServiceError,
+    network::types::{DeviceState, DeviceType},
+};
 use anyhow::Context;
 use cidr::IpInet;
 use std::{collections::HashMap, net::IpAddr, str::FromStr};
@@ -33,14 +36,20 @@ impl<'a> DeviceFromProxyBuilder<'a> {
         let type_: DeviceType = device_type
             .try_into()
             .context("Unsupported device type: {device_type}")?;
+
+        let state = self.proxy.state().await? as u8;
+        let state: DeviceState = state
+            .try_into()
+            .context("Unsupported device state: {state}")?;
+
         let mut device = Device {
             name: self.proxy.interface().await?,
             type_,
+            state,
             ..Default::default()
         };
 
-        let state = self.proxy.state().await?;
-        if state == 100 {
+        if state == DeviceState::Activated {
             device.ip_config = self.build_ip_config().await?;
         }
 

From be6337a68bcc010f32e65619848d4e4d3f228fe2 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 22 Apr 2024 11:53:41 +0100
Subject: [PATCH 285/324] Some small fixes and use of device state

---
 web/src/client/network/index.js               | 20 ++++++--
 web/src/client/network/model.js               | 14 ++++++
 .../network/ConnectionsTable.test.jsx         | 29 ++++++++---
 web/src/components/network/NetworkPage.jsx    | 41 +++++++++++++---
 .../components/network/NetworkPage.test.jsx   | 28 +++++++++--
 .../components/network/WifiConnectionForm.jsx |  4 +-
 .../network/WifiNetworkListItem.jsx           | 20 ++++----
 web/src/components/network/WifiSelector.jsx   | 49 +++++++++++++++----
 8 files changed, 162 insertions(+), 43 deletions(-)

diff --git a/web/src/client/network/index.js b/web/src/client/network/index.js
index 89d0a51fd0..dc7313f86d 100644
--- a/web/src/client/network/index.js
+++ b/web/src/client/network/index.js
@@ -209,7 +209,7 @@ class NetworkClient {
         ssid: ap.ssid,
         hwAddress: ap.hw_address,
         strength: ap.strength,
-        security: securityFromFlags(ap.flags, ap.wpa_flags, ap.rsn_flags)
+        security: securityFromFlags(ap.flags, ap.wpaFlags, ap.rsnFlags)
       });
     });
   }
@@ -220,10 +220,16 @@ class NetworkClient {
    * @param {Connection} connection - connection to be activated
    */
   async connectTo(connection) {
-    const conn = await this.addConnection(connection);
-    await this.apply();
+    return this.client.get(`/network/${connection.id}/connect`);
+  }
 
-    return conn;
+  /**
+   * Connects to given Wireless network
+   *
+   * @param {Connection} connection - connection to be activated
+   */
+  async disconnect(connection) {
+    return this.client.get(`/network/${connection.id}/disconnect`);
   }
 
   /**
@@ -252,8 +258,11 @@ class NetworkClient {
       wireless,
     });
 
+    const conn = await this.addConnection(connection);
+    await this.apply();
+
     // the connection is automatically activated when written
-    return this.connectTo(connection);
+    return conn;
   }
 
   /**
@@ -349,6 +358,7 @@ class NetworkClient {
    */
   onNetworkChange(handler) {
     return this.client.onEvent("NetworkChange", ({ type, ...data }) => {
+      console.log("Event:", type, ", with data:", data);
       const subtype = Object.values(NetworkEventTypes).find((event) => data[event]);
 
       if (subtype === undefined) {
diff --git a/web/src/client/network/model.js b/web/src/client/network/model.js
index da895b0a74..08de0fc702 100644
--- a/web/src/client/network/model.js
+++ b/web/src/client/network/model.js
@@ -36,6 +36,18 @@ const ConnectionState = Object.freeze({
   DEACTIVATED: 4
 });
 
+const DeviceState = Object.freeze({
+  UNKNOWN: "unknown",
+  UNMANAGED: "unmanaged",
+  UNAVAILABLE: "unavailable",
+  DISCONNECTED: "disconnected",
+  CONFIG: "config",
+  NEEDAUTH: "auth",
+  ACTIVATED: "activated",
+  DEACTIVATING: "deactivating",
+  FAILED: "failed"
+});
+
 /**
  * Returns a human readable connection state
  *
@@ -95,6 +107,7 @@ const SecurityProtocols = Object.freeze({
  * @property {Route[]} routes6
  * @property {string} macAddress
  * @property {string} [connection]
+ * @property {string} DeviceState
  */
 
 /**
@@ -215,5 +228,6 @@ export {
   connectionHumanState,
   ConnectionState,
   ConnectionTypes,
+  DeviceState,
   SecurityProtocols
 };
diff --git a/web/src/components/network/ConnectionsTable.test.jsx b/web/src/components/network/ConnectionsTable.test.jsx
index 51bb90e54d..b07d0a32ea 100644
--- a/web/src/components/network/ConnectionsTable.test.jsx
+++ b/web/src/components/network/ConnectionsTable.test.jsx
@@ -30,24 +30,41 @@ jest.mock("~/client");
 
 const firstConnection = {
   id: "WiFi 1",
-  uuid: "89e7d438-8143-4318-9e35-cdedfdf6c98a",
+  iface: "wlan0",
   type: ConnectionTypes.WIFI,
   addresses: [{ address: "192.168.69.200", prefix: 24 }]
 };
 
+const firstDevice = {
+  name: "wlan0",
+  connection: "WiFi 1",
+  type: ConnectionTypes.WIFI,
+  addresses: [{ address: "192.168.69.200", prefix: 24 }],
+  macAddress: "AA:11:22:33:44::FF"
+};
+
 const secondConnection = {
   id: "WiFi 2",
-  uuid: "ddc46599-db7f-4306-aee4-2ab0938fd7d6",
+  iface: "wlan1",
   type: ConnectionTypes.WIFI,
   addresses: [{ address: "192.168.69.201", prefix: 24 }]
 };
 
+const secondDevice = {
+  name: "wlan1",
+  connection: "WiFi 2",
+  type: ConnectionTypes.WIFI,
+  addresses: [{ address: "192.168.69.201", prefix: 24 }],
+  macAddress: "AA:11:22:33:44::AA"
+};
+
 const conns = [firstConnection, secondConnection];
+const devices = [firstDevice, secondDevice];
 
 describe("ConnectionsTable", () => {
   describe("when there are no connections", () => {
     it("renders nothing", async () => {
-      const { container } = plainRender(<ConnectionsTable connections={[]} />);
+      const { container } = plainRender(<ConnectionsTable connections={[]} devices={[]} />);
 
       await waitFor(() => expect(container).toBeEmptyDOMElement());
     });
@@ -55,7 +72,7 @@ describe("ConnectionsTable", () => {
 
   describe("when there are connections", () => {
     it("renders them in a table", () => {
-      plainRender(<ConnectionsTable connections={conns} />);
+      plainRender(<ConnectionsTable connections={conns} devices={devices} />);
 
       const table = screen.getByRole("grid");
       within(table).getByText("Name");
@@ -68,7 +85,7 @@ describe("ConnectionsTable", () => {
 
     describe("and the user clicks on the actions toggler", () => {
       it("renders a list of available actions", async () => {
-        const { user } = plainRender(<ConnectionsTable connections={conns} />);
+        const { user } = plainRender(<ConnectionsTable connections={conns} devices={devices} />);
         const connectionActions = screen.getByRole("button", { name: "Actions for connection WiFi 1" });
         const actionsColumn = connectionActions.parentNode;
         const menu = within(actionsColumn).queryByRole("menu");
@@ -80,7 +97,7 @@ describe("ConnectionsTable", () => {
       describe("and then in the Edit action", () => {
         it("triggers the onEdit callback", async () => {
           const onEditFn = jest.fn();
-          const { user } = plainRender(<ConnectionsTable connections={conns} onEdit={onEditFn} />);
+          const { user } = plainRender(<ConnectionsTable connections={conns} devices={devices} onEdit={onEditFn} />);
           const connectionActions = screen.getByRole("button", { name: "Actions for connection WiFi 1" });
           const actionsColumn = connectionActions.parentNode;
           await user.click(connectionActions);
diff --git a/web/src/components/network/NetworkPage.jsx b/web/src/components/network/NetworkPage.jsx
index 7f26dd4a19..19ee51e55c 100644
--- a/web/src/components/network/NetworkPage.jsx
+++ b/web/src/components/network/NetworkPage.jsx
@@ -25,6 +25,7 @@ import { Icon } from "~/components/layout";
 import { useInstallerClient } from "~/context/installer";
 import { If, Page, Section } from "~/components/core";
 import { ConnectionsTable, IpSettingsForm, NetworkPageMenu, WifiSelector } from "~/components/network";
+import { NetworkEventTypes } from "~/client/network";
 import { _ } from "~/i18n";
 
 /**
@@ -90,6 +91,34 @@ export default function NetworkPage() {
   const openWifiSelector = () => setWifiSelectorOpen(true);
   const closeWifiSelector = () => setWifiSelectorOpen(false);
 
+  useEffect(() => {
+    return client.onNetworkChange(({ type, payload }) => {
+      switch (type) {
+        case NetworkEventTypes.DEVICE_ADDED: {
+          setDevices((devs) => {
+            const newDevices = devs.filter((d) => d.name !== payload.name);
+            return [...newDevices, client.fromApiDevice(payload)];
+          });
+          break;
+        }
+
+        case NetworkEventTypes.DEVICE_UPDATED: {
+          const [name, data] = payload;
+          setDevices(devs => {
+            const newDevices = devs.filter((d) => d.name !== name);
+            return [...newDevices, client.fromApiDevice(data)];
+          });
+          break;
+        }
+
+        case NetworkEventTypes.DEVICE_REMOVED: {
+          setDevices(devs => devs.filter((d) => d.name !== payload));
+          break;
+        }
+      }
+    });
+  }, [client, devices]);
+
   useEffect(() => {
     if (connections !== undefined) return;
 
@@ -120,25 +149,25 @@ export default function NetworkPage() {
   const ready = (connections !== undefined) && (devices !== undefined);
 
   const WifiConnections = () => {
-    const activeWifiConnections = connections.filter(c => c.wireless);
+    const wifiConnections = connections.filter(c => c.wireless);
 
-    if (activeWifiConnections.length === 0) {
+    if (wifiConnections.length === 0) {
       return (
         <NoWifiConnections wifiScanSupported={wifiScanSupported} openWifiSelector={openWifiSelector} />
       );
     }
 
     return (
-      <ConnectionsTable connections={activeWifiConnections} devices={devices} onEdit={selectConnection} onForget={forgetConnection} />
+      <ConnectionsTable connections={wifiConnections} devices={devices} onEdit={selectConnection} onForget={forgetConnection} />
     );
   };
 
   const WiredConnections = () => {
-    const activeWiredConnections = connections.filter(c => !c.wireless && (c.id !== "lo"));
+    const wiredConnections = connections.filter(c => !c.wireless && (c.id !== "lo"));
 
-    if (activeWiredConnections.length === 0) return <NoWiredConnections />;
+    if (wiredConnections.length === 0) return <NoWiredConnections />;
 
-    return <ConnectionsTable connections={activeWiredConnections} devices={devices} onEdit={selectConnection} />;
+    return <ConnectionsTable connections={wiredConnections} devices={devices} onEdit={selectConnection} />;
   };
 
   return (
diff --git a/web/src/components/network/NetworkPage.test.jsx b/web/src/components/network/NetworkPage.test.jsx
index 67028fd5b8..9420ffd6ba 100644
--- a/web/src/components/network/NetworkPage.test.jsx
+++ b/web/src/components/network/NetworkPage.test.jsx
@@ -32,7 +32,7 @@ jest.mock("~/components/core/Sidebar", () => () => <div>Agama sidebar</div>);
 const wiredConnection = {
   "id": "eth0",
   "status": "up",
-  "interface": "eth0",
+  "iface": "eth0",
   "method4": "manual",
   "method6": "manual",
   "addresses": [{ address: "192.168.122.20", prefix: 24 }],
@@ -42,6 +42,7 @@ const wiredConnection = {
 
 const wiFiConnection = {
   "id": "AgamaNetwork",
+  "iface": "wlan0",
   "method4": "auto",
   "method6": "auto",
   "wireless": {
@@ -52,11 +53,29 @@ const wiFiConnection = {
   },
   "addresses": [{ address: "192.168.69.200", prefix: 24 }],
   "nameservers": [],
-  "status": "down"
+  "status": "up"
 }
 
+const ethernetDevice = {
+  name: "eth0",
+  connection: "eth0",
+  type: ConnectionTypes.ETHERNET,
+  addresses: [{ address: "192.168.122.20", prefix: 24 }],
+  macAddress: "00:11:22:33:44::55"
+};
+
+const wifiDevice = {
+  name: "wlan0",
+  connection: "AgamaNetwork",
+  type: ConnectionTypes.WIFI,
+  addresses: [{ address: "192.168.69.200", prefix: 24 }],
+  macAddress: "AA:11:22:33:44::FF"
+};
+
 const settingsFn = jest.fn();
 const connectionsFn = jest.fn();
+const onNetworChangeEventFn = jest.fn();
+const devicesFn = jest.fn();
 const activeConnections = [wiredConnection, wiFiConnection];
 const networkSettings = { wireless_enabled: false, hostname: "test", networking_enabled: true, connectivity: true };
 
@@ -64,14 +83,15 @@ describe("NetworkPage", () => {
   beforeEach(() => {
     settingsFn.mockReturnValue({ ...networkSettings });
     connectionsFn.mockReturnValue(activeConnections);
+    devicesFn.mockResolvedValue([ethernetDevice, wifiDevice]);
 
     createClient.mockImplementation(() => {
       return {
         network: {
-          setUp: () => Promise.resolve(true),
+          devices: devicesFn,
           connections: () => Promise.resolve(connectionsFn()),
           accessPoints: () => Promise.resolve([]),
-          onNetworkEvent: jest.fn(),
+          onNetworkChange: onNetworChangeEventFn,
           settings: () => Promise.resolve(settingsFn())
         }
       };
diff --git a/web/src/components/network/WifiConnectionForm.jsx b/web/src/components/network/WifiConnectionForm.jsx
index 2149b3808e..55de9cee70 100644
--- a/web/src/components/network/WifiConnectionForm.jsx
+++ b/web/src/components/network/WifiConnectionForm.jsx
@@ -58,7 +58,7 @@ const securityFrom = (supported) => {
 };
 
 export default function WifiConnectionForm({ network, onCancel, onSubmitCallback }) {
-  const client = useInstallerClient();
+  const { network: client } = useInstallerClient();
   const formRef = useRef();
   const [error, setError] = useState(false);
   const [isConnecting, setIsConnecting] = useState(false);
@@ -80,7 +80,7 @@ export default function WifiConnectionForm({ network, onCancel, onSubmitCallback
       onSubmitCallback({ ssid, password, hidden, security: [security] });
     }
 
-    client.network.addAndConnectTo(ssid, { security, password, hidden })
+    client.addAndConnectTo(ssid, { security, password, hidden })
       .catch(() => setError(true))
       .finally(() => setIsConnecting(false));
   };
diff --git a/web/src/components/network/WifiNetworkListItem.jsx b/web/src/components/network/WifiNetworkListItem.jsx
index 63520a8194..0fae0196ab 100644
--- a/web/src/components/network/WifiNetworkListItem.jsx
+++ b/web/src/components/network/WifiNetworkListItem.jsx
@@ -28,7 +28,7 @@ import {
 } from "@patternfly/react-core";
 import { sprintf } from "sprintf-js";
 
-import { ConnectionState } from "~/client/network/model";
+import { DeviceState } from "~/client/network/model";
 
 import { Icon } from "~/components/layout";
 import { WifiNetworkMenu, WifiConnectionForm } from "~/components/network";
@@ -36,16 +36,16 @@ import { _ } from "~/i18n";
 
 const networkState = (state) => {
   switch (state) {
-    case ConnectionState.ACTIVATING:
+    case DeviceState.CONFIG:
       // TRANSLATORS: Wifi network status
       return _("Connecting");
-    case ConnectionState.ACTIVATED:
+    case DeviceState.ACTIVATED:
       // TRANSLATORS: Wifi network status
       return _("Connected");
-    case ConnectionState.DEACTIVATING:
+    case DeviceState.DEACTIVATING:
       // TRANSLATORS: Wifi network status
       return _("Disconnecting");
-    case ConnectionState.DEACTIVATED:
+    case DeviceState.DISCONNECTED:
       // TRANSLATORS: Wifi network status
       return _("Disconnected");
     default:
@@ -54,8 +54,8 @@ const networkState = (state) => {
 };
 
 const isStateChanging = (network) => {
-  const state = network.connection?.state;
-  return state === ConnectionState.ACTIVATING || state === ConnectionState.DEACTIVATING;
+  const state = network.device?.state;
+  return state === DeviceState.CONFIG || DeviceState.NEEDAUTH || state === DeviceState.DEACTIVATING;
 };
 
 /**
@@ -72,7 +72,7 @@ function WifiNetworkListItem({ network, isSelected, isActive, onSelect, onCancel
   // Do not wait until receive the next D-Bus network event to have the connection object available
   // and display the spinner as soon as possible. I.e., renders it immediately when the user clicks
   // on an already configured network.
-  const showSpinner = (isSelected && network.settings && !network.connection) || isStateChanging(network);
+  const showSpinner = (isSelected && network.settings && !network.device);
 
   return (
     <li
@@ -96,8 +96,8 @@ function WifiNetworkListItem({ network, isSelected, isActive, onSelect, onCancel
           {/* TRANSLATORS: %s is replaced by a WiFi network name */}
           {showSpinner && <Spinner size="md" aria-label={sprintf(_("%s connection is waiting for an state change"), network.ssid)} />}
           <Text component="small" className="keep-words">
-            {showSpinner && !network.connection && _("Connecting")}
-            {networkState(network.connection?.state)}
+            {showSpinner && !network.device && _("Connecting")}
+            {networkState(network.device?.state)}
           </Text>
           {network.settings &&
             <WifiNetworkMenu settings={network.settings} />}
diff --git a/web/src/components/network/WifiSelector.jsx b/web/src/components/network/WifiSelector.jsx
index c14e330ed9..f32bf193e5 100644
--- a/web/src/components/network/WifiSelector.jsx
+++ b/web/src/components/network/WifiSelector.jsx
@@ -31,11 +31,11 @@ const networksFromValues = (networks) => Object.values(networks).flat();
 const baseHiddenNetwork = { ssid: undefined, hidden: true };
 
 function WifiSelector({ isOpen = false, onClose }) {
-  const client = useInstallerClient();
+  const { network: client } = useInstallerClient();
   const [networks, setNetworks] = useState([]);
   const [showHiddenForm, setShowHiddenForm] = useState(false);
+  const [devices, setDevices] = useState([]);
   const [connections, setConnections] = useState([]);
-  const [activeConnections, setActiveConnections] = useState([]);
   const [accessPoints, setAccessPoints] = useState([]);
   const [selectedNetwork, setSelectedNetwork] = useState(null);
   const [activeNetwork, setActiveNetwork] = useState(null);
@@ -46,9 +46,10 @@ function WifiSelector({ isOpen = false, onClose }) {
   };
 
   useEffect(() => {
-    client.network.connections().then(setConnections);
-    client.network.accessPoints().then(setAccessPoints);
-  }, [client.network]);
+    client.devices().then(setDevices);
+    client.connections().then(setConnections);
+    client.accessPoints().then(setAccessPoints);
+  }, [client]);
 
   useEffect(() => {
     const loadNetworks = async () => {
@@ -65,11 +66,11 @@ function WifiSelector({ isOpen = false, onClose }) {
           const network = {
             ...ap,
             settings: connections.find(c => c.wireless?.ssid === ap.ssid),
-            connection: activeConnections.find(c => c.id === ap.ssid)
+            device: devices.find(c => c.connection === ap.ssid)
           };
 
           // Group networks
-          if (network.connection) {
+          if (network.device) {
             networks.connected.push(network);
           } else if (network.settings) {
             networks.configured.push(network);
@@ -85,9 +86,37 @@ function WifiSelector({ isOpen = false, onClose }) {
 
     loadNetworks().then((data) => {
       setNetworks(data);
-      setActiveNetwork(networksFromValues(data).find(d => d.connection));
+      setActiveNetwork(networksFromValues(data).find(d => d.device));
     });
-  }, [client.network, connections, activeConnections, accessPoints, isOpen]);
+  }, [client, connections, devices, accessPoints, isOpen]);
+
+  useEffect(() => {
+    return client.onNetworkChange(({ type, payload }) => {
+      switch (type) {
+        case NetworkEventTypes.DEVICE_ADDED: {
+          setDevices((devs) => {
+            const newDevices = devs.filter((d) => d.name !== payload.name);
+            return [...newDevices, client.fromApiDevice(payload)];
+          });
+          break;
+        }
+
+        case NetworkEventTypes.DEVICE_UPDATED: {
+          const [name, data] = payload;
+          setDevices(devs => {
+            const newDevices = devs.filter((d) => d.name !== name);
+            return [...newDevices, client.fromApiDevice(data)];
+          });
+          break;
+        }
+
+        case NetworkEventTypes.DEVICE_REMOVED: {
+          setDevices(devs => devs.filter((d) => d.name !== payload));
+          break;
+        }
+      }
+    });
+  });
 
   return (
     <Popup isOpen={isOpen} title={_("Connect to a Wi-Fi network")}>
@@ -100,7 +129,7 @@ function WifiSelector({ isOpen = false, onClose }) {
         availableNetworks={networks}
         onSelectionCallback={(network) => {
           switchSelectedNetwork(network);
-          if (network.settings && !network.connection) {
+          if (network.settings && !network.device) {
             client.network.connectTo(network.settings);
           }
         }}

From 251d0e4467edcc502c95e123da0254c1ee210f1d Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Mon, 22 Apr 2024 14:25:55 +0200
Subject: [PATCH 286/324] add initial device interface

---
 rust/agama-lib/src/storage.rs        |  3 +-
 rust/agama-lib/src/storage/device.rs | 80 ++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 rust/agama-lib/src/storage/device.rs

diff --git a/rust/agama-lib/src/storage.rs b/rust/agama-lib/src/storage.rs
index dfb9105357..abb02abf37 100644
--- a/rust/agama-lib/src/storage.rs
+++ b/rust/agama-lib/src/storage.rs
@@ -1,6 +1,7 @@
 //! Implements support for handling the storage settings
 
-mod client;
+pub mod client;
+mod device;
 mod proxies;
 mod settings;
 mod store;
diff --git a/rust/agama-lib/src/storage/device.rs b/rust/agama-lib/src/storage/device.rs
new file mode 100644
index 0000000000..2772cef404
--- /dev/null
+++ b/rust/agama-lib/src/storage/device.rs
@@ -0,0 +1,80 @@
+use serde::{Deserialize, Serialize};
+
+/// Information about system device created by composition to reflect different devices on system
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Device {
+    pub device_info: DeviceInfo,
+    pub block_device: Option<BlockDevice>,
+    pub component: Option<Component>,
+    pub drive: Option<Drive>,
+    pub filesystem: Option<Filesystem>,
+    pub lvm_lv: Option<LvmLv>,
+    pub lvm_vg: Option<LvmVg>,
+    pub md: Option<MD>,
+    pub multipath: Option<Multipath>,
+    pub partition: Option<Partition>,
+    pub partition_table: Option<PartitionTable>,
+    pub raid: Option<Raid>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct DeviceInfo {
+    pub sid: u32,
+    pub name: String,
+    pub description: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct BlockDevice {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Component {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Drive {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Filesystem {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct LvmLv {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct LvmVg {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct MD {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Multipath {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Partition {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct PartitionTable {
+
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+pub struct Raid {
+
+}

From 9b2443c130b2757dbbe92f0c601e12f3ad76ff95 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 22 Apr 2024 16:59:37 +0100
Subject: [PATCH 287/324] Some small fixes to the WiFi connection handling

---
 web/src/client/network/model.js                    |  5 +++++
 web/src/components/network/NetworkPage.jsx         |  5 ++++-
 web/src/components/network/NetworkPageMenu.jsx     |  2 +-
 web/src/components/network/WifiNetworkListItem.jsx |  8 +++++---
 web/src/components/network/WifiNetworkMenu.jsx     |  2 +-
 web/src/components/network/WifiNetworksList.jsx    |  2 +-
 web/src/components/network/WifiSelector.jsx        |  7 ++++++-
 web/src/components/overview/NetworkSection.jsx     | 10 +++++-----
 8 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/web/src/client/network/model.js b/web/src/client/network/model.js
index 08de0fc702..60d8cb4803 100644
--- a/web/src/client/network/model.js
+++ b/web/src/client/network/model.js
@@ -60,6 +60,10 @@ const connectionHumanState = (state) => {
   return stateKey.toLowerCase();
 };
 
+/**
+ * @typedef {keyof ConnectionTypes} ConnectionType
+ */
+
 const ConnectionTypes = Object.freeze({
   ETHERNET: "ethernet",
   WIFI: "wireless",
@@ -97,6 +101,7 @@ const SecurityProtocols = Object.freeze({
 /**
  * @typedef {object} Device
  * @property {string} name
+ * @property {ConnectionType} type
  * @property {IPAddress[]} addresses
  * @property {string[]} nameservers
  * @property {string} gateway4
diff --git a/web/src/components/network/NetworkPage.jsx b/web/src/components/network/NetworkPage.jsx
index 19ee51e55c..d71ab42a04 100644
--- a/web/src/components/network/NetworkPage.jsx
+++ b/web/src/components/network/NetworkPage.jsx
@@ -19,13 +19,15 @@
  * find current contact information at www.suse.com.
  */
 
+// @ts-check
+
 import React, { useEffect, useState } from "react";
 import { Button, Skeleton } from "@patternfly/react-core";
 import { Icon } from "~/components/layout";
 import { useInstallerClient } from "~/context/installer";
 import { If, Page, Section } from "~/components/core";
 import { ConnectionsTable, IpSettingsForm, NetworkPageMenu, WifiSelector } from "~/components/network";
-import { NetworkEventTypes } from "~/client/network";
+import { ConnectionTypes, NetworkEventTypes } from "~/client/network";
 import { _ } from "~/i18n";
 
 /**
@@ -116,6 +118,7 @@ export default function NetworkPage() {
           break;
         }
       }
+      client.connections().then(setConnections);
     });
   }, [client, devices]);
 
diff --git a/web/src/components/network/NetworkPageMenu.jsx b/web/src/components/network/NetworkPageMenu.jsx
index ba4e10553e..748985e108 100644
--- a/web/src/components/network/NetworkPageMenu.jsx
+++ b/web/src/components/network/NetworkPageMenu.jsx
@@ -31,7 +31,7 @@ import { _ } from "~/i18n";
  * @param {boolean} [props.wifiScanSupported=false] - whether the scan of WiFi networks is supported
  * @param {function} props.openWifiSelector - the function for opening the WiFi network selector
  */
-export default function NetworkPageMenu ({
+export default function NetworkPageMenu({
   wifiScanSupported = false,
   openWifiSelector,
 }) {
diff --git a/web/src/components/network/WifiNetworkListItem.jsx b/web/src/components/network/WifiNetworkListItem.jsx
index 0fae0196ab..11f557b50b 100644
--- a/web/src/components/network/WifiNetworkListItem.jsx
+++ b/web/src/components/network/WifiNetworkListItem.jsx
@@ -45,6 +45,8 @@ const networkState = (state) => {
     case DeviceState.DEACTIVATING:
       // TRANSLATORS: Wifi network status
       return _("Disconnecting");
+    case DeviceState.FAILED:
+      return _("Failed");
     case DeviceState.DISCONNECTED:
       // TRANSLATORS: Wifi network status
       return _("Disconnected");
@@ -55,7 +57,7 @@ const networkState = (state) => {
 
 const isStateChanging = (network) => {
   const state = network.device?.state;
-  return state === DeviceState.CONFIG || DeviceState.NEEDAUTH || state === DeviceState.DEACTIVATING;
+  return state === DeviceState.CONFIG || state === DeviceState.NEEDAUTH || state === DeviceState.DEACTIVATING || state === DeviceState.FAILED;
 };
 
 /**
@@ -72,7 +74,7 @@ function WifiNetworkListItem({ network, isSelected, isActive, onSelect, onCancel
   // Do not wait until receive the next D-Bus network event to have the connection object available
   // and display the spinner as soon as possible. I.e., renders it immediately when the user clicks
   // on an already configured network.
-  const showSpinner = (isSelected && network.settings && !network.device);
+  const showSpinner = (isSelected && network.settings && !network.device) || isStateChanging(network);
 
   return (
     <li
@@ -103,7 +105,7 @@ function WifiNetworkListItem({ network, isSelected, isActive, onSelect, onCancel
             <WifiNetworkMenu settings={network.settings} />}
         </div>
       </div>
-      {isSelected && (!network.settings || network.settings.error) &&
+      {isSelected && (!network.settings || network.error) &&
         <div className="content">
           <WifiConnectionForm network={network} onCancel={onCancel} />
         </div>}
diff --git a/web/src/components/network/WifiNetworkMenu.jsx b/web/src/components/network/WifiNetworkMenu.jsx
index 354ae84b69..06e22ed554 100644
--- a/web/src/components/network/WifiNetworkMenu.jsx
+++ b/web/src/components/network/WifiNetworkMenu.jsx
@@ -48,7 +48,7 @@ export default function WifiNetworkMenu({ settings, position = "right" }) {
         <DropdownItem
           isDanger
           key="forget-network"
-          onClick={() => client.network.deleteConnection(settings.uuid)}
+          onClick={async () => await client.network.deleteConnection(settings.id)}
           icon={<Icon name="delete" size="s" />}
         >
           {/* TRANSLATORS: menu label, remove the selected WiFi network settings */}
diff --git a/web/src/components/network/WifiNetworksList.jsx b/web/src/components/network/WifiNetworksList.jsx
index aa21c80dcc..7f6d188f01 100644
--- a/web/src/components/network/WifiNetworksList.jsx
+++ b/web/src/components/network/WifiNetworksList.jsx
@@ -65,7 +65,7 @@ function WifiNetworksList({
   return (
     <ul className="selection-list" data-type="agama/list">
       {renderElements()}
-      <li data-state={showHiddenForm ? "focused" : "unstyled" }>
+      <li data-state={showHiddenForm ? "focused" : "unstyled"}>
         <div className="content">
           <WifiHiddenNetworkForm
             network={hiddenNetwork}
diff --git a/web/src/components/network/WifiSelector.jsx b/web/src/components/network/WifiSelector.jsx
index f32bf193e5..413e8b4072 100644
--- a/web/src/components/network/WifiSelector.jsx
+++ b/web/src/components/network/WifiSelector.jsx
@@ -66,7 +66,8 @@ function WifiSelector({ isOpen = false, onClose }) {
           const network = {
             ...ap,
             settings: connections.find(c => c.wireless?.ssid === ap.ssid),
-            device: devices.find(c => c.connection === ap.ssid)
+            device: devices.find(c => c.connection === ap.ssid),
+            error: undefined
           };
 
           // Group networks
@@ -103,6 +104,9 @@ function WifiSelector({ isOpen = false, onClose }) {
 
         case NetworkEventTypes.DEVICE_UPDATED: {
           const [name, data] = payload;
+          if (data.state === "failed") {
+            selectedNetwork.error = "Failed";
+          }
           setDevices(devs => {
             const newDevices = devs.filter((d) => d.name !== name);
             return [...newDevices, client.fromApiDevice(data)];
@@ -115,6 +119,7 @@ function WifiSelector({ isOpen = false, onClose }) {
           break;
         }
       }
+      client.connections().then(setConnections);
     });
   });
 
diff --git a/web/src/components/overview/NetworkSection.jsx b/web/src/components/overview/NetworkSection.jsx
index d31095e3a5..721314de72 100644
--- a/web/src/components/overview/NetworkSection.jsx
+++ b/web/src/components/overview/NetworkSection.jsx
@@ -83,19 +83,19 @@ export default function NetworkSection() {
       );
     }
   };
-
   const Content = () => {
     if (devices === undefined) return <SectionSkeleton />;
+    const activeDevices = devices.filter(d => d.connection);
+    const total = activeDevices.length;
 
-    if (devices.length === 0) return _("No network devices detected");
+    if (total === 0) return _("No network devices detected");
 
-    const summary = devices.map(deviceSummary);
+    const summary = activeDevices.map(deviceSummary);
 
     const msg = sprintf(
       // TRANSLATORS: header for the list of active network connections,
       // %d is replaced by the number of active connections
-      n_("%d device set:", "%d devices set:", devices.length),
-      devices.length
+      n_("%d device set:", "%d devices set:", total), total
     );
 
     return (

From e37c4ca04dedd5eff22fe267295f126e5e53bf2e Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 23 Apr 2024 15:34:25 +0200
Subject: [PATCH 288/324] update partly proxies

---
 rust/agama-lib/src/storage/client.rs  |  46 +++++++++++-
 rust/agama-lib/src/storage/device.rs  |  44 +++--------
 rust/agama-lib/src/storage/proxies.rs | 101 +++++++++++++++++++++++++-
 rust/agama-server/src/storage.rs      |   2 +-
 rust/agama-server/src/storage/web.rs  |   2 +-
 rust/agama-server/src/web.rs          |   2 +-
 6 files changed, 155 insertions(+), 42 deletions(-)

diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 8aa60de391..37ca991c0a 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -1,11 +1,14 @@
 //! Implements a client to access Agama's storage service.
 
-use super::proxies::{BlockDeviceProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy};
+use super::device::{Device, DeviceInfo};
+use super::proxies::{BlockProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy};
 use super::StorageSettings;
 use crate::error::ServiceError;
+use anyhow::Context;
 use futures_util::future::join_all;
 use serde::Serialize;
 use std::collections::HashMap;
+use zbus::fdo::ObjectManagerProxy;
 use zbus::zvariant::OwnedObjectPath;
 use zbus::Connection;
 
@@ -22,6 +25,7 @@ pub struct StorageClient<'a> {
     pub connection: Connection,
     calculator_proxy: ProposalCalculatorProxy<'a>,
     storage_proxy: Storage1Proxy<'a>,
+    object_manager_proxy: ObjectManagerProxy<'a>,
 }
 
 impl<'a> StorageClient<'a> {
@@ -29,6 +33,11 @@ impl<'a> StorageClient<'a> {
         Ok(Self {
             calculator_proxy: ProposalCalculatorProxy::new(&connection).await?,
             storage_proxy: Storage1Proxy::new(&connection).await?,
+            object_manager_proxy: ObjectManagerProxy::builder(&connection)
+                .destination("org.opensuse.Agama.Storage1")?
+                .path("/org/opensuse/Agama/Storage1")?
+                .build()
+                .await?,
             connection,
         })
     }
@@ -65,7 +74,7 @@ impl<'a> StorageClient<'a> {
         &self,
         dbus_path: OwnedObjectPath,
     ) -> Result<StorageDevice, ServiceError> {
-        let proxy = BlockDeviceProxy::builder(&self.connection)
+        let proxy = BlockProxy::builder(&self.connection)
             .path(dbus_path)?
             .build()
             .await?;
@@ -145,4 +154,37 @@ impl<'a> StorageClient<'a> {
 
         Ok(self.calculator_proxy.calculate(dbus_settings).await?)
     }
+
+    pub async fn system_devices(&self) -> Result<Vec<Device>, ServiceError> {
+        let objects = self
+            .object_manager_proxy
+            .get_managed_objects()
+            .await
+            .context("Failed to get managed objects")?;
+        let result: Vec<Device> = objects
+            .into_iter()
+            // take ony system devices
+            .filter(|object| object.0.as_str().contains("Storage1/system"))
+            .map(|object| Device {
+                device_info: DeviceInfo {
+                    sid: 0,
+                    name: "TODO".to_string(),
+                    description: "TODO".to_string(),
+                },
+                component: None,
+                drive: None,
+                block_device: None,
+                filesystem: None,
+                lvm_lv: None,
+                lvm_vg: None,
+                md: None,
+                multipath: None,
+                partition: None,
+                partition_table: None,
+                raid: None,
+            })
+            .collect();
+
+        Ok(result)
+    }
 }
diff --git a/rust/agama-lib/src/storage/device.rs b/rust/agama-lib/src/storage/device.rs
index 2772cef404..3110832df2 100644
--- a/rust/agama-lib/src/storage/device.rs
+++ b/rust/agama-lib/src/storage/device.rs
@@ -25,56 +25,34 @@ pub struct DeviceInfo {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct BlockDevice {
-
-}
+pub struct BlockDevice {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct Component {
-
-}
+pub struct Component {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct Drive {
-
-}
+pub struct Drive {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct Filesystem {
-
-}
+pub struct Filesystem {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct LvmLv {
-
-}
+pub struct LvmLv {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct LvmVg {
-
-}
+pub struct LvmVg {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct MD {
-
-}
+pub struct MD {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct Multipath {
-
-}
+pub struct Multipath {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct Partition {
-
-}
+pub struct Partition {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct PartitionTable {
-
-}
+pub struct PartitionTable {}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct Raid {
-
-}
+pub struct Raid {}
diff --git a/rust/agama-lib/src/storage/proxies.rs b/rust/agama-lib/src/storage/proxies.rs
index 29f08c79cd..69018ec1f4 100644
--- a/rust/agama-lib/src/storage/proxies.rs
+++ b/rust/agama-lib/src/storage/proxies.rs
@@ -103,21 +103,29 @@ trait Proposal {
 
 #[dbus_proxy(
     interface = "org.opensuse.Agama.Storage1.Block",
-    default_service = "org.opensuse.Agama.Storage1"
+    assume_defaults = true
 )]
-trait BlockDevice {
+trait Block {
     /// Active property
     #[dbus_proxy(property)]
     fn active(&self) -> zbus::Result<bool>;
 
-    /// Name property
+    /// Encrypted property
     #[dbus_proxy(property)]
-    fn name(&self) -> zbus::Result<String>;
+    fn encrypted(&self) -> zbus::Result<bool>;
+
+    /// RecoverableSize property
+    #[dbus_proxy(property)]
+    fn recoverable_size(&self) -> zbus::Result<u64>;
 
     /// Size property
     #[dbus_proxy(property)]
     fn size(&self) -> zbus::Result<u64>;
 
+    /// Start property
+    #[dbus_proxy(property)]
+    fn start(&self) -> zbus::Result<u64>;
+
     /// Systems property
     #[dbus_proxy(property)]
     fn systems(&self) -> zbus::Result<Vec<String>>;
@@ -130,3 +138,88 @@ trait BlockDevice {
     #[dbus_proxy(property)]
     fn udev_paths(&self) -> zbus::Result<Vec<String>>;
 }
+
+use zbus::proxy;
+#[dbus_proxy(
+    interface = "org.opensuse.Agama.Storage1.Drive",
+    assume_defaults = true
+)]
+trait Drive {
+    /// Bus property
+    #[dbus_proxy(property)]
+    fn bus(&self) -> zbus::Result<String>;
+
+    /// BusId property
+    #[dbus_proxy(property)]
+    fn bus_id(&self) -> zbus::Result<String>;
+
+    /// Driver property
+    #[dbus_proxy(property)]
+    fn driver(&self) -> zbus::Result<Vec<String>>;
+
+    /// Info property
+    #[dbus_proxy(property)]
+    fn info(&self) -> zbus::Result<std::collections::HashMap<String, zbus::zvariant::OwnedValue>>;
+
+    /// Model property
+    #[dbus_proxy(property)]
+    fn model(&self) -> zbus::Result<String>;
+
+    /// Transport property
+    #[dbus_proxy(property)]
+    fn transport(&self) -> zbus::Result<String>;
+
+    /// Type property
+    #[dbus_proxy(property)]
+    fn type_(&self) -> zbus::Result<String>;
+
+    /// Vendor property
+    #[dbus_proxy(property)]
+    fn vendor(&self) -> zbus::Result<String>;
+}
+
+#[dbus_proxy(
+    interface = "org.opensuse.Agama.Storage1.Multipath",
+    assume_defaults = true
+)]
+trait Multipath {
+    /// Wires property
+    #[dbus_proxy(property)]
+    fn wires(&self) -> zbus::Result<Vec<zbus::zvariant::OwnedObjectPath>>;
+}
+
+#[dbus_proxy(
+    interface = "org.opensuse.Agama.Storage1.PartitionTable",
+    assume_defaults = true
+)]
+trait PartitionTable {
+    /// Partitions property
+    #[dbus_proxy(property)]
+    fn partitions(&self) -> zbus::Result<Vec<zbus::zvariant::OwnedObjectPath>>;
+
+    /// Type property
+    #[dbus_proxy(property)]
+    fn type_(&self) -> zbus::Result<String>;
+
+    /// UnusedSlots property
+    #[dbus_proxy(property)]
+    fn unused_slots(&self) -> zbus::Result<Vec<(u64, u64)>>;
+}
+
+#[dbus_proxy(
+    interface = "org.opensuse.Agama.Storage1.Device",
+    assume_defaults = true
+)]
+trait Device {
+    /// Description property
+    #[dbus_proxy(property)]
+    fn description(&self) -> zbus::Result<String>;
+
+    /// Name property
+    #[dbus_proxy(property)]
+    fn name(&self) -> zbus::Result<String>;
+
+    /// SID property
+    #[dbus_proxy(property, name = "SID")]
+    fn sid(&self) -> zbus::Result<u32>;
+}
diff --git a/rust/agama-server/src/storage.rs b/rust/agama-server/src/storage.rs
index f5d9826611..22dd60eeea 100644
--- a/rust/agama-server/src/storage.rs
+++ b/rust/agama-server/src/storage.rs
@@ -1,2 +1,2 @@
 pub mod web;
-pub use web::{storage_service, storage_streams};
\ No newline at end of file
+pub use web::{storage_service, storage_streams};
diff --git a/rust/agama-server/src/storage/web.rs b/rust/agama-server/src/storage/web.rs
index 624c3b6cc5..d9c3cb94ae 100644
--- a/rust/agama-server/src/storage/web.rs
+++ b/rust/agama-server/src/storage/web.rs
@@ -48,4 +48,4 @@ pub async fn storage_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
 
 async fn devices_dirty(State(state): State<StorageState<'_>>) -> Result<Json<bool>, Error> {
     Ok(Json(state.client.devices_dirty_bit().await?))
-}
\ No newline at end of file
+}
diff --git a/rust/agama-server/src/web.rs b/rust/agama-server/src/web.rs
index 0be99711f5..9a9b3c39c4 100644
--- a/rust/agama-server/src/web.rs
+++ b/rust/agama-server/src/web.rs
@@ -10,8 +10,8 @@ use crate::{
     manager::web::{manager_service, manager_stream},
     network::{web::network_service, NetworkManagerAdapter},
     questions::web::{questions_service, questions_stream},
-    storage::web::{storage_service, storage_streams},
     software::web::{software_service, software_streams},
+    storage::web::{storage_service, storage_streams},
     users::web::{users_service, users_streams},
     web::common::{issues_stream, progress_stream, service_status_stream},
 };

From 29656dd564141aaf3d2c7ecd6cd4821723196276 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 24 Apr 2024 10:05:37 +0100
Subject: [PATCH 289/324] Increase the number of channel messages

---
 rust/agama-lib/src/network/client.rs    | 4 ++--
 rust/agama-server/src/network/system.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/agama-lib/src/network/client.rs b/rust/agama-lib/src/network/client.rs
index 09857563db..a76bf4c431 100644
--- a/rust/agama-lib/src/network/client.rs
+++ b/rust/agama-lib/src/network/client.rs
@@ -86,11 +86,11 @@ impl<'a> NetworkClient<'a> {
             .await?;
         let name = device_proxy.name().await?;
         let device_type = device_proxy.type_().await?;
-        let state = DeviceState::try_from(device_proxy.state().await?).unwrap();
+        let state = DeviceState::try_from(device_proxy.state().await?).expect("Unknown state");
 
         Ok(Device {
             name,
-            type_: DeviceType::try_from(device_type).unwrap(),
+            type_: DeviceType::try_from(device_type).expect("Unknown type"),
             state,
         })
     }
diff --git a/rust/agama-server/src/network/system.rs b/rust/agama-server/src/network/system.rs
index 5360bee274..45af45279a 100644
--- a/rust/agama-server/src/network/system.rs
+++ b/rust/agama-server/src/network/system.rs
@@ -89,7 +89,7 @@ impl<T: Adapter + Send + Sync + 'static> NetworkSystem<T> {
     pub async fn start(self) -> Result<NetworkSystemClient, NetworkSystemError> {
         let mut state = self.adapter.read(StateConfig::default()).await?;
         let (actions_tx, actions_rx) = mpsc::unbounded_channel();
-        let (updates_tx, _updates_rx) = broadcast::channel(16);
+        let (updates_tx, _updates_rx) = broadcast::channel(1024);
 
         if let Some(watcher) = self.adapter.watcher() {
             let actions_tx_clone = actions_tx.clone();

From 80bd8ff1602898c31fa626afb3e254136ff0c346 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 24 Apr 2024 10:11:22 +0100
Subject: [PATCH 290/324] Do not stop in case of too many messages received

---
 rust/agama-server/src/network/web.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/rust/agama-server/src/network/web.rs b/rust/agama-server/src/network/web.rs
index d583bfbf59..d3b1a19d9e 100644
--- a/rust/agama-server/src/network/web.rs
+++ b/rust/agama-server/src/network/web.rs
@@ -77,9 +77,16 @@ pub async fn network_service<T: Adapter + Send + Sync + 'static>(
 
     let mut changes = client.subscribe();
     tokio::spawn(async move {
-        while let Ok(message) = changes.recv().await {
-            if let Err(e) = events.send(Event::NetworkChange { change: message }) {
-                eprintln!("Could not send the event: {}", e);
+        loop {
+            match changes.recv().await {
+                Ok(message) => {
+                    if let Err(e) = events.send(Event::NetworkChange { change: message }) {
+                        eprintln!("Could not send the event: {}", e);
+                    }
+                }
+                Err(e) => {
+                    eprintln!("Could not send the event: {}", e);
+                }
             }
         }
     });

From d5f7da8d4b9f673f08348af6c7582cd65b414019 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 24 Apr 2024 10:18:05 +0100
Subject: [PATCH 291/324] Only show new added devices if has a connection

---
 web/src/components/overview/NetworkSection.jsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/src/components/overview/NetworkSection.jsx b/web/src/components/overview/NetworkSection.jsx
index 721314de72..36129b9127 100644
--- a/web/src/components/overview/NetworkSection.jsx
+++ b/web/src/components/overview/NetworkSection.jsx
@@ -38,6 +38,8 @@ export default function NetworkSection() {
         case NetworkEventTypes.DEVICE_ADDED: {
           setDevices((devs) => {
             const newDevices = devs.filter((d) => d.name !== payload.name);
+            if (payload.connection) return newDevices;
+
             return [...newDevices, client.fromApiDevice(payload)];
           });
           break;

From 4a8de8a7f72a1162ad7fc4ca9096663eb51e5aee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 24 Apr 2024 12:40:42 +0100
Subject: [PATCH 292/324] Extend the documentation of the NetworkManagerWatcher

---
 rust/agama-server/src/network/nm/watcher.rs | 58 +++++++++++++++++----
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
index 1ef0766e99..5033fdeb78 100644
--- a/rust/agama-server/src/network/nm/watcher.rs
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -40,6 +40,7 @@ use super::{builder::DeviceFromProxyBuilder, proxies::NetworkManagerProxy};
 /// At this point, it detects the following changes:
 ///
 /// * A device is added, changed or removed.
+/// * The status of a device changes.
 /// * The IPv4 or IPv6 configuration changes.
 pub struct NetworkManagerWatcher {
     connection: zbus::Connection,
@@ -135,13 +136,16 @@ impl<'a> ActionDispatcher<'a> {
     async fn read_devices(&mut self) -> Result<(), ServiceError> {
         let nm_proxy = NetworkManagerProxy::new(&self.connection).await?;
         for path in nm_proxy.get_devices().await? {
-            self.proxies.find_or_create_device(&path).await?;
+            self.proxies.find_or_add_device(&path).await?;
         }
         Ok(())
     }
 
+    /// Handles the case where a new device appears.
+    ///
+    /// * `path`: D-Bus object path of the new device.
     async fn handle_device_added(&mut self, path: OwnedObjectPath) -> Result<(), ServiceError> {
-        let (_, proxy) = self.proxies.find_or_create_device(&path).await?;
+        let (_, proxy) = self.proxies.find_or_add_device(&path).await?;
         if let Ok(device) = Self::device_from_proxy(&self.connection, proxy.clone()).await {
             _ = self.actions_tx.send(Action::AddDevice(Box::new(device)));
         }
@@ -150,8 +154,11 @@ impl<'a> ActionDispatcher<'a> {
         Ok(())
     }
 
+    /// Handles the case where a device is updated.
+    ///
+    /// * `path`: D-Bus object path of the updated device.
     async fn handle_device_updated(&mut self, path: OwnedObjectPath) -> Result<(), ServiceError> {
-        let (old_name, proxy) = self.proxies.find_or_create_device(&path).await?;
+        let (old_name, proxy) = self.proxies.find_or_add_device(&path).await?;
         let device = Self::device_from_proxy(&self.connection, proxy.clone()).await?;
         let new_name = device.name.clone();
         _ = self
@@ -161,6 +168,9 @@ impl<'a> ActionDispatcher<'a> {
         Ok(())
     }
 
+    /// Handles the case where a device is removed.
+    ///
+    /// * `path`: D-Bus object path of the removed device.
     async fn handle_device_removed(&mut self, path: OwnedObjectPath) -> Result<(), ServiceError> {
         if let Some((name, _)) = self.proxies.remove_device(&path) {
             _ = self.actions_tx.send(Action::RemoveDevice(name));
@@ -168,6 +178,9 @@ impl<'a> ActionDispatcher<'a> {
         Ok(())
     }
 
+    /// Handles the case where the IPv4 configuration changes.
+    ///
+    /// * `path`: D-Bus object path of the changed IP configuration.
     async fn handle_ip4_config_changed(
         &mut self,
         path: OwnedObjectPath,
@@ -181,6 +194,9 @@ impl<'a> ActionDispatcher<'a> {
         Ok(())
     }
 
+    /// Handles the case where the IPv6 configuration changes.
+    ///
+    /// * `path`: D-Bus object path of the changed IP configuration.
     async fn handle_ip6_config_changed(
         &mut self,
         path: OwnedObjectPath,
@@ -194,7 +210,6 @@ impl<'a> ActionDispatcher<'a> {
         Ok(())
     }
 
-    // TODO: improve after DeviceFromProxyBuilder API is improved
     async fn device_from_proxy(
         connection: &zbus::Connection,
         proxy: DeviceProxy<'_>,
@@ -204,11 +219,12 @@ impl<'a> ActionDispatcher<'a> {
     }
 }
 
-/// Stream of addded and removed devices.
+/// Stream of device-related events.
+///
+/// This stream listens for many NetworkManager events that are related to network devices (state,
+/// IP configuration, etc.) and converts them into variants of the [DeviceChange] enum.
 ///
-/// This is a private stream that detects when a device was added or removed
-/// from NetworkManager. It is implemented as a struct because it needs to
-/// keep the ObjectManagerProxy alive.
+/// It is implemented as a struct because it needs to keep the ObjectManagerProxy alive.
 #[pin_project]
 struct DeviceChangedStream {
     connection: zbus::Connection,
@@ -217,6 +233,9 @@ struct DeviceChangedStream {
 }
 
 impl DeviceChangedStream {
+    /// Builds a new stream using the given D-Bus connection.
+    ///
+    /// * `connection`: D-Bus connection.
     pub async fn new(connection: &zbus::Connection) -> Result<Self, ServiceError> {
         let connection = connection.clone();
         let mut inner = StreamMap::new();
@@ -349,6 +368,9 @@ async fn build_added_and_removed_stream(
     Ok(stream)
 }
 
+/// Returns a stream of properties changes to be used by DeviceChangedStream.
+///
+/// It listens for changes in several objects that are related to a network device.
 async fn build_properties_changed_stream(
     connection: &zbus::Connection,
 ) -> Result<MessageStream, ServiceError> {
@@ -370,6 +392,7 @@ enum DeviceChange {
     IP6ConfigChanged(OwnedObjectPath),
 }
 
+/// Ancillary class to track the devices and their related D-Bus objects.
 struct ProxiesRegistry<'a> {
     connection: zbus::Connection,
     devices: HashMap<OwnedObjectPath, (String, DeviceProxy<'a>)>,
@@ -382,7 +405,11 @@ impl<'a> ProxiesRegistry<'a> {
             devices: HashMap::new(),
         }
     }
-    pub async fn find_or_create_device(
+
+    /// Finds or adds a device to the registry.
+    ///
+    /// * `path`: D-Bus object path.
+    pub async fn find_or_add_device(
         &mut self,
         path: &OwnedObjectPath,
     ) -> Result<&(String, DeviceProxy<'a>), ServiceError> {
@@ -401,16 +428,26 @@ impl<'a> ProxiesRegistry<'a> {
         }
     }
 
+    /// Removes a device from the registry.
+    ///
+    /// * `path`: D-Bus object path.
     pub fn remove_device(&mut self, path: &OwnedObjectPath) -> Option<(String, DeviceProxy)> {
         self.devices.remove(&path)
     }
 
+    //// Updates a device name.
+    ///
+    /// * `path`: D-Bus object path.
+    /// * `new_name`: New device name.
     pub fn update_device_name(&mut self, path: &OwnedObjectPath, new_name: &str) {
         if let Some(value) = self.devices.get_mut(path) {
             value.0 = new_name.to_string();
         };
     }
 
+    //// For the device corresponding to a given IPv4 configuration.
+    ///
+    /// * `ip4_config_path`: D-Bus object path of the IPv4 configuration.
     pub async fn find_device_for_ip4(
         &self,
         ip4_config_path: &OwnedObjectPath,
@@ -425,6 +462,9 @@ impl<'a> ProxiesRegistry<'a> {
         None
     }
 
+    //// For the device corresponding to a given IPv6 configuration.
+    ///
+    /// * `ip6_config_path`: D-Bus object path of the IPv6 configuration.
     pub async fn find_device_for_ip6(
         &self,
         ip4_config_path: &OwnedObjectPath,

From 68cceaddcfaac7cd3bdaed2955f04a7114147971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Wed, 24 Apr 2024 12:41:10 +0100
Subject: [PATCH 293/324] Remove an unneeded 'pub' modifier

---
 rust/agama-server/src/network/nm/dbus.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-server/src/network/nm/dbus.rs b/rust/agama-server/src/network/nm/dbus.rs
index d98da3360a..31d48bcaf7 100644
--- a/rust/agama-server/src/network/nm/dbus.rs
+++ b/rust/agama-server/src/network/nm/dbus.rs
@@ -688,7 +688,7 @@ fn ip_config_from_dbus(conn: &OwnedNestedHash) -> Option<IpConfig> {
     Some(ip_config)
 }
 
-pub fn addresses_with_prefix_from_dbus(address_data: &OwnedValue) -> Option<Vec<IpInet>> {
+fn addresses_with_prefix_from_dbus(address_data: &OwnedValue) -> Option<Vec<IpInet>> {
     let address_data = address_data.downcast_ref::<zbus::zvariant::Array>()?;
     let mut addresses: Vec<IpInet> = vec![];
     for addr in address_data.get() {

From f4d20be4e94519132b1bc2417ce0e83dc0c53a72 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 24 Apr 2024 14:53:47 +0200
Subject: [PATCH 294/324] WIP for listing system devices

---
 rust/agama-lib/src/storage/client.rs  | 25 +++++++++++++------------
 rust/agama-lib/src/storage/proxies.rs | 16 ++++++++++------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 37ca991c0a..c7c5ed422c 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -1,7 +1,7 @@
 //! Implements a client to access Agama's storage service.
 
 use super::device::{Device, DeviceInfo};
-use super::proxies::{BlockProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy};
+use super::proxies::{BlockProxy, DeviceProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy};
 use super::StorageSettings;
 use crate::error::ServiceError;
 use anyhow::Context;
@@ -74,17 +74,13 @@ impl<'a> StorageClient<'a> {
         &self,
         dbus_path: OwnedObjectPath,
     ) -> Result<StorageDevice, ServiceError> {
-        let proxy = BlockProxy::builder(&self.connection)
+        let proxy = DeviceProxy::builder(&self.connection)
             .path(dbus_path)?
             .build()
             .await?;
 
-        let name = proxy.name().await?;
-        // TODO: The description is not used yet. Decide what info to show, for example the device
-        // size, see https://crates.io/crates/size.
-        let description = name.clone();
 
-        Ok(StorageDevice { name, description })
+        Ok(StorageDevice { name: proxy.name().await?, description: proxy.description().await? })
     }
 
     /// Returns the boot device proposal setting
@@ -166,11 +162,7 @@ impl<'a> StorageClient<'a> {
             // take ony system devices
             .filter(|object| object.0.as_str().contains("Storage1/system"))
             .map(|object| Device {
-                device_info: DeviceInfo {
-                    sid: 0,
-                    name: "TODO".to_string(),
-                    description: "TODO".to_string(),
-                },
+                device_info: self.build_device_info(&object.0).await?,
                 component: None,
                 drive: None,
                 block_device: None,
@@ -187,4 +179,13 @@ impl<'a> StorageClient<'a> {
 
         Ok(result)
     }
+
+    async fn build_device_info(&self, path: &OwnedObjectPath) -> Result<DeviceInfo, ServiceError> {
+        let proxy = DeviceProxy::builder(&self.connection).path(path)?.build().await?;
+        DeviceInfo {
+            sid: proxy.sid().await?,
+            name: proxy.name().await?,
+            description: proxy.description().await?,
+        }
+    }
 }
diff --git a/rust/agama-lib/src/storage/proxies.rs b/rust/agama-lib/src/storage/proxies.rs
index 69018ec1f4..3bea233564 100644
--- a/rust/agama-lib/src/storage/proxies.rs
+++ b/rust/agama-lib/src/storage/proxies.rs
@@ -103,7 +103,8 @@ trait Proposal {
 
 #[dbus_proxy(
     interface = "org.opensuse.Agama.Storage1.Block",
-    assume_defaults = true
+    default_service = "org.opensuse.Agama.Storage1",
+    default_path = "/org/opensuse/Agama/Storage1"
 )]
 trait Block {
     /// Active property
@@ -139,10 +140,10 @@ trait Block {
     fn udev_paths(&self) -> zbus::Result<Vec<String>>;
 }
 
-use zbus::proxy;
 #[dbus_proxy(
     interface = "org.opensuse.Agama.Storage1.Drive",
-    assume_defaults = true
+    default_service = "org.opensuse.Agama.Storage1",
+    default_path = "/org/opensuse/Agama/Storage1"
 )]
 trait Drive {
     /// Bus property
@@ -180,7 +181,8 @@ trait Drive {
 
 #[dbus_proxy(
     interface = "org.opensuse.Agama.Storage1.Multipath",
-    assume_defaults = true
+    default_service = "org.opensuse.Agama.Storage1",
+    default_path = "/org/opensuse/Agama/Storage1"
 )]
 trait Multipath {
     /// Wires property
@@ -190,7 +192,8 @@ trait Multipath {
 
 #[dbus_proxy(
     interface = "org.opensuse.Agama.Storage1.PartitionTable",
-    assume_defaults = true
+    default_service = "org.opensuse.Agama.Storage1",
+    default_path = "/org/opensuse/Agama/Storage1"
 )]
 trait PartitionTable {
     /// Partitions property
@@ -208,7 +211,8 @@ trait PartitionTable {
 
 #[dbus_proxy(
     interface = "org.opensuse.Agama.Storage1.Device",
-    assume_defaults = true
+    default_service = "org.opensuse.Agama.Storage1",
+    default_path = "/org/opensuse/Agama/Storage1"
 )]
 trait Device {
     /// Description property

From 67a015ce02420d54396c61251c1572217b07218c Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 24 Apr 2024 15:48:36 +0200
Subject: [PATCH 295/324] use for loop instead of iterators

---
 rust/agama-lib/src/storage/client.rs | 72 ++++++++++++++++++----------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index c7c5ed422c..27dc3f25be 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -1,7 +1,9 @@
 //! Implements a client to access Agama's storage service.
 
 use super::device::{Device, DeviceInfo};
-use super::proxies::{BlockProxy, DeviceProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy};
+use super::proxies::{
+    BlockProxy, DeviceProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy,
+};
 use super::StorageSettings;
 use crate::error::ServiceError;
 use anyhow::Context;
@@ -9,7 +11,8 @@ use futures_util::future::join_all;
 use serde::Serialize;
 use std::collections::HashMap;
 use zbus::fdo::ObjectManagerProxy;
-use zbus::zvariant::OwnedObjectPath;
+use zbus::names::OwnedInterfaceName;
+use zbus::zvariant::{OwnedObjectPath, OwnedValue};
 use zbus::Connection;
 
 /// Represents a storage device
@@ -79,8 +82,10 @@ impl<'a> StorageClient<'a> {
             .build()
             .await?;
 
-
-        Ok(StorageDevice { name: proxy.name().await?, description: proxy.description().await? })
+        Ok(StorageDevice {
+            name: proxy.name().await?,
+            description: proxy.description().await?,
+        })
     }
 
     /// Returns the boot device proposal setting
@@ -151,41 +156,56 @@ impl<'a> StorageClient<'a> {
         Ok(self.calculator_proxy.calculate(dbus_settings).await?)
     }
 
+    async fn build_device(
+        &self,
+        object: &(
+            OwnedObjectPath,
+            HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>,
+        ),
+    ) -> Result<Device, ServiceError> {
+        Ok(Device {
+            device_info: self.build_device_info(&object.0).await?,
+            component: None,
+            drive: None,
+            block_device: None,
+            filesystem: None,
+            lvm_lv: None,
+            lvm_vg: None,
+            md: None,
+            multipath: None,
+            partition: None,
+            partition_table: None,
+            raid: None,
+        })
+    }
+
     pub async fn system_devices(&self) -> Result<Vec<Device>, ServiceError> {
         let objects = self
             .object_manager_proxy
             .get_managed_objects()
             .await
             .context("Failed to get managed objects")?;
-        let result: Vec<Device> = objects
-            .into_iter()
-            // take ony system devices
-            .filter(|object| object.0.as_str().contains("Storage1/system"))
-            .map(|object| Device {
-                device_info: self.build_device_info(&object.0).await?,
-                component: None,
-                drive: None,
-                block_device: None,
-                filesystem: None,
-                lvm_lv: None,
-                lvm_vg: None,
-                md: None,
-                multipath: None,
-                partition: None,
-                partition_table: None,
-                raid: None,
-            })
-            .collect();
+        let mut result = vec![];
+        for object in objects {
+            if !object.0.as_str().contains("Storage1/system") {
+                continue;
+            }
+
+            result.push(self.build_device(&object).await?)
+        }
 
         Ok(result)
     }
 
     async fn build_device_info(&self, path: &OwnedObjectPath) -> Result<DeviceInfo, ServiceError> {
-        let proxy = DeviceProxy::builder(&self.connection).path(path)?.build().await?;
-        DeviceInfo {
+        let proxy = DeviceProxy::builder(&self.connection)
+            .path(path)?
+            .build()
+            .await?;
+        Ok(DeviceInfo {
             sid: proxy.sid().await?,
             name: proxy.name().await?,
             description: proxy.description().await?,
-        }
+        })
     }
 }

From a429350ff7ef8775b8412c86af56e19c93678048 Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Thu, 25 Apr 2024 08:39:49 +0200
Subject: [PATCH 296/324] A few sentences about how agama deals with security

---
 doc/agama-security.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 doc/agama-security.md

diff --git a/doc/agama-security.md b/doc/agama-security.md
new file mode 100644
index 0000000000..3a15f69b26
--- /dev/null
+++ b/doc/agama-security.md
@@ -0,0 +1,34 @@
+Agama Concepts
+==============
+
+Agama's functionality is divided into backend and frontend. Communication between two parts is done through REST api. Most of the api requires an authorization.
+
+Authorization
+-------------
+
+Authorization is done via password. To get authorized user is asked for a password of root on backend's machine. The password is validated through PAM [1]. Once the authorization succeeds, backend generates an authorization token and passes it back to frontend / user. Agama uses JWT as authorization token [2]. All subsequent calls to the API has to be done together with the token.
+
+To make local use (frontend and backend running on same machine) a bit easier agama implements option ```--generate-token```. When this option is used, agama-web-server generates valid JWT automatically on start. The token is pushed into web browser's cache by agama.
+
+JWT
+---
+
+The token carries just one claim - the expiration date. Token's lifetime is currently set to one day. The token is provided in an encrypted form. Security key is either automatically created random string [3] of length at least 30 characters. However, security key can be provided via ```/etc/agama.d/server.yaml``` using ```jwt_secret``` option. Content of this option is expected to be a string but no checks are done.
+
+Communication between the frontend and the backend
+--------------------------------------------------
+
+If both components run locally, communication can be done over http even https. However, in case when both run on different machines the https is mandatory. In such case all http requests are automatically redirected to https. A http response with code 308 (permanent redirect) is returned in such case.
+
+Https certificates
+------------------
+
+SSL communication is secured either by self-signed certificate which is automatically generated by agama if no certificate was provided by user. If agama should use particular custom certificate agama's web server provides options --cert and --key for path to certificate respectively to private key (in PEM format).
+
+... TBD ...
+
+External Projects in use
+========================
+[1] Rust pam crate
+[2] Rust jsonwebtoken crate
+[3] Rust rand crate

From fff5460ec21147f1b0b799aaa2b59af3a0742585 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 25 Apr 2024 13:19:04 +0200
Subject: [PATCH 297/324] use object manager approach for system devices

---
 rust/agama-lib/src/error.rs          |  4 +-
 rust/agama-lib/src/storage.rs        |  2 +-
 rust/agama-lib/src/storage/client.rs | 62 +++++++++++++++++++---------
 rust/agama-lib/src/storage/device.rs | 13 +++++-
 rust/agama-server/src/storage/web.rs |  7 +++-
 5 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/rust/agama-lib/src/error.rs b/rust/agama-lib/src/error.rs
index b1df6b842e..775336256f 100644
--- a/rust/agama-lib/src/error.rs
+++ b/rust/agama-lib/src/error.rs
@@ -2,7 +2,7 @@ use curl;
 use serde_json;
 use std::io;
 use thiserror::Error;
-use zbus;
+use zbus::{self, zvariant};
 
 #[derive(Error, Debug)]
 pub enum ServiceError {
@@ -10,6 +10,8 @@ pub enum ServiceError {
     DBus(#[from] zbus::Error),
     #[error("Could not connect to Agama bus at '{0}': {1}")]
     DBusConnectionError(String, #[source] zbus::Error),
+    #[error("Unexpected type on DBus '{0}'")]
+    ZVariant(#[from] zvariant::Error),
     // it's fine to say only "Error" because the original
     // specific error will be printed too
     #[error("Error: {0}")]
diff --git a/rust/agama-lib/src/storage.rs b/rust/agama-lib/src/storage.rs
index abb02abf37..a6796ae7f5 100644
--- a/rust/agama-lib/src/storage.rs
+++ b/rust/agama-lib/src/storage.rs
@@ -1,7 +1,7 @@
 //! Implements support for handling the storage settings
 
 pub mod client;
-mod device;
+pub mod device;
 mod proxies;
 mod settings;
 mod store;
diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 27dc3f25be..3054ead290 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -1,20 +1,38 @@
 //! Implements a client to access Agama's storage service.
 
-use super::device::{Device, DeviceInfo};
+use super::device::{BlockDevice, Device, DeviceInfo};
 use super::proxies::{
-    BlockProxy, DeviceProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy,
+    DeviceProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy,
 };
 use super::StorageSettings;
 use crate::error::ServiceError;
-use anyhow::Context;
+use anyhow::{anyhow, Context};
 use futures_util::future::join_all;
 use serde::Serialize;
 use std::collections::HashMap;
 use zbus::fdo::ObjectManagerProxy;
-use zbus::names::OwnedInterfaceName;
-use zbus::zvariant::{OwnedObjectPath, OwnedValue};
+use zbus::names::{InterfaceName, OwnedInterfaceName};
+use zbus::zvariant::{OwnedObjectPath, OwnedValue, Value};
 use zbus::Connection;
 
+// TODO: move to better place
+/// Helper to get property of given type from ManagedObjects map
+fn get_property<'a, T>(properties: &'a HashMap<String, OwnedValue>, name: &str) -> Result<T, ServiceError> 
+where
+T: TryFrom<Value<'a>>,
+<T as TryFrom<Value<'a>>>::Error: Into<zbus::zvariant::Error>
+{
+    let value: Value = properties.get(name).context(format!("Failed to find property '{}'", name))?.into();
+    match T::try_from(value) {
+        Ok(v) => Ok(v),
+        Err(e) => {
+            let verr : zbus::zvariant::Error = e.into();
+            let serr : ServiceError = verr.into();
+            Err(serr)
+        }
+    }       
+}
+
 /// Represents a storage device
 #[derive(Serialize, Debug)]
 pub struct StorageDevice {
@@ -160,11 +178,12 @@ impl<'a> StorageClient<'a> {
         &self,
         object: &(
             OwnedObjectPath,
-            HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>,
-        ),
+            HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>
+        )
     ) -> Result<Device, ServiceError> {
+        let interfaces = &object.1;
         Ok(Device {
-            device_info: self.build_device_info(&object.0).await?,
+            device_info: self.build_device_info(interfaces).await?,
             component: None,
             drive: None,
             block_device: None,
@@ -187,7 +206,8 @@ impl<'a> StorageClient<'a> {
             .context("Failed to get managed objects")?;
         let mut result = vec![];
         for object in objects {
-            if !object.0.as_str().contains("Storage1/system") {
+            let path = &object.0;
+            if !path.as_str().contains("Storage1/system") {
                 continue;
             }
 
@@ -197,15 +217,19 @@ impl<'a> StorageClient<'a> {
         Ok(result)
     }
 
-    async fn build_device_info(&self, path: &OwnedObjectPath) -> Result<DeviceInfo, ServiceError> {
-        let proxy = DeviceProxy::builder(&self.connection)
-            .path(path)?
-            .build()
-            .await?;
-        Ok(DeviceInfo {
-            sid: proxy.sid().await?,
-            name: proxy.name().await?,
-            description: proxy.description().await?,
-        })
+    async fn build_device_info(&self, interfaces: &HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>) -> Result<DeviceInfo, ServiceError> {
+        let interface : OwnedInterfaceName = InterfaceName::from_static_str_unchecked("org.opensuse.Agama.Storage1.Device").into();
+        let properties = interfaces.get(&interface);
+        // All devices has to implement device info, so report error if it is not there
+        if let Some(properties) = properties {
+            Ok(DeviceInfo {
+                sid: get_property::<u32>(properties, "SID")?,
+                name: get_property::<String>(properties, "Name")?,
+                description: get_property(properties, "Description")?,
+            })
+        } else {
+            Err(ServiceError::Anyhow(anyhow!("Device does not implement device info")))
+        }
+        
     }
 }
diff --git a/rust/agama-lib/src/storage/device.rs b/rust/agama-lib/src/storage/device.rs
index 3110832df2..5a27b7831f 100644
--- a/rust/agama-lib/src/storage/device.rs
+++ b/rust/agama-lib/src/storage/device.rs
@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
 
 /// Information about system device created by composition to reflect different devices on system
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
 pub struct Device {
     pub device_info: DeviceInfo,
     pub block_device: Option<BlockDevice>,
@@ -25,7 +26,17 @@ pub struct DeviceInfo {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct BlockDevice {}
+#[serde(rename_all = "camelCase")]
+pub struct BlockDevice {
+    pub active: bool,
+    pub encrypted: bool,
+    pub recoverable_size: u64,
+    pub size: u64,
+    pub start: u64,
+    pub systems: Vec<String>,
+    pub udev_ids: Vec<String>,
+    pub udev_paths: Vec<String>,
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 pub struct Component {}
diff --git a/rust/agama-server/src/storage/web.rs b/rust/agama-server/src/storage/web.rs
index d9c3cb94ae..921e9f5226 100644
--- a/rust/agama-server/src/storage/web.rs
+++ b/rust/agama-server/src/storage/web.rs
@@ -5,7 +5,7 @@
 //! * `storage_service` which returns the Axum service.
 //! * `storage_stream` which offers an stream that emits the storage events coming from D-Bus.
 
-use agama_lib::{error::ServiceError, storage::StorageClient};
+use agama_lib::{error::ServiceError, storage::StorageClient, storage::device::Device};
 use axum::{extract::State, routing::get, Json, Router};
 
 use crate::{
@@ -39,6 +39,7 @@ pub async fn storage_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
     let state = StorageState { client };
     let router = Router::new()
         .route("/devices/dirty", get(devices_dirty))
+        .route("/devices/system", get(system_devices))
         .merge(status_router)
         .merge(progress_router)
         .nest("/issues", issues_router)
@@ -49,3 +50,7 @@ pub async fn storage_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
 async fn devices_dirty(State(state): State<StorageState<'_>>) -> Result<Json<bool>, Error> {
     Ok(Json(state.client.devices_dirty_bit().await?))
 }
+
+async fn system_devices(State(state): State<StorageState<'_>>) -> Result<Json<Vec<Device>>, Error> {
+    Ok(Json(state.client.system_devices().await?))
+}

From bb46e3bbd7d14ea175a7c3d3f4a4585a872d5025 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 25 Apr 2024 13:55:05 +0200
Subject: [PATCH 298/324] move helper to better place

---
 rust/agama-lib/src/dbus.rs           | 28 ++++++++++++++++++-
 rust/agama-lib/src/storage/client.rs | 40 +++++++++-------------------
 rust/agama-server/src/storage/web.rs |  2 +-
 3 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/rust/agama-lib/src/dbus.rs b/rust/agama-lib/src/dbus.rs
index 863b42cb65..5054aa2821 100644
--- a/rust/agama-lib/src/dbus.rs
+++ b/rust/agama-lib/src/dbus.rs
@@ -1,7 +1,33 @@
+use anyhow::Context;
 use std::collections::HashMap;
-use zbus::zvariant;
+use zbus::zvariant::{self, OwnedValue, Value};
+
+use crate::error::ServiceError;
 
 /// Nested hash to send to D-Bus.
 pub type NestedHash<'a> = HashMap<&'a str, HashMap<&'a str, zvariant::Value<'a>>>;
 /// Nested hash as it comes from D-Bus.
 pub type OwnedNestedHash = HashMap<String, HashMap<String, zvariant::OwnedValue>>;
+
+/// Helper to get property of given type from ManagedObjects map
+pub fn get_property<'a, T>(
+    properties: &'a HashMap<String, OwnedValue>,
+    name: &str,
+) -> Result<T, ServiceError>
+where
+    T: TryFrom<Value<'a>>,
+    <T as TryFrom<Value<'a>>>::Error: Into<zbus::zvariant::Error>,
+{
+    let value: Value = properties
+        .get(name)
+        .context(format!("Failed to find property '{}'", name))?
+        .into();
+    match T::try_from(value) {
+        Ok(v) => Ok(v),
+        Err(e) => {
+            let verr: zbus::zvariant::Error = e.into();
+            let serr: ServiceError = verr.into();
+            Err(serr)
+        }
+    }
+}
diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 3054ead290..12805d0023 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -1,10 +1,9 @@
 //! Implements a client to access Agama's storage service.
 
 use super::device::{BlockDevice, Device, DeviceInfo};
-use super::proxies::{
-    DeviceProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy,
-};
+use super::proxies::{DeviceProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy};
 use super::StorageSettings;
+use crate::dbus::get_property;
 use crate::error::ServiceError;
 use anyhow::{anyhow, Context};
 use futures_util::future::join_all;
@@ -15,24 +14,6 @@ use zbus::names::{InterfaceName, OwnedInterfaceName};
 use zbus::zvariant::{OwnedObjectPath, OwnedValue, Value};
 use zbus::Connection;
 
-// TODO: move to better place
-/// Helper to get property of given type from ManagedObjects map
-fn get_property<'a, T>(properties: &'a HashMap<String, OwnedValue>, name: &str) -> Result<T, ServiceError> 
-where
-T: TryFrom<Value<'a>>,
-<T as TryFrom<Value<'a>>>::Error: Into<zbus::zvariant::Error>
-{
-    let value: Value = properties.get(name).context(format!("Failed to find property '{}'", name))?.into();
-    match T::try_from(value) {
-        Ok(v) => Ok(v),
-        Err(e) => {
-            let verr : zbus::zvariant::Error = e.into();
-            let serr : ServiceError = verr.into();
-            Err(serr)
-        }
-    }       
-}
-
 /// Represents a storage device
 #[derive(Serialize, Debug)]
 pub struct StorageDevice {
@@ -178,8 +159,8 @@ impl<'a> StorageClient<'a> {
         &self,
         object: &(
             OwnedObjectPath,
-            HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>
-        )
+            HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>,
+        ),
     ) -> Result<Device, ServiceError> {
         let interfaces = &object.1;
         Ok(Device {
@@ -217,8 +198,12 @@ impl<'a> StorageClient<'a> {
         Ok(result)
     }
 
-    async fn build_device_info(&self, interfaces: &HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>) -> Result<DeviceInfo, ServiceError> {
-        let interface : OwnedInterfaceName = InterfaceName::from_static_str_unchecked("org.opensuse.Agama.Storage1.Device").into();
+    async fn build_device_info(
+        &self,
+        interfaces: &HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>,
+    ) -> Result<DeviceInfo, ServiceError> {
+        let interface: OwnedInterfaceName =
+            InterfaceName::from_static_str_unchecked("org.opensuse.Agama.Storage1.Device").into();
         let properties = interfaces.get(&interface);
         // All devices has to implement device info, so report error if it is not there
         if let Some(properties) = properties {
@@ -228,8 +213,9 @@ impl<'a> StorageClient<'a> {
                 description: get_property(properties, "Description")?,
             })
         } else {
-            Err(ServiceError::Anyhow(anyhow!("Device does not implement device info")))
+            Err(ServiceError::Anyhow(anyhow!(
+                "Device does not implement device info"
+            )))
         }
-        
     }
 }
diff --git a/rust/agama-server/src/storage/web.rs b/rust/agama-server/src/storage/web.rs
index 921e9f5226..c5a8bc193d 100644
--- a/rust/agama-server/src/storage/web.rs
+++ b/rust/agama-server/src/storage/web.rs
@@ -5,7 +5,7 @@
 //! * `storage_service` which returns the Axum service.
 //! * `storage_stream` which offers an stream that emits the storage events coming from D-Bus.
 
-use agama_lib::{error::ServiceError, storage::StorageClient, storage::device::Device};
+use agama_lib::{error::ServiceError, storage::device::Device, storage::StorageClient};
 use axum::{extract::State, routing::get, Json, Router};
 
 use crate::{

From 30c1f0afb1f7b8a2a82e0c91345533ed22a32fdb Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Thu, 25 Apr 2024 19:44:22 +0200
Subject: [PATCH 299/324] Fixed style issues

---
 doc/agama-security.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/agama-security.md b/doc/agama-security.md
index 3a15f69b26..b277136f7d 100644
--- a/doc/agama-security.md
+++ b/doc/agama-security.md
@@ -8,7 +8,7 @@ Authorization
 
 Authorization is done via password. To get authorized user is asked for a password of root on backend's machine. The password is validated through PAM [1]. Once the authorization succeeds, backend generates an authorization token and passes it back to frontend / user. Agama uses JWT as authorization token [2]. All subsequent calls to the API has to be done together with the token.
 
-To make local use (frontend and backend running on same machine) a bit easier agama implements option ```--generate-token```. When this option is used, agama-web-server generates valid JWT automatically on start. The token is pushed into web browser's cache by agama.
+To make local use (frontend and backend running on same machine) a bit easier Agama implements option ```--generate-token```. When this option is used, Agama-web-server generates valid JWT automatically on start. The token is pushed into web browser's cache by Agama.
 
 JWT
 ---
@@ -18,12 +18,12 @@ The token carries just one claim - the expiration date. Token's lifetime is curr
 Communication between the frontend and the backend
 --------------------------------------------------
 
-If both components run locally, communication can be done over http even https. However, in case when both run on different machines the https is mandatory. In such case all http requests are automatically redirected to https. A http response with code 308 (permanent redirect) is returned in such case.
+If both components run locally, communication can be done over HTTP even HTTPS. However, in case when both run on different machines the HTTPS is mandatory. In such case all HTTP requests are automatically redirected to HTTPS. A HTTP response with code 308 (permanent redirect) is returned in such case.
 
 Https certificates
 ------------------
 
-SSL communication is secured either by self-signed certificate which is automatically generated by agama if no certificate was provided by user. If agama should use particular custom certificate agama's web server provides options --cert and --key for path to certificate respectively to private key (in PEM format).
+SSL communication is secured either by self-signed certificate which is automatically generated by Agama if no certificate was provided by user. If Agama should use particular custom certificate Agama's web server provides options --cert and --key for path to certificate respectively to private key (in PEM format).
 
 ... TBD ...
 

From c3fa6058b00fce0fffad6a828313b5ecde5c0a85 Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Thu, 25 Apr 2024 19:52:23 +0200
Subject: [PATCH 300/324] Fixed markdown

---
 doc/agama-security.md | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/doc/agama-security.md b/doc/agama-security.md
index b277136f7d..9fb92988df 100644
--- a/doc/agama-security.md
+++ b/doc/agama-security.md
@@ -1,34 +1,30 @@
-Agama Concepts
-==============
+## Agama Concepts
 
 Agama's functionality is divided into backend and frontend. Communication between two parts is done through REST api. Most of the api requires an authorization.
 
-Authorization
--------------
+### Authorization
 
-Authorization is done via password. To get authorized user is asked for a password of root on backend's machine. The password is validated through PAM [1]. Once the authorization succeeds, backend generates an authorization token and passes it back to frontend / user. Agama uses JWT as authorization token [2]. All subsequent calls to the API has to be done together with the token.
+Authorization is done via password. To get authorized user is asked for a password of root on backend's machine. The password is validated through PAM [1]. Once the authorization succeeds, backend generates an authorization token and passes it back to frontend / user. Agama uses JWT [2] as authorization token [3]. All subsequent calls to the API has to be done together with the token.
 
 To make local use (frontend and backend running on same machine) a bit easier Agama implements option ```--generate-token```. When this option is used, Agama-web-server generates valid JWT automatically on start. The token is pushed into web browser's cache by Agama.
 
-JWT
----
+### JWT
 
 The token carries just one claim - the expiration date. Token's lifetime is currently set to one day. The token is provided in an encrypted form. Security key is either automatically created random string [3] of length at least 30 characters. However, security key can be provided via ```/etc/agama.d/server.yaml``` using ```jwt_secret``` option. Content of this option is expected to be a string but no checks are done.
 
-Communication between the frontend and the backend
---------------------------------------------------
+### Communication between the frontend and the backend
 
 If both components run locally, communication can be done over HTTP even HTTPS. However, in case when both run on different machines the HTTPS is mandatory. In such case all HTTP requests are automatically redirected to HTTPS. A HTTP response with code 308 (permanent redirect) is returned in such case.
 
-Https certificates
-------------------
+### Https certificates
 
 SSL communication is secured either by self-signed certificate which is automatically generated by Agama if no certificate was provided by user. If Agama should use particular custom certificate Agama's web server provides options --cert and --key for path to certificate respectively to private key (in PEM format).
 
 ... TBD ...
 
-External Projects in use
-========================
-[1] Rust pam crate
-[2] Rust jsonwebtoken crate
-[3] Rust rand crate
+## Links to external sources
+
+- [1] Rust pam crate, https://crates.io/crates/pam
+- [2] RFC 7519, http://jwt.io
+- [3] Rust jsonwebtoken crate, https://crates.io/crates/jsonwebtoken
+- [4] Rust rand crate, https://crates.io/crates/rand

From c1016ee1b03bafe4bf0b626584ee604b50cb0a98 Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Thu, 25 Apr 2024 19:57:58 +0200
Subject: [PATCH 301/324] Removed leftover(s)

---
 doc/agama-security.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/agama-security.md b/doc/agama-security.md
index 9fb92988df..56b93a31b1 100644
--- a/doc/agama-security.md
+++ b/doc/agama-security.md
@@ -20,8 +20,6 @@ If both components run locally, communication can be done over HTTP even HTTPS.
 
 SSL communication is secured either by self-signed certificate which is automatically generated by Agama if no certificate was provided by user. If Agama should use particular custom certificate Agama's web server provides options --cert and --key for path to certificate respectively to private key (in PEM format).
 
-... TBD ...
-
 ## Links to external sources
 
 - [1] Rust pam crate, https://crates.io/crates/pam

From 2164ac638409a9278ec4fabc3da30c5c8e261748 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 25 Apr 2024 21:40:12 +0200
Subject: [PATCH 302/324] implement block device interface

---
 rust/agama-lib/src/storage/client.rs | 31 ++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 12805d0023..e4237aa0ef 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -11,7 +11,7 @@ use serde::Serialize;
 use std::collections::HashMap;
 use zbus::fdo::ObjectManagerProxy;
 use zbus::names::{InterfaceName, OwnedInterfaceName};
-use zbus::zvariant::{OwnedObjectPath, OwnedValue, Value};
+use zbus::zvariant::{OwnedObjectPath, OwnedValue};
 use zbus::Connection;
 
 /// Represents a storage device
@@ -167,7 +167,7 @@ impl<'a> StorageClient<'a> {
             device_info: self.build_device_info(interfaces).await?,
             component: None,
             drive: None,
-            block_device: None,
+            block_device: self.build_block_device(interfaces).await?,
             filesystem: None,
             lvm_lv: None,
             lvm_vg: None,
@@ -208,8 +208,8 @@ impl<'a> StorageClient<'a> {
         // All devices has to implement device info, so report error if it is not there
         if let Some(properties) = properties {
             Ok(DeviceInfo {
-                sid: get_property::<u32>(properties, "SID")?,
-                name: get_property::<String>(properties, "Name")?,
+                sid: get_property(properties, "SID")?,
+                name: get_property(properties, "Name")?,
                 description: get_property(properties, "Description")?,
             })
         } else {
@@ -218,4 +218,27 @@ impl<'a> StorageClient<'a> {
             )))
         }
     }
+
+    async fn build_block_device(
+        &self,
+        interfaces: &HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>,
+    ) -> Result<Option<BlockDevice>, ServiceError> {
+        let interface: OwnedInterfaceName =
+            InterfaceName::from_static_str_unchecked("org.opensuse.Agama.Storage1.Block").into();
+        let properties = interfaces.get(&interface);
+        if let Some(properties) = properties {
+            Ok(Some(BlockDevice {
+                active: get_property(properties, "Active")?,
+                encrypted: get_property(properties, "Encrypted")?,
+                recoverable_size: get_property(properties, "RecoverableSize")?,
+                size: get_property(properties, "Size")?,
+                start: get_property(properties, "Start")?,
+                systems: get_property(properties, "Systems")?,
+                udev_ids: get_property(properties, "UdevIds")?,
+                udev_paths: get_property(properties, "UdevPaths")?,
+            }))
+        } else {
+            Ok(None)
+        }
+    }
 }

From 36fdb6d5507577c518c568cf37dee8196fde6522 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 25 Apr 2024 21:46:01 +0200
Subject: [PATCH 303/324] implement also staging devices route

---
 rust/agama-lib/src/storage/client.rs | 19 +++++++++++++++++++
 rust/agama-server/src/storage/web.rs |  5 +++++
 2 files changed, 24 insertions(+)

diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index e4237aa0ef..30a5551c1a 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -198,6 +198,25 @@ impl<'a> StorageClient<'a> {
         Ok(result)
     }
 
+    pub async fn staging_devices(&self) -> Result<Vec<Device>, ServiceError> {
+        let objects = self
+            .object_manager_proxy
+            .get_managed_objects()
+            .await
+            .context("Failed to get managed objects")?;
+        let mut result = vec![];
+        for object in objects {
+            let path = &object.0;
+            if !path.as_str().contains("Storage1/staging") {
+                continue;
+            }
+
+            result.push(self.build_device(&object).await?)
+        }
+
+        Ok(result)
+    }
+
     async fn build_device_info(
         &self,
         interfaces: &HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>,
diff --git a/rust/agama-server/src/storage/web.rs b/rust/agama-server/src/storage/web.rs
index c5a8bc193d..6dee3e4552 100644
--- a/rust/agama-server/src/storage/web.rs
+++ b/rust/agama-server/src/storage/web.rs
@@ -40,6 +40,7 @@ pub async fn storage_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
     let router = Router::new()
         .route("/devices/dirty", get(devices_dirty))
         .route("/devices/system", get(system_devices))
+        .route("/devices/result", get(staging_devices))
         .merge(status_router)
         .merge(progress_router)
         .nest("/issues", issues_router)
@@ -54,3 +55,7 @@ async fn devices_dirty(State(state): State<StorageState<'_>>) -> Result<Json<boo
 async fn system_devices(State(state): State<StorageState<'_>>) -> Result<Json<Vec<Device>>, Error> {
     Ok(Json(state.client.system_devices().await?))
 }
+
+async fn staging_devices(State(state): State<StorageState<'_>>) -> Result<Json<Vec<Device>>, Error> {
+    Ok(Json(state.client.staging_devices().await?))
+}
\ No newline at end of file

From ba3d250dcf8a70243fa2b022bb56ee8229752744 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Thu, 25 Apr 2024 22:42:00 +0200
Subject: [PATCH 304/324] implement actions

---
 rust/agama-lib/src/storage/client.rs | 29 ++++++++++++++++++++++++++++
 rust/agama-server/src/storage/web.rs |  7 ++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 30a5551c1a..178345ecbf 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -21,6 +21,16 @@ pub struct StorageDevice {
     description: String,
 }
 
+/// Represent single change action done to storage
+#[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct Action {
+    device: String,
+    text: String,
+    subvol: bool,
+    delete: bool,
+}
+
 /// D-Bus client for the storage service
 #[derive(Clone)]
 pub struct StorageClient<'a> {
@@ -28,6 +38,7 @@ pub struct StorageClient<'a> {
     calculator_proxy: ProposalCalculatorProxy<'a>,
     storage_proxy: Storage1Proxy<'a>,
     object_manager_proxy: ObjectManagerProxy<'a>,
+    proposal_proxy: ProposalProxy<'a>,
 }
 
 impl<'a> StorageClient<'a> {
@@ -40,6 +51,7 @@ impl<'a> StorageClient<'a> {
                 .path("/org/opensuse/Agama/Storage1")?
                 .build()
                 .await?,
+            proposal_proxy: ProposalProxy::new(&connection).await?,
             connection,
         })
     }
@@ -56,6 +68,23 @@ impl<'a> StorageClient<'a> {
         Ok(self.storage_proxy.deprecated_system().await?)
     }
 
+    pub async fn actions(&self) -> Result<Vec<Action>, ServiceError> {
+        let actions = self.proposal_proxy.actions().await?;
+        let mut result: Vec<Action> = Vec::with_capacity(actions.len());
+
+        for i in actions {
+            let action = Action {
+                device: get_property(&i, "Device")?,
+                text: get_property(&i, "Text")?,
+                subvol: get_property(&i, "Subvol")?,
+                delete: get_property(&i, "Delete")?,
+            };
+            result.push(action);
+        }
+
+        Ok(result)
+    }
+
     /// Returns the available devices
     ///
     /// These devices can be used for installing the system.
diff --git a/rust/agama-server/src/storage/web.rs b/rust/agama-server/src/storage/web.rs
index 6dee3e4552..42df61c2e8 100644
--- a/rust/agama-server/src/storage/web.rs
+++ b/rust/agama-server/src/storage/web.rs
@@ -5,7 +5,7 @@
 //! * `storage_service` which returns the Axum service.
 //! * `storage_stream` which offers an stream that emits the storage events coming from D-Bus.
 
-use agama_lib::{error::ServiceError, storage::device::Device, storage::StorageClient};
+use agama_lib::{error::ServiceError, storage::{client::Action, device::Device, StorageClient}};
 use axum::{extract::State, routing::get, Json, Router};
 
 use crate::{
@@ -41,6 +41,7 @@ pub async fn storage_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
         .route("/devices/dirty", get(devices_dirty))
         .route("/devices/system", get(system_devices))
         .route("/devices/result", get(staging_devices))
+        .route("/proposal/actions", get(actions))
         .merge(status_router)
         .merge(progress_router)
         .nest("/issues", issues_router)
@@ -58,4 +59,8 @@ async fn system_devices(State(state): State<StorageState<'_>>) -> Result<Json<Ve
 
 async fn staging_devices(State(state): State<StorageState<'_>>) -> Result<Json<Vec<Device>>, Error> {
     Ok(Json(state.client.staging_devices().await?))
+}
+
+async fn actions(State(state): State<StorageState<'_>>) -> Result<Json<Vec<Action>>, Error> {
+    Ok(Json(state.client.actions().await?))
 }
\ No newline at end of file

From e9e61bffddd6db3f8dcc3d04ae6bb4625722642c Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Fri, 26 Apr 2024 09:47:09 +0200
Subject: [PATCH 305/324] Provided some more technical details.

---
 doc/agama-security.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/agama-security.md b/doc/agama-security.md
index 56b93a31b1..7e863fb8c1 100644
--- a/doc/agama-security.md
+++ b/doc/agama-security.md
@@ -1,16 +1,18 @@
 ## Agama Concepts
 
-Agama's functionality is divided into backend and frontend. Communication between two parts is done through REST api. Most of the api requires an authorization.
+Agama's functionality is divided into backend and frontend. Communication between two parts is done through HTTP/JSON and/or websocket. Most of the api requires an authorization.
+
+As frontend Agama offers web based UI or CLI. Backend currently is bunch of services implemented in Rust or Ruby with support from YaST libraries. For interprocess communication Agama uses D-Bus.
 
 ### Authorization
 
 Authorization is done via password. To get authorized user is asked for a password of root on backend's machine. The password is validated through PAM [1]. Once the authorization succeeds, backend generates an authorization token and passes it back to frontend / user. Agama uses JWT [2] as authorization token [3]. All subsequent calls to the API has to be done together with the token.
 
-To make local use (frontend and backend running on same machine) a bit easier Agama implements option ```--generate-token```. When this option is used, Agama-web-server generates valid JWT automatically on start. The token is pushed into web browser's cache by Agama.
+To make local use (frontend and backend running on same machine) with respect to agama-live use case more user friendly and allow skipping login in web UI Agama implements option ```--generate-token```. When this option is used, Agama's web server service generates valid JWT automatically on start. The token is stored locally [4] and then imported into web browser's internal database by Agama provided startup [5]. The script prepares custom profile with predefined homepage pointing to Agama's login page with the generated token as get parameter in the homepage url. Then the firefox browser is started in kiosk mode.
 
 ### JWT
 
-The token carries just one claim - the expiration date. Token's lifetime is currently set to one day. The token is provided in an encrypted form. Security key is either automatically created random string [3] of length at least 30 characters. However, security key can be provided via ```/etc/agama.d/server.yaml``` using ```jwt_secret``` option. Content of this option is expected to be a string but no checks are done.
+The token carries just one claim - the expiration date. Token's lifetime is currently set to one day. The token is provided in an encrypted form. Security key is either automatically created random string [6] of length at least 30 characters. However, security key can be provided via ```/etc/agama.d/server.yaml``` using ```jwt_secret``` option. Content of this option is expected to be a string but no checks are done.
 
 ### Communication between the frontend and the backend
 
@@ -25,4 +27,6 @@ SSL communication is secured either by self-signed certificate which is automati
 - [1] Rust pam crate, https://crates.io/crates/pam
 - [2] RFC 7519, http://jwt.io
 - [3] Rust jsonwebtoken crate, https://crates.io/crates/jsonwebtoken
-- [4] Rust rand crate, https://crates.io/crates/rand
+- [4] Backend's machine at /run/agama/token
+- [5] Agama's git repo - live/root/.icewm/startup
+- [6] Rust rand crate, https://crates.io/crates/rand

From 9e85be82026f416d0b0a3e149d0fc537f8c75b23 Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Fri, 26 Apr 2024 10:01:29 +0200
Subject: [PATCH 306/324] Note about websocket

---
 doc/agama-security.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/agama-security.md b/doc/agama-security.md
index 7e863fb8c1..6b749878a4 100644
--- a/doc/agama-security.md
+++ b/doc/agama-security.md
@@ -18,6 +18,8 @@ The token carries just one claim - the expiration date. Token's lifetime is curr
 
 If both components run locally, communication can be done over HTTP even HTTPS. However, in case when both run on different machines the HTTPS is mandatory. In such case all HTTP requests are automatically redirected to HTTPS. A HTTP response with code 308 (permanent redirect) is returned in such case.
 
+For notifications on changes from backend Agama uses WebSocket technology. Typically backend notificates about installation progress or network configuration changes this way.
+
 ### Https certificates
 
 SSL communication is secured either by self-signed certificate which is automatically generated by Agama if no certificate was provided by user. If Agama should use particular custom certificate Agama's web server provides options --cert and --key for path to certificate respectively to private key (in PEM format).

From 2500a747db07fa80fcc9eb7df2b5c3548494151b Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Fri, 26 Apr 2024 10:37:18 +0200
Subject: [PATCH 307/324] Minor rephrasing

---
 doc/agama-security.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/agama-security.md b/doc/agama-security.md
index 6b749878a4..ebacff53a9 100644
--- a/doc/agama-security.md
+++ b/doc/agama-security.md
@@ -6,9 +6,9 @@ As frontend Agama offers web based UI or CLI. Backend currently is bunch of serv
 
 ### Authorization
 
-Authorization is done via password. To get authorized user is asked for a password of root on backend's machine. The password is validated through PAM [1]. Once the authorization succeeds, backend generates an authorization token and passes it back to frontend / user. Agama uses JWT [2] as authorization token [3]. All subsequent calls to the API has to be done together with the token.
+Authorization is done via password. To get authorized frontend has to provide a root password (root on backend's machine). The password is validated through PAM [1]. Once the authorization succeeds, backend generates an authorization token and passes it back to frontend / user. Agama uses JWT [2] as authorization token [3]. All subsequent calls to the API has to be done together with the token. In case of web UI the token is stored in session cookie.
 
-To make local use (frontend and backend running on same machine) with respect to agama-live use case more user friendly and allow skipping login in web UI Agama implements option ```--generate-token```. When this option is used, Agama's web server service generates valid JWT automatically on start. The token is stored locally [4] and then imported into web browser's internal database by Agama provided startup [5]. The script prepares custom profile with predefined homepage pointing to Agama's login page with the generated token as get parameter in the homepage url. Then the firefox browser is started in kiosk mode.
+To make local use (frontend and backend running on same machine) with respect to agama-live use case more friendly and allow skipping explicit login in web UI Agama implements option ```--generate-token```. When this option is used, Agama's web server service generates valid JWT automatically on start. The token is stored locally [4] and then imported into web browser's internal database by Agama provided startup [5]. The script prepares custom profile with predefined homepage pointing to Agama's login page with the generated token as get parameter in the homepage url. Then the firefox browser is started in kiosk mode.
 
 ### JWT
 

From 686a23dd70ee383acf621263a74cc84a11f78f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 26 Apr 2024 14:43:03 +0100
Subject: [PATCH 308/324] Apply suggestions from code review

Co-authored-by: Martin Vidner <mvidner@suse.cz>
---
 rust/agama-lib/src/network/proxies.rs       | 2 +-
 rust/agama-server/src/network/action.rs     | 4 ++--
 rust/agama-server/src/network/model.rs      | 1 +
 rust/agama-server/src/network/nm/watcher.rs | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rust/agama-lib/src/network/proxies.rs b/rust/agama-lib/src/network/proxies.rs
index 8a26459d29..db7de278b1 100644
--- a/rust/agama-lib/src/network/proxies.rs
+++ b/rust/agama-lib/src/network/proxies.rs
@@ -25,7 +25,7 @@ trait Device {
     /// Type property
     #[dbus_proxy(property)]
     fn type_(&self) -> zbus::Result<u8>;
-    /// Type property
+    /// State property
     #[dbus_proxy(property)]
     fn state(&self) -> zbus::Result<u8>;
 }
diff --git a/rust/agama-server/src/network/action.rs b/rust/agama-server/src/network/action.rs
index f7736ebe2a..057b5fff68 100644
--- a/rust/agama-server/src/network/action.rs
+++ b/rust/agama-server/src/network/action.rs
@@ -44,9 +44,9 @@ pub enum Action {
     GetAccessPoints(Responder<Vec<AccessPoint>>),
     /// Adds a new device.
     AddDevice(Box<Device>),
-    /// Updates a device.
+    /// Updates a device by its `name`.
     UpdateDevice(String, Box<Device>),
-    /// Removes a device.
+    /// Removes a device by its `name`.
     RemoveDevice(String),
     /// Gets a device by its name
     GetDevice(String, Responder<Option<Device>>),
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index a6df0a0a3e..4053af4955 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -464,6 +464,7 @@ pub struct Device {
     #[serde_as(as = "DisplayFromStr")]
     pub mac_address: MacAddress,
     pub ip_config: Option<IpConfig>,
+    // Connection.id
     pub connection: Option<String>,
     pub state: DeviceState,
 }
diff --git a/rust/agama-server/src/network/nm/watcher.rs b/rust/agama-server/src/network/nm/watcher.rs
index 5033fdeb78..df7222bdd2 100644
--- a/rust/agama-server/src/network/nm/watcher.rs
+++ b/rust/agama-server/src/network/nm/watcher.rs
@@ -395,6 +395,7 @@ enum DeviceChange {
 /// Ancillary class to track the devices and their related D-Bus objects.
 struct ProxiesRegistry<'a> {
     connection: zbus::Connection,
+    // the String is the device name like eth0
     devices: HashMap<OwnedObjectPath, (String, DeviceProxy<'a>)>,
 }
 

From 02bdac20a137cf05ee40dbdf7c3d69c461040c79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 26 Apr 2024 14:51:33 +0100
Subject: [PATCH 309/324] Updates from code review

---
 rust/agama-lib/src/network/types.rs        | 2 ++
 rust/agama-server/src/network/model.rs     | 9 +++++----
 rust/agama-server/src/network/nm/client.rs | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/rust/agama-lib/src/network/types.rs b/rust/agama-lib/src/network/types.rs
index 9fb565d6f3..9bc89e13fb 100644
--- a/rust/agama-lib/src/network/types.rs
+++ b/rust/agama-lib/src/network/types.rs
@@ -58,6 +58,8 @@ pub enum DeviceType {
     Bridge = 6,
 }
 
+// For now this mirrors NetworkManager, because it was less mental work than coming up with
+// what exactly Agama needs. Expected to be adapted.
 #[derive(Debug, Default, Clone, Copy, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum DeviceState {
diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index 4053af4955..bbaacf55ac 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -180,10 +180,11 @@ impl NetworkState {
     }
 
     pub fn remove_device(&mut self, name: &str) -> Result<(), NetworkStateError> {
-        // TODO: return an error if the device does not exist
-        if let Some(position) = self.devices.iter().position(|d| &d.name == name) {
-            self.devices.remove(position);
-        }
+        let Some(position) = self.devices.iter().position(|d| &d.name == name) else {
+            return Err(NetworkStateError::UnknownDevice(name.to_string()));
+        };
+
+        self.devices.remove(position);
         Ok(())
     }
 
diff --git a/rust/agama-server/src/network/nm/client.rs b/rust/agama-server/src/network/nm/client.rs
index 5e8550601a..9e3fc06fe6 100644
--- a/rust/agama-server/src/network/nm/client.rs
+++ b/rust/agama-server/src/network/nm/client.rs
@@ -152,7 +152,7 @@ impl<'a> NetworkManagerClient<'a> {
             {
                 devs.push(device);
             } else {
-                tracing::warn!("Ignoring network device: ");
+                tracing::warn!("Ignoring network device on path {}", &path);
             }
         }
 

From a345468b294380a27d94d648e8a5dfa6be6b50b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 26 Apr 2024 15:34:52 +0100
Subject: [PATCH 310/324] Document the NetworkChange enum

---
 rust/agama-server/src/network/model.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs
index bbaacf55ac..f30c9f76e3 100644
--- a/rust/agama-server/src/network/model.rs
+++ b/rust/agama-server/src/network/model.rs
@@ -1305,10 +1305,16 @@ impl fmt::Display for InfinibandTransportMode {
     }
 }
 
+/// Represents a network change.
 #[derive(Debug, Clone, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub enum NetworkChange {
+    /// A new device has been added.
     DeviceAdded(Device),
+    /// A device has been removed.
     DeviceRemoved(String),
+    /// The device has been updated. The String corresponds to the
+    /// original device name, which is especially useful if the
+    /// device gets renamed.
     DeviceUpdated(String, Device),
 }

From 36ac90db7adf243c6f6593be7a7be51482ae0c4c Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 26 Apr 2024 17:42:52 +0200
Subject: [PATCH 311/324] WIP for volumes

---
 rust/agama-lib/src/dbus.rs           | 25 ++++++++++-
 rust/agama-lib/src/storage/client.rs | 62 +++++++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/rust/agama-lib/src/dbus.rs b/rust/agama-lib/src/dbus.rs
index 5054aa2821..d05d0f74e3 100644
--- a/rust/agama-lib/src/dbus.rs
+++ b/rust/agama-lib/src/dbus.rs
@@ -9,7 +9,7 @@ pub type NestedHash<'a> = HashMap<&'a str, HashMap<&'a str, zvariant::Value<'a>>
 /// Nested hash as it comes from D-Bus.
 pub type OwnedNestedHash = HashMap<String, HashMap<String, zvariant::OwnedValue>>;
 
-/// Helper to get property of given type from ManagedObjects map
+/// Helper to get property of given type from ManagedObjects map or any generic dbus Hash with variant as value
 pub fn get_property<'a, T>(
     properties: &'a HashMap<String, OwnedValue>,
     name: &str,
@@ -31,3 +31,26 @@ where
         }
     }
 }
+
+pub fn get_optional_property<'a, U, T>(
+    properties: &'a HashMap<String, OwnedValue>,
+    name: &str,
+) -> Result<T, ServiceError>
+where
+    T: TryFrom<Value<'a>>,
+    U: Option<T>,
+    <T as TryFrom<Value<'a>>>::Error: Into<zbus::zvariant::Error>,
+{
+    let value: Value = properties
+        .get(name)
+        .context(format!("Failed to find property '{}'", name))?
+        .into();
+    match T::try_from(value) {
+        Ok(v) => Ok(v),
+        Err(e) => {
+            let verr: zbus::zvariant::Error = e.into();
+            let serr: ServiceError = verr.into();
+            Err(serr)
+        }
+    }
+}
\ No newline at end of file
diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 178345ecbf..f846fc1ae5 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -7,7 +7,7 @@ use crate::dbus::get_property;
 use crate::error::ServiceError;
 use anyhow::{anyhow, Context};
 use futures_util::future::join_all;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use zbus::fdo::ObjectManagerProxy;
 use zbus::names::{InterfaceName, OwnedInterfaceName};
@@ -31,6 +31,47 @@ pub struct Action {
     delete: bool,
 }
 
+/// Represents value for target key of Volume
+#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum VolumeTarget {
+    Default,
+    NewPartition,
+    NewVg,
+    Device,
+    Filesystem,
+}
+
+
+/// Represents volume outline aka requirements for volume
+#[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
+#[serde(rename_all = "PascalCase")]
+pub struct VolumeOutline {
+    required: bool,
+    fs_types: Vec<String>,
+    support_auto_size: bool,
+    snapshots_configurable: bool,
+    snaphosts_affect_sizes: bool,
+    size_relevant_volumes: Vec<String>,
+}
+
+/// Represents single volume
+// TODO: Do we really want to expose PascalCase from dbus or use more consistent snakeCase?
+#[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
+#[serde(rename_all = "PascalCase")]
+pub struct Volume {
+    mount_path: String,
+    mount_options: Vec<String>,
+    target: VolumeTarget,
+    target_device: Option<String>,
+    min_size: u64,
+    max_size: Option<u64>,
+    auto_size: bool,
+    snapshots: Option<bool>,
+    transactional: Option<bool>,
+    outline: Option<VolumeOutline>,
+}
+
 /// D-Bus client for the storage service
 #[derive(Clone)]
 pub struct StorageClient<'a> {
@@ -100,6 +141,25 @@ impl<'a> StorageClient<'a> {
         join_all(devices).await.into_iter().collect()
     }
 
+    pub async fn volume_for(&self, mount_path: &str) -> Result<Volume, ServiceError> {
+        let volume_hash = self.calculator_proxy
+            .default_volume(mount_path).await?;
+        let volume = Volume {
+            mount_path: get_property(&volume_hash, "MountPath")?,
+            mount_options: get_property(&volume_hash, "MountOptions")?,
+            target: get_property(&volume_hash, "Target")?,
+            target_device: get_property(&volume_hash, "TargetDevice")?,
+            min_size: get_property(&volume_hash, "MinSize")?,
+            max_size: get_property(&volume_hash, "MaxSize")?,
+            auto_size: get_property(&volume_hash, "AutoSize")?,
+            snapshots: get_property(&volume_hash, "Snapshots")?,
+            transactional: get_property(&volume_hash, "Transactional")?,
+            outline: get_property(&volume_hash, "Outline"),
+        };
+
+        Ok(volume)
+    }
+
     /// Returns the storage device for the given D-Bus path
     async fn storage_device(
         &self,

From ca23a36af46e048fcfc625f2eaca5a712b8bd393 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 26 Apr 2024 17:54:16 +0200
Subject: [PATCH 312/324] add get_optional_property

---
 rust/agama-lib/src/dbus.rs           | 26 +++++++++++++-------------
 rust/agama-lib/src/storage/client.rs | 12 ++++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/rust/agama-lib/src/dbus.rs b/rust/agama-lib/src/dbus.rs
index d05d0f74e3..954e70bccc 100644
--- a/rust/agama-lib/src/dbus.rs
+++ b/rust/agama-lib/src/dbus.rs
@@ -32,25 +32,25 @@ where
     }
 }
 
-pub fn get_optional_property<'a, U, T>(
+pub fn get_optional_property<'a, T>(
     properties: &'a HashMap<String, OwnedValue>,
     name: &str,
-) -> Result<T, ServiceError>
+) -> Result<Option<T>, ServiceError>
 where
     T: TryFrom<Value<'a>>,
-    U: Option<T>,
     <T as TryFrom<Value<'a>>>::Error: Into<zbus::zvariant::Error>,
 {
-    let value: Value = properties
-        .get(name)
-        .context(format!("Failed to find property '{}'", name))?
-        .into();
-    match T::try_from(value) {
-        Ok(v) => Ok(v),
-        Err(e) => {
-            let verr: zbus::zvariant::Error = e.into();
-            let serr: ServiceError = verr.into();
-            Err(serr)
+    if let Some(value) = properties.get(name) {
+        let value : Value = value.into();
+        match T::try_from(value) {
+            Ok(v) => Ok(Some(v)),
+            Err(e) => {
+                let verr: zbus::zvariant::Error = e.into();
+                let serr: ServiceError = verr.into();
+                Err(serr)
+            }
         }
+    } else {
+        Ok(None)
     }
 }
\ No newline at end of file
diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index f846fc1ae5..9b92a256fd 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -3,7 +3,7 @@
 use super::device::{BlockDevice, Device, DeviceInfo};
 use super::proxies::{DeviceProxy, ProposalCalculatorProxy, ProposalProxy, Storage1Proxy};
 use super::StorageSettings;
-use crate::dbus::get_property;
+use crate::dbus::{get_optional_property, get_property};
 use crate::error::ServiceError;
 use anyhow::{anyhow, Context};
 use futures_util::future::join_all;
@@ -148,13 +148,13 @@ impl<'a> StorageClient<'a> {
             mount_path: get_property(&volume_hash, "MountPath")?,
             mount_options: get_property(&volume_hash, "MountOptions")?,
             target: get_property(&volume_hash, "Target")?,
-            target_device: get_property(&volume_hash, "TargetDevice")?,
+            target_device: get_optional_property(&volume_hash, "TargetDevice")?,
             min_size: get_property(&volume_hash, "MinSize")?,
-            max_size: get_property(&volume_hash, "MaxSize")?,
+            max_size: get_optional_property(&volume_hash, "MaxSize")?,
             auto_size: get_property(&volume_hash, "AutoSize")?,
-            snapshots: get_property(&volume_hash, "Snapshots")?,
-            transactional: get_property(&volume_hash, "Transactional")?,
-            outline: get_property(&volume_hash, "Outline"),
+            snapshots: get_optional_property(&volume_hash, "Snapshots")?,
+            transactional: get_optional_property(&volume_hash, "Transactional")?,
+            outline: get_property(&volume_hash, "Outline")?,
         };
 
         Ok(volume)

From b4d9ae5b7554732730d546a65b41e40eeb19c711 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 26 Apr 2024 18:04:56 +0200
Subject: [PATCH 313/324] apply suggestion

---
 rust/agama-lib/src/dbus.rs | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/rust/agama-lib/src/dbus.rs b/rust/agama-lib/src/dbus.rs
index 954e70bccc..db418319cc 100644
--- a/rust/agama-lib/src/dbus.rs
+++ b/rust/agama-lib/src/dbus.rs
@@ -22,14 +22,7 @@ where
         .get(name)
         .context(format!("Failed to find property '{}'", name))?
         .into();
-    match T::try_from(value) {
-        Ok(v) => Ok(v),
-        Err(e) => {
-            let verr: zbus::zvariant::Error = e.into();
-            let serr: ServiceError = verr.into();
-            Err(serr)
-        }
-    }
+    T::try_from(value).map_err(|e| e.into().into())
 }
 
 pub fn get_optional_property<'a, T>(
@@ -42,14 +35,9 @@ where
 {
     if let Some(value) = properties.get(name) {
         let value : Value = value.into();
-        match T::try_from(value) {
-            Ok(v) => Ok(Some(v)),
-            Err(e) => {
-                let verr: zbus::zvariant::Error = e.into();
-                let serr: ServiceError = verr.into();
-                Err(serr)
-            }
-        }
+        T::try_from(value)
+            .map(|v| Some(v))
+            .map_err(|e| e.into().into() )
     } else {
         Ok(None)
     }

From 5b23d77a93a918c057f45d7874676e77ba68b186 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Fri, 26 Apr 2024 22:32:14 +0200
Subject: [PATCH 314/324] implement volume for

---
 rust/agama-lib/src/dbus.rs           | 20 +++++++------
 rust/agama-lib/src/storage/client.rs | 45 ++++++++++++++++++++++++----
 rust/agama-server/src/storage/web.rs | 35 +++++++++++++++++++---
 3 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/rust/agama-lib/src/dbus.rs b/rust/agama-lib/src/dbus.rs
index db418319cc..faadc06f1d 100644
--- a/rust/agama-lib/src/dbus.rs
+++ b/rust/agama-lib/src/dbus.rs
@@ -13,32 +13,34 @@ pub type OwnedNestedHash = HashMap<String, HashMap<String, zvariant::OwnedValue>
 pub fn get_property<'a, T>(
     properties: &'a HashMap<String, OwnedValue>,
     name: &str,
-) -> Result<T, ServiceError>
+) -> Result<T, zbus::zvariant::Error>
 where
     T: TryFrom<Value<'a>>,
     <T as TryFrom<Value<'a>>>::Error: Into<zbus::zvariant::Error>,
 {
     let value: Value = properties
         .get(name)
-        .context(format!("Failed to find property '{}'", name))?
+        .ok_or(zbus::zvariant::Error::Message(format!(
+            "Failed to find property '{}'",
+            name
+        )))?
         .into();
-    T::try_from(value).map_err(|e| e.into().into())
+
+    T::try_from(value).map_err(|e| e.into())
 }
 
 pub fn get_optional_property<'a, T>(
     properties: &'a HashMap<String, OwnedValue>,
     name: &str,
-) -> Result<Option<T>, ServiceError>
+) -> Result<Option<T>, zbus::zvariant::Error>
 where
     T: TryFrom<Value<'a>>,
     <T as TryFrom<Value<'a>>>::Error: Into<zbus::zvariant::Error>,
 {
     if let Some(value) = properties.get(name) {
-        let value : Value = value.into();
-        T::try_from(value)
-            .map(|v| Some(v))
-            .map_err(|e| e.into().into() )
+        let value: Value = value.into();
+        T::try_from(value).map(|v| Some(v)).map_err(|e| e.into())
     } else {
         Ok(None)
     }
-}
\ No newline at end of file
+}
diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 9b92a256fd..4804890bfd 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -42,10 +42,27 @@ pub enum VolumeTarget {
     Filesystem,
 }
 
+impl TryFrom<zbus::zvariant::Value<'_>> for VolumeTarget {
+    type Error = zbus::zvariant::Error;
+
+    fn try_from(value: zbus::zvariant::Value) -> Result<Self, zbus::zvariant::Error> {
+        let svalue: String = value.try_into()?;
+        match svalue.as_str() {
+            "default" => Ok(VolumeTarget::Default),
+            "new_partition" => Ok(VolumeTarget::NewPartition),
+            "new_vg" => Ok(VolumeTarget::NewVg),
+            "device" => Ok(VolumeTarget::Device),
+            "filesystem" => Ok(VolumeTarget::Filesystem),
+            _ => Err(zbus::zvariant::Error::Message(
+                format!("Wrong value for Target: {}", svalue).to_string(),
+            )),
+        }
+    }
+}
 
 /// Represents volume outline aka requirements for volume
 #[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
-#[serde(rename_all = "PascalCase")]
+#[serde(rename_all = "camelCase")]
 pub struct VolumeOutline {
     required: bool,
     fs_types: Vec<String>,
@@ -55,10 +72,27 @@ pub struct VolumeOutline {
     size_relevant_volumes: Vec<String>,
 }
 
+impl TryFrom<zbus::zvariant::Value<'_>> for VolumeOutline {
+    type Error = zbus::zvariant::Error;
+
+    fn try_from(value: zbus::zvariant::Value) -> Result<Self, zbus::zvariant::Error> {
+        let mvalue: HashMap<String, OwnedValue> = value.try_into()?;
+        let res = VolumeOutline {
+            required: get_property(&mvalue, "Required")?,
+            fs_types: get_property(&mvalue, "FsTypes")?,
+            support_auto_size: get_property(&mvalue, "SupportAutoSize")?,
+            snapshots_configurable: get_property(&mvalue, "SnapshotsConfigurable")?,
+            snaphosts_affect_sizes: get_property(&mvalue, "SnapshotsAffectSizes")?,
+            size_relevant_volumes: get_property(&mvalue, "SizeRelevantVolumes")?,
+        };
+
+        Ok(res)
+    }
+}
+
 /// Represents single volume
-// TODO: Do we really want to expose PascalCase from dbus or use more consistent snakeCase?
 #[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
-#[serde(rename_all = "PascalCase")]
+#[serde(rename_all = "camelCase")]
 pub struct Volume {
     mount_path: String,
     mount_options: Vec<String>,
@@ -142,8 +176,7 @@ impl<'a> StorageClient<'a> {
     }
 
     pub async fn volume_for(&self, mount_path: &str) -> Result<Volume, ServiceError> {
-        let volume_hash = self.calculator_proxy
-            .default_volume(mount_path).await?;
+        let volume_hash = self.calculator_proxy.default_volume(mount_path).await?;
         let volume = Volume {
             mount_path: get_property(&volume_hash, "MountPath")?,
             mount_options: get_property(&volume_hash, "MountOptions")?,
@@ -154,7 +187,7 @@ impl<'a> StorageClient<'a> {
             auto_size: get_property(&volume_hash, "AutoSize")?,
             snapshots: get_optional_property(&volume_hash, "Snapshots")?,
             transactional: get_optional_property(&volume_hash, "Transactional")?,
-            outline: get_property(&volume_hash, "Outline")?,
+            outline: get_optional_property(&volume_hash, "Outline")?,
         };
 
         Ok(volume)
diff --git a/rust/agama-server/src/storage/web.rs b/rust/agama-server/src/storage/web.rs
index 42df61c2e8..15c14e3487 100644
--- a/rust/agama-server/src/storage/web.rs
+++ b/rust/agama-server/src/storage/web.rs
@@ -5,8 +5,22 @@
 //! * `storage_service` which returns the Axum service.
 //! * `storage_stream` which offers an stream that emits the storage events coming from D-Bus.
 
-use agama_lib::{error::ServiceError, storage::{client::Action, device::Device, StorageClient}};
-use axum::{extract::State, routing::get, Json, Router};
+use std::collections::HashMap;
+
+use agama_lib::{
+    error::ServiceError,
+    storage::{
+        client::{Action, Volume},
+        device::Device,
+        StorageClient,
+    },
+};
+use anyhow::anyhow;
+use axum::{
+    extract::{Query, State},
+    routing::get,
+    Json, Router,
+};
 
 use crate::{
     error::Error,
@@ -41,6 +55,7 @@ pub async fn storage_service(dbus: zbus::Connection) -> Result<Router, ServiceEr
         .route("/devices/dirty", get(devices_dirty))
         .route("/devices/system", get(system_devices))
         .route("/devices/result", get(staging_devices))
+        .route("/product/volume_for", get(volume_for))
         .route("/proposal/actions", get(actions))
         .merge(status_router)
         .merge(progress_router)
@@ -57,10 +72,22 @@ async fn system_devices(State(state): State<StorageState<'_>>) -> Result<Json<Ve
     Ok(Json(state.client.system_devices().await?))
 }
 
-async fn staging_devices(State(state): State<StorageState<'_>>) -> Result<Json<Vec<Device>>, Error> {
+async fn staging_devices(
+    State(state): State<StorageState<'_>>,
+) -> Result<Json<Vec<Device>>, Error> {
     Ok(Json(state.client.staging_devices().await?))
 }
 
 async fn actions(State(state): State<StorageState<'_>>) -> Result<Json<Vec<Action>>, Error> {
     Ok(Json(state.client.actions().await?))
-}
\ No newline at end of file
+}
+
+async fn volume_for(
+    State(state): State<StorageState<'_>>,
+    Query(params): Query<HashMap<String, String>>,
+) -> Result<Json<Volume>, Error> {
+    let mount_path = params
+        .get("mount_path")
+        .ok_or(anyhow!("Missing mount_path parameter"))?;
+    Ok(Json(state.client.volume_for(mount_path).await?))
+}

From 0ff3d1ef45597c8ed0d535d2610917585063e899 Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Mon, 29 Apr 2024 09:22:09 +0200
Subject: [PATCH 315/324] Some more suggestions from the review

---
 doc/agama-security.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/agama-security.md b/doc/agama-security.md
index ebacff53a9..03da9df1c1 100644
--- a/doc/agama-security.md
+++ b/doc/agama-security.md
@@ -2,25 +2,25 @@
 
 Agama's functionality is divided into backend and frontend. Communication between two parts is done through HTTP/JSON and/or websocket. Most of the api requires an authorization.
 
-As frontend Agama offers web based UI or CLI. Backend currently is bunch of services implemented in Rust or Ruby with support from YaST libraries. For interprocess communication Agama uses D-Bus.
+As frontend Agama offers a web based user interface (web UI) or a commandline interface (CLI). Backend currently is bunch of services implemented in Rust or Ruby with support from YaST libraries. For interprocess communication Agama uses D-Bus.
 
 ### Authorization
 
-Authorization is done via password. To get authorized frontend has to provide a root password (root on backend's machine). The password is validated through PAM [1]. Once the authorization succeeds, backend generates an authorization token and passes it back to frontend / user. Agama uses JWT [2] as authorization token [3]. All subsequent calls to the API has to be done together with the token. In case of web UI the token is stored in session cookie.
+Authorization is done via password. To get authorized the frontend has to provide the root password (root on the backend's system). The password is validated through PAM [1]. Once the authorization succeeds, the backend generates an authorization token and passes it back to frontend. Agama uses [JSON Web Token (JWT)] [2] as authorization token [3]. All subsequent calls to the API has to be done together with the token. In case of the web UI, the token is stored in a HTTP-only cookie.
 
-To make local use (frontend and backend running on same machine) with respect to agama-live use case more friendly and allow skipping explicit login in web UI Agama implements option ```--generate-token```. When this option is used, Agama's web server service generates valid JWT automatically on start. The token is stored locally [4] and then imported into web browser's internal database by Agama provided startup [5]. The script prepares custom profile with predefined homepage pointing to Agama's login page with the generated token as get parameter in the homepage url. Then the firefox browser is started in kiosk mode.
+Agama supports special use case when Agama's UI or CLI is used in live installation media. In such case skipping autorization is supported to get feeling of using a desktop application. However, skipping authorization happens only for local access. When connecting remotely, authorization is still in place. Skipping of authorization is made possible thanks to option ```--generate-token```. When this option is used, Agama's web server service generates valid JWT automatically on start. The token is stored locally [4]. To make it usable for web UI, token is imported into web browser's internal database by Agama provided startup [5] script. The script prepares custom profile for Firefox with predefined homepage pointing to Agama's special login page with the generated token as part of a get request in the homepage url. As part of the response, the token is stored as `httpOnly` cookie. In case of CLI the situation is way easier as the token can be accessed and used directly as needed from well known location [4].
 
 ### JWT
 
-The token carries just one claim - the expiration date. Token's lifetime is currently set to one day. The token is provided in an encrypted form. Security key is either automatically created random string [6] of length at least 30 characters. However, security key can be provided via ```/etc/agama.d/server.yaml``` using ```jwt_secret``` option. Content of this option is expected to be a string but no checks are done.
+The token carries just one claim - the expiration date. Token's lifetime is currently set to one day. The token is provided in encrypted form. Security key is either automatically created random string [6] which is 30 characters long. However, security can be provided via the `jwt_secret` option in the `/etc/agama.d/server.yaml` agama's configuration file. The content of this option is expected to be a string but no checks are done.
 
 ### Communication between the frontend and the backend
 
-If both components run locally, communication can be done over HTTP even HTTPS. However, in case when both run on different machines the HTTPS is mandatory. In such case all HTTP requests are automatically redirected to HTTPS. A HTTP response with code 308 (permanent redirect) is returned in such case.
+If both components run locally, communication can be done over HTTP or HTTPS. However, in case when both run on different machines, HTTPS is mandatory. In such case all HTTP requests are automatically redirected to HTTPS. A HTTP response with code 308 (permanent redirect) is returned in such case.
 
 For notifications on changes from backend Agama uses WebSocket technology. Typically backend notificates about installation progress or network configuration changes this way.
 
-### Https certificates
+### HTTPS certificates
 
 SSL communication is secured either by self-signed certificate which is automatically generated by Agama if no certificate was provided by user. If Agama should use particular custom certificate Agama's web server provides options --cert and --key for path to certificate respectively to private key (in PEM format).
 
@@ -30,5 +30,5 @@ SSL communication is secured either by self-signed certificate which is automati
 - [2] RFC 7519, http://jwt.io
 - [3] Rust jsonwebtoken crate, https://crates.io/crates/jsonwebtoken
 - [4] Backend's machine at /run/agama/token
-- [5] Agama's git repo - live/root/.icewm/startup
+- [5] [Firefox startup script] See Agama's git repository path - live/root/.icewm/startup
 - [6] Rust rand crate, https://crates.io/crates/rand

From 25552ae3a2fd4ea5d93f544edd79c86e02a0ca26 Mon Sep 17 00:00:00 2001
From: Michal Filka <mfilka@suse.cz>
Date: Mon, 29 Apr 2024 11:44:23 +0200
Subject: [PATCH 316/324] Minor tweaks in references

---
 doc/agama-security.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/agama-security.md b/doc/agama-security.md
index 03da9df1c1..2e33326e1d 100644
--- a/doc/agama-security.md
+++ b/doc/agama-security.md
@@ -26,9 +26,9 @@ SSL communication is secured either by self-signed certificate which is automati
 
 ## Links to external sources
 
-- [1] Rust pam crate, https://crates.io/crates/pam
+- [1] Rust PAM crate, https://crates.io/crates/pam
 - [2] RFC 7519, http://jwt.io
 - [3] Rust jsonwebtoken crate, https://crates.io/crates/jsonwebtoken
 - [4] Backend's machine at /run/agama/token
-- [5] [Firefox startup script] See Agama's git repository path - live/root/.icewm/startup
+- [5] [Firefox startup script] See https://github.com/openSUSE/agama/blob/master/live/root/root/.icewm/startup
 - [6] Rust rand crate, https://crates.io/crates/rand

From 785dae7c97ffd0420cc7957057ef944c046765b7 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Mon, 29 Apr 2024 12:36:22 +0200
Subject: [PATCH 317/324] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Imobach González Sosa <igonzalezsosa@suse.com>
---
 rust/agama-lib/src/dbus.rs           | 2 +-
 rust/agama-lib/src/error.rs          | 2 +-
 rust/agama-lib/src/storage/client.rs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rust/agama-lib/src/dbus.rs b/rust/agama-lib/src/dbus.rs
index faadc06f1d..b814f614b6 100644
--- a/rust/agama-lib/src/dbus.rs
+++ b/rust/agama-lib/src/dbus.rs
@@ -9,7 +9,7 @@ pub type NestedHash<'a> = HashMap<&'a str, HashMap<&'a str, zvariant::Value<'a>>
 /// Nested hash as it comes from D-Bus.
 pub type OwnedNestedHash = HashMap<String, HashMap<String, zvariant::OwnedValue>>;
 
-/// Helper to get property of given type from ManagedObjects map or any generic dbus Hash with variant as value
+/// Helper to get property of given type from ManagedObjects map or any generic D-Bus Hash with variant as value
 pub fn get_property<'a, T>(
     properties: &'a HashMap<String, OwnedValue>,
     name: &str,
diff --git a/rust/agama-lib/src/error.rs b/rust/agama-lib/src/error.rs
index 775336256f..5ef274afe3 100644
--- a/rust/agama-lib/src/error.rs
+++ b/rust/agama-lib/src/error.rs
@@ -10,7 +10,7 @@ pub enum ServiceError {
     DBus(#[from] zbus::Error),
     #[error("Could not connect to Agama bus at '{0}': {1}")]
     DBusConnectionError(String, #[source] zbus::Error),
-    #[error("Unexpected type on DBus '{0}'")]
+    #[error("Unexpected type on D-Bus '{0}'")]
     ZVariant(#[from] zvariant::Error),
     // it's fine to say only "Error" because the original
     // specific error will be printed too
diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 4804890bfd..3c49b2866c 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -21,7 +21,7 @@ pub struct StorageDevice {
     description: String,
 }
 
-/// Represent single change action done to storage
+/// Represents a single change action done to storage
 #[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct Action {
@@ -90,7 +90,7 @@ impl TryFrom<zbus::zvariant::Value<'_>> for VolumeOutline {
     }
 }
 
-/// Represents single volume
+/// Represents a single volume
 #[derive(Debug, Clone, Serialize, utoipa::ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct Volume {

From fedf5e919ef1be114b7d1fdec10f6aa989803669 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Mon, 29 Apr 2024 13:45:32 +0200
Subject: [PATCH 318/324] fixes from review

---
 rust/agama-lib/src/dbus.rs           |  2 ++
 rust/agama-lib/src/error.rs          |  2 ++
 rust/agama-lib/src/storage/client.rs | 27 ++++++++++++---------------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/rust/agama-lib/src/dbus.rs b/rust/agama-lib/src/dbus.rs
index b814f614b6..50383f7b6b 100644
--- a/rust/agama-lib/src/dbus.rs
+++ b/rust/agama-lib/src/dbus.rs
@@ -29,6 +29,8 @@ where
     T::try_from(value).map_err(|e| e.into())
 }
 
+/// It is similar helper like get_property with difference that name does not need to be in HashMap.
+/// In such case `None``is returned, so type has to be enclosed in `Option`.`
 pub fn get_optional_property<'a, T>(
     properties: &'a HashMap<String, OwnedValue>,
     name: &str,
diff --git a/rust/agama-lib/src/error.rs b/rust/agama-lib/src/error.rs
index 5ef274afe3..30f61af834 100644
--- a/rust/agama-lib/src/error.rs
+++ b/rust/agama-lib/src/error.rs
@@ -10,6 +10,8 @@ pub enum ServiceError {
     DBus(#[from] zbus::Error),
     #[error("Could not connect to Agama bus at '{0}': {1}")]
     DBusConnectionError(String, #[source] zbus::Error),
+    #[error("D-Bus protocol error: {0}")]
+    DBusProtocol(#[from] zbus::fdo::Error),
     #[error("Unexpected type on D-Bus '{0}'")]
     ZVariant(#[from] zvariant::Error),
     // it's fine to say only "Error" because the original
diff --git a/rust/agama-lib/src/storage/client.rs b/rust/agama-lib/src/storage/client.rs
index 3c49b2866c..3828c02720 100644
--- a/rust/agama-lib/src/storage/client.rs
+++ b/rust/agama-lib/src/storage/client.rs
@@ -32,6 +32,7 @@ pub struct Action {
 }
 
 /// Represents value for target key of Volume
+/// It is snake cased when serializing to be compatible with yast2-storage-ng.
 #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
 #[serde(rename_all = "snake_case")]
 pub enum VolumeTarget {
@@ -286,7 +287,7 @@ impl<'a> StorageClient<'a> {
     ) -> Result<Device, ServiceError> {
         let interfaces = &object.1;
         Ok(Device {
-            device_info: self.build_device_info(interfaces).await?,
+            device_info: self.build_device_info(object).await?,
             component: None,
             drive: None,
             block_device: self.build_block_device(interfaces).await?,
@@ -302,11 +303,7 @@ impl<'a> StorageClient<'a> {
     }
 
     pub async fn system_devices(&self) -> Result<Vec<Device>, ServiceError> {
-        let objects = self
-            .object_manager_proxy
-            .get_managed_objects()
-            .await
-            .context("Failed to get managed objects")?;
+        let objects = self.object_manager_proxy.get_managed_objects().await?;
         let mut result = vec![];
         for object in objects {
             let path = &object.0;
@@ -321,11 +318,7 @@ impl<'a> StorageClient<'a> {
     }
 
     pub async fn staging_devices(&self) -> Result<Vec<Device>, ServiceError> {
-        let objects = self
-            .object_manager_proxy
-            .get_managed_objects()
-            .await
-            .context("Failed to get managed objects")?;
+        let objects = self.object_manager_proxy.get_managed_objects().await?;
         let mut result = vec![];
         for object in objects {
             let path = &object.0;
@@ -341,8 +334,12 @@ impl<'a> StorageClient<'a> {
 
     async fn build_device_info(
         &self,
-        interfaces: &HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>,
+        object: &(
+            OwnedObjectPath,
+            HashMap<OwnedInterfaceName, HashMap<std::string::String, OwnedValue>>,
+        ),
     ) -> Result<DeviceInfo, ServiceError> {
+        let interfaces = &object.1;
         let interface: OwnedInterfaceName =
             InterfaceName::from_static_str_unchecked("org.opensuse.Agama.Storage1.Device").into();
         let properties = interfaces.get(&interface);
@@ -354,9 +351,9 @@ impl<'a> StorageClient<'a> {
                 description: get_property(properties, "Description")?,
             })
         } else {
-            Err(ServiceError::Anyhow(anyhow!(
-                "Device does not implement device info"
-            )))
+            let message =
+                format!("storage device {} is missing Device interface", object.0).to_string();
+            Err(zbus::zvariant::Error::Message(message).into())
         }
     }
 

From 45530dc1dd59f37122114fed8b12410deac3917c Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 29 Apr 2024 16:21:26 +0100
Subject: [PATCH 319/324] Changes based on code review

---
 web/src/client/network/model.js                |  2 +-
 web/src/components/overview/NetworkSection.jsx | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/web/src/client/network/model.js b/web/src/client/network/model.js
index 60d8cb4803..c4f8ab9e76 100644
--- a/web/src/client/network/model.js
+++ b/web/src/client/network/model.js
@@ -42,7 +42,7 @@ const DeviceState = Object.freeze({
   UNAVAILABLE: "unavailable",
   DISCONNECTED: "disconnected",
   CONFIG: "config",
-  NEEDAUTH: "auth",
+  NEEDAUTH: "needAuth",
   ACTIVATED: "activated",
   DEACTIVATING: "deactivating",
   FAILED: "failed"
diff --git a/web/src/components/overview/NetworkSection.jsx b/web/src/components/overview/NetworkSection.jsx
index 36129b9127..6cb71e41dd 100644
--- a/web/src/components/overview/NetworkSection.jsx
+++ b/web/src/components/overview/NetworkSection.jsx
@@ -37,10 +37,11 @@ export default function NetworkSection() {
       switch (type) {
         case NetworkEventTypes.DEVICE_ADDED: {
           setDevices((devs) => {
-            const newDevices = devs.filter((d) => d.name !== payload.name);
-            if (payload.connection) return newDevices;
+            const currentDevices = devs.filter((d) => d.name !== payload.name);
+            // only show connecting or connected devices
+            if (!payload.connection) return currentDevices;
 
-            return [...newDevices, client.fromApiDevice(payload)];
+            return [...currentDevices, client.fromApiDevice(payload)];
           });
           break;
         }
@@ -48,8 +49,10 @@ export default function NetworkSection() {
         case NetworkEventTypes.DEVICE_UPDATED: {
           const [name, data] = payload;
           setDevices(devs => {
-            const newDevices = devs.filter((d) => d.name !== name);
-            return [...newDevices, client.fromApiDevice(data)];
+            const currentDevices = devs.filter((d) => d.name !== name);
+            // only show connecting or connected devices
+            if (!data.connection) return currentDevices;
+            return [...currentDevices, client.fromApiDevice(data)];
           });
           break;
         }
@@ -95,8 +98,8 @@ export default function NetworkSection() {
     const summary = activeDevices.map(deviceSummary);
 
     const msg = sprintf(
-      // TRANSLATORS: header for the list of active network connections,
-      // %d is replaced by the number of active connections
+      // TRANSLATORS: header for the list of connected devices,
+      // %d is replaced by the number of active devices
       n_("%d device set:", "%d devices set:", total), total
     );
 

From c59cd175abc0cc3b4939865f7ecdb09da6a0fa06 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 29 Apr 2024 16:35:13 +0100
Subject: [PATCH 320/324] Added changelog

---
 rust/package/agama.changes       | 6 ++++++
 web/package/agama-web-ui.changes | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/rust/package/agama.changes b/rust/package/agama.changes
index ef4e3e9431..37be7bd747 100644
--- a/rust/package/agama.changes
+++ b/rust/package/agama.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 29 15:29:38 UTC 2024 - Knut Anderssen <kanderssen@suse.com>
+
+- Added initial support por listening and notifying network changes
+  (gh#openSUSE/agama#1158).
+
 -------------------------------------------------------------------
 Wed Mar  13 12:42:58 UTC 2024 - Jorik Cronenberg <jorik.cronenberg@suse.com>
 
diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
index 66c5fb7306..c03b24d6e1 100644
--- a/web/package/agama-web-ui.changes
+++ b/web/package/agama-web-ui.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 29 15:26:42 UTC 2024 - Knut Anderssen <kanderssen@suse.com>
+
+- Show the running network configuration and keep it up to date 
+  listening to changes from NetworkManager (gh#openSUSE/agama#1158).
+
 -------------------------------------------------------------------
 Wed Apr  3 15:16:07 UTC 2024 - José Iván López González <jlopez@suse.com>
 

From ae94b4e51ec447ae2649b10fa6f2266eb545e661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Tue, 30 Apr 2024 07:08:31 +0100
Subject: [PATCH 321/324] Revert "Added changelog"

This reverts commit c59cd175abc0cc3b4939865f7ecdb09da6a0fa06.
---
 rust/package/agama.changes       | 6 ------
 web/package/agama-web-ui.changes | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/rust/package/agama.changes b/rust/package/agama.changes
index 37be7bd747..ef4e3e9431 100644
--- a/rust/package/agama.changes
+++ b/rust/package/agama.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Mon Apr 29 15:29:38 UTC 2024 - Knut Anderssen <kanderssen@suse.com>
-
-- Added initial support por listening and notifying network changes
-  (gh#openSUSE/agama#1158).
-
 -------------------------------------------------------------------
 Wed Mar  13 12:42:58 UTC 2024 - Jorik Cronenberg <jorik.cronenberg@suse.com>
 
diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
index c03b24d6e1..66c5fb7306 100644
--- a/web/package/agama-web-ui.changes
+++ b/web/package/agama-web-ui.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Mon Apr 29 15:26:42 UTC 2024 - Knut Anderssen <kanderssen@suse.com>
-
-- Show the running network configuration and keep it up to date 
-  listening to changes from NetworkManager (gh#openSUSE/agama#1158).
-
 -------------------------------------------------------------------
 Wed Apr  3 15:16:07 UTC 2024 - José Iván López González <jlopez@suse.com>
 

From a598fb5989f9040e0ba0e9f3a4e154a743641a10 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Tue, 30 Apr 2024 11:17:31 +0200
Subject: [PATCH 322/324] Update rust/agama-lib/src/dbus.rs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Imobach González Sosa <igonzalezsosa@suse.com>
---
 rust/agama-lib/src/dbus.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust/agama-lib/src/dbus.rs b/rust/agama-lib/src/dbus.rs
index 50383f7b6b..02ca6f302c 100644
--- a/rust/agama-lib/src/dbus.rs
+++ b/rust/agama-lib/src/dbus.rs
@@ -30,7 +30,7 @@ where
 }
 
 /// It is similar helper like get_property with difference that name does not need to be in HashMap.
-/// In such case `None``is returned, so type has to be enclosed in `Option`.`
+/// In such case `None` is returned, so type has to be enclosed in `Option`.
 pub fn get_optional_property<'a, T>(
     properties: &'a HashMap<String, OwnedValue>,
     name: &str,

From 8efa41f11d3f1944fb9ce62d206cd2bf6bd8bb83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Fri, 3 May 2024 13:05:58 +0100
Subject: [PATCH 323/324] Update the agama-live startup script

---
 live/root/.icewm/startup      |  9 ---------
 live/root/root/.icewm/startup | 10 ++++++++--
 2 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100755 live/root/.icewm/startup

diff --git a/live/root/.icewm/startup b/live/root/.icewm/startup
deleted file mode 100755
index 7f8d091d27..0000000000
--- a/live/root/.icewm/startup
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env sh
-# Start a browser to connect to Agama's web user interface skipping the authentication.
-
-TOKEN_FILE=/run/agama/token
-TOKEN=$(cat $TOKEN_FILE)
-PREFS=$HOME/.mozilla/firefox/profile/user.js
-
-sed -e "s/__HOMEPAGE__/http:\/\/localhost\/login?token=$TOKEN/" $PREFS.template > $PREFS
-firefox --kiosk --profile $HOME/.mozilla/firefox/profile
diff --git a/live/root/root/.icewm/startup b/live/root/root/.icewm/startup
index 209d5242e2..7f8d091d27 100755
--- a/live/root/root/.icewm/startup
+++ b/live/root/root/.icewm/startup
@@ -1,3 +1,9 @@
-#! /bin/sh
+#!/usr/bin/env sh
+# Start a browser to connect to Agama's web user interface skipping the authentication.
 
-BROWSER="firefox --kiosk --profile $HOME/.mozilla/firefox/profile" /usr/libexec/cockpit-desktop /cockpit/@localhost/agama/index.html
+TOKEN_FILE=/run/agama/token
+TOKEN=$(cat $TOKEN_FILE)
+PREFS=$HOME/.mozilla/firefox/profile/user.js
+
+sed -e "s/__HOMEPAGE__/http:\/\/localhost\/login?token=$TOKEN/" $PREFS.template > $PREFS
+firefox --kiosk --profile $HOME/.mozilla/firefox/profile

From 6fb21b6c52a45f5da6283b65d9245fda35d87771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Imobach=20Gonz=C3=A1lez=20Sosa?= <igonzalezsosa@suse.com>
Date: Mon, 6 May 2024 06:56:14 +0100
Subject: [PATCH 324/324] Update changes files

---
 rust/package/agama.changes                 | 20 ++++++++++++++++++++
 service/package/rubygem-agama-yast.changes |  5 +++++
 web/package/agama-web-ui.changes           | 18 ++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/rust/package/agama.changes b/rust/package/agama.changes
index ef4e3e9431..7478d31fef 100644
--- a/rust/package/agama.changes
+++ b/rust/package/agama.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon May  6 05:13:54 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Extend the HTTP/JSON API:
+  - Localization (gh#openSUSE/agama#1047, gh#openSUSE/agama#1120).
+  - Networking (gh#openSUSE/agama#1064).
+  - Software (gh#openSUSE/agama#1069).
+  - Manager service (gh#openSUSE/agama#1089).
+  - Questions (gh#openSUSE/agama#1091).
+  - Progress interface (gh#openSUSE/agama#1092).
+  - Issues interface (gh#openSUSE/agama#1100).
+  - Users (gh#openSUSE/agama#1117).
+  - Product registration (gh#openSUSE/agama#1146).
+- Add an "agama-web-server" service (gh#openSUSE/agama/1119).
+- Fix the generation of the self-signed certificate
+  (gh#openSUSE/agama#1131).
+- Improve agama-server logging (gh#openSUSE/agama#1143).
+- Provide frontend translations via the /po.js path
+  (gh#openSUSE/agama#1126).
+
 -------------------------------------------------------------------
 Wed Mar  13 12:42:58 UTC 2024 - Jorik Cronenberg <jorik.cronenberg@suse.com>
 
diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes
index 5ba52de817..adf9f9709d 100644
--- a/service/package/rubygem-agama-yast.changes
+++ b/service/package/rubygem-agama-yast.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May  6 05:13:11 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Remove the dependency on cockpit.socket (gh#openSUSE/agama#1119)
+
 -------------------------------------------------------------------
 Thu Apr 25 13:40:06 UTC 2024 - Ancor Gonzalez Sosa <ancor@suse.com>
 
diff --git a/web/package/agama-web-ui.changes b/web/package/agama-web-ui.changes
index 77b9b3ee55..94900f9a2e 100644
--- a/web/package/agama-web-ui.changes
+++ b/web/package/agama-web-ui.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Mon May  6 05:41:15 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Adapt to the new HTTP/JSON API:
+  - Authentication (gh#openSUSE/agama#1080).
+  - Localization (gh#openSUSE/agama#1094).
+  - Networking (gh#openSUSE/agama#1116).
+  - Software (gh#openSUSE/agama#1094 and gh#openSUSE/agama#1112).
+  - Manager service (gh#openSUSE/agama#1132).
+  - Questions (gh#openSUSE/agama#1132).
+  - Progress interface (gh#openSUSE/agama#1103).
+  - Issues interface (gh#openSUSE/agama#1100).
+  - Product registration (gh#openSUSE/agama#1146).
+  - Users (gh#openSUSE/agama#1117).
+- Adapt webpack to work with the new architecture
+  (gh#openSUSE/agama#1061, gh#openSUSE/agama#1074 and
+  gh#openSUSE/agama#1130).
+
 -------------------------------------------------------------------
 Fri May  3 09:45:36 UTC 2024 - José Iván López González <jlopez@suse.com>