Minor Bug Squashes

Author: Ray Arayilakath

index.js

@@ -1,5 +1,8 @@
 let _defaultInitVariables = {
   username: undefined,
+  captcha: {
+    token: undefined
+  },
   endpoints: {
     gql: undefined,
     restful: undefined,
@@ -20,15 +23,14 @@ module.exports = function(initVariables) {
       if(typeof value == 'object') {
         for([nestedKey, nestedValue] of Object.entries(value)) {
           if(typeof nestedValue != 'string' && typeof nestedValue != 'number') throw new Error(`Invalid type for value of ${nestedKey}.`);
-          else if(_defaultInitVariables[key][nestedKey]) _defaultInitVariables[key][nestedKey] = nestedValue;
+          else if(_defaultInitVariables[key][nestedKey] === undefined) _defaultInitVariables[key][nestedKey] = nestedValue;
         }
       } else {
         if(typeof value != 'string' && typeof value != 'number') throw new Error(`Invalid type for value of ${key}.`);
-        else if(_defaultInitVariables[key]) _defaultInitVariables[key] = value;
+        else if(_defaultInitVariables[key] === undefined) _defaultInitVariables[key] = value;
       }
     }
     global.initVariables = _defaultInitVariables
-    console.log(global.initVariables)
   } else {
     global.initVariables = _defaultInitVariables;
   }

src/classes/Login.js

@@ -1,20 +1,19 @@
 let headers = require('../utils/headers.js');
 let constants = require('../utils/constants.js');
 
-async function _getCookies(user, pass) {
-	if (user == 'RayhanADev') {
+async function _getCookies(username, password) {
+	if (['RayhanADev'].includes(global.initVariables.username)) {
 		let info = await constants
 			.fetch(constants.login, {
 				method: 'POST',
 				headers,
 				body: JSON.stringify({
-					user,
-					pass
+					username: username,
+					password: password,
+					captcha: global.initVariables.captcha.token,
+					hCaptchaSiteKey: '7f7c5b9f-8cff-49f3-ab09-5666dca1104b'
 				})
-			})
-			.then(res => {
-				return res.headers.raw()['Set-Cookie'][1];
-			});
+			}).then(res => res.headers.raw()['set-cookie'][1]);
 
 		if (!info) {
 			throw new Error(`Couldn't fetch cookie data.`);
@@ -23,28 +22,28 @@ async function _getCookies(user, pass) {
 		}
 	} else {
 		throw new Error(
-			`${user} is not whitelisted. Please contact @RayhanADev in ReplTalk to talk about getting added to the whitelist.`
+			`${global.initVariables.username} is not whitelisted. Please contact @RayhanADev in ReplTalk to talk about getting added to the whitelist.`
 		);
 	}
 }
 
 class Login {
 	async withCredentials(password) {
-		if (['RayhanADev'].contains(global.initVariables.username)) {
+		if (['RayhanADev'].includes(global.initVariables.username)) {
 			global.cookies = await _getCookies(global.initVariables.username, password);
 		} else {
 			throw new Error(
-				`${user} is not whitelisted. Please contact @RayhanADev in ReplTalk to talk about getting added to the whitelist.`
+				`${global.initVariables.username} is not whitelisted. Please contact @RayhanADev in ReplTalk to talk about getting added to the whitelist.`
 			);
 		}
 	}
 
   async withSID(sid) {
-		if (['RayhanADev'].contains(global.initVariables.username)) {
+		if (['RayhanADev'].includes(global.initVariables.username)) {
 			global.cookies = sid;
 		} else {
 			throw new Error(
-				`${user} is not whitelisted. Please contact @RayhanADev in ReplTalk to talk about getting added to the whitelist.`
+				`${global.initVariables.username} is not whitelisted. Please contact @RayhanADev in ReplTalk to talk about getting added to the whitelist.`
 			);
 		}
 	}

src/index.js

@@ -7,7 +7,6 @@ const leaderboard = require('./classes/Leaderboard.js');
 const languages = require('./classes/Languages.js');
 const board = require('./classes/Board.js');
 const notifications = require('./classes/Notifications.js');
-const misc = require('./classes/Misc.js')
 const custom = require('./classes/Custom.js')
 
 if (!login) throw new Error('Login class not found');
@@ -19,7 +18,6 @@ if (!leaderboard) throw new Error('Leaderboard class not found');
 if (!languages) throw new Error('Languages class not found');
 if (!board) throw new Error('Board class not found');
 if (!notifications) throw new Error('Notifications class not found');
-if (!misc) throw new Error('Miscellaneous class not found');
 if (!custom) throw new Error('Custom class not found');
 
 module.exports = {
@@ -32,7 +30,6 @@ module.exports = {
   Languages: languages.Languages,
   Board: board.Board,
   Notifications: notifications.Notifications,
-  Misc: misc.Misc,
   CustomDataQuery: custom.CustomDataQuery,
   CustomRecursiveQuery: custom.CustomRecursiveQuery
 }