Adds jwt header to chat requests (#3452)

* add jwt as optional parameter * Updated request headers * Encapsulation
coral-xyz · Mar 27, 2023 · e0ea8f4 · e0ea8f4 · vercel · Mar 27, 2023
1 parent 3052424
commit e0ea8f4
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 23 deletions.
diff --git a/packages/db/src/api/friendships.ts b/packages/db/src/api/friendships.ts
@@ -9,10 +9,14 @@ import {
   updateFriendship,
 } from "../db/friends";
 
-export const refreshFriendships = async (uuid: string) => {
+export const refreshFriendships = async (uuid: string, jwt?: string) => {
   const db = getDb(uuid);
   try {
-    const res = await fetch(`${BACKEND_API_URL}/inbox/all?uuid=${uuid}`);
+    const res = await fetch(`${BACKEND_API_URL}/inbox/all?uuid=${uuid}`, {
+      headers: {
+        Authorization: `Bearer ${jwt}`,
+      },
+    });
     const json = await res.json();
     const chats: EnrichedInboxDb[] = json.chats;
     if (!chats) {
@@ -34,10 +38,13 @@ export const refreshFriendships = async (uuid: string) => {
   }
 };
 
-export const refreshGroups = async (uuid: string) => {
+export const refreshGroups = async (uuid: string, jwt?: string) => {
   try {
     const response = await fetch(`${BACKEND_API_URL}/nft/bulk?uuid=${uuid}`, {
       method: "GET",
+      headers: {
+        Authorization: `Bearer ${jwt}`,
+      },
     });
 
     const res = await response.json();

diff --git a/packages/tamagui-core/src/chat/AuthenticatedSync.tsx b/packages/tamagui-core/src/chat/AuthenticatedSync.tsx
@@ -20,6 +20,7 @@ import {
 } from "@coral-xyz/recoil";
 import { useRecoilCallback, useSetRecoilState } from "recoil";
 
+import { getAuthHeader } from "./getAuthHeader";
 import {
   BackgroundChatsSync,
   refreshGroupsAndFriendships,
@@ -47,7 +48,7 @@ export const ChatSync = ({ uuid, jwt }: { uuid: string; jwt: string }) => {
   useEffect(() => {
     (async () => {
       await Promise.all([
-        refreshGroupsAndFriendships(uuid).then(
+        refreshGroupsAndFriendships(uuid, jwt).then(
           async () => await BackgroundChatsSync.getInstance().updateUuid(uuid)
         ),
         SignalingManager.getInstance().updateUuid(uuid, jwt),
@@ -62,6 +63,7 @@ export const DbRecoilSync = ({ uuid }: { uuid: string }) => {
   const updateChats = useUpdateChats();
   const updateNotifications = useUpdateNotifications();
   const updateUsers = useUpdateUsers();
+  const authenticatedUser = useAuthenticatedUser();
 
   const setFriendshipsValue = useSetRecoilState(friendships({ uuid }));
   const setRequestCountValue = useSetRecoilState(requestCount({ uuid }));
@@ -76,6 +78,9 @@ export const DbRecoilSync = ({ uuid }: { uuid: string }) => {
       `${BACKEND_API_URL}/notifications/unreadCount`,
       {
         method: "GET",
+        headers: {
+          ...getAuthHeader(authenticatedUser?.jwt),
+        },
       }
     );
     try {

diff --git a/packages/tamagui-core/src/chat/fetchMoreChatsFor.tsx b/packages/tamagui-core/src/chat/fetchMoreChatsFor.tsx
@@ -1,19 +1,17 @@
-import type {
-  MessageWithMetadata,
-  SubscriptionType} from "@coral-xyz/common";
-import {
-  BACKEND_API_URL
-} from "@coral-xyz/common";
-import { bulkAddChats,oldestReceivedMessage  } from "@coral-xyz/db";
+import type { MessageWithMetadata, SubscriptionType } from "@coral-xyz/common";
+import { BACKEND_API_URL } from "@coral-xyz/common";
+import { bulkAddChats, oldestReceivedMessage } from "@coral-xyz/db";
 
+import { getAuthHeader } from "./getAuthHeader";
 import { SignalingManager } from "./SignalingManager";
 
 export const fetchMoreChatsFor = async (
   uuid: string,
   room: string,
   type: SubscriptionType,
   nftMint?: string,
-  publicKey?: string // To avoid DB calls on the backend
+  publicKey?: string, // To avoid DB calls on the backend
+  jwt?: string
 ) => {
   const oldestMessage = await oldestReceivedMessage(uuid, room, type);
   const response = await fetch(
@@ -24,6 +22,9 @@ export const fetchMoreChatsFor = async (
     }&mint=${nftMint}&publicKey=${publicKey}`,
     {
       method: "GET",
+      headers: {
+        ...getAuthHeader(jwt),
+      },
     }
   );
 

diff --git a/packages/tamagui-core/src/chat/getAuthHeader.ts b/packages/tamagui-core/src/chat/getAuthHeader.ts
@@ -0,0 +1,12 @@
+export const getAuthHeader = (
+  jwt?: string
+): {
+  Authorization?: string;
+} => {
+  if (jwt) {
+    return {
+      Authorization: `Bearer ${jwt}`,
+    };
+  }
+  return {};
+};
diff --git a/packages/tamagui-core/src/chat/refreshChatsFor.tsx b/packages/tamagui-core/src/chat/refreshChatsFor.tsx
@@ -7,14 +7,16 @@ import {
   resetUpdateTimestamp,
 } from "@coral-xyz/db";
 
+import { getAuthHeader } from "./getAuthHeader";
 import { SignalingManager } from "./SignalingManager";
 
 export const refreshChatsFor = async (
   uuid: string,
   room: string,
   type: SubscriptionType,
   nftMint?: string,
-  publicKey?: string // To avoid DB calls on the backend
+  publicKey?: string, // To avoid DB calls on the backend
+  jwt?: string
 ) => {
   const lastMessage = await latestReceivedMessage(uuid, room, type);
   const response = await fetch(
@@ -26,6 +28,9 @@ export const refreshChatsFor = async (
     }&mint=${nftMint}&publicKey=${publicKey}`,
     {
       method: "GET",
+      headers: {
+        ...getAuthHeader(jwt),
+      },
     }
   );
 

diff --git a/packages/tamagui-core/src/chat/refreshGroupsAndFriendships.tsx b/packages/tamagui-core/src/chat/refreshGroupsAndFriendships.tsx
@@ -2,9 +2,15 @@ import { refreshFriendships, refreshGroups } from "@coral-xyz/db";
 
 import { SignalingManager } from "./SignalingManager";
 
-export const refreshGroupsAndFriendships = async (uuid: string) => {
+export const refreshGroupsAndFriendships = async (
+  uuid: string,
+  jwt?: string
+) => {
   try {
-    await Promise.all([refreshFriendships(uuid), refreshGroups(uuid)]);
+    await Promise.all([
+      refreshFriendships(uuid, jwt),
+      refreshGroups(uuid, jwt),
+    ]);
   } catch (e) {
     console.error("Error while refreshing friendships and groups");
     console.error(e);

diff --git a/packages/tamagui-core/src/chat/refreshIndividualChatsFor.tsx b/packages/tamagui-core/src/chat/refreshIndividualChatsFor.tsx
@@ -1,11 +1,8 @@
-import type {
-  MessageWithMetadata,
-  SubscriptionType} from "@coral-xyz/common";
-import {
-  BACKEND_API_URL
-} from "@coral-xyz/common";
+import type { MessageWithMetadata, SubscriptionType } from "@coral-xyz/common";
+import { BACKEND_API_URL } from "@coral-xyz/common";
 import { bulkAddChats, latestReceivedMessage } from "@coral-xyz/db";
 
+import { getAuthHeader } from "./getAuthHeader";
 import { SignalingManager } from "./SignalingManager";
 
 export const refreshIndividualChatsFor = async (
@@ -14,7 +11,8 @@ export const refreshIndividualChatsFor = async (
   type: SubscriptionType,
   clientGeneratedUuid: string,
   nftMint?: string,
-  publicKey?: string // To avoid DB calls on the backend
+  publicKey?: string, // To avoid DB calls on the backend
+  jwt?: string
 ) => {
   const lastMessage = await latestReceivedMessage(uuid, room, type);
   const response = await fetch(
@@ -26,6 +24,9 @@ export const refreshIndividualChatsFor = async (
     }&mint=${nftMint}&publicKey=${publicKey}&clientGeneratedUuid=${clientGeneratedUuid}`,
     {
       method: "GET",
+      headers: {
+        ...getAuthHeader(jwt),
+      },
     }
   );
 

diff --git a/packages/tamagui-core/src/chat/refreshUpdatesFor.tsx b/packages/tamagui-core/src/chat/refreshUpdatesFor.tsx
@@ -6,14 +6,16 @@ import {
   processMessageUpdates,
 } from "@coral-xyz/db";
 
+import { getAuthHeader } from "./getAuthHeader";
 import { SignalingManager } from "./SignalingManager";
 
 export const refreshUpdatesFor = async (
   uuid: string,
   room: string,
   type: SubscriptionType,
   nftMint?: string,
-  publicKey?: string // To avoid DB calls on the backend
+  publicKey?: string, // To avoid DB calls on the backend
+  jwt?: string
 ) => {
   const lastUpdate = await latestReceivedUpdate(uuid, room.toString(), type);
 
@@ -25,6 +27,9 @@ export const refreshUpdatesFor = async (
     }`,
     {
       method: "GET",
+      headers: {
+        ...getAuthHeader(jwt),
+      },
     }
   );