Refactor SignerService - Organize and clean up code and encrypt seckey

block-core · Sep 14, 2024 · d40cd6b · d40cd6b
1 parent 0ad2278
commit d40cd6b
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 246 deletions.
diff --git a/src/app/components/auth/login/login.component.ts b/src/app/components/auth/login/login.component.ts
@@ -91,7 +91,7 @@ export class LoginComponent implements OnInit {
         this.showSecAlert = false;
 
         try {
-            const success = this._signerService.handleLoginWithKey(secretKey); // Updated method to handle both nsec and hex
+            const success = this._signerService.handleLoginWithKey(secretKey,password); // Updated method to handle both nsec and hex
 
             if (success) {
                 // Successful login
@@ -121,7 +121,7 @@ export class LoginComponent implements OnInit {
         this.loading = true;
         this.showMenemonicAlert = false;
 
-        const success = this._signerService.handleLoginWithMenemonic(menemonic, passphrase);
+        const success = this._signerService.handleLoginWithMenemonic(menemonic, passphrase,password);
 
         if (success) {
             this._router.navigateByUrl('/home');

diff --git a/src/app/components/auth/register/register.component.ts b/src/app/components/auth/register/register.component.ts
@@ -84,7 +84,7 @@ export class RegisterComponent implements OnInit {
         const password = this.registerForm.get('password')?.value;
 
         // Generate keys using the security service
-        const keys = this._signerService.generateAndStoreKeys();
+        const keys = this._signerService.generateAndStoreKeys(password);
 
         if (!keys) {
             // If key generation failed, enable the form and show an error
@@ -94,7 +94,7 @@ export class RegisterComponent implements OnInit {
             return;
         }
 
-        const { privateKeyHex, publicKey, npub, nsec } = keys;
+        const { secretKey, pubkey, npub, nsec } = keys;
 
         // Simulate saving user metadata along with keys
         const userMetadata = {
@@ -103,7 +103,7 @@ export class RegisterComponent implements OnInit {
             about,
             avatarUrl,
             password,
-            publicKey,
+            pubkey,
             npub,
             nsec,
         };