From 612de5c9d0ebf767bb2128b4605e07e0c3e0aa36 Mon Sep 17 00:00:00 2001
From: Alastair Ong <alastair.ong@holo.host>
Date: Mon, 3 Jun 2024 12:33:12 +0100
Subject: [PATCH 1/3] enable ssh button

---
 .../settings/SettingsHoloportSection.vue        |  8 ++++++--
 src/interfaces/HposInterface.ts                 | 17 +++++++++++++++++
 src/pages/SettingsPage.vue                      |  5 +++++
 src/store/user.ts                               |  7 ++++++-
 ui-common-library                               |  2 +-
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/components/settings/SettingsHoloportSection.vue b/src/components/settings/SettingsHoloportSection.vue
index cfff209a..eee2f465 100644
--- a/src/components/settings/SettingsHoloportSection.vue
+++ b/src/components/settings/SettingsHoloportSection.vue
@@ -19,7 +19,7 @@ const props = withDefaults(
   }
 )
 
-const emit = defineEmits(['update:device-name'])
+const emit = defineEmits(['update:device-name', 'update:ssh-access'])
 
 const isEditingDeviceName = ref(false)
 const editedDeviceName = ref('')
@@ -38,6 +38,10 @@ function cancelEditDeviceName(): void {
   isEditingDeviceName.value = false
   editedDeviceName.value = ''
 }
+
+function toggleSshAccess(): void {
+  emit('update:ssh-access', !props.settings.sshAccess)
+}
 </script>
 
 <template>
@@ -92,8 +96,8 @@ function cancelEditDeviceName(): void {
     <SettingsRow :label="$t('settings.ssh_access')">
       <BaseCheckbox
         id="sshAccess"
-        is-disabled
         :checked="props.settings.sshAccess"
+        @change="toggleSshAccess"
       />
     </SettingsRow>
 
diff --git a/src/interfaces/HposInterface.ts b/src/interfaces/HposInterface.ts
index ac6c785b..21d6652e 100644
--- a/src/interfaces/HposInterface.ts
+++ b/src/interfaces/HposInterface.ts
@@ -25,6 +25,7 @@ interface HposInterface {
   getKycLevel: () => Promise<EUserKycLevel | null>
   getHposStatus: () => Promise<HPosStatus>
   updateHoloportName: (name: string) => Promise<void>
+  updateSshSettings: (access: boolean) => Promise<void>
   getHoloFuelProfile: () => unknown
   updateHoloFuelProfile: ({ nickname, avatarUrl }: UpdateHoloFuelProfilePayload) => Promise<boolean>
   getPaidInvoices: () => Promise<HposHolochainCallResponse>
@@ -839,6 +840,21 @@ export function useHposInterface(): HposInterface {
     }
   }
 
+  async function updateSshSettings(access: boolean): Promise<void> {
+    try {
+      let method = 'delete'
+      if (access) {
+        method = 'put'
+      }
+        await hposAdminCall({
+        method: method,
+        path: '/profiles/development/features/ssh',
+      })
+    } catch (error) {
+      console.error('updateSshSettings failed: ', error)
+    }
+  }
+
   async function updateHoloFuelProfile({
     nickname,
     avatarUrl
@@ -1021,6 +1037,7 @@ export function useHposInterface(): HposInterface {
     getUser,
     getHposStatus,
     updateHoloportName,
+    updateSshSettings,
     getHoloFuelProfile,
     updateHoloFuelProfile,
     getPaidInvoices,
diff --git a/src/pages/SettingsPage.vue b/src/pages/SettingsPage.vue
index 7f7921fb..5cd16b07 100644
--- a/src/pages/SettingsPage.vue
+++ b/src/pages/SettingsPage.vue
@@ -12,6 +12,10 @@ const user = computed(() => userStore)
 async function onDeviceNameUpdate(deviceName: string): Promise<void> {
   await userStore.updateDeviceName(deviceName)
 }
+
+async function onSshAccessUpdate(sshAccess: boolean): Promise<void> {
+  await userStore.updateSshAccess(sshAccess)
+}
 </script>
 
 <template>
@@ -19,6 +23,7 @@ async function onDeviceNameUpdate(deviceName: string): Promise<void> {
     <SettingsHoloportSection
       :settings="user"
       @update:device-name="onDeviceNameUpdate"
+      @update:ssh-access="onSshAccessUpdate"
     />
 
     <SettingsHolofuelSection
diff --git a/src/store/user.ts b/src/store/user.ts
index 4802d923..311c6e80 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -9,7 +9,7 @@ import { EUserKycLevel } from '@/types/types'
 // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-assignment
 const { showModal } = useModals()
 
-const { getCoreAppVersion, getUser, updateHoloFuelProfile, updateHoloportName, getKycLevel } =
+const { getCoreAppVersion, getUser, updateHoloFuelProfile, updateHoloportName, getKycLevel, updateSshSettings } =
   useHposInterface()
 
 interface State {
@@ -90,6 +90,11 @@ export const useUserStore = defineStore('user', {
       this.deviceName = name
 
       await updateHoloportName(name)
+    },
+
+    async updateSshAccess(access: boolean): Promise<void> {
+      this.sshAccess = access
+      await updateSshSettings(access) 
     }
   }
 })
diff --git a/ui-common-library b/ui-common-library
index fea3d7ec..2ae5248d 160000
--- a/ui-common-library
+++ b/ui-common-library
@@ -1 +1 @@
-Subproject commit fea3d7ec9d9a5f532406b67e9eb3232afc816df5
+Subproject commit 2ae5248dcb34bd5130662e7ba381101916f765a2

From 66d785e8f26f9bf3cc6d471d340bf6366fb4c59d Mon Sep 17 00:00:00 2001
From: Alastair Ong <alastair.ong@gmail.com>
Date: Tue, 23 Jul 2024 11:37:32 +0100
Subject: [PATCH 2/3] update SSH call

---
 src/interfaces/HposInterface.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/interfaces/HposInterface.ts b/src/interfaces/HposInterface.ts
index 21d6652e..aa19bc1d 100644
--- a/src/interfaces/HposInterface.ts
+++ b/src/interfaces/HposInterface.ts
@@ -842,13 +842,17 @@ export function useHposInterface(): HposInterface {
 
   async function updateSshSettings(access: boolean): Promise<void> {
     try {
-      let method = 'delete'
-      if (access) {
-        method = 'put'
+      const method = 'put'
+      const data = {
+        enable: access,
+        include_default: access,
+        pubkeys: []
       }
-        await hposAdminCall({
-        method: method,
-        path: '/profiles/development/features/ssh',
+
+      await hposAdminCall({
+        method,
+        path: '/ssh',
+        params: { data }
       })
     } catch (error) {
       console.error('updateSshSettings failed: ', error)

From eb659d23a6848f8a92619e875cc3e857ae9119a5 Mon Sep 17 00:00:00 2001
From: Alastair Ong <alastair.ong.a7o@gmail.com>
Date: Mon, 5 Aug 2024 13:50:52 +0100
Subject: [PATCH 3/3] enable ssh and get ssh status

---
 src/interfaces/HposInterface.ts | 21 ++++++++++-----------
 src/store/user.ts               |  3 ++-
 ui-common-library               |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/interfaces/HposInterface.ts b/src/interfaces/HposInterface.ts
index 1a5f2d41..d48f66cf 100644
--- a/src/interfaces/HposInterface.ts
+++ b/src/interfaces/HposInterface.ts
@@ -247,6 +247,7 @@ interface HPosStatus {
   networkFlavour?: string
   hposVersion?: string
   name?: string
+  ssh_enabled?: boolean
 }
 
 interface CoreAppVersion {
@@ -727,7 +728,7 @@ export function useHposInterface(): HposInterface {
     try {
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      const { holo_nixpkgs, holoport } = await hposAdminCall({
+      const { holo_nixpkgs, holoport, ssh } = await hposAdminCall({
         method: 'get',
         path: '/status'
       })
@@ -738,7 +739,8 @@ export function useHposInterface(): HposInterface {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         hposVersion: formatHposVersion(holo_nixpkgs),
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
-        name: holoport.name
+        name: holoport.name,
+        ssh_enabled: holoport.ssh_enabled
       }
     } catch (err) {
       return {}
@@ -797,17 +799,14 @@ export function useHposInterface(): HposInterface {
 
   async function updateSshSettings(access: boolean): Promise<void> {
     try {
-      const method = 'put'
-      const data = {
-        enable: access,
-        include_default: access,
-        pubkeys: []
-      }
-
       await hposAdminCall({
-        method,
+        method: 'put',
         path: '/ssh',
-        params: { data }
+        params: {
+          enable: access,
+          include_default: access,
+          pubkeys: []
+        }
       })
     } catch (error) {
       console.error('updateSshSettings failed: ', error)
diff --git a/src/store/user.ts b/src/store/user.ts
index 311c6e80..267197f9 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -29,7 +29,7 @@ export const useUserStore = defineStore('user', {
     publicKey: undefined,
     email: '',
     networkFlavour: '',
-    sshAccess: true,
+    sshAccess: false,
     deviceName: '',
     hposVersion: '',
     holoFuel: {
@@ -52,6 +52,7 @@ export const useUserStore = defineStore('user', {
         this.publicKey = user.hostPubKey
         this.email = user.registrationEmail ?? ''
         this.networkFlavour = holoport.networkFlavour ?? ''
+        this.sshAccess = holoport.ssh_enabled ?? false
         this.deviceName = holoport.name ?? ''
         this.hposVersion = holoport.hposVersion ?? ''
         this.holoFuel = holoFuelProfile
diff --git a/ui-common-library b/ui-common-library
index 83f2a11b..a0cddfa1 160000
--- a/ui-common-library
+++ b/ui-common-library
@@ -1 +1 @@
-Subproject commit 83f2a11b268b02a25d5d274d73a75da1883eb0f4
+Subproject commit a0cddfa1bf94cbbf03e757168cc1c7263c9c3f0c