Merge branch 'develop' into release

urfit-tech · Dec 14, 2023 · a2b6ac2 · a2b6ac2
2 parents 43e4ce2 + 3171b24
commit a2b6ac2
Showing 1 changed file with 24 additions and 25 deletions.
diff --git a/src/components/library/VideoLibraryItem.tsx b/src/components/library/VideoLibraryItem.tsx
@@ -134,32 +134,31 @@ export const PreviewButton: React.VFC<
           },
         })
         .then(({ data }) => {
-          const { signedVideoUrl, signedCaptionUrl, cloudfrontOptions, captionPaths } = data.result
-          const videoSearch = new URL(signedVideoUrl).search
-          const captionSearch = new URL(signedCaptionUrl).search
-          const hlsPath = cloudfrontOptions?.playPaths ? new URL(cloudfrontOptions.playPaths.hls).pathname : null
-          const dashPath = cloudfrontOptions?.playPaths ? new URL(cloudfrontOptions.playPaths.dash).pathname : null
-          const cloudfrontMigratedHlsPath = cloudfrontOptions?.path ? new URL(cloudfrontOptions.path).pathname : null
-          const source = cloudfrontOptions?.playPaths
-            ? [
-                {
-                  type: 'application/x-mpegURL',
-                  src: `${process.env.REACT_APP_LODESTAR_SERVER_ENDPOINT}/videos${hlsPath}${videoSearch}`,
-                },
-                {
-                  type: 'application/dash+xml',
-                  src: `${process.env.REACT_APP_LODESTAR_SERVER_ENDPOINT}/videos${dashPath}${videoSearch}`,
-                },
-              ]
-            : [
-                {
-                  type: 'application/x-mpegURL',
-                  src: `${process.env.REACT_APP_LODESTAR_SERVER_ENDPOINT}/videos${cloudfrontMigratedHlsPath}${videoSearch}`,
-                },
-              ]
-          const captions = captionPaths?.map((captionUrl: string) => `${captionUrl}${captionSearch}`)
+          const {
+            videoSignedPaths: { hlsPath, dashPath, cloudfrontMigratedHlsPath },
+            captionSignedUrls,
+          } = data.result
+
+          const source =
+            hlsPath && dashPath
+              ? [
+                  {
+                    type: 'application/x-mpegURL',
+                    src: `${process.env.REACT_APP_LODESTAR_SERVER_ENDPOINT}/videos${hlsPath}&token=${authToken}`,
+                  },
+                  {
+                    type: 'application/dash+xml',
+                    src: `${process.env.REACT_APP_LODESTAR_SERVER_ENDPOINT}/videos${dashPath}&token=${authToken}`,
+                  },
+                ]
+              : [
+                  {
+                    type: 'application/x-mpegURL',
+                    src: `${process.env.REACT_APP_LODESTAR_SERVER_ENDPOINT}/videos${cloudfrontMigratedHlsPath}&token=${authToken}`,
+                  },
+                ]
           setSources(source)
-          setCaptions(captions)
+          setCaptions(captionSignedUrls)
         })
         .catch(error => console.log(error))
         .finally(() => setLoading(false))