Skip to content

Commit 1abe9d9

Browse files
committed
feat(nuxt): simplify getCurrentUser
1 parent 108fc28 commit 1abe9d9

File tree

3 files changed

+24
-5
lines changed

3 files changed

+24
-5
lines changed

Diff for: packages/nuxt/playground/middleware/vuefire-auth.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { getCurrentUser } from 'vuefire'
21
export default defineNuxtRouteMiddleware(async (to, from) => {
3-
const app = useNuxtApp().$firebaseApp
4-
console.log('app name', app.name)
5-
const user = await getCurrentUser(app.name)
2+
const user = await getCurrentUser()
3+
4+
console.log('got user in middleware', user?.uid)
65

76
if (!user) {
87
return navigateTo('/authentication')

Diff for: packages/nuxt/src/module.ts

+11-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,17 @@ const VueFire: NuxtModule<VueFireNuxtModuleOptions> =
140140
addVueFireImports([
141141
// auth
142142
{ from: 'vuefire', name: 'useFirebaseAuth' },
143-
{ from: 'vuefire', name: 'useCurrentUser' },
143+
])
144+
// these are improved for nuxt to avoid the need to pass the app name
145+
addImports([
146+
{
147+
from: resolve(runtimeDir, 'auth/composables'),
148+
name: 'getCurrentUser',
149+
},
150+
{
151+
from: resolve(runtimeDir, 'auth/composables'),
152+
name: 'useCurrentUser',
153+
},
144154
])
145155
}
146156

Diff for: packages/nuxt/src/runtime/auth/composables.ts

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { getCurrentUser as _getCurrentUser } from 'vuefire'
2+
import { useNuxtApp } from '#app'
3+
4+
/**
5+
* @inheritDoc {getCurrentUser}
6+
*/
7+
export function getCurrentUser(name?: string) {
8+
// This makes the `getCurrentUser()` function work by default in more places when using the Nuxt module
9+
return _getCurrentUser(name ?? useNuxtApp().$firebaseApp.name)
10+
}

0 commit comments

Comments
 (0)