Merge branch 'dev' into feat/devtools

nuxt-modules · Mar 6, 2023 · 6f4525d · 6f4525d
2 parents f71b571 + a45eab4
commit 6f4525d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/runtime/composables/useStrapiAuth.ts b/src/runtime/composables/useStrapiAuth.ts
@@ -33,7 +33,7 @@ export const useStrapiAuth = () => {
   }
 
   const fetchUser = async (): Promise<Ref<StrapiUser>> => {
-    if (token.value && !user.value) {
+    if (token.value) {
       try {
         user.value = await client('/users/me', { params: config.strapi.auth })
       } catch (e) {

diff --git a/src/runtime/strapi.plugin.ts b/src/runtime/strapi.plugin.ts
@@ -1,8 +1,13 @@
 import { defineNuxtPlugin } from '#app'
 import { useStrapiAuth } from './composables/useStrapiAuth'
+import { useStrapiUser } from './composables/useStrapiUser'
 
 export default defineNuxtPlugin(async () => {
-  const { fetchUser } = useStrapiAuth()
+  const user = useStrapiUser()
 
-  await fetchUser()
+  if (!user.value) {
+    const { fetchUser } = useStrapiAuth()
+
+    await fetchUser()
+  }
 })