Skip to content

fix: Invalid password message #49

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

Draft
joshuamegnauth54 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: Invalid password message #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions i18n/en/cosmic_greeter.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ restart-timeout = The system will restart automatically in {$seconds} seconds.
shutdown = Shut down
shutdown-now = Shut down now?
shutdown-timeout = The system will shut down automatically in {$seconds} seconds.

# Error messages
auth-failed = You entered an invalid password.
try-again = Please try again.
12 changes: 9 additions & 3 deletions src/greeter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,17 @@ async fn request_message(socket: Arc<UnixStream>, request: Request) -> Message {
}
},
Response::Error {
error_type: _,
error_type: error,
description,
} => {
//TODO: use error_type?
return Message::Error(socket, description);
log::error!("{error:?} => {description}");
return match error {
greetd_ipc::ErrorType::AuthError => Message::Error(
socket,
format!("{} {}", fl!("auth-failed"), fl!("try-again")),
),
greetd_ipc::ErrorType::Error => Message::Error(socket, description),
};
}
Response::Success => match request {
Request::CreateSession { .. } => {
Expand Down