From 375916678d14c3e3114f50f252ac0914cb29ccb6 Mon Sep 17 00:00:00 2001
From: Winston Li <winston.li12@imperial.ac.uk>
Date: Sun, 16 Nov 2014 20:27:37 +0000
Subject: [PATCH] Generating SnapshotPostRequest data correctly.

---
 .../application/SnapshotPushPostbackHandler.java    |  5 +++++
 .../ac/ic/wlgitbridge/bridge/CandidateSnapshot.java |  1 +
 .../ic/wlgitbridge/bridge/WriteLatexDataSource.java |  2 +-
 .../git/handler/WLReceivePackFactory.java           |  2 +-
 .../git/handler/hook/WriteLatexPutHook.java         |  7 +++++--
 .../writelatex/WLDirectoryNodeSnapshot.java         | 13 ++++++++++---
 .../ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java |  4 ++--
 .../wlgitbridge/writelatex/model/WLDataModel.java   |  3 ++-
 8 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java
index 9be9605b6d..51c2533873 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java
@@ -20,6 +20,11 @@ public class SnapshotPushPostbackHandler extends AbstractHandler {
 //                response.setContentType("text/html;charset=utf-8");
 //                response.setStatus(HttpServletResponse.SC_OK);
         baseRequest.setHandled(false);
+        if (request.getMethod().equals("POST") && request.getPathInfo().endsWith("postback")) {
+            System.out.println(request.getHeaderNames());
+        }
+
+//        System.out.println(request.getRemoteAddr());
 //        System.out.println("method: " + request.getMethod());
 //        System.out.println("pathInfo: " + request.getPathInfo());
 //        System.out.println("contextPath: " + request.getContextPath());
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java
index 21c053a9d2..d127f1072b 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java
@@ -10,6 +10,7 @@ public interface CandidateSnapshot {
 
     public JsonElement getJsonRepresentation();
     public int getPreviousVersionID();
+    public String getProjectURL();
     public void approveWithVersionID(int versionID);
     public String getProjectName();
     public WLDirectoryNode getDirectoryNode();
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java
index faac9fbce8..2f636ecb63 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java
@@ -15,7 +15,7 @@ public interface WriteLatexDataSource {
     /* Called by request thread. */
     public boolean repositoryExists(String projectName) throws FailedConnectionException;
     public List<WritableRepositoryContents> getWritableRepositories(String projectName) throws FailedConnectionException, InvalidProjectException;
-    public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents) throws SnapshotPostException, IOException, FailedConnectionException;
+    public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String remoteAddr) throws SnapshotPostException, IOException, FailedConnectionException;
     public void expectPostback(String projectName);
 
     /* Called by postback thread. */
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java
index 6f83b4731b..416324eef6 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java
@@ -25,7 +25,7 @@ public class WLReceivePackFactory implements ReceivePackFactory<HttpServletReque
     @Override
     public ReceivePack create(HttpServletRequest httpServletRequest, Repository repository) throws ServiceNotEnabledException, ServiceNotAuthorizedException {
         ReceivePack receivePack = new ReceivePack(repository);
-        receivePack.setPreReceiveHook(new WriteLatexPutHook(writeLatexDataSource));
+        receivePack.setPreReceiveHook(new WriteLatexPutHook(writeLatexDataSource, httpServletRequest.getRemoteAddr()));
         return receivePack;
     }
 
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java
index 95d5fd3d95..a181792de2 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java
@@ -22,9 +22,11 @@ import java.util.Collection;
 public class WriteLatexPutHook implements PreReceiveHook {
 
     private final WriteLatexDataSource writeLatexDataSource;
+    private final String remoteAddr;
 
-    public WriteLatexPutHook(WriteLatexDataSource writeLatexDataSource) {
+    public WriteLatexPutHook(WriteLatexDataSource writeLatexDataSource, String remoteAddr) {
         this.writeLatexDataSource = writeLatexDataSource;
+        this.remoteAddr = remoteAddr;
     }
 
     @Override
@@ -55,7 +57,8 @@ public class WriteLatexPutHook implements PreReceiveHook {
         checkForcedPush(receiveCommand);
         writeLatexDataSource.putDirectoryContentsToProjectWithName(repository.getWorkTree().getName(),
                                                                    getPushedDirectoryContents(repository,
-                                                                                              receiveCommand));
+                                                                                              receiveCommand),
+                                                                   remoteAddr);
     }
 
     private void checkForcedPush(ReceiveCommand receiveCommand) throws ForcedPushException {
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java
index 3084b8639d..e8325de39c 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java
@@ -16,12 +16,14 @@ public class WLDirectoryNodeSnapshot implements CandidateSnapshot {
 
     private final int previousVersionID;
     private final String projectName;
+    private final String projectURL;
     private final WLDirectoryNode directoryNode;
     private final CandidateSnapshotCallback callback;
 
-    public WLDirectoryNodeSnapshot(WLProject project, WLDirectoryNode directoryNode, CandidateSnapshotCallback callback) {
+    public WLDirectoryNodeSnapshot(WLProject project, WLDirectoryNode directoryNode, String remoteAddr, CandidateSnapshotCallback callback) {
         previousVersionID = project.getLatestSnapshot().getVersionID();
         projectName = project.getName();
+        projectURL = "http://" + remoteAddr + "/" + projectName;
         this.directoryNode = directoryNode;
         this.callback = callback;
         System.out.println(getJsonRepresentation());
@@ -32,7 +34,7 @@ public class WLDirectoryNodeSnapshot implements CandidateSnapshot {
         JsonObject jsonObject = new JsonObject();
         jsonObject.addProperty("latestVerId", previousVersionID);
         jsonObject.add("files", getFilesAsJson());
-        jsonObject.addProperty("postbackUrl", "wsomewhere");
+        jsonObject.addProperty("postbackUrl", projectURL + "/postback");
         return jsonObject;
     }
 
@@ -48,7 +50,7 @@ public class WLDirectoryNodeSnapshot implements CandidateSnapshot {
         JsonObject file = new JsonObject();
         file.addProperty("name", fileNode.getFilePath());
         if (fileNode.isChanged()) {
-            file.addProperty("url", "url");
+            file.addProperty("url", projectURL + "/" + fileNode.getFilePath());
         }
         return file;
     }
@@ -58,6 +60,11 @@ public class WLDirectoryNodeSnapshot implements CandidateSnapshot {
         return previousVersionID;
     }
 
+    @Override
+    public String getProjectURL() {
+        return projectURL;
+    }
+
     @Override
     public void approveWithVersionID(int versionID) {
         callback.approveSnapshot(versionID, this);
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java
index 86c639740c..e0be99b21b 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java
@@ -43,8 +43,8 @@ public class WriteLatexAPI implements WriteLatexDataSource {
     }
 
     @Override
-    public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents) throws SnapshotPostException, IOException, FailedConnectionException {
-        CandidateSnapshot candidate = dataModel.createCandidateSnapshotFromProjectWithContents(projectName, directoryContents);
+    public void putDirectoryContentsToProjectWithName(String projectName, RawDirectoryContents directoryContents, String remoteAddr) throws SnapshotPostException, IOException, FailedConnectionException {
+        CandidateSnapshot candidate = dataModel.createCandidateSnapshotFromProjectWithContents(projectName, directoryContents, remoteAddr);
         new SnapshotPushRequest(candidate);
         throw new SnapshotPostException() {
 
diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java
index c2a77bbe5b..001aa97391 100644
--- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java
+++ b/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java
@@ -43,10 +43,11 @@ public class WLDataModel implements CandidateSnapshotCallback {
         return project;
     }
 
-    public CandidateSnapshot createCandidateSnapshotFromProjectWithContents(String projectName, RawDirectoryContents directoryContents) throws SnapshotPostException, IOException, FailedConnectionException {
+    public CandidateSnapshot createCandidateSnapshotFromProjectWithContents(String projectName, RawDirectoryContents directoryContents, String remoteAddr) throws SnapshotPostException, IOException, FailedConnectionException {
         return new WLDirectoryNodeSnapshot(getProjectWithName(projectName),
                                            fileStore.createNextDirectoryNodeInProjectFromContents(getProjectWithName(projectName),
                                                                                                   directoryContents),
+                                           remoteAddr,
                                            this);
     }