fix(admin): use instance branding on self-hosted (#3401)

This commit is contained in:
Hampus authored and GitHub committed 2026-10-11 15:57:12 +02:00
1 parent af7724dbf6
commit 50c28aa8fa
9 files changed
+206 -49

No files matched your search

+2 -1
View File
@@ -87,7 +87,8 @@ async fn login_page(
Some(_) => Some("Login error. Please try again."),
None => None,
};
Html(login::login_page(config, error_msg).into_string()).into_response()
let branding = state.self_hosted_branding().await;
Html(login::login_page(config, branding.as_ref(), error_msg).into_string()).into_response()
}
async fn auth_start(State(state): State<AppState>) -> Response {
+3
View File
@@ -480,11 +480,13 @@ mod tests {
let gold = PremiumBranding {
name: Some("Gold".to_owned()),
premium_enabled: true,
..PremiumBranding::default()
};
assert_eq!(premium_badge_name(Some(&gold)).as_deref(), Some("Gold"));
let unnamed = PremiumBranding {
name: None,
premium_enabled: true,
..PremiumBranding::default()
};
assert_eq!(
premium_badge_name(Some(&unnamed)).as_deref(),
@@ -493,6 +495,7 @@ mod tests {
let everyone = PremiumBranding {
name: Some("Gold".to_owned()),
premium_enabled: false,
..PremiumBranding::default()
};
assert_eq!(premium_badge_name(Some(&everyone)), None);
assert_eq!(premium_badge_name(None).as_deref(), Some("Premium"));