diff --git a/src/app/file-browser/components/file-viewer/file-viewer.component.scss b/src/app/file-browser/components/file-viewer/file-viewer.component.scss index 57dc32446..27fc08dea 100644 --- a/src/app/file-browser/components/file-viewer/file-viewer.component.scss +++ b/src/app/file-browser/components/file-viewer/file-viewer.component.scss @@ -88,8 +88,7 @@ pr-zooming-image-viewer, pr-thumbnail, pr-video, pr-audio .thumb-preview, -iframe, -replay-web-page { +iframe { position: absolute; top: 0px; bottom: 0px; diff --git a/src/app/file-browser/components/file-viewer/file-viewer.component.spec.ts b/src/app/file-browser/components/file-viewer/file-viewer.component.spec.ts index 7bc80b80e..1f75aaec9 100644 --- a/src/app/file-browser/components/file-viewer/file-viewer.component.spec.ts +++ b/src/app/file-browser/components/file-viewer/file-viewer.component.spec.ts @@ -15,6 +15,7 @@ import { ApiService } from '@shared/services/api/api.service'; import { FeatureFlagService } from '@root/app/feature-flag/services/feature-flag.service'; import { MockComponent } from 'ng-mocks'; import { GetThumbnailPipe } from '@shared/pipes/get-thumbnail.pipe'; +import { environment } from '@root/environments/environment'; import { TagsComponent } from '../../../shared/components/tags/tags.component'; import { FileViewerComponent } from './file-viewer.component'; @@ -579,6 +580,10 @@ describe('FileViewerComponent', () => { await fixture.whenStable(); expect(component.replayUrl).toBeTruthy(); + const internalUrl = (component.replayUrl as any) + .changingThisBreaksApplicationSecurity; + + expect(internalUrl.startsWith(environment.replayBaseUrl)).toBe(true); }); it('should not set replayUrl when replay-web feature flag is disabled', async () => { diff --git a/src/app/file-browser/components/file-viewer/file-viewer.component.ts b/src/app/file-browser/components/file-viewer/file-viewer.component.ts index 9dd8b679a..f3a9e136b 100644 --- a/src/app/file-browser/components/file-viewer/file-viewer.component.ts +++ b/src/app/file-browser/components/file-viewer/file-viewer.component.ts @@ -30,6 +30,7 @@ import { GetAccessFile } from '@models/get-access-file'; import { ShareLinksService } from '@root/app/share-links/services/share-links.service'; import { ApiService } from '@shared/services/api/api.service'; import { FeatureFlagService } from '@root/app/feature-flag/services/feature-flag.service'; +import { environment } from '@root/environments/environment'; import { TagsService } from '../../../core/services/tags/tags.service'; @Component({ @@ -291,7 +292,7 @@ export class FileViewerComponent implements OnInit, OnDestroy { return null; } - const url = `https://replay.dev.permanent.org/?source=${encodeURIComponent(originalFileUrl)}&embed=replay-with-info`; + const url = `${environment.replayBaseUrl}/?source=${encodeURIComponent(originalFileUrl)}&embed=replay-with-info`; return this.sanitizer.bypassSecurityTrustResourceUrl(url); } diff --git a/src/environments/environment-interface.ts b/src/environments/environment-interface.ts index 8b82f3a75..bf7238bd4 100644 --- a/src/environments/environment-interface.ts +++ b/src/environments/environment-interface.ts @@ -23,6 +23,7 @@ interface AnalyticsConfig { export interface Environment { production: boolean; apiUrl: string; + replayBaseUrl: string; hmr: boolean; firebase: FirebaseConfig; debug: boolean; diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index a3c63d06c..39db6d4e6 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -4,6 +4,7 @@ import { Environment } from './environment-interface'; export const environment: Environment = { production: true, apiUrl: 'https://app.dev.permanent.org/api', + replayBaseUrl: 'https://replay.dev.permanent.org', hmr: false, firebase: { authDomain: 'prpledgedev.firebaseapp.com', diff --git a/src/environments/environment.local-docker.proxy.ts b/src/environments/environment.local-docker.proxy.ts index 4a5bb6626..6fd89860d 100644 --- a/src/environments/environment.local-docker.proxy.ts +++ b/src/environments/environment.local-docker.proxy.ts @@ -4,6 +4,7 @@ import { Environment } from './environment-interface'; export const environment: Environment = { production: false, apiUrl: 'https://local.permanent.org/api', + replayBaseUrl: 'https://replay.dev.permanent.org', hmr: false, firebase: { authDomain: 'prpledgedev.firebaseapp.com', diff --git a/src/environments/environment.local.proxy.ts b/src/environments/environment.local.proxy.ts index 33859740d..9b72dada8 100644 --- a/src/environments/environment.local.proxy.ts +++ b/src/environments/environment.local.proxy.ts @@ -4,6 +4,7 @@ import { Environment } from './environment-interface'; export const environment: Environment = { production: false, apiUrl: 'https://ng.permanent.org:4200/api', + replayBaseUrl: 'https://replay.dev.permanent.org', hmr: false, firebase: { authDomain: 'prpledgedev.firebaseapp.com', diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index f8f066281..453ed89a7 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,6 +4,7 @@ import { Environment } from './environment-interface'; export const environment: Environment = { production: true, apiUrl: 'https://app.permanent.org/api', + replayBaseUrl: 'https://replay.permanent.org', hmr: false, firebase: { authDomain: 'prpledgeprod.firebaseapp.com', diff --git a/src/environments/environment.staging.ts b/src/environments/environment.staging.ts index cfd8fb41f..5332d3831 100644 --- a/src/environments/environment.staging.ts +++ b/src/environments/environment.staging.ts @@ -4,6 +4,7 @@ import { Environment } from './environment-interface'; export const environment: Environment = { production: true, apiUrl: 'https://app.staging.permanent.org/api', + replayBaseUrl: 'https://replay.staging.permanent.org', hmr: false, firebase: { authDomain: 'prpledgestaging.firebaseapp.com', diff --git a/src/environments/environment.ts b/src/environments/environment.ts index b4cecf209..3a0361f17 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,6 +4,7 @@ import { Environment } from './environment-interface'; export const environment: Environment = { production: false, apiUrl: 'https://local.permanent.org/api', + replayBaseUrl: 'https://replay.dev.permanent.org', hmr: false, firebase: { authDomain: 'prpledgedev.firebaseapp.com', diff --git a/src/index.html b/src/index.html index d08d632ac..84823d467 100644 --- a/src/index.html +++ b/src/index.html @@ -51,6 +51,5 @@
-