Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions frontend/src/ts/firebase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ export async function signInWithEmailAndPassword(
return result;
}

function setUserState(
export function setUserState(
options: {
uid: string;
emailVerified: boolean;
Expand Down Expand Up @@ -166,10 +166,10 @@ export async function signInWithPopup(
throw translateFirebaseError(error, "Failed to sign in with popup");
}
const additionalUserInfo = getAdditionalUserInfo(signedInUser);
setUserState(signedInUser.user);
if (additionalUserInfo?.isNewUser) {
googleSignUpEvent.dispatch({ signedInUser, isNewUser: true });
} else {
setUserState(signedInUser.user);
ignoreAuthCallback = false;
await readyCallback?.(true, signedInUser.user);
}
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/ts/modals/google-sign-up.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import * as CaptchaController from "../controllers/captcha-controller";
import { showLoaderBar, hideLoaderBar } from "../states/loader-bar";
import { googleSignUpEvent } from "../events/google-sign-up";
import AnimatedModal from "../utils/animated-modal";
import { resetIgnoreAuthCallback } from "../firebase";
import { resetIgnoreAuthCallback, setUserState } from "../firebase";
import { ValidatedHtmlInputElement } from "../elements/input-validation";
import { UserNameSchema } from "@monkeytype/schemas/users";
import { remoteValidation } from "../utils/remote-validation";
Expand Down Expand Up @@ -105,6 +105,7 @@ async function apply(): Promise<void> {
}

if (response.status === 200) {
setUserState(signedInUser.user);
await updateProfile(signedInUser.user, { displayName: name });
await sendEmailVerification(signedInUser.user);
showSuccessNotification("Account created");
Expand Down
Loading