fix(DicomWebDataSource): set correct cross-service URLs on DICOMweb clients

The dicomweb-client library sets qidoURL, wadoURL, and stowURL all to
the same base url when no prefixes are provided. This causes requests
to be routed to the wrong endpoint when qidoRoot and wadoRoot differ
(e.g. /qidors/ vs /wadors/).

Extract applyServiceUrls into a shared utility so the production code
and tests exercise the same function. After constructing the clients,
call applyServiceUrls to assign the correct cross-service URLs. Also
adds an optional stowRoot config field for deployments with a separate
STOW endpoint.

Closes #5820

Signed-off-by: Agustin Bereciartua <bereciartua.agustin@gmail.com>

Author: galenzo17

extensions/default/src/DicomWebDataSource/index.ts

@@ -16,6 +16,7 @@ import { retrieveStudyMetadata, deleteStudyMetadataPromise } from './retrieveStu
 import StaticWadoClient from './utils/StaticWadoClient';
 import getDirectURL from '../utils/getDirectURL';
 import { fixBulkDataURI } from './utils/fixBulkDataURI';
+import { applyServiceUrls } from './utils/applyServiceUrls';
 import {HeadersInterface} from '@ohif/core/src/types/RequestHeaders';
 
 const { DicomMetaDictionary, DicomDict } = dcmjs.data;
@@ -35,6 +36,7 @@ export type DicomWebConfig = {
   /** Base URL to use for QIDO requests */
   qidoRoot?: string;
   wadoRoot?: string; // - Base URL to use for WADO requests
+  stowRoot?: string; // - Base URL to use for STOW requests (defaults to wadoRoot)
   wadoUri?: string; // - Base URL to use for WADO URI requests
   qidoSupportsIncludeField?: boolean; // - Whether QIDO supports the "Include" option to request additional fields in response
   imageRendering?: string; // - wadors | ? (unsure of where/how this is used)
@@ -207,6 +209,8 @@ function createDicomWebApi(dicomWebConfig: DicomWebConfig, servicesManager) {
       wadoDicomWebClient = dicomWebConfig.staticWado
         ? new StaticWadoClient(wadoConfig)
         : new api.DICOMwebClient(wadoConfig);
+
+      applyServiceUrls(qidoDicomWebClient, wadoDicomWebClient, dicomWebConfig);
     },
     query: {
       studies: {

extensions/default/src/DicomWebDataSource/utils/applyServiceUrls.test.ts

@@ -0,0 +1,61 @@
+import { applyServiceUrls } from './applyServiceUrls';
+
+describe('applyServiceUrls', () => {
+  it('should fix cross-service URLs when roots differ', () => {
+    const qidoClient = { wadoURL: 'https://server.com/qidors/org1', stowURL: 'https://server.com/qidors/org1' };
+    const wadoClient = { qidoURL: 'https://server.com/wadors/org1', stowURL: 'https://server.com/wadors/org1' };
+
+    applyServiceUrls(qidoClient, wadoClient, {
+      qidoRoot: 'https://server.com/qidors/org1',
+      wadoRoot: 'https://server.com/wadors/org1',
+    });
+
+    expect(qidoClient.wadoURL).toBe('https://server.com/wadors/org1');
+    expect(qidoClient.stowURL).toBe('https://server.com/wadors/org1');
+
+    expect(wadoClient.qidoURL).toBe('https://server.com/qidors/org1');
+    expect(wadoClient.stowURL).toBe('https://server.com/wadors/org1');
+  });
+
+  it('should use explicit stowRoot when provided', () => {
+    const qidoClient = { wadoURL: '', stowURL: '' };
+    const wadoClient = { qidoURL: '', stowURL: '' };
+
+    applyServiceUrls(qidoClient, wadoClient, {
+      qidoRoot: 'https://server.com/qidors/org1',
+      wadoRoot: 'https://server.com/wadors/org1',
+      stowRoot: 'https://server.com/stowrs/org1',
+    });
+
+    expect(qidoClient.stowURL).toBe('https://server.com/stowrs/org1');
+    expect(wadoClient.stowURL).toBe('https://server.com/stowrs/org1');
+  });
+
+  it('should be a no-op when qidoRoot and wadoRoot are the same', () => {
+    const qidoClient = { wadoURL: 'https://server.com/dicomweb', stowURL: 'https://server.com/dicomweb' };
+    const wadoClient = { qidoURL: 'https://server.com/dicomweb', stowURL: 'https://server.com/dicomweb' };
+
+    applyServiceUrls(qidoClient, wadoClient, {
+      qidoRoot: 'https://server.com/dicomweb',
+      wadoRoot: 'https://server.com/dicomweb',
+    });
+
+    expect(qidoClient.wadoURL).toBe('https://server.com/dicomweb');
+    expect(qidoClient.stowURL).toBe('https://server.com/dicomweb');
+    expect(wadoClient.qidoURL).toBe('https://server.com/dicomweb');
+    expect(wadoClient.stowURL).toBe('https://server.com/dicomweb');
+  });
+
+  it('should default stowURL to wadoRoot when stowRoot is not provided', () => {
+    const qidoClient = { wadoURL: '', stowURL: '' };
+    const wadoClient = { qidoURL: '', stowURL: '' };
+
+    applyServiceUrls(qidoClient, wadoClient, {
+      qidoRoot: 'https://server.com/qidors',
+      wadoRoot: 'https://server.com/wadors',
+    });
+
+    expect(qidoClient.stowURL).toBe('https://server.com/wadors');
+    expect(wadoClient.stowURL).toBe('https://server.com/wadors');
+  });
+});

extensions/default/src/DicomWebDataSource/utils/applyServiceUrls.ts

@@ -0,0 +1,21 @@
+/**
+ * Ensures each DICOMweb client has the correct URLs for all services.
+ *
+ * The dicomweb-client library sets qidoURL, wadoURL, and stowURL all to the
+ * base `url` when no prefixes are provided. This function cross-assigns the
+ * correct service URLs so requests are routed to the right endpoint when
+ * qidoRoot and wadoRoot differ (e.g. /qidors/ vs /wadors/).
+ */
+export function applyServiceUrls(
+  qidoClient: { wadoURL: string; stowURL: string },
+  wadoClient: { qidoURL: string; stowURL: string },
+  config: { qidoRoot?: string; wadoRoot?: string; stowRoot?: string }
+): void {
+  const effectiveStowRoot = config.stowRoot || config.wadoRoot;
+
+  qidoClient.wadoURL = config.wadoRoot;
+  qidoClient.stowURL = effectiveStowRoot;
+
+  wadoClient.qidoURL = config.qidoRoot;
+  wadoClient.stowURL = effectiveStowRoot;
+}