浏览代码

minor fixes

Olivier Massot 2 年之前
父节点
当前提交
2b3d27eeba
共有 3 个文件被更改,包括 13 次插入10 次删除
  1. 3 3
      composables/data/useImageFetch.ts
  2. 9 6
      plugins/init.server.ts
  3. 1 1
      services/sse/sseSource.ts

+ 3 - 3
composables/data/useImageFetch.ts

@@ -1,8 +1,8 @@
-import {FetchResult, useAsyncData} from "#app";
 import {useImageManager} from "~/composables/data/useImageManager";
+import {FetchResult} from "#app";
 
 interface useImageFetchReturnType {
-    fetch: (id: number | null, defaultImage?: string | null, height?: number, width?: number) => FetchResult<any>
+    fetch: (id: number | null, defaultImage?: string | null, height?: number, width?: number) => FetchResult<any, any>
 }
 
 /**
@@ -16,7 +16,7 @@ export const useImageFetch = (): useImageFetchReturnType => {
         defaultImage: string | null = null,
         height: number = 0,
         width: number = 0
-    ): FetchResult<string> => useAsyncData(
+    ): FetchResult<string, any> => useAsyncData(
         'img' + (id ?? defaultImage ?? 0),
         () => imageManager.get(id, defaultImage, height, width),
         { lazy: true, server: false }  // Always fetch images client-side

+ 9 - 6
plugins/init.server.ts

@@ -1,4 +1,3 @@
-import {defineNuxtPlugin, useCookie} from "nuxt/app";
 import {useAccessProfileStore} from "~/stores/accessProfile";
 import {useEntityManager} from "~/composables/data/useEntityManager";
 import UnauthorizedError from "~/services/error/UnauthorizedError";
@@ -8,24 +7,28 @@ export default defineNuxtPlugin(async () => {
     const redirectToLogout = useRedirectToLogout()
 
     const bearer = useCookie('BEARER')
-    const accessId = useCookie('AccessId')
+    let accessCookieId = useCookie('AccessId')
 
-    const accessProfile = useAccessProfileStore()
+    console.log(accessCookieId.value, Number.isNaN(accessCookieId.value))
 
-    if (accessId.value === null) {
+    if (accessCookieId.value === null || Number.isNaN(accessCookieId.value)) {
         redirectToLogout()
         return
     }
 
+    const accessId: number = parseInt(accessCookieId.value)
+
+    const accessProfile = useAccessProfileStore()
+
     accessProfile.$patch({
         bearer: bearer.value,
-        id: parseInt(accessId.value)
+        id: accessId
     })
 
     const {em} = useEntityManager()
 
     try {
-        await em.refreshProfile(parseInt(accessId.value))
+        await em.refreshProfile(accessId)
     } catch (error) {
         if (error instanceof UnauthorizedError) {
             redirectToLogout()

+ 1 - 1
services/sse/sseSource.ts

@@ -49,7 +49,7 @@ class SseSource {
 
     this.eventSource.onerror = (event) => {
       if (event.target.readyState === EventSource.CLOSED) {
-        console.log("SSE closed (" + event.target.readyState + ")");
+        console.log("SSE closed");
       }
       // @ts-ignore
       this.eventSource.close();