From e56d07dbab4579b408ae34ccba665173bedd6367 Mon Sep 17 00:00:00 2001 From: Drew Ansbacher Date: Mon, 20 Sep 2021 12:13:16 -0600 Subject: [PATCH] hash to fingerprint --- .../security-routes/ssh-keys/ssh-keys.page.html | 2 +- .../server-routes/security-routes/ssh-keys/ssh-keys.page.ts | 2 +- ui/src/app/services/api/api.fixures.ts | 6 +++--- ui/src/app/services/api/api.types.ts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.html b/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.html index 34d1460c7..082ec824c 100644 --- a/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.html +++ b/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.html @@ -51,7 +51,7 @@

{{ ssh.hostname }}

{{ ssh['created-at'] | date: 'short' }}

-

{{ ssh.alg }} {{ ssh.hash }}

+

{{ ssh.alg }} {{ ssh.fingerprint }}

diff --git a/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.ts b/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.ts index 04b7b01e6..2230b8875 100644 --- a/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.ts +++ b/ui/src/app/pages/server-routes/security-routes/ssh-keys/ssh-keys.page.ts @@ -102,7 +102,7 @@ export class SSHKeysPage { try { const entry = this.sshKeys[i] - await this.embassyApi.deleteSshKey({ hash: entry.hash }) + await this.embassyApi.deleteSshKey({ fingerprint: entry.fingerprint }) delete this.sshKeys[i] } catch (e) { this.errToast.present(e) diff --git a/ui/src/app/services/api/api.fixures.ts b/ui/src/app/services/api/api.fixures.ts index e343eb59f..90de0ca69 100644 --- a/ui/src/app/services/api/api.fixures.ts +++ b/ui/src/app/services/api/api.fixures.ts @@ -837,13 +837,13 @@ export module Mock { 'created-at': new Date().toISOString(), alg: 'ed25519', hostname: 'Matt Key', - hash: '28:d2:7e:78:61:b4:bf:g2:de:24:15:96:4e:d4:15:53', + fingerprint: '28:d2:7e:78:61:b4:bf:g2:de:24:15:96:4e:d4:15:53', }, { 'created-at': new Date().toISOString(), alg: 'ed25519', hostname: 'Aiden Key', - hash: '12:f8:7e:78:61:b4:bf:e2:de:24:15:96:4e:d4:72:53', + fingerprint: '12:f8:7e:78:61:b4:bf:e2:de:24:15:96:4e:d4:72:53', }, ] @@ -851,7 +851,7 @@ export module Mock { 'created-at': new Date().toISOString(), alg: 'ed25519', hostname: 'Lucy Key', - hash: '44:44:7e:78:61:b4:bf:g2:de:24:15:96:4e:d4:15:53', + fingerprint: '44:44:7e:78:61:b4:bf:g2:de:24:15:96:4e:d4:15:53', } export const Wifi: RR.GetWifiRes = { diff --git a/ui/src/app/services/api/api.types.ts b/ui/src/app/services/api/api.types.ts index 20d1e9fca..a9ebeecb2 100644 --- a/ui/src/app/services/api/api.types.ts +++ b/ui/src/app/services/api/api.types.ts @@ -113,7 +113,7 @@ export module RR { export type AddSSHKeyReq = { key: string } // ssh.add export type AddSSHKeyRes = SSHKey - export type DeleteSSHKeyReq = { hash: string } // ssh.delete + export type DeleteSSHKeyReq = { fingerprint: string } // ssh.delete export type DeleteSSHKeyRes = null // backup @@ -316,7 +316,7 @@ export interface SSHKey { 'created-at': string alg: string hostname: string - hash: string + fingerprint: string } export type ServerNotifications = ServerNotification[]