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

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2025-06-01 16:27:26 +01:00
parent 4a083fe73b
commit 1364074c2c
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/package-shared/functions/api/social-login/loginSocialUser.js vendored
View File

@ -25,8 +25,8 @@ function loginSocialUser(_a) {
return __awaiter(this, arguments, void 0, function* ({ user, social_platform, invitation, database, additionalFields, debug, }) { return __awaiter(this, arguments, void 0, function* ({ user, social_platform, invitation, database, additionalFields, debug, }) {
const finalDbName = database ? database : "datasquirel"; const finalDbName = database ? database : "datasquirel";
const dbAppend = database ? `\`${finalDbName}\`.` : ""; const dbAppend = database ? `\`${finalDbName}\`.` : "";
const foundUserQuery = `SELECT * FROM ${dbAppend}\`users\` WHERE email=? AND social_id=? AND social_platform=?`; const foundUserQuery = `SELECT * FROM ${dbAppend}\`users\` WHERE email=?`;
const foundUserValues = [user.email, user.social_id, social_platform]; const foundUserValues = [user.email];
const foundUser = yield (0, varDatabaseDbHandler_1.default)({ const foundUser = yield (0, varDatabaseDbHandler_1.default)({
database: finalDbName, database: finalDbName,
queryString: foundUserQuery, queryString: foundUserQuery,
@ -37,12 +37,14 @@ function loginSocialUser(_a) {
return { return {
success: false, success: false,
payload: null, payload: null,
msg: "Couldn't find Social User.",
}; };
let csrfKey = Math.random().toString(36).substring(2) + let csrfKey = Math.random().toString(36).substring(2) +
"-" + "-" +
Math.random().toString(36).substring(2); Math.random().toString(36).substring(2);
let userPayload = { let userPayload = {
id: foundUser[0].id, id: foundUser[0].id,
uuid: foundUser[0].uuid,
first_name: foundUser[0].first_name, first_name: foundUser[0].first_name,
last_name: foundUser[0].last_name, last_name: foundUser[0].last_name,
username: foundUser[0].username, username: foundUser[0].username,

6
package-shared/functions/api/social-login/loginSocialUser.ts
View File

@ -36,8 +36,8 @@ export default async function loginSocialUser({
const finalDbName = database ? database : "datasquirel"; const finalDbName = database ? database : "datasquirel";
const dbAppend = database ? `\`${finalDbName}\`.` : ""; const dbAppend = database ? `\`${finalDbName}\`.` : "";
const foundUserQuery = `SELECT * FROM ${dbAppend}\`users\` WHERE email=? AND social_id=? AND social_platform=?`; const foundUserQuery = `SELECT * FROM ${dbAppend}\`users\` WHERE email=?`;
const foundUserValues = [user.email, user.social_id, social_platform]; const foundUserValues = [user.email];
const foundUser = await varDatabaseDbHandler({ const foundUser = await varDatabaseDbHandler({
database: finalDbName, database: finalDbName,
@ -50,6 +50,7 @@ export default async function loginSocialUser({
return { return {
success: false, success: false,
payload: null, payload: null,
msg: "Couldn't find Social User.",
}; };
let csrfKey = let csrfKey =
@ -59,6 +60,7 @@ export default async function loginSocialUser({
let userPayload: DATASQUIREL_LoggedInUser = { let userPayload: DATASQUIREL_LoggedInUser = {
id: foundUser[0].id, id: foundUser[0].id,
uuid: foundUser[0].uuid,
first_name: foundUser[0].first_name, first_name: foundUser[0].first_name,
last_name: foundUser[0].last_name, last_name: foundUser[0].last_name,
username: foundUser[0].username, username: foundUser[0].username,

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@moduletrace/datasquirel", "name": "@moduletrace/datasquirel",
"version": "4.7.0", "version": "4.7.1",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {