From 3dd1d08a5b277a6949015ed1b2c3cf90f5960fbb Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Mon, 20 Jan 2025 07:43:04 +0100 Subject: [PATCH] Updates --- .../functions/api/social-login/handleSocialDb.js | 11 ++++++----- .../functions/api/social-login/handleSocialDb.ts | 12 +++++++----- package.json | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dist/package-shared/functions/api/social-login/handleSocialDb.js b/dist/package-shared/functions/api/social-login/handleSocialDb.js index 8082102..f74977e 100644 --- a/dist/package-shared/functions/api/social-login/handleSocialDb.js +++ b/dist/package-shared/functions/api/social-login/handleSocialDb.js @@ -27,7 +27,9 @@ const loginSocialUser_1 = __importDefault(require("./loginSocialUser")); function handleSocialDb(_a) { return __awaiter(this, arguments, void 0, function* ({ database, social_id, email, social_platform, payload, invitation, supEmail, additionalFields, useLocal, }) { try { - const existingSocialIdUserQuery = `SELECT * FROM datasquirel.users WHERE social_id = ? AND social_login='1' AND social_platform = ? `; + const finalDbName = database ? database : "datasquirel"; + const dbAppend = database ? `${finalDbName}.` : ""; + const existingSocialIdUserQuery = `SELECT * FROM ${dbAppend}users WHERE social_id = ? AND social_login='1' AND social_platform = ? `; const existingSocialIdUserValues = [ social_id.toString(), social_platform, @@ -56,7 +58,7 @@ function handleSocialDb(_a) { msg: "No Email Present", }; } - const existingEmailOnlyQuery = `SELECT * FROM datasquirel.users WHERE email='${finalEmail}'`; + const existingEmailOnlyQuery = `SELECT * FROM ${dbAppend}users WHERE email='${finalEmail}'`; let existingEmailOnly = yield (0, varDatabaseDbHandler_1.default)({ database: database ? database : "datasquirel", queryString: existingEmailOnlyQuery, @@ -69,7 +71,7 @@ function handleSocialDb(_a) { msg: "This Email is already taken", }; } - const foundUserQuery = `SELECT * FROM datasquirel.users WHERE email=? AND social_login='1' AND social_platform=? AND social_id=?`; + const foundUserQuery = `SELECT * FROM ${dbAppend}users WHERE email=? AND social_login='1' AND social_platform=? AND social_id=?`; const foundUserQueryValues = [finalEmail, social_platform, social_id]; const foundUser = yield (0, varDatabaseDbHandler_1.default)({ database: database ? database : "datasquirel", @@ -98,7 +100,6 @@ function handleSocialDb(_a) { Object.keys(payload).forEach((key) => { data[key] = payload[key]; }); - /** @type {any} */ const newUser = yield (0, addDbEntry_1.default)({ dbContext: database ? "Dsql User" : undefined, paradigm: database ? "Full Access" : undefined, @@ -116,7 +117,7 @@ function handleSocialDb(_a) { */ yield (0, addMariadbUser_1.default)({ userId: newUser.insertId, useLocal }); } - const newUserQueriedQuery = `SELECT * FROM datasquirel.users WHERE id='${newUser.insertId}'`; + const newUserQueriedQuery = `SELECT * FROM ${dbAppend}users WHERE id='${newUser.insertId}'`; const newUserQueried = yield (0, varDatabaseDbHandler_1.default)({ database: database ? database : "datasquirel", queryString: newUserQueriedQuery, diff --git a/package-shared/functions/api/social-login/handleSocialDb.ts b/package-shared/functions/api/social-login/handleSocialDb.ts index ada0e15..031bd7b 100644 --- a/package-shared/functions/api/social-login/handleSocialDb.ts +++ b/package-shared/functions/api/social-login/handleSocialDb.ts @@ -26,7 +26,10 @@ export default async function handleSocialDb({ useLocal, }: HandleSocialDbFunctionParams): Promise { try { - const existingSocialIdUserQuery = `SELECT * FROM datasquirel.users WHERE social_id = ? AND social_login='1' AND social_platform = ? `; + const finalDbName = database ? database : "datasquirel"; + const dbAppend = database ? `${finalDbName}.` : ""; + + const existingSocialIdUserQuery = `SELECT * FROM ${dbAppend}users WHERE social_id = ? AND social_login='1' AND social_platform = ? `; const existingSocialIdUserValues = [ social_id.toString(), social_platform, @@ -60,7 +63,7 @@ export default async function handleSocialDb({ }; } - const existingEmailOnlyQuery = `SELECT * FROM datasquirel.users WHERE email='${finalEmail}'`; + const existingEmailOnlyQuery = `SELECT * FROM ${dbAppend}users WHERE email='${finalEmail}'`; let existingEmailOnly = await varDatabaseDbHandler({ database: database ? database : "datasquirel", @@ -76,7 +79,7 @@ export default async function handleSocialDb({ }; } - const foundUserQuery = `SELECT * FROM datasquirel.users WHERE email=? AND social_login='1' AND social_platform=? AND social_id=?`; + const foundUserQuery = `SELECT * FROM ${dbAppend}users WHERE email=? AND social_login='1' AND social_platform=? AND social_id=?`; const foundUserQueryValues = [finalEmail, social_platform, social_id]; const foundUser = await varDatabaseDbHandler({ @@ -111,7 +114,6 @@ export default async function handleSocialDb({ data[key] = payload[key]; }); - /** @type {any} */ const newUser = await addDbEntry({ dbContext: database ? "Dsql User" : undefined, paradigm: database ? "Full Access" : undefined, @@ -134,7 +136,7 @@ export default async function handleSocialDb({ await addMariadbUser({ userId: newUser.insertId, useLocal }); } - const newUserQueriedQuery = `SELECT * FROM datasquirel.users WHERE id='${newUser.insertId}'`; + const newUserQueriedQuery = `SELECT * FROM ${dbAppend}users WHERE id='${newUser.insertId}'`; const newUserQueried = await varDatabaseDbHandler({ database: database ? database : "datasquirel", diff --git a/package.json b/package.json index 5ac05b4..2d32f93 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "3.7.3", + "version": "3.7.4", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {