Updates
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
import fs from "fs";
|
||||
import { OAuth2Client } from "google-auth-library";
|
||||
import serverError from "../../backend/serverError";
|
||||
import DB_HANDLER from "../../../utils/backend/global-db/DB_HANDLER";
|
||||
import dbHandler from "../../backend/dbHandler";
|
||||
import hashPassword from "../../dsql/hashPassword";
|
||||
import { PostInsertReturn } from "../../../types";
|
||||
|
||||
type Param = {
|
||||
usertype: string;
|
||||
@@ -66,11 +67,12 @@ export default async function googleLogin({
|
||||
////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////
|
||||
|
||||
let existinEmail = await 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='${payload.email}' AND social_login!='1' AND social_platform!='google'`,
|
||||
values: [payload.email],
|
||||
})) as any[];
|
||||
|
||||
if (existinEmail && existinEmail[0]) {
|
||||
if (existinEmail?.[0]) {
|
||||
loginFailureReason = "Email Exists Already";
|
||||
isGoogleAuthValid = false;
|
||||
return {
|
||||
@@ -82,11 +84,12 @@ export default async function googleLogin({
|
||||
|
||||
////////////////////////////////////////
|
||||
|
||||
foundUser = await 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],
|
||||
})) as any[];
|
||||
|
||||
if (foundUser && foundUser[0]) {
|
||||
if (foundUser?.[0]) {
|
||||
newFoundUser = foundUser;
|
||||
return {
|
||||
isGoogleAuthValid: isGoogleAuthValid,
|
||||
@@ -98,9 +101,10 @@ export default async function googleLogin({
|
||||
////////////////////////////////////////////////
|
||||
////////////////////////////////////////////////
|
||||
|
||||
let newUser = await DB_HANDLER(`INSERT INTO ${usertype} (
|
||||
let newUser = (await dbHandler({
|
||||
query: `INSERT INTO ${usertype} (
|
||||
first_name,
|
||||
last_name,
|
||||
last_name,
|
||||
social_platform,
|
||||
social_name,
|
||||
social_id,
|
||||
@@ -128,19 +132,19 @@ export default async function googleLogin({
|
||||
'1',
|
||||
'${Date()}',
|
||||
'${Date.now()}'
|
||||
)`);
|
||||
)`,
|
||||
})) as PostInsertReturn;
|
||||
|
||||
newFoundUser = await DB_HANDLER(
|
||||
`SELECT * FROM ${usertype} WHERE id='${newUser.insertId}'`
|
||||
);
|
||||
newFoundUser = (await dbHandler({
|
||||
query: `SELECT * FROM ${usertype} WHERE id=?`,
|
||||
values: [newUser.insertId],
|
||||
})) as any[];
|
||||
} catch (error: any) {
|
||||
serverError({
|
||||
component: "googleLogin",
|
||||
message: error.message,
|
||||
});
|
||||
|
||||
global.ERROR_CALLBACK?.(`Google Login Error`, error as Error);
|
||||
|
||||
loginFailureReason = error;
|
||||
|
||||
isUserValid = false;
|
||||
|
||||
Reference in New Issue
Block a user