Skip to content

Commit d93faf2

Browse files
itsmeakhilitsmeakhil
authored
Merge pull request #65 from zecrypt-io/preview
Fix Session related Issue
2 parents 82fd469 + e441f6d commit d93faf2

37 files changed

Lines changed: 235 additions & 63 deletions

‎packages/frontend-web/components/add-account-dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { Badge } from "@/components/ui/badge";
1010
import { useTranslator } from "@/hooks/use-translations";
1111
import axiosInstance from "../libs/Middleware/axiosInstace";
1212
import { encryptAccountData } from "@/libs/encryption";
13-
import { secureGetItem } from "@/libs/session-storage-utils";
13+
import { secureGetItem } from "@/libs/local-storage-utils";
1414

1515
interface AddAccountDialogProps {
1616
open: boolean;

‎packages/frontend-web/components/add-apikey.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { useTranslator } from "@/hooks/use-translations";
1414
import axiosInstance from "@/libs/Middleware/axiosInstace";
1515
import { hashData } from "@/libs/crypto";
1616
import { encryptDataField } from "@/libs/encryption";
17-
import { secureGetItem, decryptFromSessionStorage } from "@/libs/session-storage-utils";
17+
import { secureGetItem, decryptFromLocalStorage } from "@/libs/local-storage-utils";
1818
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
1919

2020
interface AddApiKeyProps {
@@ -106,18 +106,18 @@ export function AddApiKey({ open, onOpenChange, onApiKeyAdded }: AddApiKeyProps)
106106
console.log("API key JSON prepared:", apiKeyJson);
107107

108108
// Get the current project keys from storage
109-
console.log("All sessionStorage keys:", Object.keys(sessionStorage));
109+
console.log("All localStorage keys:", Object.keys(localStorage));
110110

111-
// Direct access to session storage key - using project name
111+
// Direct access to localStorage key - using project name
112112
let effectiveProjectKey = projectKey;
113113
if (!effectiveProjectKey && selectedProjectName) {
114114
console.log("Project key not found in state, trying to load directly");
115-
const rawProjectKey = sessionStorage.getItem(`projectKey_${selectedProjectName}`);
116-
console.log("Raw project key from session storage:", rawProjectKey ? `Found (${rawProjectKey.length} chars)` : "Not found");
115+
const rawProjectKey = localStorage.getItem(`projectKey_${selectedProjectName}`);
116+
console.log("Raw project key from localStorage:", rawProjectKey ? `Found (${rawProjectKey.length} chars)` : "Not found");
117117

118118
// Try to decrypt it if found
119119
if (rawProjectKey) {
120-
effectiveProjectKey = await decryptFromSessionStorage(rawProjectKey);
120+
effectiveProjectKey = await decryptFromLocalStorage(rawProjectKey);
121121
console.log("Decrypted project key:", effectiveProjectKey ? "Found" : "Failed to decrypt");
122122
}
123123
}

‎packages/frontend-web/components/add-card-dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { Badge } from "@/components/ui/badge";
1515
import { X } from "lucide-react";
1616
import axiosInstance from "@/libs/Middleware/axiosInstace";
1717
import { encryptDataField } from "@/libs/encryption";
18-
import { secureGetItem } from "@/libs/session-storage-utils";
18+
import { secureGetItem } from "@/libs/local-storage-utils";
1919

2020
interface AddCardDialogProps {
2121
open: boolean;

‎packages/frontend-web/components/add-email-dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { useTranslator } from "@/hooks/use-translations";
1414
import axiosInstance from "@/libs/Middleware/axiosInstace";
1515
import { hashData } from "@/libs/crypto";
1616
import { encryptDataField } from "@/libs/encryption";
17-
import { secureGetItem } from "@/libs/session-storage-utils";
17+
import { secureGetItem } from "@/libs/local-storage-utils";
1818
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
1919

2020
interface Email {

‎packages/frontend-web/components/add-identity-dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { Badge } from "@/components/ui/badge";
1414
import { X } from "lucide-react";
1515
import axiosInstance from "@/libs/Middleware/axiosInstace";
1616
import { encryptDataField } from "@/libs/encryption";
17-
import { secureGetItem } from "@/libs/session-storage-utils";
17+
import { secureGetItem } from "@/libs/local-storage-utils";
1818

1919
interface AddIdentityDialogProps {
2020
open: boolean;

‎packages/frontend-web/components/add-license-dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
DialogTitle,
2222
} from "@/components/ui/dialog";
2323
import { encryptDataField } from "@/libs/encryption";
24-
import { secureGetItem } from "@/libs/session-storage-utils";
24+
import { secureGetItem } from "@/libs/local-storage-utils";
2525

2626
interface AddLicenseDialogProps {
2727
isOpen: boolean;

‎packages/frontend-web/components/add-passphrase-dialoge.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import { useTranslator } from "@/hooks/use-translations";
1515
import axiosInstance from "@/libs/Middleware/axiosInstace";
1616
import { hashData } from "@/libs/crypto";
1717
import { encryptDataField } from "@/libs/encryption";
18-
import { secureGetItem, decryptFromSessionStorage } from "@/libs/session-storage-utils";
18+
import { secureGetItem, decryptFromLocalStorage } from "@/libs/local-storage-utils";
1919
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
2020

2121
interface WalletPassphrase {
@@ -231,12 +231,12 @@ export function AddPassphraseDialog({
231231
if (!effectiveProjectKey && selectedProjectName) {
232232
try {
233233
console.log("Project key not found in state, trying to load directly");
234-
const rawProjectKey = sessionStorage.getItem(`projectKey_${selectedProjectName}`);
235-
console.log("Raw project key from session storage:", rawProjectKey ? `Found (${rawProjectKey.length} chars)` : "Not found");
234+
const rawProjectKey = localStorage.getItem(`projectKey_${selectedProjectName}`);
235+
console.log("Raw project key from localStorage:", rawProjectKey ? `Found (${rawProjectKey.length} chars)` : "Not found");
236236

237237
// Try to decrypt it if found
238238
if (rawProjectKey) {
239-
effectiveProjectKey = await decryptFromSessionStorage(rawProjectKey);
239+
effectiveProjectKey = await decryptFromLocalStorage(rawProjectKey);
240240
console.log("Decrypted project key:", effectiveProjectKey ? "Found" : "Failed to decrypt");
241241
}
242242
} catch (error) {

‎packages/frontend-web/components/add-ssh-key-dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { toast } from "@/components/ui/use-toast";
1313
import { useTranslator } from "@/hooks/use-translations";
1414
import axiosInstance from "@/libs/Middleware/axiosInstace";
1515
import { encryptDataField } from "@/libs/encryption";
16-
import { secureGetItem } from "@/libs/session-storage-utils";
16+
import { secureGetItem } from "@/libs/local-storage-utils";
1717
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
1818

1919
interface SSHKey {

‎packages/frontend-web/components/add-wifi.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { toast } from "@/components/ui/use-toast";
1313
import { useTranslator } from "@/hooks/use-translations";
1414
import axiosInstance from "../libs/Middleware/axiosInstace";
1515
import { encryptDataField } from "../libs/encryption";
16-
import { secureGetItem } from "@/libs/session-storage-utils";
16+
import { secureGetItem } from "@/libs/local-storage-utils";
1717
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
1818

1919
interface AddWifiProps {

‎packages/frontend-web/components/api-keys-content.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import { useApiKeyManagement } from "@/hooks/use-apikey-management";
3939
import { AddApiKey } from "./add-apikey";
4040
import { EditApiKey } from "./edit-apikey";
4141
import { SortButton } from "@/components/ui/sort-button";
42-
import { secureGetItem, decryptFromSessionStorage } from "@/libs/session-storage-utils";
42+
import { secureGetItem, decryptFromLocalStorage } from "@/libs/local-storage-utils";
4343
import { decryptDataField } from "@/libs/encryption";
4444

4545
interface ApiKey {
@@ -176,9 +176,9 @@ export function ApiKeysContent() {
176176
let effectiveProjectKey = projectKey;
177177
if (!effectiveProjectKey && selectedProjectName) {
178178
try {
179-
const rawProjectKey = sessionStorage.getItem(`projectKey_${selectedProjectName}`);
179+
const rawProjectKey = localStorage.getItem(`projectKey_${selectedProjectName}`);
180180
if (rawProjectKey) {
181-
effectiveProjectKey = await decryptFromSessionStorage(rawProjectKey);
181+
effectiveProjectKey = await decryptFromLocalStorage(rawProjectKey);
182182
}
183183
} catch (error) {
184184
console.error("Failed to get project key directly:", error);
@@ -221,9 +221,9 @@ export function ApiKeysContent() {
221221
let effectiveProjectKey = projectKey;
222222
if (!effectiveProjectKey && selectedProjectName) {
223223
try {
224-
const rawProjectKey = sessionStorage.getItem(`projectKey_${selectedProjectName}`);
224+
const rawProjectKey = localStorage.getItem(`projectKey_${selectedProjectName}`);
225225
if (rawProjectKey) {
226-
effectiveProjectKey = await decryptFromSessionStorage(rawProjectKey);
226+
effectiveProjectKey = await decryptFromLocalStorage(rawProjectKey);
227227
}
228228
} catch (error) {
229229
console.error("Failed to get project key directly:", error);

0 commit comments

Comments
 (0)