Merge pull request #23 from ecency/feature/get-rid-of-ls

Use abstract storage instead of local's one
ecency · Apr 11, 2024 · f4f1820 · f4f1820
2 parents 4f76771 + 3819bf7
commit f4f1820
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/lib/chat-context-provider.tsx b/lib/chat-context-provider.tsx
@@ -17,13 +17,15 @@ interface Context {
   activeUserData: AccountData | undefined;
   privateApiHost: string;
   ecencyAccessToken: string;
+  storage?: Storage;
 }
 
 interface Props {
   activeUsername?: string;
   activeUserData?: AccountData;
   privateApiHost: string;
   ecencyAccessToken: string;
+  storage?: Storage;
 }
 
 export const ChatContext = createContext<Context>({
@@ -50,6 +52,7 @@ export const ChatContextProvider = (props: PropsWithChildren<Props>) => {
     props.ecencyAccessToken,
   );
   const [privateApiHost, setPrivateApiHost] = useState(props.privateApiHost);
+  const [storage, setStorage] = useState<Storage | undefined>(props.storage);
 
   useEffect(() => {
     setEcencyAccessToken(props.ecencyAccessToken);
@@ -75,6 +78,7 @@ export const ChatContextProvider = (props: PropsWithChildren<Props>) => {
         activeUserData,
         privateApiHost,
         ecencyAccessToken,
+        storage,
       }}
     >
       <NostrProvider>

diff --git a/lib/mutations/import-chat-by-keys.ts b/lib/mutations/import-chat-by-keys.ts
@@ -18,7 +18,7 @@ export function useImportChatByKeys(
   meta?: Record<string, unknown>,
 ) {
   const queryClient = useQueryClient();
-  const { activeUsername, activeUserData } = useContext(ChatContext);
+  const { activeUsername, storage } = useContext(ChatContext);
 
   const { mutateAsync: uploadChatKeys } = useSaveKeys();
   const { mutateAsync: uploadKeys } = useMutation(
@@ -79,7 +79,7 @@ export function useImportChatByKeys(
         iv: initialVector,
       });
 
-      localStorage.setItem("ecency_nostr_pr_" + activeUsername, pin);
+      storage?.setItem("ecency_nostr_pr_" + activeUsername, pin);
       queryClient.setQueryData(
         [NostrQueries.PUBLIC_KEY, activeUsername],
         publicKey,

diff --git a/lib/mutations/join-chat.ts b/lib/mutations/join-chat.ts
@@ -24,7 +24,7 @@ export function useJoinChat(
   meta?: Record<string, unknown>,
 ) {
   const queryClient = useQueryClient();
-  const { activeUsername } = useContext(ChatContext);
+  const { activeUsername, storage } = useContext(ChatContext);
 
   const { mutateAsync: updateProfile } = useNostrPublishMutation(
     ["chats/update-nostr-profile"],
@@ -37,7 +37,7 @@ export function useJoinChat(
     ["chat-join-chat"],
     async (pin: string) => {
       const keys = createNoStrAccount();
-      localStorage.setItem("ecency_nostr_pr_" + activeUsername, pin);
+      storage?.setItem("ecency_nostr_pr_" + activeUsername, pin);
 
       const initialVector = crypto.randomBytes(16);
       const encryptedKey = EncryptionTools.encrypt(

diff --git a/lib/mutations/logout-from-chats.tsx b/lib/mutations/logout-from-chats.tsx
@@ -6,10 +6,10 @@ import { ChatContext } from "../chat-context-provider";
 
 export function useLogoutFromChats() {
   const queryClient = useQueryClient();
-  const { activeUsername } = useContext(ChatContext);
+  const { activeUsername, storage } = useContext(ChatContext);
 
   return useMutation(["chats/logout-from-chats"], async () => {
-    localStorage.removeItem("ecency_nostr_pr_" + activeUsername);
+    storage?.removeItem("ecency_nostr_pr_" + activeUsername);
     queryClient.setQueryData([NostrQueries.PUBLIC_KEY, activeUsername], "");
     queryClient.setQueryData([NostrQueries.PRIVATE_KEY, activeUsername], "");
     queryClient.setQueryData([ChatQueries.JOINED_CHANNELS, activeUsername], []);

diff --git a/lib/mutations/restore-chat-by-pin.ts b/lib/mutations/restore-chat-by-pin.ts
@@ -8,7 +8,7 @@ import { useGetKeysQuery, useSaveKeys } from "../api";
 
 export function useRestoreChatByPin() {
   const queryClient = useQueryClient();
-  const { activeUserData, activeUsername } = useContext(ChatContext);
+  const { activeUserData, activeUsername, storage } = useContext(ChatContext);
 
   const { publicKey } = useKeysQuery();
   const { data: keys } = useGetKeysQuery();
@@ -43,7 +43,7 @@ export function useRestoreChatByPin() {
       decryptedKey,
     );
 
-    localStorage.setItem("ecency_nostr_pr_" + activeUsername, pin);
+    storage?.setItem("ecency_nostr_pr_" + activeUsername, pin);
 
     await updateProfile({
       tags: [["p", publicKey]],

diff --git a/lib/nostr/core/keys-query.ts b/lib/nostr/core/keys-query.ts
@@ -6,7 +6,7 @@ import { ChatContext } from "../../chat-context-provider";
 import { useGetKeysQuery } from "../../api";
 
 export function useKeysQuery() {
-  const { activeUsername, activeUserData } = useContext(ChatContext);
+  const { activeUsername, activeUserData, storage } = useContext(ChatContext);
   const getKeysQuery = useGetKeysQuery();
 
   useMount(() => {
@@ -25,7 +25,7 @@ export function useKeysQuery() {
       {
         queryKey: [NostrQueries.PRIVATE_KEY, activeUsername],
         queryFn: async () => {
-          const pin = localStorage.getItem("ecency_nostr_pr_" + activeUsername);
+          const pin = storage?.getItem("ecency_nostr_pr_" + activeUsername);
 
           if (!pin) {
             return null;

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ecency/ns-query",
   "description": "React-query based Nostr protocol SDK for Ecency vision and mobile",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "repository": "https://github.com/ecency/ns-query",
   "author": "ildar.timerbaev <dkildar@gmail.com>",
   "license": "MIT",