fix: teams edit modal + race conditions on currentUser
This commit is contained in:
@@ -42,12 +42,14 @@ export const currentUserInfo$ = new BehaviorSubject<UserInfo | null>(null)
|
||||
/**
|
||||
* Initializes the currenUserInfo$ view and sets up its update mechanism
|
||||
*/
|
||||
export function initUserInfo() {
|
||||
updateUserInfo()
|
||||
export async function initUserInfo() {
|
||||
await updateUserInfo()
|
||||
console.log("updated")
|
||||
|
||||
fb.idToken$.subscribe(token => {
|
||||
fb.idToken$.subscribe((token) => {
|
||||
if (token) {
|
||||
updateUserInfo()
|
||||
console.log(token, "updateUserInfo")
|
||||
} else {
|
||||
currentUserInfo$.next(null)
|
||||
}
|
||||
@@ -63,22 +65,24 @@ async function updateUserInfo() {
|
||||
query: gql`
|
||||
query GetUserInfo {
|
||||
me {
|
||||
uid,
|
||||
displayName,
|
||||
email,
|
||||
photoURL,
|
||||
uid
|
||||
displayName
|
||||
email
|
||||
photoURL
|
||||
eaInvited
|
||||
}
|
||||
}
|
||||
`
|
||||
`,
|
||||
})
|
||||
|
||||
|
||||
console.log(data)
|
||||
|
||||
currentUserInfo$.next({
|
||||
uid: data.me.uid,
|
||||
displayName: data.me.displayName,
|
||||
email: data.me.email,
|
||||
photoURL : data.me.photoURL,
|
||||
eaInvited: data.me.eaInvited
|
||||
photoURL: data.me.photoURL,
|
||||
eaInvited: data.me.eaInvited,
|
||||
})
|
||||
} catch (e) {
|
||||
currentUserInfo$.next(null)
|
||||
|
||||
@@ -32,7 +32,6 @@ export async function getLiveTeamMembersList(apollo, teamID) {
|
||||
},
|
||||
})
|
||||
|
||||
debugger
|
||||
subject.next(data.team.members)
|
||||
|
||||
const addedSub = apollo
|
||||
@@ -53,6 +52,7 @@ export async function getLiveTeamMembersList(apollo, teamID) {
|
||||
},
|
||||
})
|
||||
.subscribe(({ data }) => {
|
||||
console.log(data)
|
||||
subject.next([...subject.value, data.teamMemberAdded])
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user