From 1364074c2c7ae59445fc0fc5583be855816db0d3 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Sun, 1 Jun 2025 16:27:26 +0100 Subject: [PATCH] Updates --- .../functions/api/social-login/loginSocialUser.js | 6 ++++-- .../functions/api/social-login/loginSocialUser.ts | 6 ++++-- package.json | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dist/package-shared/functions/api/social-login/loginSocialUser.js b/dist/package-shared/functions/api/social-login/loginSocialUser.js index 0755378..e68f7cf 100644 --- a/dist/package-shared/functions/api/social-login/loginSocialUser.js +++ b/dist/package-shared/functions/api/social-login/loginSocialUser.js @@ -25,8 +25,8 @@ function loginSocialUser(_a) { return __awaiter(this, arguments, void 0, function* ({ user, social_platform, invitation, database, additionalFields, debug, }) { const finalDbName = database ? database : "datasquirel"; const dbAppend = database ? `\`${finalDbName}\`.` : ""; - const foundUserQuery = `SELECT * FROM ${dbAppend}\`users\` WHERE email=? AND social_id=? AND social_platform=?`; - const foundUserValues = [user.email, user.social_id, social_platform]; + const foundUserQuery = `SELECT * FROM ${dbAppend}\`users\` WHERE email=?`; + const foundUserValues = [user.email]; const foundUser = yield (0, varDatabaseDbHandler_1.default)({ database: finalDbName, queryString: foundUserQuery, @@ -37,12 +37,14 @@ function loginSocialUser(_a) { return { success: false, payload: null, + msg: "Couldn't find Social User.", }; let csrfKey = Math.random().toString(36).substring(2) + "-" + Math.random().toString(36).substring(2); let userPayload = { id: foundUser[0].id, + uuid: foundUser[0].uuid, first_name: foundUser[0].first_name, last_name: foundUser[0].last_name, username: foundUser[0].username, diff --git a/package-shared/functions/api/social-login/loginSocialUser.ts b/package-shared/functions/api/social-login/loginSocialUser.ts index 8bc3ee9..63ceef0 100644 --- a/package-shared/functions/api/social-login/loginSocialUser.ts +++ b/package-shared/functions/api/social-login/loginSocialUser.ts @@ -36,8 +36,8 @@ export default async function loginSocialUser({ const finalDbName = database ? database : "datasquirel"; const dbAppend = database ? `\`${finalDbName}\`.` : ""; - const foundUserQuery = `SELECT * FROM ${dbAppend}\`users\` WHERE email=? AND social_id=? AND social_platform=?`; - const foundUserValues = [user.email, user.social_id, social_platform]; + const foundUserQuery = `SELECT * FROM ${dbAppend}\`users\` WHERE email=?`; + const foundUserValues = [user.email]; const foundUser = await varDatabaseDbHandler({ database: finalDbName, @@ -50,6 +50,7 @@ export default async function loginSocialUser({ return { success: false, payload: null, + msg: "Couldn't find Social User.", }; let csrfKey = @@ -59,6 +60,7 @@ export default async function loginSocialUser({ let userPayload: DATASQUIREL_LoggedInUser = { id: foundUser[0].id, + uuid: foundUser[0].uuid, first_name: foundUser[0].first_name, last_name: foundUser[0].last_name, username: foundUser[0].username, diff --git a/package.json b/package.json index 686cbeb..90309c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "4.7.0", + "version": "4.7.1", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {