High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat: use request host as default SSR domain (#19485)
bo0tzz3c6e9e1191f3
diff --git a/e2e/src/api/specs/shared-link.e2e-spec.ts b/e2e/src/api/specs/shared-link.e2e-spec.tsindex 97aa252dbb..d9f8672c66 100644--- a/e2e/src/api/specs/shared-link.e2e-spec.ts+++ b/e2e/src/api/specs/shared-link.e2e-spec.ts@@ -117,6 +117,13 @@ describe('/shared-links', () => {const resp = await request(shareUrl).get(`/${linkWithAssets.key}`);expect(resp.status).toBe(200);expect(resp.header['content-type']).toContain('text/html');+ expect(resp.text).toContain(`<meta property="og:image" content="http://127.0.0.1:2285`);+ });++ it('should fall back to my.immich.app og:image meta tag for shared asset if Host header is not present', async () => {+ const resp = await request(shareUrl).get(`/${linkWithAssets.key}`).set('Host', '');+ expect(resp.status).toBe(200);+ expect(resp.header['content-type']).toContain('text/html');expect(resp.text).toContain(`<meta property="og:image" content="https://my.immich.app`);});diff --git a/server/src/services/api.service.ts b/server/src/services/api.service.tsindex 6b40aa46ef..064b2e268d 100644--- a/server/src/services/api.service.ts+++ b/server/src/services/api.service.ts@@ -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);}diff --git a/server/src/services/shared-link.service.ts b/server/src/services/shared-link.service.tsindex 17f1b974d2..c70b31a3a1 100644--- a/server/src/services/shared-link.service.ts+++ b/server/src/services/shared-link.service.ts@@ -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,};}diff --git a/server/src/utils/misc.ts b/server/src/utils/misc.tsindex 05811350e4..742e98c1c3 100644--- a/server/src/utils/misc.ts+++ b/server/src/utils/misc.ts@@ -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