From 779778fdb1e436497197a3315c60f70805ac805a Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Tue, 8 Jan 2019 09:47:01 +0000
Subject: [PATCH] Use `newUrl` if supplied when v1 is deprecated

---
 .../base/MissingRepositoryException.java      | 36 +++++++++++++++----
 .../ic/wlgitbridge/snapshot/base/Request.java |  8 ++++-
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java
index c3717b0afc..9b0fef28ce 100644
--- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java
+++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java
@@ -18,12 +18,36 @@ public class MissingRepositoryException extends SnapshotAPIException {
         "see https://www.overleaf.com/help/342 for more information."
     );
 
-    public static final List<String> OVERLEAF_V1_DEPRECATED_REASON = Arrays.asList(
-            "Overleaf v1 is deprecated, and you need to migrate this project to v2.",
-            "",
-            "If this is unexpected, please contact us at support@overleaf.com, or",
-            "see https://www.overleaf.com/help/342 for more information."
-    );
+    static List<String> buildDeprecatedMessage(String newUrl) {
+        if (newUrl == null) {
+            return Arrays.asList(
+                    "This project has not yet been moved into the new version of Overleaf. You will",
+                    "need to move it in order to continue working on it. Please visit this project",
+                    "online on www.overleaf.com to do this.",
+                    "",
+                    "After migrating this project to the new version of Overleaf, you will be",
+                    "prompted to update your git remote to the project's new identifier.",
+                    "",
+                    "If this is unexpected, please contact us at support@overleaf.com, or",
+                    "see https://www.overleaf.com/help/342 for more information."
+            );
+        } else {
+            return Arrays.asList(
+                "This project has not yet been moved into the new version of Overleaf. You will",
+                "need to move it in order to continue working on it. Please visit this project",
+                "online to do this:",
+                "",
+                "    " + newUrl,
+                "",
+                "After migrating this project to the new version of Overleaf, you will be",
+                "prompted to update your git remote to the project's new identifier.",
+                "",
+                "If this is unexpected, please contact us at support@overleaf.com, or",
+                "see https://www.overleaf.com/help/342 for more information."
+            );
+        }
+
+    }
 
     static List<String> buildExportedToV2Message(String remoteUrl) {
         if (remoteUrl == null) {
diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java
index e9ef50114c..eeb40c8f35 100644
--- a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java
+++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java
@@ -91,8 +91,14 @@ public abstract class Request<T extends Result> {
                                 MissingRepositoryException.buildExportedToV2Message(newRemote)
                             );
                         } else if ("Overleaf v1 is Deprecated".equals(message)) {
+                            String newUrl;
+                            if (json.has("newUrl")) {
+                                newUrl = json.get("newUrl").getAsString();
+                            } else {
+                                newUrl = null;
+                            }
                             throw new MissingRepositoryException(
-                                    MissingRepositoryException.OVERLEAF_V1_DEPRECATED_REASON
+                                    MissingRepositoryException.buildDeprecatedMessage(newUrl)
                             );
                         }
                     } catch (IllegalStateException