Updates
This commit is contained in:
@@ -24,10 +24,11 @@ export default async function handleSocialDb({
|
||||
supEmail,
|
||||
additionalFields,
|
||||
useLocal,
|
||||
debug,
|
||||
}: HandleSocialDbFunctionParams): Promise<APILoginFunctionReturn> {
|
||||
try {
|
||||
const finalDbName = database ? database : "datasquirel";
|
||||
const dbAppend = database ? `${finalDbName}.` : "";
|
||||
const dbAppend = useLocal ? "" : `${finalDbName}.`;
|
||||
|
||||
const existingSocialIdUserQuery = `SELECT * FROM ${dbAppend}users WHERE social_id = ? AND social_login='1' AND social_platform = ? `;
|
||||
const existingSocialIdUserValues = [
|
||||
@@ -35,14 +36,33 @@ export default async function handleSocialDb({
|
||||
social_platform,
|
||||
];
|
||||
|
||||
if (debug) {
|
||||
console.log(
|
||||
"handleSocialDb:existingSocialIdUserQuery",
|
||||
existingSocialIdUserQuery
|
||||
);
|
||||
console.log(
|
||||
"handleSocialDb:existingSocialIdUserValues",
|
||||
existingSocialIdUserValues
|
||||
);
|
||||
}
|
||||
|
||||
let existingSocialIdUser = await varDatabaseDbHandler({
|
||||
database: database ? database : "datasquirel",
|
||||
queryString: existingSocialIdUserQuery,
|
||||
queryValuesArray: existingSocialIdUserValues,
|
||||
useLocal,
|
||||
debug,
|
||||
});
|
||||
|
||||
if (existingSocialIdUser && existingSocialIdUser[0]) {
|
||||
if (debug) {
|
||||
console.log(
|
||||
"handleSocialDb:existingSocialIdUser",
|
||||
existingSocialIdUser
|
||||
);
|
||||
}
|
||||
|
||||
if (existingSocialIdUser?.[0]) {
|
||||
return await loginSocialUser({
|
||||
user: existingSocialIdUser[0],
|
||||
social_platform,
|
||||
@@ -50,6 +70,7 @@ export default async function handleSocialDb({
|
||||
database,
|
||||
additionalFields,
|
||||
useLocal,
|
||||
debug,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -65,12 +86,24 @@ export default async function handleSocialDb({
|
||||
|
||||
const existingEmailOnlyQuery = `SELECT * FROM ${dbAppend}users WHERE email='${finalEmail}'`;
|
||||
|
||||
if (debug) {
|
||||
console.log(
|
||||
"handleSocialDb:existingEmailOnlyQuery",
|
||||
existingEmailOnlyQuery
|
||||
);
|
||||
}
|
||||
|
||||
let existingEmailOnly = await varDatabaseDbHandler({
|
||||
database: database ? database : "datasquirel",
|
||||
queryString: existingEmailOnlyQuery,
|
||||
useLocal,
|
||||
debug,
|
||||
});
|
||||
|
||||
if (debug) {
|
||||
console.log("handleSocialDb:existingEmailOnly", existingEmailOnly);
|
||||
}
|
||||
|
||||
if (existingEmailOnly && existingEmailOnly[0]) {
|
||||
return {
|
||||
success: false,
|
||||
@@ -87,6 +120,7 @@ export default async function handleSocialDb({
|
||||
queryString: foundUserQuery,
|
||||
queryValuesArray: foundUserQueryValues,
|
||||
useLocal,
|
||||
debug,
|
||||
});
|
||||
|
||||
if (foundUser && foundUser[0]) {
|
||||
@@ -97,6 +131,7 @@ export default async function handleSocialDb({
|
||||
database,
|
||||
additionalFields,
|
||||
useLocal,
|
||||
debug,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -142,6 +177,7 @@ export default async function handleSocialDb({
|
||||
database: database ? database : "datasquirel",
|
||||
queryString: newUserQueriedQuery,
|
||||
useLocal,
|
||||
debug,
|
||||
});
|
||||
|
||||
if (!newUserQueried || !newUserQueried[0])
|
||||
@@ -220,6 +256,7 @@ export default async function handleSocialDb({
|
||||
database,
|
||||
additionalFields,
|
||||
useLocal,
|
||||
debug,
|
||||
});
|
||||
} else {
|
||||
console.log(
|
||||
|
||||
@@ -17,6 +17,7 @@ type Param = {
|
||||
database?: string;
|
||||
additionalFields?: string[];
|
||||
useLocal?: boolean;
|
||||
debug?: boolean;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -32,6 +33,7 @@ export default async function loginSocialUser({
|
||||
database,
|
||||
additionalFields,
|
||||
useLocal,
|
||||
debug,
|
||||
}: Param): Promise<APILoginFunctionReturn> {
|
||||
const finalDbName = database ? database : "datasquirel";
|
||||
const dbAppend = database ? `\`${finalDbName}\`.` : "";
|
||||
@@ -44,6 +46,7 @@ export default async function loginSocialUser({
|
||||
queryString: foundUserQuery,
|
||||
queryValuesArray: foundUserValues,
|
||||
useLocal,
|
||||
debug,
|
||||
});
|
||||
|
||||
if (!foundUser?.[0])
|
||||
|
||||
@@ -15,6 +15,7 @@ export default async function apiGoogleLogin({
|
||||
database,
|
||||
additionalFields,
|
||||
additionalData,
|
||||
debug,
|
||||
}: APIGoogleLoginFunctionParams): Promise<APILoginFunctionReturn> {
|
||||
try {
|
||||
const gUser: GoogleOauth2User | undefined = await new Promise(
|
||||
@@ -87,6 +88,7 @@ export default async function apiGoogleLogin({
|
||||
social_platform: "google",
|
||||
social_id: sub,
|
||||
additionalFields,
|
||||
debug,
|
||||
});
|
||||
|
||||
////////////////////////////////////////
|
||||
|
||||
@@ -1257,6 +1257,7 @@ export type APIGoogleLoginFunctionParams = {
|
||||
database: string;
|
||||
additionalFields?: string[];
|
||||
additionalData?: { [key: string]: string | number };
|
||||
debug?: boolean;
|
||||
};
|
||||
|
||||
export type APIGoogleLoginFunction = (
|
||||
@@ -1276,6 +1277,7 @@ export type HandleSocialDbFunctionParams = {
|
||||
supEmail?: string;
|
||||
additionalFields?: string[];
|
||||
useLocal?: boolean;
|
||||
debug?: boolean;
|
||||
};
|
||||
|
||||
export type HandleSocialDbFunctionReturn = {
|
||||
|
||||
Reference in New Issue
Block a user