File tree 3 files changed +24
-5
lines changed
3 files changed +24
-5
lines changed Original file line number Diff line number Diff line change 1
- import { getCurrentUser } from 'vuefire'
2
1
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 )
6
5
7
6
if ( ! user ) {
8
7
return navigateTo ( '/authentication' )
Original file line number Diff line number Diff line change @@ -140,7 +140,17 @@ const VueFire: NuxtModule<VueFireNuxtModuleOptions> =
140
140
addVueFireImports ( [
141
141
// auth
142
142
{ 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
+ } ,
144
154
] )
145
155
}
146
156
Original file line number Diff line number Diff line change
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
+ }
You can’t perform that action at this time.
0 commit comments