From dd249021e7777420f06472b9b29e70c8349053ab Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Mon, 2 Aug 2021 11:09:16 -0700
Subject: [PATCH] fix: GoogleDrive embeds stopped working with new share urls
 closes #2405

---
 app/embeds/GoogleDrive.js      | 4 ++--
 app/embeds/GoogleDrive.test.js | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/embeds/GoogleDrive.js b/app/embeds/GoogleDrive.js
index 28db91b2..5ea35381 100644
--- a/app/embeds/GoogleDrive.js
+++ b/app/embeds/GoogleDrive.js
@@ -4,7 +4,7 @@ import Image from "components/Image";
 import Frame from "./components/Frame";
 
 const URL_REGEX = new RegExp(
-  "^https?://drive.google.com/file/d/(.*)/(preview|view).?usp=sharing$"
+  "^https?://drive.google.com/file/d/(.*)/(preview|view).?usp=sharing(.*)"
 );
 
 type Props = {|
@@ -29,7 +29,7 @@ export default class GoogleDrive extends React.Component<Props> {
             height={16}
           />
         }
-        title="Google Drive Embed"
+        title="Google Drive"
         canonicalUrl={this.props.attrs.href}
         border
       />
diff --git a/app/embeds/GoogleDrive.test.js b/app/embeds/GoogleDrive.test.js
index 3339c426..c63d2ce4 100644
--- a/app/embeds/GoogleDrive.test.js
+++ b/app/embeds/GoogleDrive.test.js
@@ -3,6 +3,7 @@ import GoogleDrive from "./GoogleDrive";
 
 describe("GoogleDrive", () => {
   const match = GoogleDrive.ENABLED[0];
+
   test("to be enabled on share link", () => {
     expect(
       "https://drive.google.com/file/d/1ohkOgmE8MiNx68u6ynBfYkgjeKu_x3ZK/view?usp=sharing".match(
@@ -14,6 +15,11 @@ describe("GoogleDrive", () => {
         match
       )
     ).toBeTruthy();
+    expect(
+      "https://drive.google.com/file/d/1ohkOgmE8MiNx68u6ynBfYkgjeKu_x3ZK/preview?usp=sharing&resourceKey=BG8k4dEt1p2gisnVdlaSpA".match(
+        match
+      )
+    ).toBeTruthy();
   });
 
   test("to not be enabled elsewhere", () => {