Handle oembed with params in URL

server/middlewares/validators/oembed.ts

@@ -62,12 +62,26 @@ const oembedValidator = [
 
     const url = req.query.url as string
 
+    let urlPath: string
+
+    try {
+      urlPath = new URL(url).pathname
+    } catch (err) {
+      return res.fail({
+        status: HttpStatusCode.BAD_REQUEST_400,
+        message: err.message,
+        data: {
+          url
+        }
+      })
+    }
+
     const isPlaylist = startPlaylistURLs.some(u => url.startsWith(u))
     const isVideo = isPlaylist ? false : startVideoURLs.some(u => url.startsWith(u))
 
     const startIsOk = isVideo || isPlaylist
 
-    const matches = watchRegex.exec(url)
+    const matches = watchRegex.exec(urlPath)
 
     if (startIsOk === false || matches === null) {
       return res.fail({

server/tests/api/server/services.ts

@@ -52,7 +52,8 @@ describe('Test services', function () {
 
   it('Should have a valid oEmbed video response', async function () {
     for (const basePath of [ '/videos/watch/', '/w/' ]) {
-      const oembedUrl = 'http://localhost:' + server.port + basePath + video.uuid
+      for (const suffix of [ '', '?param=1' ]) {
+        const oembedUrl = server.url + basePath + video.uuid + suffix
 
         const res = await server.services.getOEmbed({ oembedUrl })
         const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
@@ -69,11 +70,13 @@ describe('Test services', function () {
         expect(res.body.thumbnail_width).to.equal(850)
         expect(res.body.thumbnail_height).to.equal(480)
       }
+    }
   })
 
   it('Should have a valid playlist oEmbed response', async function () {
     for (const basePath of [ '/videos/watch/playlist/', '/w/p/' ]) {
-      const oembedUrl = 'http://localhost:' + server.port + basePath + playlistUUID
+      for (const suffix of [ '', '?param=1' ]) {
+        const oembedUrl = server.url + basePath + playlistUUID + suffix
 
         const res = await server.services.getOEmbed({ oembedUrl })
         const expectedHtml = '<iframe width="560" height="315" sandbox="allow-same-origin allow-scripts" ' +
@@ -89,6 +92,7 @@ describe('Test services', function () {
         expect(res.body.thumbnail_width).to.equal(280)
         expect(res.body.thumbnail_height).to.equal(157)
       }
+    }
   })
 
   it('Should have a valid oEmbed response with small max height query', async function () {