From 0550b092b74e84e8d30619edf928d89a86d0c5f7 Mon Sep 17 00:00:00 2001
From: Drew Regitsky <drew@nylas.com>
Date: Wed, 24 Feb 2016 12:00:40 -0800
Subject: [PATCH] fix(plugins): fix open tracking and link tracking URLs

---
 .../link-tracking/lib/link-tracking-composer-extension.es6      | 2 +-
 internal_packages/link-tracking/lib/link-tracking-constants.es6 | 2 +-
 internal_packages/link-tracking/lib/main.es6                    | 2 +-
 internal_packages/open-tracking/lib/main.es6                    | 2 +-
 .../open-tracking/lib/open-tracking-composer-extension.es6      | 2 +-
 internal_packages/open-tracking/lib/open-tracking-constants.es6 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal_packages/link-tracking/lib/link-tracking-composer-extension.es6 b/internal_packages/link-tracking/lib/link-tracking-composer-extension.es6
index 687782a67..62dee0e87 100644
--- a/internal_packages/link-tracking/lib/link-tracking-composer-extension.es6
+++ b/internal_packages/link-tracking/lib/link-tracking-composer-extension.es6
@@ -29,7 +29,7 @@ export default class LinkTrackingComposerExtension extends ComposerExtension {
       // loop through all <a href> elements, replace with redirect links and save mappings
       draftBody.unquoted = draftBody.unquoted.replace(RegExpUtils.linkTagRegex(), (match, prefix, url, suffix, content, closingTag) => {
         const encoded = encodeURIComponent(url);
-        const redirectUrl = `http://${PLUGIN_URL}/${draft.accountId}/${messageUid}/${links.length}?redirect=${encoded}`;
+        const redirectUrl = `http://${PLUGIN_URL}/link/${draft.accountId}/${messageUid}/${links.length}?redirect=${encoded}`;
         links.push({url: url, click_count: 0, click_data: [], redirect_url: redirectUrl});
         return prefix + redirectUrl + suffix + content + closingTag;
       });
diff --git a/internal_packages/link-tracking/lib/link-tracking-constants.es6 b/internal_packages/link-tracking/lib/link-tracking-constants.es6
index a1d78b44e..8053c616b 100644
--- a/internal_packages/link-tracking/lib/link-tracking-constants.es6
+++ b/internal_packages/link-tracking/lib/link-tracking-constants.es6
@@ -2,4 +2,4 @@ import plugin from '../package.json'
 
 export const PLUGIN_NAME = plugin.title
 export const PLUGIN_ID = plugin.appId[NylasEnv.config.get("env")];
-export const PLUGIN_URL = "https://edgehill-staging.nylas.com/plugins";
+export const PLUGIN_URL = "https://edgehill-staging.nylas.com";
diff --git a/internal_packages/link-tracking/lib/main.es6 b/internal_packages/link-tracking/lib/main.es6
index 81298bb3f..fb3007459 100644
--- a/internal_packages/link-tracking/lib/main.es6
+++ b/internal_packages/link-tracking/lib/main.es6
@@ -25,7 +25,7 @@ function afterDraftSend({draftClientId}) {
 
       // post the uid and message id pair to the plugin server
       const data = {uid: uid, message_id: message.id};
-      const serverUrl = `${PLUGIN_URL}/register-message`;
+      const serverUrl = `${PLUGIN_URL}/plugins/register-message`;
       return post({
         url: serverUrl,
         body: JSON.stringify(data),
diff --git a/internal_packages/open-tracking/lib/main.es6 b/internal_packages/open-tracking/lib/main.es6
index 569400632..0a3fcd418 100644
--- a/internal_packages/open-tracking/lib/main.es6
+++ b/internal_packages/open-tracking/lib/main.es6
@@ -27,7 +27,7 @@ function afterDraftSend({draftClientId}) {
 
       // post the uid and message id pair to the plugin server
       const data = {uid: uid, message_id: message.id, thread_id: 1};
-      const serverUrl = `${PLUGIN_URL}/register-message`;
+      const serverUrl = `${PLUGIN_URL}/plugins/register-message`;
       return post({
         url: serverUrl,
         body: JSON.stringify(data),
diff --git a/internal_packages/open-tracking/lib/open-tracking-composer-extension.es6 b/internal_packages/open-tracking/lib/open-tracking-composer-extension.es6
index c25f5f5e6..803a5692f 100644
--- a/internal_packages/open-tracking/lib/open-tracking-composer-extension.es6
+++ b/internal_packages/open-tracking/lib/open-tracking-composer-extension.es6
@@ -21,7 +21,7 @@ export default class OpenTrackingComposerExtension extends ComposerExtension {
       const uid = uuid.v4().replace(/-/g, "");
 
       // insert a tracking pixel <img> into the message
-      const serverUrl = `http://${PLUGIN_URL}/${draft.accountId}/${uid}`;
+      const serverUrl = `http://${PLUGIN_URL}/open/${draft.accountId}/${uid}`;
       const img = `<img width="0" height="0" style="border:0; width:0; height:0;" src="${serverUrl}">`;
       const draftBody = new DraftBody(draft);
       draftBody.unquoted = draftBody.unquoted + "<br>" + img;
diff --git a/internal_packages/open-tracking/lib/open-tracking-constants.es6 b/internal_packages/open-tracking/lib/open-tracking-constants.es6
index a1d78b44e..8053c616b 100644
--- a/internal_packages/open-tracking/lib/open-tracking-constants.es6
+++ b/internal_packages/open-tracking/lib/open-tracking-constants.es6
@@ -2,4 +2,4 @@ import plugin from '../package.json'
 
 export const PLUGIN_NAME = plugin.title
 export const PLUGIN_ID = plugin.appId[NylasEnv.config.get("env")];
-export const PLUGIN_URL = "https://edgehill-staging.nylas.com/plugins";
+export const PLUGIN_URL = "https://edgehill-staging.nylas.com";