Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Report login errors #1099

Merged
merged 3 commits into from
Mar 18, 2024
Merged

Report login errors #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b84eff9
Report wrong credentials when logging in
imobachgs Mar 18, 2024
d50a63a
Grammar fixes in the login page
imobachgs Mar 18, 2024
b1a1a4b
Use the If component in the LoginPage
imobachgs Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions web/src/components/core/LoginPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, If, Page, PasswordInput, Section } from "~/components/core";
import { Center } from "~/components/layout";

// @ts-check
Expand All @@ -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) {
Expand All @@ -56,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>
Expand All @@ -66,9 +63,9 @@ 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."),
"<b>root</b>"
)
_("The installer requires %s user privileges. Please, provide its password to log in to the system."),
"<b>root</b>",
),
}}
/>

Expand All @@ -82,6 +79,14 @@ export default function LoginPage() {
onChange={(_, v) => setPassword(v)}
/>
</FormGroup>
<If
condition={error}
then={
<FormValidationError
message={_("Could not log in. Please, make sure that the password is correct.")}
/>
}
/>

<ActionGroup>
<Button type="submit" variant="primary">
Expand All @@ -93,7 +98,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>
);
Expand Down
4 changes: 3 additions & 1 deletion web/src/context/auth.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
Loading