helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-14 17:36:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: use request host as default SSR domain (#19485)

Browse source 
fix: hostname and domain confusion

chore: e2e test
This commit is contained in:
bo0tzz 2025-07-01 05:24:44 +02:00 • committed by GitHub
parent db0415bbcc
commit 3c6e9e1191
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
server/src/services/api.service.ts
View file

@ -86,7 +86,10 @@ export class ApiService {
try {
const key = shareMatches[1];
const auth = await this.authService.validateSharedLink(key);
const meta = await this.sharedLinkService.getMetadataTags(auth);
const meta = await this.sharedLinkService.getMetadataTags(
auth,
request.host ? `${request.protocol}://${request.host}` : undefined,
);
if (meta) {
html = render(index, meta);
}

4
server/src/services/shared-link.service.ts
View file

@ -174,7 +174,7 @@ export class SharedLinkService extends BaseService {
return results;
}
async getMetadataTags(auth: AuthDto): Promise<null | OpenGraphTags> {
async getMetadataTags(auth: AuthDto, defaultDomain?: string): Promise<null | OpenGraphTags> {
if (!auth.sharedLink || auth.sharedLink.password) {
return null;
}
@ -190,7 +190,7 @@ export class SharedLinkService extends BaseService {
return {
title: sharedLink.album ? sharedLink.album.albumName : 'Public Share',
description: sharedLink.description || `${assetCount} shared photos & videos`,
imageUrl: new URL(imagePath, getExternalDomain(config.server)).href,
imageUrl: new URL(imagePath, getExternalDomain(config.server, defaultDomain)).href,
};
}

3
server/src/utils/misc.ts
View file

@ -44,7 +44,8 @@ export const getMethodNames = (instance: any) => {
return methods;
};
export const getExternalDomain = (server: SystemConfig['server']) => server.externalDomain || `https://my.immich.app`;
export const getExternalDomain = (server: SystemConfig['server'], defaultDomain = 'https://my.immich.app') =>
server.externalDomain || defaultDomain;
/**
* @returns a list of strings representing the keys of the object in dot notation