Rename localStorage.token to ecthelion:token.

This avoids conflicting with any other applications.
retrixe · Aug 7, 2023 · 75a97ef · 75a97ef
1 parent 7d56160
commit 75a97ef
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/imports/dashboard/dashboardLayout.tsx b/imports/dashboard/dashboardLayout.tsx
@@ -41,8 +41,8 @@ const DrawerItem = (props: { icon: React.ReactElement, name: string, subUrl: str
 }
 
 const onLogout = (): void => {
-  const token = localStorage.getItem('token')
-  localStorage.removeItem('token')
+  const token = localStorage.getItem('ecthelion:token')
+  localStorage.removeItem('ecthelion:token')
   fetch(`${config.ip}/logout`, { headers: { Authorization: token ?? '' } }).catch(console.error)
 }
 

diff --git a/imports/dashboard/files/fileManager.tsx b/imports/dashboard/files/fileManager.tsx
@@ -293,7 +293,7 @@ const FileManager = (props: {
   const handleDownloadButton = (): void => {
     ;(async () => {
       handleCloseDownload()
-      // document.cookie = `X-Authentication=${localStorage.getItem('token')}`
+      // document.cookie = `X-Authentication=${localStorage.getItem('ecthelion:token')}`
       const ticket = encodeURIComponent((await ky.get('ott').json<{ ticket: string }>()).ticket)
       const loc = `${ip}/server/${server}/file?ticket=${ticket}&path=${euc(joinPath(path, download))}`
       window.location.href = loc

diff --git a/imports/errors/authFailure.tsx b/imports/errors/authFailure.tsx
@@ -10,7 +10,7 @@ export const AuthFailure = (): JSX.Element => (
       <Typography
         style={{ textDecoration: 'underline' }}
         onClick={() => {
-          try { localStorage.removeItem('token') } catch (e) { }
+          try { localStorage.removeItem('ecthelion:token') } catch (e) { }
         }}
       >Consider logging in?
       </Typography>

diff --git a/imports/helpers/useKy.ts b/imports/helpers/useKy.ts
@@ -10,7 +10,7 @@ const defaultKy = ky.create({
   prefixUrl: config.ip,
   hooks: {
     beforeRequest: [
-      request => request.headers.set('Authorization', localStorage.getItem('token') ?? '')
+      request => request.headers.set('Authorization', localStorage.getItem('ecthelion:token') ?? '')
     ]
   }
 })

diff --git a/imports/servers/serverList.tsx b/imports/servers/serverList.tsx
@@ -51,7 +51,7 @@ const ServerList = ({ ip, node, setMessage, setFailure }: {
   const runCommand = (command: string): void => {
     ;(async () => {
       const ott = encodeURIComponent((await ky.get('ott').json<{ ticket: string }>()).ticket)
-      // document.cookie = `X-Authentication=${localStorage.getItem('token')}`
+      // document.cookie = `X-Authentication=${localStorage.getItem('ecthelion:token')}`
       const ws = new WebSocket(`${ip.split('http').join('ws')}/server/${server}/console?ticket=${ott}`)
       ws.onopen = () => {
         ws.send(command)

diff --git a/imports/settings/settingsLayout.tsx b/imports/settings/settingsLayout.tsx
@@ -37,8 +37,8 @@ const DrawerItem = (props: { icon: React.ReactElement, name: string, subUrl: str
 }
 
 const onLogout = (): void => {
-  const token = localStorage.getItem('token')
-  localStorage.removeItem('token')
+  const token = localStorage.getItem('ecthelion:token')
+  localStorage.removeItem('ecthelion:token')
   fetch(`${config.ip}/logout`, { headers: { Authorization: token ?? '' } }).catch(console.error)
 }
 

diff --git a/pages/dashboard/[server]/console.tsx b/pages/dashboard/[server]/console.tsx
@@ -96,7 +96,7 @@ const Console = ({ setAuthenticated }: {
     if (!server) return
     try {
       // Connect to console.
-      // document.cookie = `X-Authentication=${localStorage.getItem('token')}`
+      // document.cookie = `X-Authentication=${localStorage.getItem('ecthelion:token')}`
       const ticket = await ky.get('ott')
       if (ignore.current) return // If useEffect was called again by React, drop this.
       setListening(true)

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -63,7 +63,7 @@ const Index = (): JSX.Element => {
       const response = await request.json()
       if (response.token || response.success) {
         // Save the access token in localStorage if received in JSON body.
-        if (response.token) localStorage.setItem('token', response.token)
+        if (response.token) localStorage.setItem('ecthelion:token', response.token)
         // Also, if authentication previously failed, let's just say it succeeded.
         setFailedAuth(false)
         setInvalid(false)

diff --git a/pages/servers.tsx b/pages/servers.tsx
@@ -15,8 +15,8 @@ import ConnectionFailure from '../imports/errors/connectionFailure'
 const { ip, nodes } = config
 
 const logout = (): void => {
-  const token = localStorage.getItem('token')
-  localStorage.removeItem('token')
+  const token = localStorage.getItem('ecthelion:token')
+  localStorage.removeItem('ecthelion:token')
   fetch(`${config.ip}/logout`, { headers: { Authorization: token ?? '' } }).catch(console.error)
 }