Your favorite shift management application!
feat: Centralizes password caching with utility functions (#21)
panteL67205e5e5900
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.mdindex 4fd7feb..ca0e2a8 100644--- a/.github/copilot-instructions.md+++ b/.github/copilot-instructions.md@@ -66,14 +66,29 @@ export async function PUT(Calendars can be password-protected. Implementation flow:-1. Check localStorage: `calendar_password_${calendarId}`-2. Verify via `/api/calendars/[id]/verify-password` POST-3. On 401: Show `PasswordDialog`, store in localStorage+1. Check localStorage via `getCachedPassword(calendarId)` from `lib/password-cache.ts`+2. Verify via `verifyAndCachePassword(calendarId, password)` - automatically caches valid passwords+3. On invalid password: Show `PasswordDialog`, which automatically caches on success4. Use `pendingAction` state to retry operation after authentication+**Important**: Always use the utilities from `lib/password-cache.ts` instead of direct localStorage access:++- `getCachedPassword(calendarId)` - Get cached password+- `setCachedPassword(calendarId, password)` - Cache password after verification+- `removeCachedPassword(calendarId)` - Remove cached password+- `verifyAndCachePassword(calendarId, password)` - Verify and auto-cache if valid+- `hasValidCachedPassword(calendarId)` - Check if cached password is still valid+```typescript-setPendingAction({ type: "edit", shiftId: id, formData });-setShowPasswordDialog(true);+// Example: Password check before action+const password = getCachedPassword(calendarId);+const result = await verifyAndCachePassword(calendarId, password);++if (result.protected && !result.valid) {+ setPendingAction({ type: "edit", shiftId: id, formData });+ setShowPasswordDialog(true);+ return;+}```### State Managementdiff --git a/app/page.tsx b/app/page.tsxindex 1f72dc5..691d99c 100644--- a/app/page.tsx+++ b/app/page.tsx@@ -3,6 +3,7 @@import { useState, useEffect, useCallback, useMemo, Suspense } from "react";import { useRouter, useSearchParams } from "next/navigation";import { useTranslations, useLocale } from "next-intl";+import { toast } from "sonner";import { CalendarDialog } from "@/components/calendar-dialog";import { ShiftDialog, ShiftFormData } from "@/components/shift-dialog";import { PasswordDialog } from "@/components/password-dialog";@@ -43,7 +44,10 @@ import { de, enUS } from "date-fns/locale";import { CalendarNote, ShiftPreset, ICloudSync } from "@/lib/db/schema";import { ShiftWithCalendar } from "@/lib/types";import { formatDateToLocal } from "@/lib/date-utils";-import { toast } from "sonner";+import {+ getCachedPassword,+ verifyAndCachePassword,+} from "@/lib/password-cache";import { motion } from "motion/react";import { useCalendars } from "@/hooks/useCalendars";import { useShifts } from "@/hooks/useShifts";@@ -212,34 +216,17 @@ function HomeContent() {// Check if calendar is lockedif (selectedCalendarIsLocked) {- // Check if we have a valid password in localStorage- const storedPassword = localStorage.getItem(- `calendar_password_${selectedCalendar}`- );+ const cachedPassword = getCachedPassword(selectedCalendar);- if (storedPassword) {+ if (cachedPassword) {// Set loading state and verify password before unlockingsetIsVerifyingCalendarPassword(true);setIsCalendarUnlocked(false);- // Verify the stored password- fetch(`/api/calendars/${selectedCalendar}/verify-password`, {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({ password: storedPassword }),- })- .then((response) => response.json())- .then((data) => {- if (data.valid) {- // Password valid, unlock calendar- setIsCalendarUnlocked(true);- } else {- // Password invalid, remove from storage and keep locked- localStorage.removeItem(- `calendar_password_${selectedCalendar}`- );- setIsCalendarUnlocked(false);- }+ // Verify the cached password+ verifyAndCachePassword(selectedCalendar, cachedPassword)+ .then((result) => {+ setIsCalendarUnlocked(result.valid);}).catch(() => {// On error, keep calendar locked@@ -250,7 +237,7 @@ function HomeContent() {setIsVerifyingCalendarPassword(false);});} else {- // No stored password, set unlocked to false - form will handle it+ // No cached password, set unlocked to falsesetIsCalendarUnlocked(false);setIsVerifyingCalendarPassword(false);}@@ -278,35 +265,22 @@ function HomeContent() {// Check if calendar is password protectedif (calendar.passwordHash) {- const storedPassword = localStorage.getItem(- `calendar_password_${selectedCalendar}`- );+ const cachedPassword = getCachedPassword(selectedCalendar);- if (storedPassword) {- // Verify stored password- try {- const response = await fetch(- `/api/calendars/${selectedCalendar}/verify-password`,- {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({ password: storedPassword }),- }- );+ if (cachedPassword) {+ // Verify cached password+ const result = await verifyAndCachePassword(+ selectedCalendar,+ cachedPassword+ );- if (response.ok) {- setShowICloudSyncDialog(true);- return;- } else {- // Password invalid, remove from storage- localStorage.removeItem(`calendar_password_${selectedCalendar}`);- }- } catch (error) {- console.error("Password verification failed:", error);+ if (result.valid) {+ setShowICloudSyncDialog(true);+ return;}}- // Show password dialog+ // Show password dialog if no valid cached passwordsetPendingAction({type: "edit",presetAction: async () => {@@ -519,38 +493,23 @@ function HomeContent() {const handleManualShiftCreation = async () => {if (!selectedCalendar) return;- try {- const password = localStorage.getItem(- `calendar_password_${selectedCalendar}`- );-- const response = await fetch(- `/api/calendars/${selectedCalendar}/verify-password`,- {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({ password }),- }- );-- const data = await response.json();-- if (data.protected && !data.valid) {- localStorage.removeItem(`calendar_password_${selectedCalendar}`);- setPendingAction({- type: "edit",- presetAction: handleManualShiftCreation,- });- setShowPasswordDialog(true);- return;- }+ const cachedPassword = getCachedPassword(selectedCalendar);+ const result = await verifyAndCachePassword(+ selectedCalendar,+ cachedPassword+ );- setSelectedDate(new Date());- setShowShiftDialog(true);- } catch (error) {- console.error("Failed to verify password:", error);- toast.error(t("password.errorVerification"));+ if (result.protected && !result.valid) {+ setPendingAction({+ type: "edit",+ presetAction: handleManualShiftCreation,+ });+ setShowPasswordDialog(true);+ return;}++ setSelectedDate(new Date());+ setShowShiftDialog(true);};const handleShowAllShifts = (date: Date, dayShifts: ShiftWithCalendar[]) => {@@ -593,23 +552,13 @@ function HomeContent() {try {const password = selectedCalendar- ? localStorage.getItem(`calendar_password_${selectedCalendar}`)+ ? getCachedPassword(selectedCalendar): null;if (selectedCalendar) {- const response = await fetch(- `/api/calendars/${selectedCalendar}/verify-password`,- {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({ password }),- }- );-- const data = await response.json();+ const result = await verifyAndCachePassword(selectedCalendar, password);- if (data.protected && !data.valid) {- localStorage.removeItem(`calendar_password_${selectedCalendar}`);+ if (result.protected && !result.valid) {setPendingAction({type: "edit",presetAction: () => handleAddShift(targetDate),diff --git a/components/manage-password-dialog.tsx b/components/manage-password-dialog.tsxindex f5224b1..45b9b80 100644--- a/components/manage-password-dialog.tsx+++ b/components/manage-password-dialog.tsx@@ -14,6 +14,7 @@ import { Button } from "@/components/ui/button";import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";import { Checkbox } from "@/components/ui/checkbox";+import { removeCachedPassword, setCachedPassword } from "@/lib/password-cache";interface ManagePasswordDialogProps {open: boolean;@@ -112,12 +113,16 @@ export function ManagePasswordDialog({return;}- // Clear cached password from localStorage- localStorage.removeItem(`calendar_password_${calendarId}`);-- // If new password was set, cache it- if (!removePassword && newPassword) {- localStorage.setItem(`calendar_password_${calendarId}`, newPassword);+ // Handle localStorage based on what changed+ if (removePassword) {+ // Only remove from localStorage if password was actually removed+ removeCachedPassword(calendarId);+ } else if (newPassword) {+ // New password was set, update localStorage+ setCachedPassword(calendarId, newPassword);+ } else if (hasPassword && currentPassword) {+ // Only isLocked changed, keep the current password cached+ setCachedPassword(calendarId, currentPassword);}onSuccess();diff --git a/components/password-dialog.tsx b/components/password-dialog.tsxindex 165a544..1cca959 100644--- a/components/password-dialog.tsx+++ b/components/password-dialog.tsx@@ -12,6 +12,7 @@ import {import { Button } from "@/components/ui/button";import { Input } from "@/components/ui/input";import { Label } from "@/components/ui/label";+import { verifyAndCachePassword } from "@/lib/password-cache";interface PasswordDialogProps {open: boolean;@@ -46,20 +47,9 @@ export function PasswordDialog({setLoading(true);try {- const response = await fetch(- `/api/calendars/${calendarId}/verify-password`,- {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({ password }),- }- );+ const result = await verifyAndCachePassword(calendarId, password);- const data = await response.json();-- if (data.valid) {- // Store password in localStorage- localStorage.setItem(`calendar_password_${calendarId}`, password);+ if (result.valid) {onSuccess(password);onOpenChange(false);} else {diff --git a/hooks/useCalendars.ts b/hooks/useCalendars.tsindex 7714602..5b053a3 100644--- a/hooks/useCalendars.ts+++ b/hooks/useCalendars.ts@@ -2,6 +2,7 @@ import { useState, useEffect } from "react";import { CalendarWithCount } from "@/lib/types";import { toast } from "sonner";import { useTranslations } from "next-intl";+import { removeCachedPassword, setCachedPassword } from "@/lib/password-cache";export function useCalendars(initialCalendarId?: string | null) {const t = useTranslations();@@ -63,6 +64,12 @@ export function useCalendars(initialCalendarId?: string | null) {const newCalendar = await response.json();setCalendars((prev) => [...prev, newCalendar]);setSelectedCalendar(newCalendar.id);++ // Cache the password if one was provided+ if (password) {+ setCachedPassword(newCalendar.id, password);+ }+toast.success(t("calendar.created"));} catch (error) {console.error("Failed to create calendar:", error);@@ -99,7 +106,7 @@ export function useCalendars(initialCalendarId?: string | null) {return remainingCalendars;});- localStorage.removeItem(`calendar_password_${calendarId}`);+ removeCachedPassword(calendarId);toast.success(t("calendar.deleted"));return true;diff --git a/hooks/useNotes.ts b/hooks/useNotes.tsindex 9f6f2a9..b281a6c 100644--- a/hooks/useNotes.ts+++ b/hooks/useNotes.ts@@ -3,6 +3,7 @@ import { CalendarNote } from "@/lib/db/schema";import { formatDateToLocal } from "@/lib/date-utils";import { toast } from "sonner";import { useTranslations } from "next-intl";+import { getCachedPassword } from "@/lib/password-cache";export function useNotes(calendarId: string | undefined) {const t = useTranslations();@@ -34,7 +35,7 @@ export function useNotes(calendarId: string | undefined) {if (!calendarId) return false;try {- const password = localStorage.getItem(`calendar_password_${calendarId}`);+ const password = getCachedPassword(calendarId);const response = await fetch("/api/notes", {method: "POST",@@ -79,9 +80,7 @@ export function useNotes(calendarId: string | undefined) {onPasswordRequired?: () => void) => {try {- const password = calendarId- ? localStorage.getItem(`calendar_password_${calendarId}`)- : null;+ const password = calendarId ? getCachedPassword(calendarId) : null;const response = await fetch(`/api/notes/${noteId}`, {method: "PUT",@@ -120,9 +119,7 @@ export function useNotes(calendarId: string | undefined) {onPasswordRequired?: () => void) => {try {- const password = calendarId- ? localStorage.getItem(`calendar_password_${calendarId}`)- : null;+ const password = calendarId ? getCachedPassword(calendarId) : null;const response = await fetch(`/api/notes/${noteId}`, {method: "DELETE",diff --git a/hooks/usePasswordProtection.ts b/hooks/usePasswordProtection.tsindex e039d03..20279bf 100644--- a/hooks/usePasswordProtection.ts+++ b/hooks/usePasswordProtection.ts@@ -1,4 +1,8 @@import { useCallback } from "react";+import {+ getCachedPassword,+ verifyAndCachePassword,+} from "@/lib/password-cache";interface UsePasswordProtectionOptions {calendarId: string;@@ -10,30 +14,9 @@ export function usePasswordProtection({onPasswordRequired,}: UsePasswordProtectionOptions) {const verifyPassword = useCallback(async (): Promise<boolean> => {- const password = localStorage.getItem(`calendar_password_${calendarId}`);-- try {- const response = await fetch(- `/api/calendars/${calendarId}/verify-password`,- {- method: "POST",- headers: { "Content-Type": "application/json" },- body: JSON.stringify({ password }),- }- );-- const data = await response.json();-- if (data.protected && !data.valid) {- localStorage.removeItem(`calendar_password_${calendarId}`);- return false;- }-- return true;- } catch (error) {- console.error("Failed to verify password:", error);- return false;- }+ const password = getCachedPassword(calendarId);+ const result = await verifyAndCachePassword(calendarId, password);+ return result.valid;}, [calendarId]);const withPasswordCheck = useCallback(@@ -53,7 +36,7 @@ export function usePasswordProtection({);const getPassword = useCallback(() => {- return localStorage.getItem(`calendar_password_${calendarId}`);+ return getCachedPassword(calendarId);}, [calendarId]);return {diff --git a/hooks/useShifts.ts b/hooks/useShifts.tsindex 8c3d34c..82807f9 100644--- a/hooks/useShifts.ts+++ b/hooks/useShifts.ts@@ -3,6 +3,7 @@ import { ShiftWithCalendar } from "@/lib/types";import { ShiftFormData } from "@/components/shift-dialog";import { toast } from "sonner";import { useTranslations } from "next-intl";+import { getCachedPassword } from "@/lib/password-cache";export function useShifts(calendarId: string | undefined) {const t = useTranslations();@@ -81,9 +82,7 @@ export function useShifts(calendarId: string | undefined) {onPasswordRequired?: () => void) => {try {- const password = calendarId- ? localStorage.getItem(`calendar_password_${calendarId}`)- : null;+ const password = calendarId ? getCachedPassword(calendarId) : null;const response = await fetch(`/api/shifts/${id}`, {method: "PATCH",@@ -119,9 +118,7 @@ export function useShifts(calendarId: string | undefined) {const deleteShift = async (id: string, onPasswordRequired?: () => void) => {try {- const password = calendarId- ? localStorage.getItem(`calendar_password_${calendarId}`)- : null;+ const password = calendarId ? getCachedPassword(calendarId) : null;const response = await fetch(`/api/shifts/${id}`, {method: "DELETE",diff --git a/lib/password-cache.ts b/lib/password-cache.tsnew file mode 100644index 0000000..6571596--- /dev/null+++ b/lib/password-cache.ts@@ -0,0 +1,101 @@+/**+ * Centralized password caching and verification utility+ * Ensures consistent password handling across all components+ */++/**+ * Get cached password from localStorage+ */+export function getCachedPassword(calendarId: string): string | null {+ if (typeof window === "undefined") return null;+ return localStorage.getItem(`calendar_password_${calendarId}`);+}++/**+ * Cache password in localStorage+ */+export function setCachedPassword(calendarId: string, password: string): void {+ if (typeof window === "undefined") return;+ localStorage.setItem(`calendar_password_${calendarId}`, password);+}++/**+ * Remove cached password from localStorage+ */+export function removeCachedPassword(calendarId: string): void {+ if (typeof window === "undefined") return;+ localStorage.removeItem(`calendar_password_${calendarId}`);+}++/**+ * Verify password with the server and cache if valid+ * Returns { valid: boolean, protected: boolean }+ */+export async function verifyAndCachePassword(+ calendarId: string,+ password: string | null+): Promise<{ valid: boolean; protected: boolean }> {+ try {+ const response = await fetch(+ `/api/calendars/${calendarId}/verify-password`,+ {+ method: "POST",+ headers: { "Content-Type": "application/json" },+ body: JSON.stringify({ password }),+ }+ );++ // Handle different HTTP status codes+ if (!response.ok) {+ // 401 Unauthorized or 403 Forbidden indicate wrong password+ if (response.status === 401 || response.status === 403) {+ removeCachedPassword(calendarId);+ return { valid: false, protected: true };+ }++ // Other errors (404, 500, etc.) - treat as temporary failure+ // Don't remove cached password as the error might be transient+ console.error(+ `Password verification failed with status ${response.status}`+ );+ return { valid: false, protected: true };+ }++ const data = await response.json();++ // If calendar is protected and password is invalid, remove from cache+ if (data.protected && !data.valid) {+ removeCachedPassword(calendarId);+ return { valid: false, protected: true };+ }++ // If valid and password was provided, cache it+ if (data.valid && password) {+ setCachedPassword(calendarId, password);+ }++ return {+ valid: data.valid,+ protected: data.protected,+ };+ } catch (error) {+ // Network errors or other exceptions+ // Don't remove cached password as this might be a temporary network issue+ console.error("Failed to verify password:", error);+ return { valid: false, protected: true };+ }+}++/**+ * Check if we have a valid cached password+ * This verifies the cached password with the server+ */+export async function hasValidCachedPassword(+ calendarId: string+): Promise<boolean> {+ const cachedPassword = getCachedPassword(calendarId);+ if (!cachedPassword) return false;++ const result = await verifyAndCachePassword(calendarId, cachedPassword);+ return result.valid;+}diff --git a/lib/password-utils.ts b/lib/password-utils.tsindex 8953010..4cedf38 100644--- a/lib/password-utils.ts+++ b/lib/password-utils.ts@@ -21,10 +21,3 @@ export function verifyPassword(const inputHash = hashPassword(password);return inputHash === hash;}--/**- * Generates a random salt (optional, for future enhancements)- */-export function generateSalt(): string {- return crypto.randomBytes(16).toString("hex");-}