From d04986097516db02c96e3571f51b2c727bbb6b9e Mon Sep 17 00:00:00 2001 From: harsh mahajan Date: Mon, 17 Aug 2026 09:20:25 +0530 Subject: [PATCH] Fix the cropped logo with CSS instead of a client-ID override The avatar used object-fit: cover, which crops a wide wordmark into an unreadable fragment. Switching to contain fixes that for every client, so the appwrite-cli special case and its resolver helper are unnecessary. Hardcoding the CLI's client ID in the console was also the wrong layer: logoUri is server-owned app-registry data, so a square mark belongs in the registration upstream. Worse, app IDs are user-supplied, so anyone able to create an OAuth app on a self-hosted instance could claim `appwrite-cli` and render official Appwrite branding on a consent screen. The helper's trim/?? '' normalization was dead too: the {#if} already covered empty and undefined, and cimdDocumentToApp gates logoUri through HTTP_URL before it ever reaches the template. Fold the rule into .avatar rather than a separate img.avatar block. Every other .avatar is a flex-centered div, so object-fit is inert there and the padding stays harmless. --- src/lib/helpers/oauth2-app-logo.test.ts | 27 ------------------- src/lib/helpers/oauth2-app-logo.ts | 18 ------------- .../(public)/oauth2/consent-card.svelte | 11 +++----- .../(public)/oauth2/outcome-card.svelte | 11 +++----- 4 files changed, 6 insertions(+), 61 deletions(-) delete mode 100644 src/lib/helpers/oauth2-app-logo.test.ts delete mode 100644 src/lib/helpers/oauth2-app-logo.ts diff --git a/src/lib/helpers/oauth2-app-logo.test.ts b/src/lib/helpers/oauth2-app-logo.test.ts deleted file mode 100644 index 1ab56b2c0..000000000 --- a/src/lib/helpers/oauth2-app-logo.test.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { resolveOAuth2AppLogoUrl } from './oauth2-app-logo'; - -describe('resolveOAuth2AppLogoUrl', () => { - it('uses the square Appwrite icon for the first-party CLI client', () => { - expect( - resolveOAuth2AppLogoUrl({ - $id: 'appwrite-cli', - logoUri: 'https://example.com/wordmark.svg' - }) - ).toBe('/console/logos/appwrite-icon.svg'); - }); - - it('keeps third-party logoUri values', () => { - expect( - resolveOAuth2AppLogoUrl({ - $id: 'other-app', - logoUri: 'https://example.com/logo.png' - }) - ).toBe('https://example.com/logo.png'); - }); - - it('returns an empty string when no logo is available', () => { - expect(resolveOAuth2AppLogoUrl({ $id: 'other-app', logoUri: ' ' })).toBe(''); - expect(resolveOAuth2AppLogoUrl(null)).toBe(''); - }); -}); diff --git a/src/lib/helpers/oauth2-app-logo.ts b/src/lib/helpers/oauth2-app-logo.ts deleted file mode 100644 index 3235ec749..000000000 --- a/src/lib/helpers/oauth2-app-logo.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { base } from '$app/paths'; - -/** - * First-party clients may register a wide wordmark as `logoUri`. Consent and - * outcome avatars are square, so `object-fit: cover` crops those marks into - * unreadable fragments (see #3159 for Appwrite CLI). Prefer the square icon. - */ -const FIRST_PARTY_ICON_CLIENTS = new Set(['appwrite-cli']); - -export function resolveOAuth2AppLogoUrl( - app: { $id?: string; logoUri?: string } | null | undefined -): string { - if (app?.$id && FIRST_PARTY_ICON_CLIENTS.has(app.$id)) { - return `${base}/logos/appwrite-icon.svg`; - } - - return app?.logoUri?.trim() ?? ''; -} diff --git a/src/routes/(public)/oauth2/consent-card.svelte b/src/routes/(public)/oauth2/consent-card.svelte index 583e2a8c0..b609dba95 100644 --- a/src/routes/(public)/oauth2/consent-card.svelte +++ b/src/routes/(public)/oauth2/consent-card.svelte @@ -48,7 +48,6 @@ type ResourcePage, type ResourceNameMap } from '$lib/helpers/oauth2-authorization-details'; - import { resolveOAuth2AppLogoUrl } from '$lib/helpers/oauth2-app-logo'; import ResourceSelector from './resource-selector.svelte'; export type OAuth2Flow = 'authorization' | 'device'; @@ -111,7 +110,6 @@ ); const redirectHost = $derived(hostnameOf(grant.redirectUri)); - const appLogoUrl = $derived(resolveOAuth2AppLogoUrl(app)); const appInitial = $derived((app.name || '?').charAt(0).toUpperCase()); const accountInitial = $derived((accountLabel || '?').charAt(0).toUpperCase()); @@ -495,8 +493,8 @@