Merge pull request #3161 from appwrite/fix-3159-cli-oauth-logo

fix: show Appwrite icon for CLI OAuth consent avatars
This commit is contained in:
Chirag Aggarwal authored and GitHub committed 2026-08-17 09:39:06 +05:30
commit 964c9b3c23
4 files changed
+67 -6

No files matched your search

+27
View File
@@ -0,0 +1,27 @@
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('');
});
});
+18
View File
@@ -0,0 +1,18 @@
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() ?? '';
}
+11 -3
View File
@@ -48,6 +48,7 @@
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';
@@ -110,6 +111,7 @@
);
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());
@@ -493,8 +495,8 @@
<div class="consent">
<header class="header">
<div class="identity">
{#if app.logoUri}
<img src={app.logoUri} alt={app.name} class="avatar" />
{#if appLogoUrl}
<img src={appLogoUrl} alt={app.name} class="avatar" />
{:else}
<div class="avatar placeholder">{appInitial}</div>
{/if}
@@ -902,12 +904,18 @@
width: 3.5rem;
height: 3.5rem;
border-radius: var(--border-radius-l, 0.85rem);
object-fit: cover;
flex-shrink: 0;
border: 1px solid var(--border-neutral-strong);
background: var(--bgcolor-neutral-primary);
}
/* Keep wordmarks readable inside the square avatar (cover crops them). */
img.avatar {
object-fit: contain;
padding: 0.4rem;
box-sizing: border-box;
}
.avatar.placeholder {
display: flex;
align-items: center;
+11 -3
View File
@@ -3,6 +3,7 @@
import { Card, Typography, Icon } from '@appwrite.io/pink-svelte';
import { IconCheck, IconX, IconLockClosed } from '@appwrite.io/pink-icons-svelte';
import { Button } from '$lib/elements/forms';
import { resolveOAuth2AppLogoUrl } from '$lib/helpers/oauth2-app-logo';
import type { OAuth2Flow, OAuth2Outcome } from './consent-card.svelte';
interface Props {
@@ -28,6 +29,7 @@
const approved = $derived(outcome === 'approved');
const appName = $derived(app?.name ?? 'the application');
const appLogoUrl = $derived(resolveOAuth2AppLogoUrl(app));
const appInitial = $derived((app?.name || '?').charAt(0).toUpperCase());
const accountInitial = $derived((accountLabel || '?').charAt(0).toUpperCase());
@@ -53,8 +55,8 @@
<div class="outcome" class:approved>
<header class="header">
<div class="identity">
{#if app?.logoUri}
<img src={app.logoUri} alt={appName} class="avatar" />
{#if appLogoUrl}
<img src={appLogoUrl} alt={appName} class="avatar" />
{:else}
<div class="avatar placeholder">{appInitial}</div>
{/if}
@@ -158,12 +160,18 @@
width: 3.5rem;
height: 3.5rem;
border-radius: var(--border-radius-l, 0.85rem);
object-fit: cover;
flex-shrink: 0;
border: 1px solid var(--border-neutral-strong);
background: var(--bgcolor-neutral-primary);
}
/* Keep wordmarks readable inside the square avatar (cover crops them). */
img.avatar {
object-fit: contain;
padding: 0.4rem;
box-sizing: border-box;
}
.avatar.placeholder {
display: flex;
align-items: center;