From 5b32b32324c4bbaaf9c4c5b37eefe8467c03eed2 Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm@evermiss.net>
Date: Sun, 28 Jul 2024 21:40:45 -0500
Subject: [PATCH] split out verifyPassword into two functions

---
 src/components/Popup/SetPasswordPage.vue |  4 ++--
 src/models/password.ts                   | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/Popup/SetPasswordPage.vue b/src/components/Popup/SetPasswordPage.vue
index 7f6eca5f..f01ddd65 100644
--- a/src/components/Popup/SetPasswordPage.vue
+++ b/src/components/Popup/SetPasswordPage.vue
@@ -29,7 +29,7 @@
 </template>
 <script lang="ts">
 import Vue from "vue";
-import { verifyPassword } from "../../models/password";
+import { verifyPasswordUsingKeyID } from "../../models/password";
 
 export default Vue.extend({
   data: function () {
@@ -70,7 +70,7 @@ export default Vue.extend({
       this.$store.commit("currentView/changeView", "LoadingPage");
 
       if (this.defaultEncryption) {
-        const isCorrectPassword = await verifyPassword(
+        const isCorrectPassword = await verifyPasswordUsingKeyID(
           this.defaultEncryption,
           this.currentPhrase
         );
diff --git a/src/models/password.ts b/src/models/password.ts
index c0e55330..2d3bb310 100644
--- a/src/models/password.ts
+++ b/src/models/password.ts
@@ -52,7 +52,8 @@ export async function argonVerify(
   return argonPromise;
 }
 
-export async function verifyPassword(
+// Verify a password using keys in BrowserStorage
+export async function verifyPasswordUsingKeyID(
   keyId: string,
   password: string
 ): Promise<boolean> {
@@ -69,6 +70,13 @@ export async function verifyPassword(
     throw new Error(`Key ${keyId} not in BrowserStorage`);
   }
 
+  return verifyPasswordUsingKey(key, password);
+}
+
+export async function verifyPasswordUsingKey(
+  key: Key,
+  password: string
+): Promise<boolean> {
   // Hash password with argon
   const rawHash = await argonHash(password, key.salt);
   if (!rawHash) {