Misc fixes

Author: cvs0

prisma/schema.prisma

@@ -24,7 +24,6 @@ model User {
   noteItems     NoteItem[]
 }
 
-
 enum VaultItemType {
   PASSWORD
   CARD
@@ -33,18 +32,18 @@ enum VaultItemType {
 }
 
 model PasswordItem {
-  id        String        @id @default(uuid())
-  type      VaultItemType @default(PASSWORD)
-  website   String
-  username  String
-  password  String
-  usernameIV        String
-  websiteIV         String
-  passwordIV        String
-  createdAt DateTime      @default(now())
-  updatedAt DateTime      @updatedAt
-  userId    String
-  user      User          @relation(fields: [userId], references: [id])
+  id         String        @id @default(uuid())
+  type       VaultItemType @default(PASSWORD)
+  website    String
+  username   String
+  password   String
+  usernameIV String
+  websiteIV  String
+  passwordIV String
+  createdAt  DateTime      @default(now())
+  updatedAt  DateTime      @updatedAt
+  userId     String
+  user       User          @relation(fields: [userId], references: [id])
 }
 
 model CardItem {

src/app/actions.ts

@@ -37,7 +37,7 @@ export async function updatePasswordItem(
     throw new Error("Password item not found");
   }
 
-  await prismadb.passwordItem.update({
+  const item = await prismadb.passwordItem.update({
     where: {
       id: passwordItem.id,
     },
@@ -51,7 +51,7 @@ export async function updatePasswordItem(
     },
   });
 
-  return { success: true };
+  return item;
 }
 
 export async function deletePasswordItem(id: string) {

src/components/vault/dialogs/edit-password-dialog.tsx

@@ -1,5 +1,5 @@
-import {updatePasswordItem} from "@/app/actions";
-import {Button} from "@/components/ui/button";
+import { updatePasswordItem } from "@/app/actions";
+import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
@@ -8,15 +8,16 @@ import {
   DialogHeader,
   DialogTitle,
 } from "@/components/ui/dialog";
-import {Input} from "@/components/ui/input";
-import {encrypt} from "@/utils/encryption";
-import {useUser} from "@clerk/nextjs";
-import {Globe,Loader2} from "lucide-react";
-import {useRouter} from "next/navigation";
+import { Input } from "@/components/ui/input";
+import prismadb from "@/lib/prismadb";
+import { encrypt } from "@/utils/encryption";
+import { useUser } from "@clerk/nextjs";
+import { Globe, Loader2 } from "lucide-react";
+import { useRouter } from "next/navigation";
 import * as React from "react";
-import {useEffect,useState} from "react";
+import { useEffect, useState } from "react";
 import toast from "react-hot-toast";
-import {z} from "zod";
+import { z } from "zod";
 
 interface PasswordEntry {
   id: string;
@@ -80,53 +81,59 @@ export function EditPasswordDialog({
 
   const handleSave = async () => {
     setLoading(true);
-  
+
     const validationResult = passwordSchema.safeParse({
       name: editedEntry.name,
       username: editedEntry.username,
       website: editedEntry.website,
       password: editedEntry.password,
     });
-  
+
     if (!validationResult.success) {
       const errorMessage =
         validationResult.error.errors[0]?.message || "Validation failed";
       toast.error(errorMessage);
       setLoading(false);
       return;
     }
-  
+
     if (!user) {
       toast.error("User not found");
       setLoading(false);
       return;
     }
-  
+
+    if (!entry) {
+      toast.error("Entry not found");
+      setLoading(false);
+      return;
+    }
+
     try {
       const encryptedUsername = await encrypt(editedEntry.username, user.id);
       const encryptedWebsite = await encrypt(editedEntry.website, user.id);
       const encryptedPassword = await encrypt(editedEntry.password, user.id);
-  
-      updatePasswordItem(
-        entry!.id,
+
+      await updatePasswordItem(
+        entry.id,
         encryptedUsername.encryptedData,
         encryptedWebsite.encryptedData,
         encryptedPassword.encryptedData,
-        encryptedUsername.iv,
+        encryptedUsername.iv, 
         encryptedWebsite.iv,
-        encryptedPassword.iv,
+        encryptedPassword.iv
       );
-  
+
       router.refresh();
       toast.success("Password updated");
+
       onClose();
     } catch (error) {
       toast.error("Failed to update password");
     } finally {
       setLoading(false);
     }
   };
-  
 
   return (
     <Dialog open={isOpen} onOpenChange={onClose}>

src/components/vault/vault-page.tsx

@@ -33,7 +33,9 @@ interface PasswordEntry {
   username: string;
   website: string;
   password: string;
-  iv: string;
+  usernameIV: string;
+  websiteIV: string;
+  passwordIV: string;
   updatedAt: string;
   lastAccess: string;
   created: string;
@@ -86,19 +88,31 @@ export const VaultPage: React.FC<VaultPageProps> = ({ user }) => {
 
   useEffect(() => {
     if (!clerkUser) return;
-  
+
     if (!user?.passwordItems || !passwordItems) return;
-  
+
     const decryptPasswords = async () => {
       const decryptedPasswords = await Promise.all(
         passwordItems.map(async (item) => {
           try {
             const decryptedItem = {
               id: item.id,
               name: await decrypt(item.username, item.usernameIV, clerkUser.id),
-              username: await decrypt(item.username, item.usernameIV, clerkUser.id),
-              website: await decrypt(item.website, item.websiteIV, clerkUser.id),
-              password: await decrypt(item.password, item.passwordIV, clerkUser.id),
+              username: await decrypt(
+                item.username,
+                item.usernameIV,
+                clerkUser.id
+              ),
+              website: await decrypt(
+                item.website,
+                item.websiteIV,
+                clerkUser.id
+              ),
+              password: await decrypt(
+                item.password,
+                item.passwordIV,
+                clerkUser.id
+              ),
               updatedAt: item.updatedAt.toISOString(),
               lastAccess: item.updatedAt.toISOString(),
               created: item.createdAt.toISOString(),
@@ -110,15 +124,16 @@ export const VaultPage: React.FC<VaultPageProps> = ({ user }) => {
           }
         })
       );
-  
+
       setPasswords(
-        decryptedPasswords.filter((item): item is PasswordEntry => item !== null)
+        decryptedPasswords.filter(
+          (item): item is PasswordEntry => item !== null
+        )
       );
     };
-  
+
     decryptPasswords();
   }, [user?.passwordItems, clerkUser, passwordItems]);
-  
 
   const handleSearchChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setSearchQuery(e.target.value);