From da5888b5cfe290a414ad38a80b2f5ce3a5879402 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 10 Feb 2021 16:32:24 -0500
Subject: [PATCH 1/4] chore: Add missing origin validation message

---
 addons/core/translations/errors/en-us.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/addons/core/translations/errors/en-us.yaml b/addons/core/translations/errors/en-us.yaml
index 0e2239e72..a151a4ba9 100644
--- a/addons/core/translations/errors/en-us.yaml
+++ b/addons/core/translations/errors/en-us.yaml
@@ -17,3 +17,5 @@ generic:
   title: Error
 authentication-failed:
   title: Authentication Failed
+origin-verification-failed:
+  description: Could not validate the provided origin URL as Boundary URL. Please check origin URL and try again.

From f31cd4315b32538fa69b798b04435ec74ede82bc Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 10 Feb 2021 21:26:30 -0500
Subject: [PATCH 2/4] style: Fix auth border expanding to bottom of screen

---
 .../templates/scopes/scope/authenticate.hbs   | 105 ++++++++----------
 1 file changed, 49 insertions(+), 56 deletions(-)

diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
index b01ed3a31..3d7d834bd 100644
--- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
@@ -1,65 +1,58 @@
 {{page-title (t "actions.authenticate")}}
-{{!--
-<Rose::Form::Input
-  @type="text"
-  @name=""
-  @value={{this.origin.rendererOrigin}}
-  @label={{t "form.origin.label"}}
-  @disabled={{true}}
-  />
-<Rose::Button @style="ghost">Change</Rose::Button> --}}
 
-<BrandedCard
-  @title={{t 'actions.authenticate'}}
-  @description={{t 'auth.descriptions.authenticating-with-org' name=@model.scope.displayName}}
->
+<main>
+  <BrandedCard
+    @title={{t 'actions.authenticate'}}
+    @description={{t 'auth.descriptions.authenticating-with-org' name=@model.scope.displayName}}
+  >
 
-  <Rose::Dropdown
-    @text={{t "actions.choose-different-org"}}
-    @icon="user-organization"
-  as |dropdown|>
-    <dropdown.link @route="scopes.scope.authenticate" @model="global">
-      {{t "titles.global"}}
-    </dropdown.link>
-    {{#each this.sortedScopes as |scope|}}
-      <dropdown.link @route="scopes.scope.authenticate" @model={{scope.id}}>
-        {{scope.displayName}}
+    <Rose::Dropdown
+      @text={{t "actions.choose-different-org"}}
+      @icon="user-organization"
+    as |dropdown|>
+      <dropdown.link @route="scopes.scope.authenticate" @model="global">
+        {{t "titles.global"}}
       </dropdown.link>
-    {{/each}}
-  </Rose::Dropdown>
+      {{#each this.sortedScopes as |scope|}}
+        <dropdown.link @route="scopes.scope.authenticate" @model={{scope.id}}>
+          {{scope.displayName}}
+        </dropdown.link>
+      {{/each}}
+    </Rose::Dropdown>
 
-  <Rose::Nav::Tabs as |nav|>
-    {{#each @model.authMethods as |authMethod|}}
-      <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod.id}}>
-        {{t (concat "resources.auth-method.types." authMethod.type)}}
-      </nav.link>
-    {{/each}}
-  </Rose::Nav::Tabs>
+    <Rose::Nav::Tabs as |nav|>
+      {{#each @model.authMethods as |authMethod|}}
+        <nav.link @route="scopes.scope.authenticate.method" @model={{authMethod.id}}>
+          {{t (concat "resources.auth-method.types." authMethod.type)}}
+        </nav.link>
+      {{/each}}
+    </Rose::Nav::Tabs>
 
-  {{#if @model.authMethods}}
-    {{outlet}}
+    {{#if @model.authMethods}}
+      {{outlet}}
 
-    <p class="change-origin">
-      {{t "origin.connected-to"}}:
-      <code>{{this.origin}}</code>
-      <br>
-      <LinkTo @route="origin">
-        {{t "actions.change-origin"}}
-      </LinkTo>
-    </p>
+      <p class="change-origin">
+        {{t "origin.connected-to"}}:
+        <code>{{this.origin}}</code>
+        <br>
+        <LinkTo @route="origin">
+          {{t "actions.change-origin"}}
+        </LinkTo>
+      </p>
 
-  {{/if}}
-  {{#unless @model.authMethods}}
-    <Rose::Layout::Centered>
-      <Rose::Message
-        @title={{t "resources.auth-method.messages.none.title"}}
-        @icon="alert-circle-outline"
-      as |message|>
-        <message.description>
-          {{t "resources.auth-method.messages.none.description"}}
-        </message.description>
-      </Rose::Message>
-    </Rose::Layout::Centered>
-  {{/unless}}
+    {{/if}}
+    {{#unless @model.authMethods}}
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t "resources.auth-method.messages.none.title"}}
+          @icon="alert-circle-outline"
+        as |message|>
+          <message.description>
+            {{t "resources.auth-method.messages.none.description"}}
+          </message.description>
+        </Rose::Message>
+      </Rose::Layout::Centered>
+    {{/unless}}
 
-</BrandedCard>
+  </BrandedCard>
+</main>

From 34511f1a0123ffa0a257fae0f8da699e24d2465c Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Wed, 10 Feb 2021 23:12:15 -0500
Subject: [PATCH 3/4] chore: Remove spaces from dmg filename

---
 ui/desktop/electron-app/config/forge.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/desktop/electron-app/config/forge.config.js b/ui/desktop/electron-app/config/forge.config.js
index 2c7b5f4a6..612c4d733 100644
--- a/ui/desktop/electron-app/config/forge.config.js
+++ b/ui/desktop/electron-app/config/forge.config.js
@@ -34,7 +34,8 @@ module.exports = {
     {
       name: "@electron-forge/maker-dmg",
       config: {
-        name: "Boundary Desktop"
+        name: "boundary-desktop",
+        title: "Boundary Desktop"
       }
     }
   ]

From 8ab7785915c22ca8495611b0a91b64b100eaf798 Mon Sep 17 00:00:00 2001
From: Susmitha Girumala <susmitha@hashicorp.com>
Date: Thu, 11 Feb 2021 09:08:32 -0500
Subject: [PATCH 4/4] refactor: Wordsmith origin error message

---
 addons/core/translations/errors/en-us.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/core/translations/errors/en-us.yaml b/addons/core/translations/errors/en-us.yaml
index a151a4ba9..c814611d0 100644
--- a/addons/core/translations/errors/en-us.yaml
+++ b/addons/core/translations/errors/en-us.yaml
@@ -18,4 +18,4 @@ generic:
 authentication-failed:
   title: Authentication Failed
 origin-verification-failed:
-  description: Could not validate the provided origin URL as Boundary URL. Please check origin URL and try again.
+  description: Unable to connect to the specified origin. Please check the URL and try again.