Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrades

Browse Source
This commit is contained in:
Tben
2023-08-13 14:16:32 +01:00
parent 43287b0329
commit 80e34fa6ec
5 changed files with 89 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/user/social/utils/githubLogin.js
+5 -1
View File
@@ -7,6 +7,7 @@
*/
const fs = require("fs");
const httpsRequest = require("./httpsRequest");
const dbHandler = require("../../../engine/utils/dbHandler");
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
@@ -122,7 +123,10 @@ async function githubLogin({ code, clientId, clientSecret }) {
////////////////////////////////////////////////
if (!gitHubUser?.email) {
const existingGithubUser = await global.DB_HANDLER(`SELECT email FROM users WHERE social_login='1' AND social_platform='github' AND social_id='${gitHubUser?.id || ""}'`);
const existingGithubUser = await dbHandler({
query: `SELECT email FROM users WHERE social_login='1' AND social_platform='github' AND social_id= ?`,
values: [gitHubUser?.id || ""],
});
if (existingGithubUser && existingGithubUser[0] && gitHubUser) {
gitHubUser.email = existingGithubUser[0].email;
engine/user/social/utils/googleLogin.js
+50 -42
View File
@@ -1,3 +1,5 @@
// @ts-check
/**
* ==============================================================================
* Imports
@@ -11,8 +13,8 @@ const fs = require("fs");
const { OAuth2Client } = require("google-auth-library");
const { hashPassword } = require("../passwordHash");
const serverError = require("../serverError");
const dbHandler = require("../../../engine/utils/dbHandler");
const hashPassword = require("../../../../functions/hashPassword");
//////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////
@@ -44,6 +46,7 @@ module.exports = async function googleLogin({ usertype, foundUser, isSocialValid
//[CLIENT_ID_1, CLIENT_ID_2, CLIENT_ID_3]
});
// @ts-ignore
const payload = ticket.payload;
const userid = payload["sub"];
@@ -63,7 +66,10 @@ module.exports = async function googleLogin({ usertype, foundUser, isSocialValid
////////////////////////////////////////////////
////////////////////////////////////////////////
let existinEmail = await global.DB_HANDLER(`SELECT * FROM ${usertype} WHERE email='${payload.email}' AND social_login!='1' AND social_platform!='google'`);
let existinEmail = await dbHandler({
query: `SELECT * FROM ${usertype} WHERE email = ? AND social_login!='1' AND social_platform!='google'`,
values: [payload.email],
});
if (existinEmail && existinEmail[0]) {
loginFailureReason = "Email Exists Already";
@@ -73,7 +79,10 @@ module.exports = async function googleLogin({ usertype, foundUser, isSocialValid
////////////////////////////////////////
foundUser = await global.DB_HANDLER(`SELECT * FROM ${usertype} WHERE email='${payload.email}' AND social_login='1' AND social_platform='google'`);
foundUser = await dbHandler({
query: `SELECT * FROM ${usertype} WHERE email = ? AND social_login='1' AND social_platform='google'`,
values: [payload.email],
});
if (foundUser && foundUser[0]) {
newFoundUser = foundUser;
@@ -84,50 +93,49 @@ module.exports = async function googleLogin({ usertype, foundUser, isSocialValid
////////////////////////////////////////////////
////////////////////////////////////////////////
let newUser = await global.DB_HANDLER(`INSERT INTO ${usertype} (
first_name,
last_name,
social_platform,
social_name,
social_id,
email,
image,
image_thumbnail,
password,
verification_status,
social_login,
terms_agreement,
date_created,
date_code
) VALUES (
'${payload.given_name}',
'${payload.family_name}',
'google',
'google_${payload.email.replace(/@.*/, "")}',
'${payload.sub}',
'${payload.email}',
'${payload.picture}',
'${payload.picture}',
'${socialHashedPassword}',
'1',
'1',
'1',
'${Date()}',
'${Date.now()}'
)`);
let newUser = await dbHandler({
query: `INSERT INTO ${usertype} (
first_name,
last_name,
social_platform,
social_name,
social_id,
email,
image,
image_thumbnail,
password,
verification_status,
social_login,
terms_agreement,
date_created,
date_code
) VALUES (
'${payload.given_name}',
'${payload.family_name}',
'google',
'google_${payload.email.replace(/@.*/, "")}',
'${payload.sub}',
'${payload.email}',
'${payload.picture}',
'${payload.picture}',
'${socialHashedPassword}',
'1',
'1',
'1',
'${Date()}',
'${Date.now()}'
)`,
});
newFoundUser = await global.DB_HANDLER(`SELECT * FROM ${usertype} WHERE id='${newUser.insertId}'`);
newFoundUser = await dbHandler({
query: `SELECT * FROM ${usertype} WHERE id = ?`,
values: [newUser.insertId],
});
////////////////////////////////////////////////
////////////////////////////////////////////////
////////////////////////////////////////////////
} catch (error) {
serverError({
component: "googleLogin",
message: error.message,
user: {},
});
loginFailureReason = error;
isUserValid = false;