From cd4ff88673e1d8ac5e0dbdcdfa0bc7773f0b31d3 Mon Sep 17 00:00:00 2001
From: Dragos <cojocaru.dragos@gmail.com>
Date: Mon, 31 May 2021 11:24:59 +0300
Subject: [PATCH] TRIX-21 Remove fingerprint from SSH key editor

---
 app/src/app/account/account.component.ts                     | 2 ++
 app/src/app/account/helpers/account.service.ts               | 4 ++--
 .../app/account/ssh-key-editor/ssh-key-editor.component.html | 3 +--
 .../app/account/ssh-key-editor/ssh-key-editor.component.ts   | 5 ++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/app/account/account.component.ts b/app/src/app/account/account.component.ts
index 0cc16dc..181ea7e 100644
--- a/app/src/app/account/account.component.ts
+++ b/app/src/app/account/account.component.ts
@@ -71,6 +71,8 @@ export class AccountComponent implements OnInit, OnDestroy
     };
 
     const modalRef = this.modalService.show(SshKeyEditorComponent, modalConfig);
+
+    modalRef.content.save.pipe(first()).subscribe(sshKey => this.userKeys.push(sshKey));
   }
 
   // ----------------------------------------------------------------------------------------------------------------
diff --git a/app/src/app/account/helpers/account.service.ts b/app/src/app/account/helpers/account.service.ts
index 4fc8df8..cad7ba7 100644
--- a/app/src/app/account/helpers/account.service.ts
+++ b/app/src/app/account/helpers/account.service.ts
@@ -37,9 +37,9 @@ export class AccountService
   }
 
   // ----------------------------------------------------------------------------------------------------------------
-  addKey(name: string, key: string, fingerprint: string): Observable<UserKey>
+  addKey(name: string, key: string): Observable<UserKey>
   {
-    return this.httpClient.post<UserKey>(`/api/my/keys`, { name, key, fingerprint });
+    return this.httpClient.post<UserKey>(`/api/my/keys`, { name, key });
   }
 
   // ----------------------------------------------------------------------------------------------------------------
diff --git a/app/src/app/account/ssh-key-editor/ssh-key-editor.component.html b/app/src/app/account/ssh-key-editor/ssh-key-editor.component.html
index bac6aae..6947dd6 100644
--- a/app/src/app/account/ssh-key-editor/ssh-key-editor.component.html
+++ b/app/src/app/account/ssh-key-editor/ssh-key-editor.component.html
@@ -10,11 +10,10 @@
       <div class="mt-3">
         <input type="text" class="form-control" formControlName="name" placeholder="Name" [appAutofocus]="true" [appAutofocusDelay]="600">
         <textarea rows="4" class="form-control" formControlName="key" placeholder="SSH key"></textarea>
-        <input type="text" class="form-control" formControlName="fingerprint" placeholder="Fingerprint">
       </div>
 
       <div class="d-flex justify-content-end align-items-center mt-5">
-        <button class="btn btn-info" (click)="saveChanges()" [disabled]="editorForm.invalid">Save changes</button>
+        <button class="btn btn-info" (click)="saveChanges()" [disabled]="editorForm.invalid">Add key</button>
       </div>
     </div>
   </fieldset>
diff --git a/app/src/app/account/ssh-key-editor/ssh-key-editor.component.ts b/app/src/app/account/ssh-key-editor/ssh-key-editor.component.ts
index 7160fc7..dbe8da3 100644
--- a/app/src/app/account/ssh-key-editor/ssh-key-editor.component.ts
+++ b/app/src/app/account/ssh-key-editor/ssh-key-editor.component.ts
@@ -40,8 +40,7 @@ export class SshKeyEditorComponent implements OnInit, OnDestroy
     this.editorForm = this.fb.group(
       {
         name: [null, Validators.required],
-        key: [null, Validators.required],
-        fingerprint: [null, Validators.required]
+        key: [null, Validators.required]
       });
   }
 
@@ -56,7 +55,7 @@ export class SshKeyEditorComponent implements OnInit, OnDestroy
   {
     const sshKey = this.editorForm.getRawValue();
 
-    this.accountService.addKey(sshKey.name, sshKey.key, sshKey.fingerprint)
+    this.accountService.addKey(sshKey.name, sshKey.key)
       .subscribe(response =>
       {
         this.save.next(response);