monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2025-09-12 01:25:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

optimised name availability check, added name reserve

Browse source
This commit is contained in:
Jack 2020-10-26 19:24:37 +00:00
parent 50bed0599c
commit 46b7995dca
2 changed files with 97 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
functions/index.js
View file

@ -13,6 +13,7 @@ admin.initializeApp({
});
const db = admin.firestore();
const auth = admin.auth();
const fetch = require("node-fetch");
async function getAllNames() {
@ -45,17 +46,54 @@ async function getAllNames() {
return ret;
}
// exports.testGetAllNames = functions.https.onCall(async (request, response) => {
// return await getAllNames();
// });
async function getAllUsers() {
// return admin
// .auth()
// .listUsers()
// .then((data) => {
// let names = [];
// data.users.forEach((user) => {
// names.push(user.displayName);
// });
// return names;
// });
function getAllUsers() {
return admin
.auth()
.listUsers()
.then((data) => {
return data.users;
});
let ret = [];
async function getAll(nextPageToken) {
// List batch of users, 1000 at a time.
let listUsersResult = await auth.listUsers(1000, nextPageToken);
for (let i = 0; i < listUsersResult.users.length; i++) {
let loopuser = listUsersResult.users[i];
//if custom claim is undefined check, if its true then ignore
// if (loopuser === undefined || loopuser.customClaims === undefined || loopuser.customClaims['nameChecked'] === undefined) {
ret.push(listUsersResult.users[i]);
// }
// console.log(loopuser.customClaims['asd']);
// let userdata = await db.collection('users').doc(listUsersResult.users[i].uid).get();
// let data = userdata.data();
// if (data === undefined || data.needsToChangeName === undefined) {
// // console.log(data);
// ret.push(listUsersResult.users[i]);
// // console.log('user added');
// } else {
// // console.log('user already added');
// }
}
if (listUsersResult.pageToken) {
// List next batch of users.
await getAll(listUsersResult.pageToken);
}
}
await getAll();
return ret;
}
function isUsernameValid(name) {
@ -63,33 +101,62 @@ function isUsernameValid(name) {
if (/miodec/.test(name.toLowerCase())) return false;
if (/bitly/.test(name.toLowerCase())) return false;
if (name.length > 14) return false;
if (/^\..*/.test(name.toLowerCase())) return false;
return /^[0-9a-zA-Z_.-]+$/.test(name);
}
exports.checkNameAvailability = functions.https.onCall((request, response) => {
exports.reserveName = functions.auth.user().onCreate((user) => {
db.collection('takenNames')
.doc(user.uid)
.set({
taken: true
}, { merge: true });
});
exports.clearName = functions.auth.user().onDelete((user) => {
db.collection('takenNames')
.doc(user.uid)
.delete();
});
exports.checkNameAvailability = functions.https.onCall(async (request, response) => {
// 1 - available
// -1 - unavailable (taken)
// -2 - not valid name
// -999 - unknown error
try {
if (!isUsernameValid(request.name)) return -2;
return getAllNames().then((data) => {
let available = 1;
data.forEach((name) => {
try {
if (name.toLowerCase() === request.name.toLowerCase()) available = -1;
} catch (e) {
//
}
});
return available;
});
let takendata = await db.collection('takenNames')
.doc(request.name.toLowerCase())
.get();
takendata = takendata.data();
if (takendata !== undefined && takendata.taken) {
return -1;
} else {
return 1;
}
// return getAllNames().then((data) => {
// let available = 1;
// data.forEach((name) => {
// try {
// if (name.toLowerCase() === request.name.toLowerCase()) available = -1;
// } catch (e) {
// //
// }
// });
// return available;
// });
} catch (e) {
console.log(e.message);
return -999;
}
});
// exports.changeName = functions.https.onCall((request, response) => {
// exports.changeName = functions.https.onCall((request, response) => {
// try {
// if (!isUsernameValid(request.name)) {
// console.warn(

13
public/js/account.js
View file

@ -107,6 +107,13 @@ function signUp() {
let password = $(".pageLogin .register input")[2].value;
let passwordVerify = $(".pageLogin .register input")[3].value;
if (password != passwordVerify) {
showNotification("Passwords do not match", 3000);
$(".pageLogin .preloader").addClass("hidden");
$(".pageLogin .register .button").removeClass("disabled");
return;
}
const namecheck = firebase.functions().httpsCallable("checkNameAvailability");
namecheck({ name: nname }).then((d) => {
@ -124,12 +131,6 @@ function signUp() {
$(".pageLogin .register .button").removeClass("disabled");
return;
} else if (d.data === 1) {
if (password != passwordVerify) {
showNotification("Passwords do not match", 3000);
$(".pageLogin .preloader").addClass("hidden");
$(".pageLogin .register .button").removeClass("disabled");
return;
}
firebase
.auth()
.createUserWithEmailAndPassword(email, password)