letro/letro-authentication-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Typos and error message rewording

Browse Source 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Quentin Gliech
2025-12-01 11:03:04 +01:00
committed by GitHub
parent 3e65ff54b7
commit e484a810a7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/handlers/src/upstream_oauth2/link.rs
View File

@@ -588,7 +588,7 @@ pub(crate) async fn get(
.await?;
}
// We matched anexisting user and the conflict resolution is to replace any
// We matched an existing user and the conflict resolution is to replace any
// link on the existing user with this one
UpstreamOAuthProviderOnConflict::Replace => {
// Find existing links for this provider and user
@@ -635,7 +635,7 @@ pub(crate) async fn get(
.await?;
}
// We matched an existing user and the conflict resolution is link to the
// We matched an existing user and the conflict resolution is to link to the
// existing user *only if* there is no existing link on that user
UpstreamOAuthProviderOnConflict::Set => {
// Find existing links for this provider and user
@@ -649,7 +649,7 @@ pub(crate) async fn get(
upstream_oauth_provider.id = %provider.id,
upstream_oauth_link.id = %link.id,
user.id = %existing_user.id,
"Upstream provider returned a localpart {localpart:?} which is already used by another user. That user already has a ({count}) link to this provider, which isn't allowed by the conflict resolution"
"Upstream provider returned a localpart {localpart:?} matching an existing user who already has {count} link(s) to this provider, which isn't allowed by the conflict resolution"
);
// TODO: translate
@@ -657,7 +657,7 @@ pub(crate) async fn get(
.with_code("User exists")
.with_description(format!(
r"Upstream account provider returned {localpart:?} as username,
which is not linked to another existing upstream account.
but this user already has an existing link to this provider.
Your homeserver does not allow replacing upstream account links automatically."
))
.with_language(&locale);