From f08a27a36325ff9904a002972dbc450066bf0e0f Mon Sep 17 00:00:00 2001
From: Randall Morey <randall@randallmorey.com>
Date: Tue, 15 Dec 2020 17:23:02 -0500
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20desktop=20client=20should?=
 =?UTF-8?q?=20pass=20controller=20URL=20to=20CLI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/desktop/app/routes/scopes/scope/projects/targets.js | 2 ++
 ui/desktop/electron-app/src/boundary-cli.js            | 5 +++--
 ui/desktop/electron-app/src/handlers.js                | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets.js b/ui/desktop/app/routes/scopes/scope/projects/targets.js
index 55f9dbdf0..c1da48c1d 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/targets.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/targets.js
@@ -8,6 +8,7 @@ export default class ScopesScopeProjectsTargetsRoute extends Route {
 
   @service ipc;
   @service session;
+  @service origin;
   @service notify;
   @service confirm;
 
@@ -58,6 +59,7 @@ export default class ScopesScopeProjectsTargetsRoute extends Route {
       const connectionDetails = await this.ipc.invoke('connect', {
         target_id: model.target.id,
         token: this.session.data.authenticated.token,
+        addr: this.origin.rendererOrigin
       });
 
       // Show the user a modal with basic connection info.
diff --git a/ui/desktop/electron-app/src/boundary-cli.js b/ui/desktop/electron-app/src/boundary-cli.js
index d3112bd79..42618b71b 100644
--- a/ui/desktop/electron-app/src/boundary-cli.js
+++ b/ui/desktop/electron-app/src/boundary-cli.js
@@ -9,14 +9,15 @@ module.exports = {
   // Check boundary cli existence
   exists: () => Boolean(cliPath()),
   // Initiate connection and return output
-  connect: (target_id, token) => {
+  connect: (target_id, token, addr) => {
     const command = [
       'connect',
       `-target-id=${target_id}`,
       `-token=${token}`,
+      `-addr=${addr}`,
       '-format=json',
       '--output-json-errors'
     ]
     return spawnPromise(command);
   }
-}
\ No newline at end of file
+}
diff --git a/ui/desktop/electron-app/src/handlers.js b/ui/desktop/electron-app/src/handlers.js
index 4ee3466b8..4c3735fc3 100644
--- a/ui/desktop/electron-app/src/handlers.js
+++ b/ui/desktop/electron-app/src/handlers.js
@@ -33,4 +33,4 @@ handle('cliPath', () => boundaryCli.path());
 /**
  * Establishes a boundary session and returns session details.
  */
-handle('connect', ({ target_id, token }) => boundaryCli.connect(target_id, token));
+handle('connect', ({ target_id, token, addr }) => boundaryCli.connect(target_id, token, addr));