monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-12-27 10:31:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Disabling auth observer in signIn

Browse source
This commit is contained in:
DharmarajX24 2021-07-21 16:48:02 +05:30
parent f4ddd2ce78
commit e62acc923f
2 changed files with 95 additions and 14648 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14623
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

120
src/js/account-controller.js
View file

@ -19,46 +19,64 @@ const githubProvider = new firebase.auth.GithubAuthProvider();
let newSignUp = false;
const authListener = firebase.auth().onAuthStateChanged(function (user) {
if (user && !newSignUp) {
loadUser(user);
} else {
UI.setPageTransition(false);
if ($(".pageLoading").hasClass("active")) UI.changePage("");
}
let theme = Misc.findGetParameter("customTheme");
if (theme !== null) {
try {
theme = theme.split(",");
UpdateConfig.setCustomThemeColors(theme);
Notifications.add("Custom theme applied.", 1);
} catch (e) {
Notifications.add(
"Something went wrong. Reverting to default custom colors.",
0
);
UpdateConfig.setCustomThemeColors(Config.defaultConfig.customThemeColors);
}
UpdateConfig.setCustomTheme(true);
Settings.setCustomThemeInputs();
}
if (/challenge_.+/g.test(window.location.pathname)) {
Notifications.add("Loading challenge", 0);
let challengeName = window.location.pathname.split("_")[1];
setTimeout(() => {
ChallengeController.setup(challengeName);
}, 1000);
}
});
export function signIn() {
authListener();
$(".pageLogin .preloader").removeClass("hidden");
let email = $(".pageLogin .login input")[0].value;
let password = $(".pageLogin .login input")[1].value;
if ($(".pageLogin .login #rememberMe input").prop("checked")) {
//remember me
firebase
.auth()
.setPersistence(firebase.auth.Auth.Persistence.LOCAL)
.then(function () {
return firebase
.auth()
.signInWithEmailAndPassword(email, password)
.then((e) => {
// UI.changePage("test");
})
.catch(function (error) {
Notifications.add(error.message, -1);
$(".pageLogin .preloader").addClass("hidden");
});
});
} else {
//dont remember
firebase
.auth()
.setPersistence(firebase.auth.Auth.Persistence.SESSION)
.then(function () {
return firebase
.auth()
.signInWithEmailAndPassword(email, password)
.then((e) => {
// UI.changePage("test");
})
.catch(function (error) {
Notifications.add(error.message, -1);
$(".pageLogin .preloader").addClass("hidden");
});
});
}
const persistence = $(".pageLogin .login #rememberMe input").prop("checked")
? firebase.auth.Auth.Persistence.LOCAL
: firebase.auth.Auth.Persistence.SESSION;
firebase
.auth()
.setPersistence(persistence)
.then(function () {
return firebase
.auth()
.signInWithEmailAndPassword(email, password)
.then((e) => {
// UI.changePage("test");
//TODO: redirect user to relevant page
})
.catch(function (error) {
Notifications.add(error.message, -1);
$(".pageLogin .preloader").addClass("hidden");
});
});
}
export async function signInWithGoogle() {
@ -489,38 +507,6 @@ async function loadUser(user) {
}
}
firebase.auth().onAuthStateChanged(function (user) {
if (user && !newSignUp) {
loadUser(user);
} else {
UI.setPageTransition(false);
if ($(".pageLoading").hasClass("active")) UI.changePage("");
}
let theme = Misc.findGetParameter("customTheme");
if (theme !== null) {
try {
theme = theme.split(",");
UpdateConfig.setCustomThemeColors(theme);
Notifications.add("Custom theme applied.", 1);
} catch (e) {
Notifications.add(
"Something went wrong. Reverting to default custom colors.",
0
);
UpdateConfig.setCustomThemeColors(Config.defaultConfig.customThemeColors);
}
UpdateConfig.setCustomTheme(true);
Settings.setCustomThemeInputs();
}
if (/challenge_.+/g.test(window.location.pathname)) {
Notifications.add("Loading challenge", 0);
let challengeName = window.location.pathname.split("_")[1];
setTimeout(() => {
ChallengeController.setup(challengeName);
}, 1000);
}
});
$(".pageLogin .register input").keyup((e) => {
if ($(".pageLogin .register .button").hasClass("disabled")) return;
if (e.key == "Enter") {