@instructure/canvas-rce 5.6.17 → 5.6.18

package/lib/translated/tg/modules/rce/plugins/shared/__tests__/fileTypeUtils.test.js

@@ -138,11 +138,22 @@ describe('fileTypeUtils', () => {
       it('uses attachment route if id is present', () => {
         const file = {
           id: '123',
-          type: 'video/mov'
+          type: 'video/mov',
+          uuid: 'abc'
         };
         const url = mediaPlayerURLFromFile(file);
         expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true');
       });
+      it('uses adds the uuid if the context is User', () => {
+        const file = {
+          id: '123',
+          type: 'video/mov',
+          contextType: 'User',
+          uuid: 'abc'
+        };
+        const url = mediaPlayerURLFromFile(file);
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=abc');
+      });
       it('uses the file verifier if present', () => {
         const file = {
           id: '123',
@@ -150,7 +161,7 @@ describe('fileTypeUtils', () => {
           url: 'host?verifier=something'
         };
         const url = mediaPlayerURLFromFile(file);
-        expect(url).toBe('/media_attachments_iframe/123?type=video&verifier=something&embedded=true');
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=something');
       });
       it('uses media_object route if no attachmentId exists', () => {
         const file = {

package/lib/translated/tg/modules/rce/plugins/shared/fileTypeUtils.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import { parse } from 'url';
+import { format, parse } from 'url';
 import { absoluteToRelativeUrl } from '../../../common/fileUrl';
 import { IconAudioLine, IconDocumentLine, IconMsExcelLine, IconMsPptLine, IconMsWordLine, IconPdfLine, IconVideoLine } from '@instructure/ui-icons';
 import RCEGlobals from '../../RCEGlobals';
@@ -94,13 +94,21 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   const type = content_type.replace(/\/.*$/, '');
 
   if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type) && file.id) {
-    if (!file.url && !file.href) {
-      return `/media_attachments_iframe/${file.id}?type=${type}&embedded=true`;
+    const url = parse(`/media_attachments_iframe/${file.id}`, true);
+    url.query.type = type;
+    url.query.embedded = true;
+
+    if (file.uuid && file.contextType == 'User') {
+      url.query.verifier = file.uuid;
+    } else if (file.url || file.href) {
+      const parsed_url = parse(file.url || file.href, true);
+
+      if (parsed_url.query.verifier) {
+        url.query.verifier = parsed_url.query.verifier;
+      }
     }
 
-    const parsed_url = parse(file.url || file.href, true);
-    const verifier = parsed_url.query.verifier ? `&verifier=${parsed_url.query.verifier}` : '';
-    return `/media_attachments_iframe/${file.id}?type=${type}${verifier}&embedded=true`;
+    return format(url);
   }
 
   if (file.embedded_iframe_url) {

package/lib/translated/tg/modules/sidebar/actions/upload.js

@@ -272,7 +272,9 @@ export function mediaUploadComplete(error, uploadData) {
         media_id: mediaObject.media_object.media_id,
         type: uploadedFile.type,
         title: uploadedFile.title || uploadedFile.name,
-        id: mediaObject.media_object.attachment_id
+        id: mediaObject.media_object.attachment_id,
+        uuid: mediaObject.media_object.uuid,
+        contextType: mediaObject.media_object.context_type
       };
       dispatch(removePlaceholdersFor(uploadedFile.name));
       embedUploadResult(embedData, 'media');

package/lib/translated/th/modules/rce/plugins/shared/__tests__/fileTypeUtils.test.js

@@ -138,11 +138,22 @@ describe('fileTypeUtils', () => {
       it('uses attachment route if id is present', () => {
         const file = {
           id: '123',
-          type: 'video/mov'
+          type: 'video/mov',
+          uuid: 'abc'
         };
         const url = mediaPlayerURLFromFile(file);
         expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true');
       });
+      it('uses adds the uuid if the context is User', () => {
+        const file = {
+          id: '123',
+          type: 'video/mov',
+          contextType: 'User',
+          uuid: 'abc'
+        };
+        const url = mediaPlayerURLFromFile(file);
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=abc');
+      });
       it('uses the file verifier if present', () => {
         const file = {
           id: '123',
@@ -150,7 +161,7 @@ describe('fileTypeUtils', () => {
           url: 'host?verifier=something'
         };
         const url = mediaPlayerURLFromFile(file);
-        expect(url).toBe('/media_attachments_iframe/123?type=video&verifier=something&embedded=true');
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=something');
       });
       it('uses media_object route if no attachmentId exists', () => {
         const file = {

package/lib/translated/th/modules/rce/plugins/shared/fileTypeUtils.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import { parse } from 'url';
+import { format, parse } from 'url';
 import { absoluteToRelativeUrl } from '../../../common/fileUrl';
 import { IconAudioLine, IconDocumentLine, IconMsExcelLine, IconMsPptLine, IconMsWordLine, IconPdfLine, IconVideoLine } from '@instructure/ui-icons';
 import RCEGlobals from '../../RCEGlobals';
@@ -94,13 +94,21 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   const type = content_type.replace(/\/.*$/, '');
 
   if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type) && file.id) {
-    if (!file.url && !file.href) {
-      return `/media_attachments_iframe/${file.id}?type=${type}&embedded=true`;
+    const url = parse(`/media_attachments_iframe/${file.id}`, true);
+    url.query.type = type;
+    url.query.embedded = true;
+
+    if (file.uuid && file.contextType == 'User') {
+      url.query.verifier = file.uuid;
+    } else if (file.url || file.href) {
+      const parsed_url = parse(file.url || file.href, true);
+
+      if (parsed_url.query.verifier) {
+        url.query.verifier = parsed_url.query.verifier;
+      }
     }
 
-    const parsed_url = parse(file.url || file.href, true);
-    const verifier = parsed_url.query.verifier ? `&verifier=${parsed_url.query.verifier}` : '';
-    return `/media_attachments_iframe/${file.id}?type=${type}${verifier}&embedded=true`;
+    return format(url);
   }
 
   if (file.embedded_iframe_url) {

package/lib/translated/th/modules/sidebar/actions/upload.js

@@ -272,7 +272,9 @@ export function mediaUploadComplete(error, uploadData) {
         media_id: mediaObject.media_object.media_id,
         type: uploadedFile.type,
         title: uploadedFile.title || uploadedFile.name,
-        id: mediaObject.media_object.attachment_id
+        id: mediaObject.media_object.attachment_id,
+        uuid: mediaObject.media_object.uuid,
+        contextType: mediaObject.media_object.context_type
       };
       dispatch(removePlaceholdersFor(uploadedFile.name));
       embedUploadResult(embedData, 'media');

package/lib/translated/th_TH/modules/rce/plugins/shared/__tests__/fileTypeUtils.test.js

@@ -138,11 +138,22 @@ describe('fileTypeUtils', () => {
       it('uses attachment route if id is present', () => {
         const file = {
           id: '123',
-          type: 'video/mov'
+          type: 'video/mov',
+          uuid: 'abc'
         };
         const url = mediaPlayerURLFromFile(file);
         expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true');
       });
+      it('uses adds the uuid if the context is User', () => {
+        const file = {
+          id: '123',
+          type: 'video/mov',
+          contextType: 'User',
+          uuid: 'abc'
+        };
+        const url = mediaPlayerURLFromFile(file);
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=abc');
+      });
       it('uses the file verifier if present', () => {
         const file = {
           id: '123',
@@ -150,7 +161,7 @@ describe('fileTypeUtils', () => {
           url: 'host?verifier=something'
         };
         const url = mediaPlayerURLFromFile(file);
-        expect(url).toBe('/media_attachments_iframe/123?type=video&verifier=something&embedded=true');
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=something');
       });
       it('uses media_object route if no attachmentId exists', () => {
         const file = {

package/lib/translated/th_TH/modules/rce/plugins/shared/fileTypeUtils.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import { parse } from 'url';
+import { format, parse } from 'url';
 import { absoluteToRelativeUrl } from '../../../common/fileUrl';
 import { IconAudioLine, IconDocumentLine, IconMsExcelLine, IconMsPptLine, IconMsWordLine, IconPdfLine, IconVideoLine } from '@instructure/ui-icons';
 import RCEGlobals from '../../RCEGlobals';
@@ -94,13 +94,21 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   const type = content_type.replace(/\/.*$/, '');
 
   if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type) && file.id) {
-    if (!file.url && !file.href) {
-      return `/media_attachments_iframe/${file.id}?type=${type}&embedded=true`;
+    const url = parse(`/media_attachments_iframe/${file.id}`, true);
+    url.query.type = type;
+    url.query.embedded = true;
+
+    if (file.uuid && file.contextType == 'User') {
+      url.query.verifier = file.uuid;
+    } else if (file.url || file.href) {
+      const parsed_url = parse(file.url || file.href, true);
+
+      if (parsed_url.query.verifier) {
+        url.query.verifier = parsed_url.query.verifier;
+      }
     }
 
-    const parsed_url = parse(file.url || file.href, true);
-    const verifier = parsed_url.query.verifier ? `&verifier=${parsed_url.query.verifier}` : '';
-    return `/media_attachments_iframe/${file.id}?type=${type}${verifier}&embedded=true`;
+    return format(url);
   }
 
   if (file.embedded_iframe_url) {

package/lib/translated/th_TH/modules/sidebar/actions/upload.js

@@ -272,7 +272,9 @@ export function mediaUploadComplete(error, uploadData) {
         media_id: mediaObject.media_object.media_id,
         type: uploadedFile.type,
         title: uploadedFile.title || uploadedFile.name,
-        id: mediaObject.media_object.attachment_id
+        id: mediaObject.media_object.attachment_id,
+        uuid: mediaObject.media_object.uuid,
+        contextType: mediaObject.media_object.context_type
       };
       dispatch(removePlaceholdersFor(uploadedFile.name));
       embedUploadResult(embedData, 'media');

package/lib/translated/tr/modules/rce/plugins/shared/__tests__/fileTypeUtils.test.js

@@ -138,11 +138,22 @@ describe('fileTypeUtils', () => {
       it('uses attachment route if id is present', () => {
         const file = {
           id: '123',
-          type: 'video/mov'
+          type: 'video/mov',
+          uuid: 'abc'
         };
         const url = mediaPlayerURLFromFile(file);
         expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true');
       });
+      it('uses adds the uuid if the context is User', () => {
+        const file = {
+          id: '123',
+          type: 'video/mov',
+          contextType: 'User',
+          uuid: 'abc'
+        };
+        const url = mediaPlayerURLFromFile(file);
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=abc');
+      });
       it('uses the file verifier if present', () => {
         const file = {
           id: '123',
@@ -150,7 +161,7 @@ describe('fileTypeUtils', () => {
           url: 'host?verifier=something'
         };
         const url = mediaPlayerURLFromFile(file);
-        expect(url).toBe('/media_attachments_iframe/123?type=video&verifier=something&embedded=true');
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=something');
       });
       it('uses media_object route if no attachmentId exists', () => {
         const file = {

package/lib/translated/tr/modules/rce/plugins/shared/fileTypeUtils.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import { parse } from 'url';
+import { format, parse } from 'url';
 import { absoluteToRelativeUrl } from '../../../common/fileUrl';
 import { IconAudioLine, IconDocumentLine, IconMsExcelLine, IconMsPptLine, IconMsWordLine, IconPdfLine, IconVideoLine } from '@instructure/ui-icons';
 import RCEGlobals from '../../RCEGlobals';
@@ -94,13 +94,21 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   const type = content_type.replace(/\/.*$/, '');
 
   if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type) && file.id) {
-    if (!file.url && !file.href) {
-      return `/media_attachments_iframe/${file.id}?type=${type}&embedded=true`;
+    const url = parse(`/media_attachments_iframe/${file.id}`, true);
+    url.query.type = type;
+    url.query.embedded = true;
+
+    if (file.uuid && file.contextType == 'User') {
+      url.query.verifier = file.uuid;
+    } else if (file.url || file.href) {
+      const parsed_url = parse(file.url || file.href, true);
+
+      if (parsed_url.query.verifier) {
+        url.query.verifier = parsed_url.query.verifier;
+      }
     }
 
-    const parsed_url = parse(file.url || file.href, true);
-    const verifier = parsed_url.query.verifier ? `&verifier=${parsed_url.query.verifier}` : '';
-    return `/media_attachments_iframe/${file.id}?type=${type}${verifier}&embedded=true`;
+    return format(url);
   }
 
   if (file.embedded_iframe_url) {

package/lib/translated/tr/modules/sidebar/actions/upload.js

@@ -272,7 +272,9 @@ export function mediaUploadComplete(error, uploadData) {
         media_id: mediaObject.media_object.media_id,
         type: uploadedFile.type,
         title: uploadedFile.title || uploadedFile.name,
-        id: mediaObject.media_object.attachment_id
+        id: mediaObject.media_object.attachment_id,
+        uuid: mediaObject.media_object.uuid,
+        contextType: mediaObject.media_object.context_type
       };
       dispatch(removePlaceholdersFor(uploadedFile.name));
       embedUploadResult(embedData, 'media');

package/lib/translated/uk_UA/modules/rce/plugins/shared/__tests__/fileTypeUtils.test.js

@@ -138,11 +138,22 @@ describe('fileTypeUtils', () => {
       it('uses attachment route if id is present', () => {
         const file = {
           id: '123',
-          type: 'video/mov'
+          type: 'video/mov',
+          uuid: 'abc'
         };
         const url = mediaPlayerURLFromFile(file);
         expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true');
       });
+      it('uses adds the uuid if the context is User', () => {
+        const file = {
+          id: '123',
+          type: 'video/mov',
+          contextType: 'User',
+          uuid: 'abc'
+        };
+        const url = mediaPlayerURLFromFile(file);
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=abc');
+      });
       it('uses the file verifier if present', () => {
         const file = {
           id: '123',
@@ -150,7 +161,7 @@ describe('fileTypeUtils', () => {
           url: 'host?verifier=something'
         };
         const url = mediaPlayerURLFromFile(file);
-        expect(url).toBe('/media_attachments_iframe/123?type=video&verifier=something&embedded=true');
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=something');
       });
       it('uses media_object route if no attachmentId exists', () => {
         const file = {

package/lib/translated/uk_UA/modules/rce/plugins/shared/fileTypeUtils.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import { parse } from 'url';
+import { format, parse } from 'url';
 import { absoluteToRelativeUrl } from '../../../common/fileUrl';
 import { IconAudioLine, IconDocumentLine, IconMsExcelLine, IconMsPptLine, IconMsWordLine, IconPdfLine, IconVideoLine } from '@instructure/ui-icons';
 import RCEGlobals from '../../RCEGlobals';
@@ -94,13 +94,21 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   const type = content_type.replace(/\/.*$/, '');
 
   if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type) && file.id) {
-    if (!file.url && !file.href) {
-      return `/media_attachments_iframe/${file.id}?type=${type}&embedded=true`;
+    const url = parse(`/media_attachments_iframe/${file.id}`, true);
+    url.query.type = type;
+    url.query.embedded = true;
+
+    if (file.uuid && file.contextType == 'User') {
+      url.query.verifier = file.uuid;
+    } else if (file.url || file.href) {
+      const parsed_url = parse(file.url || file.href, true);
+
+      if (parsed_url.query.verifier) {
+        url.query.verifier = parsed_url.query.verifier;
+      }
     }
 
-    const parsed_url = parse(file.url || file.href, true);
-    const verifier = parsed_url.query.verifier ? `&verifier=${parsed_url.query.verifier}` : '';
-    return `/media_attachments_iframe/${file.id}?type=${type}${verifier}&embedded=true`;
+    return format(url);
   }
 
   if (file.embedded_iframe_url) {

package/lib/translated/uk_UA/modules/sidebar/actions/upload.js

@@ -272,7 +272,9 @@ export function mediaUploadComplete(error, uploadData) {
         media_id: mediaObject.media_object.media_id,
         type: uploadedFile.type,
         title: uploadedFile.title || uploadedFile.name,
-        id: mediaObject.media_object.attachment_id
+        id: mediaObject.media_object.attachment_id,
+        uuid: mediaObject.media_object.uuid,
+        contextType: mediaObject.media_object.context_type
       };
       dispatch(removePlaceholdersFor(uploadedFile.name));
       embedUploadResult(embedData, 'media');

package/lib/translated/vi/modules/rce/plugins/shared/__tests__/fileTypeUtils.test.js

@@ -138,11 +138,22 @@ describe('fileTypeUtils', () => {
       it('uses attachment route if id is present', () => {
         const file = {
           id: '123',
-          type: 'video/mov'
+          type: 'video/mov',
+          uuid: 'abc'
         };
         const url = mediaPlayerURLFromFile(file);
         expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true');
       });
+      it('uses adds the uuid if the context is User', () => {
+        const file = {
+          id: '123',
+          type: 'video/mov',
+          contextType: 'User',
+          uuid: 'abc'
+        };
+        const url = mediaPlayerURLFromFile(file);
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=abc');
+      });
       it('uses the file verifier if present', () => {
         const file = {
           id: '123',
@@ -150,7 +161,7 @@ describe('fileTypeUtils', () => {
           url: 'host?verifier=something'
         };
         const url = mediaPlayerURLFromFile(file);
-        expect(url).toBe('/media_attachments_iframe/123?type=video&verifier=something&embedded=true');
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=something');
       });
       it('uses media_object route if no attachmentId exists', () => {
         const file = {

package/lib/translated/vi/modules/rce/plugins/shared/fileTypeUtils.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import { parse } from 'url';
+import { format, parse } from 'url';
 import { absoluteToRelativeUrl } from '../../../common/fileUrl';
 import { IconAudioLine, IconDocumentLine, IconMsExcelLine, IconMsPptLine, IconMsWordLine, IconPdfLine, IconVideoLine } from '@instructure/ui-icons';
 import RCEGlobals from '../../RCEGlobals';
@@ -94,13 +94,21 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   const type = content_type.replace(/\/.*$/, '');
 
   if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type) && file.id) {
-    if (!file.url && !file.href) {
-      return `/media_attachments_iframe/${file.id}?type=${type}&embedded=true`;
+    const url = parse(`/media_attachments_iframe/${file.id}`, true);
+    url.query.type = type;
+    url.query.embedded = true;
+
+    if (file.uuid && file.contextType == 'User') {
+      url.query.verifier = file.uuid;
+    } else if (file.url || file.href) {
+      const parsed_url = parse(file.url || file.href, true);
+
+      if (parsed_url.query.verifier) {
+        url.query.verifier = parsed_url.query.verifier;
+      }
     }
 
-    const parsed_url = parse(file.url || file.href, true);
-    const verifier = parsed_url.query.verifier ? `&verifier=${parsed_url.query.verifier}` : '';
-    return `/media_attachments_iframe/${file.id}?type=${type}${verifier}&embedded=true`;
+    return format(url);
   }
 
   if (file.embedded_iframe_url) {

package/lib/translated/vi/modules/sidebar/actions/upload.js

@@ -272,7 +272,9 @@ export function mediaUploadComplete(error, uploadData) {
         media_id: mediaObject.media_object.media_id,
         type: uploadedFile.type,
         title: uploadedFile.title || uploadedFile.name,
-        id: mediaObject.media_object.attachment_id
+        id: mediaObject.media_object.attachment_id,
+        uuid: mediaObject.media_object.uuid,
+        contextType: mediaObject.media_object.context_type
       };
       dispatch(removePlaceholdersFor(uploadedFile.name));
       embedUploadResult(embedData, 'media');

package/lib/translated/vi_VN/modules/rce/plugins/shared/__tests__/fileTypeUtils.test.js

@@ -138,11 +138,22 @@ describe('fileTypeUtils', () => {
       it('uses attachment route if id is present', () => {
         const file = {
           id: '123',
-          type: 'video/mov'
+          type: 'video/mov',
+          uuid: 'abc'
         };
         const url = mediaPlayerURLFromFile(file);
         expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true');
       });
+      it('uses adds the uuid if the context is User', () => {
+        const file = {
+          id: '123',
+          type: 'video/mov',
+          contextType: 'User',
+          uuid: 'abc'
+        };
+        const url = mediaPlayerURLFromFile(file);
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=abc');
+      });
       it('uses the file verifier if present', () => {
         const file = {
           id: '123',
@@ -150,7 +161,7 @@ describe('fileTypeUtils', () => {
           url: 'host?verifier=something'
         };
         const url = mediaPlayerURLFromFile(file);
-        expect(url).toBe('/media_attachments_iframe/123?type=video&verifier=something&embedded=true');
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=something');
       });
       it('uses media_object route if no attachmentId exists', () => {
         const file = {

package/lib/translated/vi_VN/modules/rce/plugins/shared/fileTypeUtils.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import { parse } from 'url';
+import { format, parse } from 'url';
 import { absoluteToRelativeUrl } from '../../../common/fileUrl';
 import { IconAudioLine, IconDocumentLine, IconMsExcelLine, IconMsPptLine, IconMsWordLine, IconPdfLine, IconVideoLine } from '@instructure/ui-icons';
 import RCEGlobals from '../../RCEGlobals';
@@ -94,13 +94,21 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   const type = content_type.replace(/\/.*$/, '');
 
   if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type) && file.id) {
-    if (!file.url && !file.href) {
-      return `/media_attachments_iframe/${file.id}?type=${type}&embedded=true`;
+    const url = parse(`/media_attachments_iframe/${file.id}`, true);
+    url.query.type = type;
+    url.query.embedded = true;
+
+    if (file.uuid && file.contextType == 'User') {
+      url.query.verifier = file.uuid;
+    } else if (file.url || file.href) {
+      const parsed_url = parse(file.url || file.href, true);
+
+      if (parsed_url.query.verifier) {
+        url.query.verifier = parsed_url.query.verifier;
+      }
     }
 
-    const parsed_url = parse(file.url || file.href, true);
-    const verifier = parsed_url.query.verifier ? `&verifier=${parsed_url.query.verifier}` : '';
-    return `/media_attachments_iframe/${file.id}?type=${type}${verifier}&embedded=true`;
+    return format(url);
   }
 
   if (file.embedded_iframe_url) {

package/lib/translated/vi_VN/modules/sidebar/actions/upload.js

@@ -272,7 +272,9 @@ export function mediaUploadComplete(error, uploadData) {
         media_id: mediaObject.media_object.media_id,
         type: uploadedFile.type,
         title: uploadedFile.title || uploadedFile.name,
-        id: mediaObject.media_object.attachment_id
+        id: mediaObject.media_object.attachment_id,
+        uuid: mediaObject.media_object.uuid,
+        contextType: mediaObject.media_object.context_type
       };
       dispatch(removePlaceholdersFor(uploadedFile.name));
       embedUploadResult(embedData, 'media');

package/lib/translated/zh/modules/rce/plugins/shared/__tests__/fileTypeUtils.test.js

@@ -138,11 +138,22 @@ describe('fileTypeUtils', () => {
       it('uses attachment route if id is present', () => {
         const file = {
           id: '123',
-          type: 'video/mov'
+          type: 'video/mov',
+          uuid: 'abc'
         };
         const url = mediaPlayerURLFromFile(file);
         expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true');
       });
+      it('uses adds the uuid if the context is User', () => {
+        const file = {
+          id: '123',
+          type: 'video/mov',
+          contextType: 'User',
+          uuid: 'abc'
+        };
+        const url = mediaPlayerURLFromFile(file);
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=abc');
+      });
       it('uses the file verifier if present', () => {
         const file = {
           id: '123',
@@ -150,7 +161,7 @@ describe('fileTypeUtils', () => {
           url: 'host?verifier=something'
         };
         const url = mediaPlayerURLFromFile(file);
-        expect(url).toBe('/media_attachments_iframe/123?type=video&verifier=something&embedded=true');
+        expect(url).toBe('/media_attachments_iframe/123?type=video&embedded=true&verifier=something');
       });
       it('uses media_object route if no attachmentId exists', () => {
         const file = {