fix: handle static ICM content links in CMS content (#1543)

intershop · Dec 4, 2023 · eb03fde · eb03fde
1 parent a0ee491
commit eb03fde
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/app/core/directives/server-html.directive.spec.ts b/src/app/core/directives/server-html.directive.spec.ts
@@ -14,21 +14,25 @@ describe('Server Html Directive', () => {
     let element: HTMLElement;
 
     beforeEach(() => {
+      const appFacade = mock(AppFacade);
+      when(appFacade.icmBaseUrl).thenReturn('http://example.org');
+
       @Component({
         template: ` <div [ishServerHtml]="html"></div> `,
         changeDetection: ChangeDetectionStrategy.OnPush,
       })
       class TestComponent {
         html = `<div><a href="product://8182790134362@inSPIRED-inTRONICS">Product</a></div>
         <div><a href="http://google.de">Google</a></div>
-        <div><a href="route://basket">Basket</a></div>`;
+        <div><a href="route://basket">Basket</a></div>
+        <div><a href="/INTERSHOP/static/WFS/channel/test.pdf">Relative Pdf link</a></div>`;
       }
 
       TestBed.configureTestingModule({
         declarations: [ServerHtmlDirective, TestComponent],
         providers: [
           { provide: APP_BASE_HREF, useValue: '/' },
-          { provide: AppFacade, useFactory: () => instance(mock(AppFacade)) },
+          { provide: AppFacade, useFactory: () => instance(appFacade) },
         ],
       }).compileComponents();
 
@@ -43,6 +47,9 @@ describe('Server Html Directive', () => {
           <div><a href="/product/8182790134362">Product</a></div>
           <div><a href="http://google.de">Google</a></div>
           <div><a href="/basket">Basket</a></div>
+          <div>
+            <a href="http://example.org/INTERSHOP/static/WFS/channel/test.pdf">Relative Pdf link</a>
+          </div>
         </div>
       `);
     });

diff --git a/src/app/core/directives/server-html.directive.ts b/src/app/core/directives/server-html.directive.ts
@@ -55,7 +55,13 @@ export class ServerHtmlDirective implements AfterContentInit, AfterViewInit, OnC
   private patchElements() {
     // use setAttribute here to bypass security check
     Array.from(this.elementRef.nativeElement.querySelectorAll('[href]')).forEach((element: HTMLElement) => {
-      this.renderer.setAttribute(element, 'href', LinkParser.parseLink(element.getAttribute('href'), this.baseHref));
+      const href = element.getAttribute('href');
+
+      this.renderer.setAttribute(
+        element,
+        'href',
+        href.startsWith('/INTERSHOP/') ? this.transformMediaObjectSrc(href) : LinkParser.parseLink(href, this.baseHref)
+      );
     });
     Array.from(this.elementRef.nativeElement.querySelectorAll('[src]')).forEach((element: HTMLElement) => {
       this.renderer.setAttribute(element, 'src', this.transformMediaObjectSrc(element.getAttribute('src')));