Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions lib/plugins/services/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ export default async function (session, firebase, ctx, inject) {
}
},
subscribe() {

const promises = []
<% if (hasOnAuthStateChanged && !this.unsubscribeAuthStateListener) { %>
return new Promise(resolve => {
promises.push(new Promise(resolve => {
this.unsubscribeAuthStateListener = authService.onAuthStateChanged(async authUser => {
const claims = authUser ? (await authUser.getIdTokenResult(true)).claims : null

Expand All @@ -75,11 +75,11 @@ export default async function (session, firebase, ctx, inject) {

resolve()
})
})
}))
<% } %>

<% if (hasIdTokenChanged && !this.unsubscribeIdTokenListener) { %>
return new Promise(resolve => {
promises.push(new Promise(resolve => {
this.unsubscribeIdTokenListener = authService.onIdTokenChanged(async authUser => {
const claims = authUser ? (await authUser.getIdTokenResult(true)).claims : null

Expand All @@ -93,8 +93,9 @@ export default async function (session, firebase, ctx, inject) {

resolve()
})
})
}))
<% } %>
return Promise.all(promises)
}
}
inject('fireAuthStore', fireAuthStore)
Expand Down