github-issue-tower-defence-management 1.173.3 → 1.174.0

package/src/adapter/entry-points/console/consoleGithubTokenResolver.test.ts

@@ -1,5 +1,6 @@
 import {
   createConsoleGithubTokenResolver,
+  createConsoleGithubTokenResolverByItemUrl,
   createConsoleIssueRepositoryResolver,
   createConsoleProjectRepositoryResolver,
   extractProjectOwner,
@@ -50,6 +51,30 @@ describe('createConsoleProjectRepositoryResolver', () => {
   });
 });
 
+describe('createConsoleGithubTokenResolverByItemUrl', () => {
+  it('returns the token for the owner of the given item url', () => {
+    const resolve = createConsoleGithubTokenResolverByItemUrl(
+      (repositoryOwner) => `token-of-${repositoryOwner}`,
+    );
+
+    expect(
+      resolve('https://github.com/acme-labs/acme-portal-mock/issues/178'),
+    ).toBe('token-of-acme-labs');
+  });
+
+  it('throws when the repository owner cannot be read from the url', () => {
+    const resolve = createConsoleGithubTokenResolverByItemUrl(
+      (repositoryOwner) => `token-of-${repositoryOwner}`,
+    );
+
+    expect(() =>
+      resolve('https://github.com/acme-labs/acme-portal-mock'),
+    ).toThrow(
+      'The repository owner cannot be read from the url: https://github.com/acme-labs/acme-portal-mock',
+    );
+  });
+});
+
 describe('createConsoleIssueRepositoryResolver', () => {
   it('builds the issue repository from the token of the owner in the url', () => {
     const resolve = createConsoleIssueRepositoryResolver<string>(
@@ -128,14 +153,16 @@ describe('createConsoleGithubTokenResolver', () => {
     expect(resolve('acme-labs')).toBe('fine-grained-token');
   });
 
-  it('should keep using the default token for the other owners when one owner has a token file', () => {
+  it('should throw when the per-owner token map is provided but the owner has no entry in it', () => {
     const resolve = createConsoleGithubTokenResolver(
       'default-token',
       { 'acme-labs': '/creds/acme-labs-token.txt' },
       () => 'fine-grained-token',
     );
 
-    expect(resolve('globex-inc')).toBe('default-token');
+    expect(() => resolve('globex-inc')).toThrow(
+      'No GitHub token file is configured for repository owner "globex-inc". Add an entry for this owner in consoleGithubTokenFilesByRepositoryOwner.',
+    );
   });
 
   it('should read the token file only once per owner', () => {

package/src/adapter/entry-points/console/consoleGithubTokenResolver.ts

@@ -50,6 +50,20 @@ export const createConsoleProjectRepositoryResolver = <ProjectRepositoryType>(
   };
 };
 
+export const createConsoleGithubTokenResolverByItemUrl = (
+  resolveGithubToken: ConsoleGithubTokenResolver,
+): ((itemUrl: string) => string) => {
+  return (itemUrl: string): string => {
+    const owner = extractRepositoryOwner(itemUrl);
+    if (owner === null) {
+      throw new Error(
+        `The repository owner cannot be read from the url: ${itemUrl}`,
+      );
+    }
+    return resolveGithubToken(owner);
+  };
+};
+
 export const createConsoleGithubTokenResolver = (
   defaultToken: string,
   githubTokenFilePathByRepositoryOwner: Record<string, string> | null,
@@ -61,12 +75,15 @@ export const createConsoleGithubTokenResolver = (
     if (alreadyResolved !== undefined) {
       return alreadyResolved;
     }
-    const filePath = githubTokenFilePathByRepositoryOwner
-      ? githubTokenFilePathByRepositoryOwner[repositoryOwner]
-      : undefined;
-    if (filePath === undefined) {
+    if (githubTokenFilePathByRepositoryOwner === null) {
       return defaultToken;
     }
+    const filePath = githubTokenFilePathByRepositoryOwner[repositoryOwner];
+    if (filePath === undefined) {
+      throw new Error(
+        `No GitHub token file is configured for repository owner "${repositoryOwner}". Add an entry for this owner in consoleGithubTokenFilesByRepositoryOwner.`,
+      );
+    }
     const token = readTokenFile(filePath).trim();
     if (token.length === 0) {
       throw new Error(

package/src/adapter/entry-points/console/ui/src/features/console/components/content/ConsoleMarkdownContent.stories.tsx

@@ -35,7 +35,11 @@ export const WithCodeFence: Story = {
 export const WithProxiedGitHubImages: Story = {
   args: {
     body: consoleMarkdownImageBodyFixture,
-    buildImageProxyUrl: (src) => buildImageProxyUrl(src),
+    buildImageProxyUrl: (src) =>
+      buildImageProxyUrl(
+        src,
+        'https://github.com/example-owner/example-repo/issues/1',
+      ),
   },
 };
 

package/src/adapter/entry-points/console/ui/src/features/console/lib/imageProxy.test.ts

@@ -4,6 +4,8 @@ import {
   rewriteGitHubImageSources,
 } from './imageProxy';
 
+const itemUrl = 'https://github.com/example-owner/example-repo/issues/1';
+
 describe('isProxyableImageUrl', () => {
   it('matches github user-attachments urls', () => {
     expect(
@@ -27,21 +29,22 @@ describe('isProxyableImageUrl', () => {
 });
 
 describe('buildImageProxyUrl', () => {
-  it('encodes the source url without appending a token', () => {
+  it('encodes the source url and the item url without appending a token', () => {
     const src = 'https://github.com/user-attachments/assets/abc?x=1';
-    expect(buildImageProxyUrl(src)).toBe(
-      `/api/img?url=${encodeURIComponent(src)}`,
+    expect(buildImageProxyUrl(src, itemUrl)).toBe(
+      `/api/img?url=${encodeURIComponent(src)}&itemUrl=${encodeURIComponent(itemUrl)}`,
     );
   });
 
   it('does not include a token query parameter', () => {
     const src = 'https://github.com/user-attachments/assets/abc';
-    expect(buildImageProxyUrl(src)).not.toContain('k=');
+    expect(buildImageProxyUrl(src, itemUrl)).not.toContain('k=');
   });
 });
 
 describe('rewriteGitHubImageSources', () => {
-  const buildProxyUrl = (src: string): string => buildImageProxyUrl(src);
+  const buildProxyUrl = (src: string): string =>
+    buildImageProxyUrl(src, itemUrl);
 
   it('rewrites an allow-listed github image src to the proxy url', () => {
     const githubSrc = 'https://github.com/user-attachments/assets/abc';

package/src/adapter/entry-points/console/ui/src/features/console/lib/imageProxy.ts

@@ -6,8 +6,8 @@ export const isProxyableImageUrl = (src: string): boolean =>
 
 export type ImageProxyUrlBuilder = (src: string) => string;
 
-export const buildImageProxyUrl = (src: string): string =>
-  `/api/img?url=${encodeURIComponent(src)}`;
+export const buildImageProxyUrl = (src: string, itemUrl: string): string =>
+  `/api/img?url=${encodeURIComponent(src)}&itemUrl=${encodeURIComponent(itemUrl)}`;
 
 export const rewriteGitHubImageSources = (
   html: string,

package/src/adapter/entry-points/console/ui/src/features/console/pages/ConsoleItemDetailContainer.tsx

@@ -60,8 +60,8 @@ export const ConsoleItemDetailContainer = ({
 }: ConsoleItemDetailContainerProps) => {
   const detail = useConsoleItemDetailData(caches, item);
   const resolveImageProxyUrl = useCallback(
-    (src: string): string => buildImageProxyUrl(src),
-    [],
+    (src: string): string => buildImageProxyUrl(src, item.url),
+    [item.url],
   );
   const renderReferenceLink = useCallback(
     (href: string, fallbackText: string) => (