From 9d758f4a1e7cc119ab6487f8dc975a445ab892ed Mon Sep 17 00:00:00 2001
From: "W. Leighton Dawson" <leighton@thinkst.com>
Date: Fri, 13 Dec 2024 12:30:11 +0200
Subject: [PATCH] Include install instructions on manage page for cmd tokens
 (#637)

---
 .../components/tokens/cmd/ActivatedToken.vue  | 28 +----------------
 .../src/components/tokens/cmd/ManageToken.vue |  8 ++---
 .../components/tokens/cmd/TokenDisplay.vue    | 31 +++++++++++++++++++
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/frontend_vue/src/components/tokens/cmd/ActivatedToken.vue b/frontend_vue/src/components/tokens/cmd/ActivatedToken.vue
index cb0684cb1..6cbeb3935 100644
--- a/frontend_vue/src/components/tokens/cmd/ActivatedToken.vue
+++ b/frontend_vue/src/components/tokens/cmd/ActivatedToken.vue
@@ -1,27 +1,5 @@
 <template>
-  <TokenDisplay :token-data="tokenData" />
-  <base-message-box
-    class="mt-24"
-    variant="info"
-    message="Once installed (with admin permissions) you'll get an alert whenever someone
-  (or someone's code) runs your sensitive process."
-  />
-  <p class="mt-24 text-sm">
-    It will automatically provide the command used, computer the command ran on,
-    and the user invoking the command.
-  </p>
-  <p class="mt-16 text-sm"></p>
-  <base-message-box
-    class="mt-24"
-    variant="warning"
-    message="In order to ensure that the token fires for both 32-bit and 64-bit
-    executables, we suggest installing by running the following commands:"
-  />
-  <BaseCodeSnippet
-    class="mt-16"
-    lang="bash"
-    :code="recommendedReg"
-  ></BaseCodeSnippet>
+  <TokenDisplay :token-data="tokenData" :displayInfoBox="true"/>
 </template>
 
 <script setup lang="ts">
@@ -37,8 +15,4 @@ const tokenData = ref({
   token: props.tokenData.token || '',
   auth: props.tokenData.auth_token || '',
 });
-
-const recommendedReg = ref(
-  'reg import FILENAME /reg:64  \nreg import FILENAME /reg:32'
-);
 </script>
diff --git a/frontend_vue/src/components/tokens/cmd/ManageToken.vue b/frontend_vue/src/components/tokens/cmd/ManageToken.vue
index f40807ff4..5c0744e58 100644
--- a/frontend_vue/src/components/tokens/cmd/ManageToken.vue
+++ b/frontend_vue/src/components/tokens/cmd/ManageToken.vue
@@ -1,12 +1,8 @@
 <template>
-  <div v-if="!tokenData">Error loading</div>
-  <TokenDisplay
-    v-else
-    :token-data="tokenData"
-  />
+  <TokenDisplay :token-data="tokenData" :displayInfoBox="false"/>
 </template>
 
-<script lang="ts" setup>
+<script setup lang="ts">
 import { ref } from 'vue';
 import TokenDisplay from './TokenDisplay.vue';
 import type { ManageTokenBackendType } from '@/components/tokens/types.ts';
diff --git a/frontend_vue/src/components/tokens/cmd/TokenDisplay.vue b/frontend_vue/src/components/tokens/cmd/TokenDisplay.vue
index e6ab7006e..78a9b9413 100644
--- a/frontend_vue/src/components/tokens/cmd/TokenDisplay.vue
+++ b/frontend_vue/src/components/tokens/cmd/TokenDisplay.vue
@@ -6,9 +6,34 @@
       >Download your MS registry file</base-button
     >
   </div>
+  <div v-if="displayInfoBox">
+    <base-message-box
+      class="mt-24"
+      variant="info"
+      message="Once installed (with admin permissions) you'll get an alert whenever someone
+    (or someone's code) runs your sensitive process."
+    />
+    <p class="mt-24 text-sm">
+      It will automatically provide the command used, computer the command ran on,
+      and the user invoking the command.
+    </p>
+    <p class="mt-16 text-sm"></p>
+  </div>
+  <base-message-box
+    class="mt-24"
+    variant="warning"
+    message="In order to ensure that the token fires for both 32-bit and 64-bit
+    executables, we suggest installing by running the following commands:"
+  />
+  <BaseCodeSnippet
+    class="mt-16"
+    lang="bash"
+    :code="recommendedReg"
+  ></BaseCodeSnippet>
 </template>
 
 <script setup lang="ts">
+import { ref } from 'vue';
 import { downloadAsset } from '@/api/main';
 
 type CMDDataType = {
@@ -18,6 +43,7 @@ type CMDDataType = {
 
 const props = defineProps<{
   tokenData: CMDDataType;
+  displayInfoBox: boolean;
 }>();
 
 async function handleDownloadMSregistryFile() {
@@ -35,4 +61,9 @@ async function handleDownloadMSregistryFile() {
     console.log('Download ready');
   }
 }
+
+const recommendedReg = ref(
+  'reg import FILENAME /reg:64  \nreg import FILENAME /reg:32'
+);
+
 </script>