feat(webapp): add header authorization

binbat · Dec 31, 2023 · b948cbe · b948cbe
1 parent 8a86b8f
commit b948cbe
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 24 deletions.
diff --git a/vite.config.ts b/vite.config.ts
@@ -12,6 +12,7 @@ export default defineConfig({
       '^/whip/.*': 'http://localhost:7777',
       '^/whep/.*': 'http://localhost:7777',
       '^/room/.*': 'http://localhost:4000',
+      '^/user/.*': 'http://localhost:4000',
     },
   },
   build: {

diff --git a/webapp/components/join.tsx b/webapp/components/join.tsx
@@ -5,7 +5,7 @@ import {
   meetingIdAtom,
 } from '../store/atom'
 import { setMeetingId } from '../lib/storage'
-import { newRoom } from '../lib/api'
+import { newRoom, newUser } from '../lib/api'
 
 export default function Join() {
   const [loc, setLoc] = useAtom(locationAtom)
@@ -14,12 +14,14 @@ export default function Join() {
   const [tmpId, setTmpId] = useState<string>("")
 
   const newMeeting = async () => {
+    await newUser()
     let meetingId = (await newRoom()).roomId
     enterMeeting(meetingId)
   }
 
   const joinMeeting = async () => {
     let meetingId = tmpId
+    await newUser()
     //await fetch(`/room/${meetingId}`, {
     //  method: "PATCH"
     //})

diff --git a/webapp/lib/api.ts b/webapp/lib/api.ts
@@ -1,3 +1,10 @@
+const StreamIdKey = 'stream'
+
+function setStreamId(id: string) {
+  localStorage.setItem(StreamIdKey, id)
+}
+
+let token = ""
 
 interface Room {
   roomId: string,
@@ -7,27 +14,47 @@ interface Room {
   streams: any,
 }
 
-
 interface Stream {
   name: string,
   audio: boolean,
   video: boolean,
   screen: boolean,
 }
 
+function setToken(str: string) {
+  token = str
+}
+
+async function newUser(): Promise<string> {
+  const res = await (await fetch(`/user/`, {
+    method: "POST",
+  })).json()
+  setToken(res.token)
+  setStreamId(res.streamId)
+  return res.streamId
+}
+
 async function newRoom(): Promise<Room> {
   return (await fetch(`/room/`, {
+    headers: {
+      "Authorization": `Bearer ${token}`,
+    },
     method: "POST",
   })).json()
 }
 
 async function getRoom(roomId: string): Promise<Room> {
-  return (await fetch(`/room/${roomId}`)).json()
+  return (await fetch(`/room/${roomId}`, {
+    headers: {
+      "Authorization": `Bearer ${token}`,
+    },
+  })).json()
 }
 
 async function setRoom(roomId: string, data: any): Promise<Room> {
   return (await fetch(`/room/${roomId}`, {
     headers: {
+      "Authorization": `Bearer ${token}`,
       "Content-Type": "application/json",
     },
     method: "PATCH",
@@ -37,19 +64,26 @@ async function setRoom(roomId: string, data: any): Promise<Room> {
 
 async function delRoom(roomId: string): Promise<void> {
   return (await fetch(`/room/${roomId}`, {
+    headers: {
+      "Authorization": `Bearer ${token}`,
+    },
     method: "DELETE",
   })).json()
 }
 
 async function newStream(roomId: string): Promise<Stream> {
   return (await fetch(`/room/${roomId}/stream`, {
+    headers: {
+      "Authorization": `Bearer ${token}`,
+    },
     method: "POST",
   })).json()
 }
 
 async function setStream(roomId: string, streamId: string, data: any): Promise<Stream> {
   return (await fetch(`/room/${roomId}/stream/${streamId}`, {
     headers: {
+      "Authorization": `Bearer ${token}`,
       "Content-Type": "application/json",
     },
     method: "PATCH",
@@ -59,11 +93,16 @@ async function setStream(roomId: string, streamId: string, data: any): Promise<S
 
 async function delStream(roomId: string, streamId: string): Promise<void> {
   return (await fetch(`/room/${roomId}/stream/${streamId}`, {
+    headers: {
+      "Authorization": `Bearer ${token}`,
+    },
     method: "DELETE",
   })).json()
 }
 
 export {
+  newUser,
+
   newRoom,
   getRoom,
   setRoom,

diff --git a/webapp/lib/storage.ts b/webapp/lib/storage.ts
@@ -1,3 +1,5 @@
+import { newUser } from "./api"
+
 const MeetingIdKey = 'meeting'
 const StreamIdKey = 'stream'
 
@@ -6,35 +8,16 @@ function setMeetingId(id: string) {
   if (id !== oldId) {
     localStorage.setItem(MeetingIdKey, id)
     localStorage.removeItem(StreamIdKey)
+    newUser()
   }
 }
 
-function setStreamId(id: string) {
-  localStorage.setItem(StreamIdKey, id)
-}
-
-async function serverGetStreamId(meetingId: string): Promise<string> {
-  let res = await (await fetch(`/room/${meetingId}/stream`, {
-    method: "POST"
-  })).json()
-  return res.streamId
-}
-
 async function asyncGetStreamId(): Promise<string> {
   const streamId = localStorage.getItem(StreamIdKey)
-  if (!!streamId) {
-    return streamId
-  }
-
-  const meetingId = localStorage.getItem(MeetingIdKey)
-  const id = await serverGetStreamId(meetingId)
-
-  setStreamId(id)
-  return id
+  return streamId || ""
 }
 
 export {
   setMeetingId,
-  setStreamId,
   asyncGetStreamId,
 }