From 5a4d4448a588bea1728a398f5426d6cff1823709 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Fri, 18 Jul 2025 19:44:23 +0100 Subject: [PATCH] Updates --- dist/package-shared/actions/users/social/google-auth.d.ts | 2 +- dist/package-shared/actions/users/social/google-auth.js | 3 +-- .../functions/api/social-login/handleSocialDb.d.ts | 2 +- .../functions/api/social-login/handleSocialDb.js | 8 ++------ .../functions/api/users/social/api-google-login.d.ts | 2 +- .../functions/api/users/social/api-google-login.js | 3 +-- dist/package-shared/types/index.d.ts | 3 --- package-shared/actions/users/social/google-auth.ts | 2 -- .../functions/api/social-login/handleSocialDb.ts | 6 +----- .../functions/api/users/social/api-google-login.ts | 2 -- package-shared/types/index.ts | 3 --- package.json | 2 +- 12 files changed, 9 insertions(+), 29 deletions(-) diff --git a/dist/package-shared/actions/users/social/google-auth.d.ts b/dist/package-shared/actions/users/social/google-auth.d.ts index 8fc4817..4cc7cb8 100644 --- a/dist/package-shared/actions/users/social/google-auth.d.ts +++ b/dist/package-shared/actions/users/social/google-auth.d.ts @@ -2,4 +2,4 @@ import { APIResponseObject, GoogleAuthParams } from "../../../types"; /** * # SERVER FUNCTION: Login with google Function */ -export default function googleAuth({ apiKey, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, secureCookie, loginOnly, useLocal, apiVersion, skipWriteAuthFile, cleanupTokens, }: GoogleAuthParams): Promise; +export default function googleAuth({ apiKey, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, debug, secureCookie, loginOnly, useLocal, apiVersion, skipWriteAuthFile, cleanupTokens, }: GoogleAuthParams): Promise; diff --git a/dist/package-shared/actions/users/social/google-auth.js b/dist/package-shared/actions/users/social/google-auth.js index 95f756d..27ef4ff 100644 --- a/dist/package-shared/actions/users/social/google-auth.js +++ b/dist/package-shared/actions/users/social/google-auth.js @@ -21,7 +21,7 @@ const post_login_response_handler_1 = __importDefault(require("../../../function * # SERVER FUNCTION: Login with google Function */ function googleAuth(_a) { - return __awaiter(this, arguments, void 0, function* ({ apiKey, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, apiUserID, debug, secureCookie, loginOnly, useLocal, apiVersion, skipWriteAuthFile, cleanupTokens, }) { + return __awaiter(this, arguments, void 0, function* ({ apiKey, token, database, response, encryptionKey, encryptionSalt, additionalFields, additionalData, debug, secureCookie, loginOnly, useLocal, apiVersion, skipWriteAuthFile, cleanupTokens, }) { const finalEncryptionKey = encryptionKey || process.env.DSQL_ENCRYPTION_PASSWORD; const finalEncryptionSalt = encryptionSalt || process.env.DSQL_ENCRYPTION_SALT; if (!(finalEncryptionKey === null || finalEncryptionKey === void 0 ? void 0 : finalEncryptionKey.match(/.{8,}/))) { @@ -65,7 +65,6 @@ function googleAuth(_a) { debug, loginOnly, database, - apiUserId: apiUserID || process.env.DSQL_API_USER_ID, }; if (useLocal) { if (debug) { diff --git a/dist/package-shared/functions/api/social-login/handleSocialDb.d.ts b/dist/package-shared/functions/api/social-login/handleSocialDb.d.ts index 347da62..c463923 100644 --- a/dist/package-shared/functions/api/social-login/handleSocialDb.d.ts +++ b/dist/package-shared/functions/api/social-login/handleSocialDb.d.ts @@ -2,4 +2,4 @@ import { APIResponseObject, HandleSocialDbFunctionParams } from "../../../types" /** * # Handle Social DB */ -export default function handleSocialDb({ database, email, social_platform, payload, invitation, supEmail, additionalFields, debug, loginOnly, apiUserId, }: HandleSocialDbFunctionParams): Promise; +export default function handleSocialDb({ database, email, social_platform, payload, invitation, supEmail, additionalFields, debug, loginOnly, }: HandleSocialDbFunctionParams): Promise; diff --git a/dist/package-shared/functions/api/social-login/handleSocialDb.js b/dist/package-shared/functions/api/social-login/handleSocialDb.js index c8e3b67..365be0c 100644 --- a/dist/package-shared/functions/api/social-login/handleSocialDb.js +++ b/dist/package-shared/functions/api/social-login/handleSocialDb.js @@ -19,18 +19,14 @@ const dbHandler_1 = __importDefault(require("../../backend/dbHandler")); const encrypt_1 = __importDefault(require("../../dsql/encrypt")); const addDbEntry_1 = __importDefault(require("../../backend/db/addDbEntry")); const loginSocialUser_1 = __importDefault(require("./loginSocialUser")); -const grab_db_full_name_1 = __importDefault(require("../../../utils/grab-db-full-name")); /** * # Handle Social DB */ function handleSocialDb(_a) { - return __awaiter(this, arguments, void 0, function* ({ database, email, social_platform, payload, invitation, supEmail, additionalFields, debug, loginOnly, apiUserId, }) { + return __awaiter(this, arguments, void 0, function* ({ database, email, social_platform, payload, invitation, supEmail, additionalFields, debug, loginOnly, }) { var _b; try { - const finalDbName = (0, grab_db_full_name_1.default)({ - dbName: database, - userId: apiUserId, - }); + const finalDbName = database; const existingSocialUserQUery = `SELECT * FROM users WHERE email = ? AND social_login='1' AND social_platform = ? `; const existingSocialUserValues = [email, social_platform]; if (debug) { diff --git a/dist/package-shared/functions/api/users/social/api-google-login.d.ts b/dist/package-shared/functions/api/users/social/api-google-login.d.ts index 18619f5..dc05b16 100644 --- a/dist/package-shared/functions/api/users/social/api-google-login.d.ts +++ b/dist/package-shared/functions/api/users/social/api-google-login.d.ts @@ -3,4 +3,4 @@ import { APIResponseObject } from "../../../../types"; /** * # API google login */ -export default function apiGoogleLogin({ token, database, additionalFields, additionalData, debug, loginOnly, apiUserId, }: APIGoogleLoginFunctionParams): Promise; +export default function apiGoogleLogin({ token, database, additionalFields, additionalData, debug, loginOnly, }: APIGoogleLoginFunctionParams): Promise; diff --git a/dist/package-shared/functions/api/users/social/api-google-login.js b/dist/package-shared/functions/api/users/social/api-google-login.js index 29804de..2a99f81 100644 --- a/dist/package-shared/functions/api/users/social/api-google-login.js +++ b/dist/package-shared/functions/api/users/social/api-google-login.js @@ -20,7 +20,7 @@ const ejson_1 = __importDefault(require("../../../../utils/ejson")); * # API google login */ function apiGoogleLogin(_a) { - return __awaiter(this, arguments, void 0, function* ({ token, database, additionalFields, additionalData, debug, loginOnly, apiUserId, }) { + return __awaiter(this, arguments, void 0, function* ({ token, database, additionalFields, additionalData, debug, loginOnly, }) { try { const gUser = yield new Promise((resolve, reject) => { https_1.default @@ -71,7 +71,6 @@ function apiGoogleLogin(_a) { additionalFields, debug, loginOnly, - apiUserId, }); //////////////////////////////////////// //////////////////////////////////////// diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index 3b919ca..6237b76 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -968,7 +968,6 @@ export type APIGoogleLoginFunctionParams = { }; debug?: boolean; loginOnly?: boolean; - apiUserId?: string | number; }; export type APIGoogleLoginFunction = (params: APIGoogleLoginFunctionParams) => Promise; /** @@ -985,7 +984,6 @@ export type HandleSocialDbFunctionParams = { debug?: boolean; loginOnly?: boolean; social_id?: string | number; - apiUserId?: string | number; }; export type HandleSocialDbFunctionReturn = { success: boolean; @@ -1925,7 +1923,6 @@ export type GoogleAuthParams = { additionalData?: { [s: string]: string | number; }; - apiUserID?: string | number; debug?: boolean; secureCookie?: boolean; loginOnly?: boolean; diff --git a/package-shared/actions/users/social/google-auth.ts b/package-shared/actions/users/social/google-auth.ts index 35dff61..b9ecd73 100644 --- a/package-shared/actions/users/social/google-auth.ts +++ b/package-shared/actions/users/social/google-auth.ts @@ -20,7 +20,6 @@ export default async function googleAuth({ encryptionSalt, additionalFields, additionalData, - apiUserID, debug, secureCookie, loginOnly, @@ -80,7 +79,6 @@ export default async function googleAuth({ debug, loginOnly, database, - apiUserId: apiUserID || process.env.DSQL_API_USER_ID, }; if (useLocal) { diff --git a/package-shared/functions/api/social-login/handleSocialDb.ts b/package-shared/functions/api/social-login/handleSocialDb.ts index b5b3cff..c0dc2cb 100644 --- a/package-shared/functions/api/social-login/handleSocialDb.ts +++ b/package-shared/functions/api/social-login/handleSocialDb.ts @@ -23,13 +23,9 @@ export default async function handleSocialDb({ additionalFields, debug, loginOnly, - apiUserId, }: HandleSocialDbFunctionParams): Promise { try { - const finalDbName = grabDbFullName({ - dbName: database, - userId: apiUserId, - }); + const finalDbName = database; const existingSocialUserQUery = `SELECT * FROM users WHERE email = ? AND social_login='1' AND social_platform = ? `; const existingSocialUserValues = [email, social_platform]; diff --git a/package-shared/functions/api/users/social/api-google-login.ts b/package-shared/functions/api/users/social/api-google-login.ts index f6aac66..c6b85b5 100644 --- a/package-shared/functions/api/users/social/api-google-login.ts +++ b/package-shared/functions/api/users/social/api-google-login.ts @@ -17,7 +17,6 @@ export default async function apiGoogleLogin({ additionalData, debug, loginOnly, - apiUserId, }: APIGoogleLoginFunctionParams): Promise { try { const gUser: GoogleOauth2User | undefined = await new Promise( @@ -79,7 +78,6 @@ export default async function apiGoogleLogin({ additionalFields, debug, loginOnly, - apiUserId, }); //////////////////////////////////////// diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index 3998fb6..778c09a 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -1170,7 +1170,6 @@ export type APIGoogleLoginFunctionParams = { additionalData?: { [key: string]: string | number }; debug?: boolean; loginOnly?: boolean; - apiUserId?: string | number; }; export type APIGoogleLoginFunction = ( @@ -1191,7 +1190,6 @@ export type HandleSocialDbFunctionParams = { debug?: boolean; loginOnly?: boolean; social_id?: string | number; - apiUserId?: string | number; }; export type HandleSocialDbFunctionReturn = { @@ -2478,7 +2476,6 @@ export type GoogleAuthParams = { encryptionSalt?: string; additionalFields?: string[]; additionalData?: { [s: string]: string | number }; - apiUserID?: string | number; debug?: boolean; secureCookie?: boolean; loginOnly?: boolean; diff --git a/package.json b/package.json index fcdb5c2..b500b13 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.0.6", + "version": "5.0.7", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {