From b02399c64dfca1f678532ec1f2b8065737222696 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Fri, 26 Dec 2025 06:37:30 +0100 Subject: [PATCH] Updates --- dist/index.d.ts | 6 +++--- dist/package-shared/actions/get.d.ts | 2 +- dist/package-shared/actions/users/login-user.d.ts | 2 +- .../actions/users/reset-password.d.ts | 4 ++-- dist/package-shared/actions/users/update-user.d.ts | 4 ++-- dist/package-shared/api/crud/delete.d.ts | 4 +--- dist/package-shared/api/schema/get.d.ts | 2 +- dist/package-shared/api/user/local-user.d.ts | 6 +++--- .../functions/api/query-dsql-api.d.ts | 4 +--- .../functions/api/social-login/handleSocialDb.js | 6 +++--- .../functions/api/users/api-create-user.js | 4 ++-- .../functions/api/users/api-login.js | 2 +- .../functions/api/users/api-reset-user-password.js | 2 +- .../functions/api/users/api-update-user.js | 2 +- .../api/users/social/api-github-login.d.ts | 4 ++-- .../backend/auth/post-login-response-handler.js | 8 ++++---- .../backend/backups/su/add-backup/index.js | 4 ++-- .../functions/backend/db/deleteDbEntry.js | 2 +- .../functions/backend/db/updateDbEntry.js | 2 +- .../mariadb-user/handle-mariadb-user-record.js | 4 +++- .../shell/createDbFromSchema/check-db-record.js | 2 +- .../shell/createDbFromSchema/check-table-record.js | 2 +- .../shell/mariadb-users/users/create-user.js | 14 +++++++------- .../utils/create-table-handle-table-record.js | 4 ++-- dist/package-shared/types/index.d.ts | 10 ++++++++-- dist/package-shared/utils/data-fetching/crud.js | 2 +- package-shared/actions/get.ts | 7 +++---- package-shared/actions/users/login-user.ts | 2 +- package-shared/actions/users/reset-password.ts | 6 +++--- package-shared/actions/users/update-user.ts | 5 +++-- package-shared/api/schema/get.ts | 4 ++-- package-shared/functions/api/query-dsql-api.ts | 9 +++------ .../functions/api/social-login/handleSocialDb.ts | 6 +++--- .../functions/api/users/api-create-user.ts | 4 ++-- package-shared/functions/api/users/api-login.ts | 2 +- .../functions/api/users/api-reset-user-password.ts | 2 +- .../functions/api/users/api-update-user.ts | 2 +- .../functions/api/users/social/api-github-login.ts | 4 ++-- .../backend/auth/post-login-response-handler.ts | 10 +++++----- .../backend/backups/su/add-backup/index.ts | 4 ++-- .../functions/backend/db/deleteDbEntry.ts | 2 +- .../functions/backend/db/updateDbEntry.ts | 2 +- .../mariadb-user/handle-mariadb-user-record.ts | 4 +++- .../shell/createDbFromSchema/check-db-record.ts | 2 +- .../shell/createDbFromSchema/check-table-record.ts | 2 +- .../shell/mariadb-users/users/create-user.ts | 14 +++++++------- .../utils/create-table-handle-table-record.ts | 4 ++-- package-shared/types/index.ts | 8 ++++++-- package-shared/utils/data-fetching/crud.ts | 2 +- package.json | 2 +- 50 files changed, 112 insertions(+), 105 deletions(-) diff --git a/dist/index.d.ts b/dist/index.d.ts index 6b9c2c8..e681f98 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts @@ -73,12 +73,12 @@ declare const datasquirel: { post: typeof post; user: { auth: { - login: (_: import("./package-shared/types").LoginUserParam) => Promise>; + login: (_: import("./package-shared/types").LoginUserParam) => Promise; get: (_: import("./package-shared/types").GetUserParams) => Promise; signup: (_: import("./package-shared/types").AddUserParams) => Promise; sendEmailCode: (_: import("./package-shared/types").SendEmailCodeParams) => Promise; - update: (_: import("./package-shared/types").UpdateUserParams) => Promise; - resetPassword: (_: import("./package-shared/types").ResetPasswordParams) => Promise; + update: (_: import("./package-shared/types").UpdateUserParams) => Promise; + resetPassword: (_: import("./package-shared/types").ResetPasswordParams) => Promise; googleLogin: (_: import("./package-shared/types").GoogleAuthParams) => Promise; logout: typeof import("./package-shared/actions/users/logout-user").default; auth: typeof import("./package-shared/actions/users/user-auth").default; diff --git a/dist/package-shared/actions/get.d.ts b/dist/package-shared/actions/get.d.ts index 17a3cba..6a298d0 100644 --- a/dist/package-shared/actions/get.d.ts +++ b/dist/package-shared/actions/get.d.ts @@ -20,5 +20,5 @@ export default function get({ key, database, query, table, debug, useLocal, apiVersion, }: Param): Promise>; +}>({ key, database, query, table, debug, useLocal, apiVersion, }: Param): Promise; export {}; diff --git a/dist/package-shared/actions/users/login-user.d.ts b/dist/package-shared/actions/users/login-user.d.ts index 740fb26..044d579 100644 --- a/dist/package-shared/actions/users/login-user.d.ts +++ b/dist/package-shared/actions/users/login-user.d.ts @@ -2,4 +2,4 @@ import { APIResponseObject, DATASQUIREL_LoggedInUser, LoginUserParam } from "../ /** * # Login A user */ -export default function loginUser({ apiKey, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, useLocal, apiVersion, }: LoginUserParam): Promise>; +export default function loginUser({ apiKey, payload, database, additionalFields, response, encryptionKey, encryptionSalt, email_login, email_login_code, temp_code_field, token, skipPassword, apiUserID, skipWriteAuthFile, dbUserId, debug, cleanupTokens, secureCookie, useLocal, apiVersion, }: LoginUserParam): Promise; diff --git a/dist/package-shared/actions/users/reset-password.d.ts b/dist/package-shared/actions/users/reset-password.d.ts index b351ca1..2d75c4a 100644 --- a/dist/package-shared/actions/users/reset-password.d.ts +++ b/dist/package-shared/actions/users/reset-password.d.ts @@ -1,5 +1,5 @@ -import { ResetPasswordParams, UpdateUserFunctionReturn } from "../../types"; +import { APIResponseObject, ResetPasswordParams } from "../../types"; /** * # Reset User Password */ -export default function resetPassword(params: ResetPasswordParams): Promise; +export default function resetPassword(params: ResetPasswordParams): Promise; diff --git a/dist/package-shared/actions/users/update-user.d.ts b/dist/package-shared/actions/users/update-user.d.ts index 9b44cac..d09610b 100644 --- a/dist/package-shared/actions/users/update-user.d.ts +++ b/dist/package-shared/actions/users/update-user.d.ts @@ -1,8 +1,8 @@ -import { UpdateUserFunctionReturn, UpdateUserParams } from "../../types"; +import { APIResponseObject, UpdateUserParams } from "../../types"; import { DSQL_DATASQUIREL_USERS } from "../../types/dsql"; /** * # Update User */ export default function updateUser({ payload, database, updatedUserId, useLocal, apiKey, apiVersion, dbUserId, }: UpdateUserParams): Promise; +}>({ payload, database, updatedUserId, useLocal, apiKey, apiVersion, dbUserId, }: UpdateUserParams): Promise; diff --git a/dist/package-shared/api/crud/delete.d.ts b/dist/package-shared/api/crud/delete.d.ts index 551bae0..9c70183 100644 --- a/dist/package-shared/api/crud/delete.d.ts +++ b/dist/package-shared/api/crud/delete.d.ts @@ -20,7 +20,5 @@ export default function apiCrudDELETE({ dbName, tableName, deleteSpec, targetID, apiKey, useDefault }: Params): Promise>; +}>({ dbName, tableName, deleteSpec, targetID, apiKey, useDefault }: Params): Promise; export {}; diff --git a/dist/package-shared/api/schema/get.d.ts b/dist/package-shared/api/schema/get.d.ts index 64e188b..88b51df 100644 --- a/dist/package-shared/api/schema/get.d.ts +++ b/dist/package-shared/api/schema/get.d.ts @@ -9,5 +9,5 @@ type Params = { grabbedHostnames?: GrabHostNamesReturn; useDefault?: boolean; }; -export default function ({ dbName, tableName, apiKey, useDefault, fieldName, apiConnectionConfig, grabbedHostnames, }: Params): Promise>; +export default function ({ dbName, tableName, apiKey, useDefault, fieldName, apiConnectionConfig, grabbedHostnames, }: Params): Promise; export {}; diff --git a/dist/package-shared/api/user/local-user.d.ts b/dist/package-shared/api/user/local-user.d.ts index ac0c079..3a16972 100644 --- a/dist/package-shared/api/user/local-user.d.ts +++ b/dist/package-shared/api/user/local-user.d.ts @@ -4,12 +4,12 @@ import validateTempEmailCode from "../../actions/users/validate-temp-email-code" import { AddUserParams, GetUserParams, GoogleAuthParams, LoginUserParam, ResetPasswordParams, SendEmailCodeParams, UpdateUserParams } from "../../types"; declare const localUser: { auth: { - login: (_: LoginUserParam) => Promise>; + login: (_: LoginUserParam) => Promise; get: (_: GetUserParams) => Promise; signup: (_: AddUserParams) => Promise; sendEmailCode: (_: SendEmailCodeParams) => Promise; - update: (_: UpdateUserParams) => Promise; - resetPassword: (_: ResetPasswordParams) => Promise; + update: (_: UpdateUserParams) => Promise; + resetPassword: (_: ResetPasswordParams) => Promise; googleLogin: (_: GoogleAuthParams) => Promise; logout: typeof logoutUser; auth: typeof userAuth; diff --git a/dist/package-shared/functions/api/query-dsql-api.d.ts b/dist/package-shared/functions/api/query-dsql-api.d.ts index 4dbbf07..5c056e8 100644 --- a/dist/package-shared/functions/api/query-dsql-api.d.ts +++ b/dist/package-shared/functions/api/query-dsql-api.d.ts @@ -17,7 +17,5 @@ type Param({ body, query, useDefault, path: passedPath, method, apiKey, apiConnectionConfig, grabbedHostnames, }: Param): Promise>; +}>({ body, query, useDefault, path: passedPath, method, apiKey, apiConnectionConfig, grabbedHostnames, }: Param): Promise; export {}; diff --git a/dist/package-shared/functions/api/social-login/handleSocialDb.js b/dist/package-shared/functions/api/social-login/handleSocialDb.js index fabe3bc..da2a721 100644 --- a/dist/package-shared/functions/api/social-login/handleSocialDb.js +++ b/dist/package-shared/functions/api/social-login/handleSocialDb.js @@ -121,8 +121,8 @@ function handleSocialDb(_a) { duplicateColumnValue: finalEmail, data: Object.assign(Object.assign({}, data), { email: finalEmail }), }); - if ((_b = newUser === null || newUser === void 0 ? void 0 : newUser.payload) === null || _b === void 0 ? void 0 : _b.insertId) { - const newUserQueriedQuery = `SELECT * FROM users WHERE id='${newUser.payload.insertId}'`; + if ((_b = newUser === null || newUser === void 0 ? void 0 : newUser.postInsertReturn) === null || _b === void 0 ? void 0 : _b.insertId) { + const newUserQueriedQuery = `SELECT * FROM users WHERE id='${newUser.postInsertReturn.insertId}'`; const newUserQueried = (yield (0, dbHandler_1.default)({ database: finalDbName, query: newUserQueriedQuery, @@ -141,7 +141,7 @@ function handleSocialDb(_a) { */ let generatedToken = (0, encrypt_1.default)({ data: JSON.stringify({ - id: newUser.payload.insertId, + id: newUser.postInsertReturn.insertId, email: supEmail, dateCode: Date.now(), }), diff --git a/dist/package-shared/functions/api/users/api-create-user.js b/dist/package-shared/functions/api/users/api-create-user.js index 527cd98..e324b0b 100644 --- a/dist/package-shared/functions/api/users/api-create-user.js +++ b/dist/package-shared/functions/api/users/api-create-user.js @@ -138,8 +138,8 @@ function apiCreateUser(_a) { "/images/user-preset.png", image_thumbnail: process.env.DSQL_DEFAULT_USER_IMAGE || "/images/user-preset-thumbnail.png", verification_status: verify ? 1 : 0 }), }); - if ((_b = addUser === null || addUser === void 0 ? void 0 : addUser.payload) === null || _b === void 0 ? void 0 : _b.insertId) { - const newlyAddedUserQuery = `SELECT id,uuid,first_name,last_name,email,username,image,image_thumbnail,verification_status FROM ${dbFullName}.users WHERE id='${addUser.payload.insertId}'`; + if ((_b = addUser === null || addUser === void 0 ? void 0 : addUser.postInsertReturn) === null || _b === void 0 ? void 0 : _b.insertId) { + const newlyAddedUserQuery = `SELECT id,uuid,first_name,last_name,email,username,image,image_thumbnail,verification_status FROM ${dbFullName}.users WHERE id='${addUser.postInsertReturn.insertId}'`; const newlyAddedUser = (yield (0, dbHandler_1.default)({ query: newlyAddedUserQuery, values: [], diff --git a/dist/package-shared/functions/api/users/api-login.js b/dist/package-shared/functions/api/users/api-login.js index a95abcb..562e59a 100644 --- a/dist/package-shared/functions/api/users/api-login.js +++ b/dist/package-shared/functions/api/users/api-login.js @@ -153,7 +153,7 @@ function apiLoginUser(_a) { const resposeObject = { success: true, msg: "Login Successful", - payload: userPayload, + singleRes: userPayload, userId: foundUser[0].id, csrf: csrfKey, }; diff --git a/dist/package-shared/functions/api/users/api-reset-user-password.js b/dist/package-shared/functions/api/users/api-reset-user-password.js index 3e894e9..5104855 100644 --- a/dist/package-shared/functions/api/users/api-reset-user-password.js +++ b/dist/package-shared/functions/api/users/api-reset-user-password.js @@ -49,7 +49,7 @@ function apiResetUserPassword(_a) { }); return { success: true, - payload: updateUser, + singleRes: updateUser, }; }); } diff --git a/dist/package-shared/functions/api/users/api-update-user.js b/dist/package-shared/functions/api/users/api-update-user.js index 912c281..88a560b 100644 --- a/dist/package-shared/functions/api/users/api-update-user.js +++ b/dist/package-shared/functions/api/users/api-update-user.js @@ -75,7 +75,7 @@ function apiUpdateUser(_a) { }); return { success: true, - payload: updateUser, + singleRes: updateUser, }; }); } diff --git a/dist/package-shared/functions/api/users/social/api-github-login.d.ts b/dist/package-shared/functions/api/users/social/api-github-login.d.ts index 93e3442..956489f 100644 --- a/dist/package-shared/functions/api/users/social/api-github-login.d.ts +++ b/dist/package-shared/functions/api/users/social/api-github-login.d.ts @@ -1,4 +1,4 @@ -import { APILoginFunctionReturn } from "../../../../types"; +import { APIResponseObject } from "../../../../types"; type Param = { code?: string; clientId?: string; @@ -13,5 +13,5 @@ type Param = { /** * # API Login with Github */ -export default function apiGithubLogin({ code, clientId, clientSecret, database, additionalFields, email, additionalData, }: Param): Promise; +export default function apiGithubLogin({ code, clientId, clientSecret, database, additionalFields, email, additionalData, }: Param): Promise; export {}; diff --git a/dist/package-shared/functions/backend/auth/post-login-response-handler.js b/dist/package-shared/functions/backend/auth/post-login-response-handler.js index 383f4d3..77f822e 100644 --- a/dist/package-shared/functions/backend/auth/post-login-response-handler.js +++ b/dist/package-shared/functions/backend/auth/post-login-response-handler.js @@ -20,7 +20,7 @@ function postLoginResponseHandler({ database, httpResponse, response, encryption const COOKIE_EXPIRY_DATE = (0, grab_cookie_expirt_date_1.default)(); if (httpResponse === null || httpResponse === void 0 ? void 0 : httpResponse.success) { let encryptedPayload = (0, encrypt_1.default)({ - data: JSON.stringify(httpResponse.payload), + data: JSON.stringify(httpResponse.singleRes), encryptionKey, encryptionSalt, }); @@ -35,8 +35,8 @@ function postLoginResponseHandler({ database, httpResponse, response, encryption database, }); if (httpResponse.csrf && !skipWriteAuthFile) { - (0, write_auth_files_1.writeAuthFile)(httpResponse.csrf, JSON.stringify(httpResponse.payload), cleanupTokens && ((_a = httpResponse.payload) === null || _a === void 0 ? void 0 : _a.id) - ? { userId: httpResponse.payload.id } + (0, write_auth_files_1.writeAuthFile)(httpResponse.csrf, JSON.stringify(httpResponse.singleRes), cleanupTokens && ((_a = httpResponse.singleRes) === null || _a === void 0 ? void 0 : _a.id) + ? { userId: httpResponse.singleRes.id } : undefined); } httpResponse["cookieNames"] = cookieNames; @@ -50,7 +50,7 @@ function postLoginResponseHandler({ database, httpResponse, response, encryption } response === null || response === void 0 ? void 0 : response.setHeader("Set-Cookie", [ `${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Expires=${COOKIE_EXPIRY_DATE}${secureCookie ? ";Secure=true" : ""}`, - `${csrfName}=${(_b = httpResponse.payload) === null || _b === void 0 ? void 0 : _b.csrf_k};samesite=strict;path=/;HttpOnly=true;Expires=${COOKIE_EXPIRY_DATE}`, + `${csrfName}=${(_b = httpResponse.singleRes) === null || _b === void 0 ? void 0 : _b.csrf_k};samesite=strict;path=/;HttpOnly=true;Expires=${COOKIE_EXPIRY_DATE}`, ]); if (debug) { debugFn("Response Sent!"); diff --git a/dist/package-shared/functions/backend/backups/su/add-backup/index.js b/dist/package-shared/functions/backend/backups/su/add-backup/index.js index 041a170..fdc3e45 100644 --- a/dist/package-shared/functions/backend/backups/su/add-backup/index.js +++ b/dist/package-shared/functions/backend/backups/su/add-backup/index.js @@ -38,7 +38,7 @@ function suAddBackup(_a) { tableName: "backups", data: newBackup, }); - if (!((_b = newBackupEntry === null || newBackupEntry === void 0 ? void 0 : newBackupEntry.payload) === null || _b === void 0 ? void 0 : _b.insertId)) { + if (!((_b = newBackupEntry === null || newBackupEntry === void 0 ? void 0 : newBackupEntry.postInsertReturn) === null || _b === void 0 ? void 0 : _b.insertId)) { return { success: false, msg: `Couldn't create new backup entry`, @@ -46,7 +46,7 @@ function suAddBackup(_a) { } const { single: newlyAddedBackup } = yield (0, grab_user_resource_1.default)({ tableName: "backups", - targetID: (_c = newBackupEntry.payload) === null || _c === void 0 ? void 0 : _c.insertId, + targetID: (_c = newBackupEntry.postInsertReturn) === null || _c === void 0 ? void 0 : _c.insertId, isSuperUser: true, }); if (!(newlyAddedBackup === null || newlyAddedBackup === void 0 ? void 0 : newlyAddedBackup.id)) { diff --git a/dist/package-shared/functions/backend/db/deleteDbEntry.js b/dist/package-shared/functions/backend/db/deleteDbEntry.js index e313b27..9747f48 100644 --- a/dist/package-shared/functions/backend/db/deleteDbEntry.js +++ b/dist/package-shared/functions/backend/db/deleteDbEntry.js @@ -53,7 +53,7 @@ function deleteDbEntry(_a) { */ return { success: Boolean(deletedEntry.affectedRows), - payload: deletedEntry, + postInsertReturn: deletedEntry, queryObject: { sql: (0, sql_formatter_1.format)(query), params: values, diff --git a/dist/package-shared/functions/backend/db/updateDbEntry.js b/dist/package-shared/functions/backend/db/updateDbEntry.js index e97f4bc..e1a274d 100644 --- a/dist/package-shared/functions/backend/db/updateDbEntry.js +++ b/dist/package-shared/functions/backend/db/updateDbEntry.js @@ -115,7 +115,7 @@ function updateDbEntry(_a) { */ return { success: Boolean(updatedEntry === null || updatedEntry === void 0 ? void 0 : updatedEntry.affectedRows), - payload: updatedEntry, + postInsertReturn: updatedEntry, queryObject: { sql: (0, sql_formatter_1.format)(query), params: updateValues, diff --git a/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-record.js b/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-record.js index a3587d4..b4f3193 100644 --- a/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-record.js +++ b/dist/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-record.js @@ -61,7 +61,9 @@ function handleMariadbUserRecord(_a) { query: { query: { id: { - value: String((existingRecord === null || existingRecord === void 0 ? void 0 : existingRecord.id) || ((_d = record === null || record === void 0 ? void 0 : record.payload) === null || _d === void 0 ? void 0 : _d.insertId) || 0), + value: String((existingRecord === null || existingRecord === void 0 ? void 0 : existingRecord.id) || + ((_d = record === null || record === void 0 ? void 0 : record.postInsertReturn) === null || _d === void 0 ? void 0 : _d.insertId) || + 0), }, }, }, diff --git a/dist/package-shared/shell/createDbFromSchema/check-db-record.js b/dist/package-shared/shell/createDbFromSchema/check-db-record.js index 1893045..5f2c824 100644 --- a/dist/package-shared/shell/createDbFromSchema/check-db-record.js +++ b/dist/package-shared/shell/createDbFromSchema/check-db-record.js @@ -52,7 +52,7 @@ function checkDbRecordCreateDbSchema(_a) { tableName: "user_databases", forceLocal: true, }); - if ((_b = newDbEntry.payload) === null || _b === void 0 ? void 0 : _b.insertId) { + if ((_b = newDbEntry.postInsertReturn) === null || _b === void 0 ? void 0 : _b.insertId) { recordedDbEntryArray = (yield (0, dbHandler_1.default)({ query: `SELECT * FROM datasquirel.user_databases WHERE db_full_name = ?`, values: [dbFullName || "NULL"], diff --git a/dist/package-shared/shell/createDbFromSchema/check-table-record.js b/dist/package-shared/shell/createDbFromSchema/check-table-record.js index 89c5035..5b7b806 100644 --- a/dist/package-shared/shell/createDbFromSchema/check-table-record.js +++ b/dist/package-shared/shell/createDbFromSchema/check-table-record.js @@ -74,7 +74,7 @@ function checkTableRecordCreateDbSchema(_a) { dbContext: "Master", forceLocal: true, }); - if ((_b = newTableRecordEntry.payload) === null || _b === void 0 ? void 0 : _b.insertId) { + if ((_b = newTableRecordEntry.postInsertReturn) === null || _b === void 0 ? void 0 : _b.insertId) { recordedTableEntryArray = (yield (0, dbHandler_1.default)({ query: (queryObj === null || queryObj === void 0 ? void 0 : queryObj.string) || "", values: queryObj === null || queryObj === void 0 ? void 0 : queryObj.values, diff --git a/dist/package-shared/shell/mariadb-users/users/create-user.js b/dist/package-shared/shell/mariadb-users/users/create-user.js index 35e4e84..0e2a6c1 100644 --- a/dist/package-shared/shell/mariadb-users/users/create-user.js +++ b/dist/package-shared/shell/mariadb-users/users/create-user.js @@ -78,7 +78,7 @@ function createUser() { tableName: "users", data: Object.assign(Object.assign({}, userObj), { password: hashedPassword }), }); - if (!((_a = newUser === null || newUser === void 0 ? void 0 : newUser.payload) === null || _a === void 0 ? void 0 : _a.insertId)) + if (!((_a = newUser === null || newUser === void 0 ? void 0 : newUser.postInsertReturn) === null || _a === void 0 ? void 0 : _a.insertId)) return false; const { STATIC_ROOT } = (0, grab_dir_names_1.default)(); if (!STATIC_ROOT) { @@ -90,17 +90,17 @@ function createUser() { * * @description Create new user folder and file */ - let newUserSchemaFolderPath = `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${newUser.payload.insertId}`; - let newUserMediaFolderPath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.payload.insertId}`); + let newUserSchemaFolderPath = `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${newUser.postInsertReturn.insertId}`; + let newUserMediaFolderPath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.postInsertReturn.insertId}`); fs_1.default.mkdirSync(newUserSchemaFolderPath, { recursive: true }); fs_1.default.mkdirSync(newUserMediaFolderPath, { recursive: true }); fs_1.default.writeFileSync(`${newUserSchemaFolderPath}/main.json`, JSON.stringify([]), "utf8"); - const imageBasePath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.payload.insertId}`); + const imageBasePath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.postInsertReturn.insertId}`); if (!fs_1.default.existsSync(imageBasePath)) { fs_1.default.mkdirSync(imageBasePath, { recursive: true }); } - let imagePath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.payload.insertId}/user-${newUser.payload.insertId}-profile.jpg`); - let imageThumbnailPath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.payload.insertId}/user-${newUser.payload.insertId}-profile-thumbnail.jpg`); + let imagePath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.postInsertReturn.insertId}/user-${newUser.postInsertReturn.insertId}-profile.jpg`); + let imageThumbnailPath = path_1.default.join(STATIC_ROOT, `images/user-images/user-${newUser.postInsertReturn.insertId}/user-${newUser.postInsertReturn.insertId}-profile-thumbnail.jpg`); let prodImageUrl = imagePath.replace(STATIC_ROOT, process.env.DSQL_STATIC_HOST || ""); let prodImageThumbnailUrl = imageThumbnailPath.replace(STATIC_ROOT, process.env.DSQL_STATIC_HOST || ""); fs_1.default.copyFileSync(path_1.default.join(ROOT_DIR, "/public/images/user-preset.png"), imagePath); @@ -110,7 +110,7 @@ function createUser() { dbFullName: "datasquirel", tableName: "users", identifierColumnName: "id", - identifierValue: newUser.payload.insertId, + identifierValue: newUser.postInsertReturn.insertId, data: { image: prodImageUrl, image_thumbnail: prodImageThumbnailUrl, diff --git a/dist/package-shared/shell/utils/create-table-handle-table-record.js b/dist/package-shared/shell/utils/create-table-handle-table-record.js index 531fc39..fdb5940 100644 --- a/dist/package-shared/shell/utils/create-table-handle-table-record.js +++ b/dist/package-shared/shell/utils/create-table-handle-table-record.js @@ -85,8 +85,8 @@ function default_1(_a) { tableName: targetTableName, dbFullName: targetDatabase, }); - if ((_b = newTableEntryRes === null || newTableEntryRes === void 0 ? void 0 : newTableEntryRes.payload) === null || _b === void 0 ? void 0 : _b.insertId) { - tableId = newTableEntryRes.payload.insertId; + if ((_b = newTableEntryRes === null || newTableEntryRes === void 0 ? void 0 : newTableEntryRes.postInsertReturn) === null || _b === void 0 ? void 0 : _b.insertId) { + tableId = newTableEntryRes.postInsertReturn.insertId; } } if (newTableSchema.tableNameOld) { diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts index e0861f6..5f5d24e 100644 --- a/dist/package-shared/types/index.d.ts +++ b/dist/package-shared/types/index.d.ts @@ -1444,9 +1444,15 @@ export type ResponseQueryObject = { sql?: string; params?: (string | number)[]; }; -export type APIResponseObject = { +export type APIResponseObject = { success: boolean; - payload?: T; + payload?: T[] | null; + singleRes?: T | null; + postInsertReturn?: PostInsertReturn | null; payloadBase64?: string; payloadThumbnailBase64?: string; payloadURL?: string; diff --git a/dist/package-shared/utils/data-fetching/crud.js b/dist/package-shared/utils/data-fetching/crud.js index 6fe3be7..84879c3 100644 --- a/dist/package-shared/utils/data-fetching/crud.js +++ b/dist/package-shared/utils/data-fetching/crud.js @@ -99,7 +99,7 @@ function dsqlCrud(params) { })); return { success: Boolean(res.affectedRows), - payload: res, + postInsertReturn: res, queryObject: { sql: (0, sql_formatter_1.format)((deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.query) || ""), params: (deleteQuery === null || deleteQuery === void 0 ? void 0 : deleteQuery.values) || [], diff --git a/package-shared/actions/get.ts b/package-shared/actions/get.ts index 020417b..ae830fd 100644 --- a/package-shared/actions/get.ts +++ b/package-shared/actions/get.ts @@ -22,8 +22,7 @@ export type ApiGetParams = Param; * # Make a get request to Datasquirel API */ export default async function get< - T extends { [k: string]: any } = { [k: string]: any }, - R extends any = any + T extends { [k: string]: any } = { [k: string]: any } >({ key, database, @@ -32,7 +31,7 @@ export default async function get< debug, useLocal, apiVersion = "v1", -}: Param): Promise> { +}: Param): Promise { const grabedHostNames = grabHostNames(); const { host, port, scheme } = grabedHostNames; @@ -122,5 +121,5 @@ export default async function get< .end(); }); - return httpResponse as APIResponseObject; + return httpResponse as APIResponseObject; } diff --git a/package-shared/actions/users/login-user.ts b/package-shared/actions/users/login-user.ts index c07745c..49fd0e2 100644 --- a/package-shared/actions/users/login-user.ts +++ b/package-shared/actions/users/login-user.ts @@ -44,7 +44,7 @@ export default async function loginUser< secureCookie, useLocal, apiVersion = "v1", -}: LoginUserParam): Promise> { +}: LoginUserParam): Promise { const COOKIE_EXPIRY_DATE = grabCookieExpiryDate(); const defaultTempLoginFieldName = "temp_login_code"; diff --git a/package-shared/actions/users/reset-password.ts b/package-shared/actions/users/reset-password.ts index c44d1ee..8053fc9 100644 --- a/package-shared/actions/users/reset-password.ts +++ b/package-shared/actions/users/reset-password.ts @@ -1,4 +1,4 @@ -import { ResetPasswordParams, UpdateUserFunctionReturn } from "../../types"; +import { APIResponseObject, ResetPasswordParams } from "../../types"; import queryDSQLAPI from "../../functions/api/query-dsql-api"; import grabUserDSQLAPIPath from "../../utils/backend/users/grab-api-path"; import apiResetUserPassword from "../../functions/api/users/api-reset-user-password"; @@ -8,7 +8,7 @@ import apiResetUserPassword from "../../functions/api/users/api-reset-user-passw */ export default async function resetPassword( params: ResetPasswordParams -): Promise { +): Promise { if (params.useLocal) { return await apiResetUserPassword(params); } @@ -25,5 +25,5 @@ export default async function resetPassword( method: "POST", }); - return httpResponse as UpdateUserFunctionReturn; + return httpResponse as APIResponseObject; } diff --git a/package-shared/actions/users/update-user.ts b/package-shared/actions/users/update-user.ts index f9e0d24..00954b1 100644 --- a/package-shared/actions/users/update-user.ts +++ b/package-shared/actions/users/update-user.ts @@ -1,5 +1,6 @@ import apiUpdateUser from "../../functions/api/users/api-update-user"; import { + APIResponseObject, ApiUpdateUserParams, UpdateUserFunctionReturn, UpdateUserParams, @@ -23,7 +24,7 @@ export default async function updateUser< apiKey, apiVersion, dbUserId, -}: UpdateUserParams): Promise { +}: UpdateUserParams): Promise { const updateUserParams: ApiUpdateUserParams = { payload: payload, database, @@ -52,5 +53,5 @@ export default async function updateUser< method: "POST", }); - return httpResponse as UpdateUserFunctionReturn; + return httpResponse as APIResponseObject; } diff --git a/package-shared/api/schema/get.ts b/package-shared/api/schema/get.ts index 019df2e..6862349 100644 --- a/package-shared/api/schema/get.ts +++ b/package-shared/api/schema/get.ts @@ -33,7 +33,7 @@ export default async function < fieldName, apiConnectionConfig, grabbedHostnames, -}: Params): Promise> { +}: Params): Promise { const basePath = grabAPIBasePath({ paradigm: "schema" }); const finalPath = path.join( @@ -43,7 +43,7 @@ export default async function < fieldName || "" ); - const GET_RES = await queryDSQLAPI({ + const GET_RES = await queryDSQLAPI({ method: "GET", path: finalPath, apiKey, diff --git a/package-shared/functions/api/query-dsql-api.ts b/package-shared/functions/api/query-dsql-api.ts index f4f1f5e..12a7bbf 100644 --- a/package-shared/functions/api/query-dsql-api.ts +++ b/package-shared/functions/api/query-dsql-api.ts @@ -30,10 +30,7 @@ type Param = { /** * # Query DSQL API */ -export default async function queryDSQLAPI< - T = { [k: string]: any }, - P = { [k: string]: any } ->({ +export default async function queryDSQLAPI({ body, query, useDefault, @@ -42,7 +39,7 @@ export default async function queryDSQLAPI< apiKey, apiConnectionConfig, grabbedHostnames, -}: Param): Promise> { +}: Param): Promise { const grabedHostNames = grabbedHostnames || grabHostNames({ useDefault, apiConnectionConfig }); const { host, port, scheme } = grabedHostNames; @@ -168,7 +165,7 @@ export default async function queryDSQLAPI< httpsRequest.end(); }); - return httpResponse as APIResponseObject

; + return httpResponse as APIResponseObject; } catch (error: any) { return { success: false, diff --git a/package-shared/functions/api/social-login/handleSocialDb.ts b/package-shared/functions/api/social-login/handleSocialDb.ts index 3c96e06..5d14033 100644 --- a/package-shared/functions/api/social-login/handleSocialDb.ts +++ b/package-shared/functions/api/social-login/handleSocialDb.ts @@ -152,8 +152,8 @@ export default async function handleSocialDb({ }, }); - if (newUser?.payload?.insertId) { - const newUserQueriedQuery = `SELECT * FROM users WHERE id='${newUser.payload.insertId}'`; + if (newUser?.postInsertReturn?.insertId) { + const newUserQueriedQuery = `SELECT * FROM users WHERE id='${newUser.postInsertReturn.insertId}'`; const newUserQueried = (await dbHandler({ database: finalDbName, @@ -175,7 +175,7 @@ export default async function handleSocialDb({ */ let generatedToken = encrypt({ data: JSON.stringify({ - id: newUser.payload.insertId, + id: newUser.postInsertReturn.insertId, email: supEmail, dateCode: Date.now(), }), diff --git a/package-shared/functions/api/users/api-create-user.ts b/package-shared/functions/api/users/api-create-user.ts index 1c836b1..ddcad71 100644 --- a/package-shared/functions/api/users/api-create-user.ts +++ b/package-shared/functions/api/users/api-create-user.ts @@ -163,8 +163,8 @@ export default async function apiCreateUser({ }, }); - if (addUser?.payload?.insertId) { - const newlyAddedUserQuery = `SELECT id,uuid,first_name,last_name,email,username,image,image_thumbnail,verification_status FROM ${dbFullName}.users WHERE id='${addUser.payload.insertId}'`; + if (addUser?.postInsertReturn?.insertId) { + const newlyAddedUserQuery = `SELECT id,uuid,first_name,last_name,email,username,image,image_thumbnail,verification_status FROM ${dbFullName}.users WHERE id='${addUser.postInsertReturn.insertId}'`; const newlyAddedUser = (await dbHandler({ query: newlyAddedUserQuery, diff --git a/package-shared/functions/api/users/api-login.ts b/package-shared/functions/api/users/api-login.ts index 3d0dba8..06f9c21 100644 --- a/package-shared/functions/api/users/api-login.ts +++ b/package-shared/functions/api/users/api-login.ts @@ -184,7 +184,7 @@ export default async function apiLoginUser({ const resposeObject: APIResponseObject = { success: true, msg: "Login Successful", - payload: userPayload, + singleRes: userPayload, userId: foundUser[0].id, csrf: csrfKey, }; diff --git a/package-shared/functions/api/users/api-reset-user-password.ts b/package-shared/functions/api/users/api-reset-user-password.ts index d038a9f..2f4f5f4 100644 --- a/package-shared/functions/api/users/api-reset-user-password.ts +++ b/package-shared/functions/api/users/api-reset-user-password.ts @@ -48,6 +48,6 @@ export default async function apiResetUserPassword({ return { success: true, - payload: updateUser, + singleRes: updateUser, }; } diff --git a/package-shared/functions/api/users/api-update-user.ts b/package-shared/functions/api/users/api-update-user.ts index 04a0526..6674879 100644 --- a/package-shared/functions/api/users/api-update-user.ts +++ b/package-shared/functions/api/users/api-update-user.ts @@ -81,6 +81,6 @@ export default async function apiUpdateUser({ return { success: true, - payload: updateUser, + singleRes: updateUser, }; } diff --git a/package-shared/functions/api/users/social/api-github-login.ts b/package-shared/functions/api/users/social/api-github-login.ts index 7521f75..f08020f 100644 --- a/package-shared/functions/api/users/social/api-github-login.ts +++ b/package-shared/functions/api/users/social/api-github-login.ts @@ -1,7 +1,7 @@ import handleSocialDb from "../../social-login/handleSocialDb"; import githubLogin from "../../social-login/githubLogin"; import camelJoinedtoCamelSpace from "../../../../utils/camelJoinedtoCamelSpace"; -import { APILoginFunctionReturn } from "../../../../types"; +import { APILoginFunctionReturn, APIResponseObject } from "../../../../types"; type Param = { code?: string; @@ -24,7 +24,7 @@ export default async function apiGithubLogin({ additionalFields, email, additionalData, -}: Param): Promise { +}: Param): Promise { if (!code || !clientId || !clientSecret || !database) { return { success: false, diff --git a/package-shared/functions/backend/auth/post-login-response-handler.ts b/package-shared/functions/backend/auth/post-login-response-handler.ts index 05edf9f..342e00d 100644 --- a/package-shared/functions/backend/auth/post-login-response-handler.ts +++ b/package-shared/functions/backend/auth/post-login-response-handler.ts @@ -42,7 +42,7 @@ export default function postLoginResponseHandler({ if (httpResponse?.success) { let encryptedPayload = encrypt({ - data: JSON.stringify(httpResponse.payload), + data: JSON.stringify(httpResponse.singleRes), encryptionKey, encryptionSalt, }); @@ -61,9 +61,9 @@ export default function postLoginResponseHandler({ if (httpResponse.csrf && !skipWriteAuthFile) { writeAuthFile( httpResponse.csrf, - JSON.stringify(httpResponse.payload), - cleanupTokens && httpResponse.payload?.id - ? { userId: httpResponse.payload.id } + JSON.stringify(httpResponse.singleRes), + cleanupTokens && httpResponse.singleRes?.id + ? { userId: httpResponse.singleRes.id } : undefined ); } @@ -84,7 +84,7 @@ export default function postLoginResponseHandler({ `${authKeyName}=${encryptedPayload};samesite=strict;path=/;HttpOnly=true;Expires=${COOKIE_EXPIRY_DATE}${ secureCookie ? ";Secure=true" : "" }`, - `${csrfName}=${httpResponse.payload?.csrf_k};samesite=strict;path=/;HttpOnly=true;Expires=${COOKIE_EXPIRY_DATE}`, + `${csrfName}=${httpResponse.singleRes?.csrf_k};samesite=strict;path=/;HttpOnly=true;Expires=${COOKIE_EXPIRY_DATE}`, ]); if (debug) { diff --git a/package-shared/functions/backend/backups/su/add-backup/index.ts b/package-shared/functions/backend/backups/su/add-backup/index.ts index b229eaf..f5ae99f 100644 --- a/package-shared/functions/backend/backups/su/add-backup/index.ts +++ b/package-shared/functions/backend/backups/su/add-backup/index.ts @@ -43,7 +43,7 @@ export default async function suAddBackup({ data: newBackup, }); - if (!newBackupEntry?.payload?.insertId) { + if (!newBackupEntry?.postInsertReturn?.insertId) { return { success: false, msg: `Couldn't create new backup entry`, @@ -53,7 +53,7 @@ export default async function suAddBackup({ const { single: newlyAddedBackup } = await dbGrabUserResource({ tableName: "backups", - targetID: newBackupEntry.payload?.insertId, + targetID: newBackupEntry.postInsertReturn?.insertId, isSuperUser: true, }); diff --git a/package-shared/functions/backend/db/deleteDbEntry.ts b/package-shared/functions/backend/db/deleteDbEntry.ts index ef67366..44002ed 100644 --- a/package-shared/functions/backend/db/deleteDbEntry.ts +++ b/package-shared/functions/backend/db/deleteDbEntry.ts @@ -74,7 +74,7 @@ export default async function deleteDbEntry< */ return { success: Boolean(deletedEntry.affectedRows), - payload: deletedEntry, + postInsertReturn: deletedEntry, queryObject: { sql: format(query), params: values, diff --git a/package-shared/functions/backend/db/updateDbEntry.ts b/package-shared/functions/backend/db/updateDbEntry.ts index d93c71e..adab385 100644 --- a/package-shared/functions/backend/db/updateDbEntry.ts +++ b/package-shared/functions/backend/db/updateDbEntry.ts @@ -161,7 +161,7 @@ export default async function updateDbEntry< */ return { success: Boolean(updatedEntry?.affectedRows), - payload: updatedEntry, + postInsertReturn: updatedEntry, queryObject: { sql: format(query), params: updateValues, diff --git a/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-record.ts b/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-record.ts index c0daca5..ed4f813 100644 --- a/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-record.ts +++ b/package-shared/functions/web-app/mariadb-user/handle-mariadb-user-record.ts @@ -78,7 +78,9 @@ export default async function handleMariadbUserRecord({ query: { id: { value: String( - existingRecord?.id || record?.payload?.insertId || 0 + existingRecord?.id || + record?.postInsertReturn?.insertId || + 0 ), }, }, diff --git a/package-shared/shell/createDbFromSchema/check-db-record.ts b/package-shared/shell/createDbFromSchema/check-db-record.ts index 71ab602..9e6a2b0 100644 --- a/package-shared/shell/createDbFromSchema/check-db-record.ts +++ b/package-shared/shell/createDbFromSchema/check-db-record.ts @@ -64,7 +64,7 @@ export default async function checkDbRecordCreateDbSchema({ forceLocal: true, }); - if (newDbEntry.payload?.insertId) { + if (newDbEntry.postInsertReturn?.insertId) { recordedDbEntryArray = (await dbHandler({ query: `SELECT * FROM datasquirel.user_databases WHERE db_full_name = ?`, values: [dbFullName || "NULL"], diff --git a/package-shared/shell/createDbFromSchema/check-table-record.ts b/package-shared/shell/createDbFromSchema/check-table-record.ts index 0450605..83301af 100644 --- a/package-shared/shell/createDbFromSchema/check-table-record.ts +++ b/package-shared/shell/createDbFromSchema/check-table-record.ts @@ -97,7 +97,7 @@ export default async function checkTableRecordCreateDbSchema({ forceLocal: true, }); - if (newTableRecordEntry.payload?.insertId) { + if (newTableRecordEntry.postInsertReturn?.insertId) { recordedTableEntryArray = (await dbHandler({ query: queryObj?.string || "", values: queryObj?.values, diff --git a/package-shared/shell/mariadb-users/users/create-user.ts b/package-shared/shell/mariadb-users/users/create-user.ts index c70c982..1c047f0 100644 --- a/package-shared/shell/mariadb-users/users/create-user.ts +++ b/package-shared/shell/mariadb-users/users/create-user.ts @@ -77,7 +77,7 @@ async function createUser() { data: { ...userObj, password: hashedPassword }, }); - if (!newUser?.payload?.insertId) return false; + if (!newUser?.postInsertReturn?.insertId) return false; const { STATIC_ROOT } = grabDirNames(); @@ -91,10 +91,10 @@ async function createUser() { * * @description Create new user folder and file */ - let newUserSchemaFolderPath = `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${newUser.payload.insertId}`; + let newUserSchemaFolderPath = `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${newUser.postInsertReturn.insertId}`; let newUserMediaFolderPath = path.join( STATIC_ROOT, - `images/user-images/user-${newUser.payload.insertId}` + `images/user-images/user-${newUser.postInsertReturn.insertId}` ); fs.mkdirSync(newUserSchemaFolderPath, { recursive: true }); @@ -108,7 +108,7 @@ async function createUser() { const imageBasePath = path.join( STATIC_ROOT, - `images/user-images/user-${newUser.payload.insertId}` + `images/user-images/user-${newUser.postInsertReturn.insertId}` ); if (!fs.existsSync(imageBasePath)) { @@ -117,12 +117,12 @@ async function createUser() { let imagePath = path.join( STATIC_ROOT, - `images/user-images/user-${newUser.payload.insertId}/user-${newUser.payload.insertId}-profile.jpg` + `images/user-images/user-${newUser.postInsertReturn.insertId}/user-${newUser.postInsertReturn.insertId}-profile.jpg` ); let imageThumbnailPath = path.join( STATIC_ROOT, - `images/user-images/user-${newUser.payload.insertId}/user-${newUser.payload.insertId}-profile-thumbnail.jpg` + `images/user-images/user-${newUser.postInsertReturn.insertId}/user-${newUser.postInsertReturn.insertId}-profile-thumbnail.jpg` ); let prodImageUrl = imagePath.replace( @@ -149,7 +149,7 @@ async function createUser() { dbFullName: "datasquirel", tableName: "users", identifierColumnName: "id", - identifierValue: newUser.payload.insertId, + identifierValue: newUser.postInsertReturn.insertId, data: { image: prodImageUrl, image_thumbnail: prodImageThumbnailUrl, diff --git a/package-shared/shell/utils/create-table-handle-table-record.ts b/package-shared/shell/utils/create-table-handle-table-record.ts index 3ba852e..c061d8f 100644 --- a/package-shared/shell/utils/create-table-handle-table-record.ts +++ b/package-shared/shell/utils/create-table-handle-table-record.ts @@ -97,8 +97,8 @@ export default async function ({ dbFullName: targetDatabase, }); - if (newTableEntryRes?.payload?.insertId) { - tableId = newTableEntryRes.payload.insertId; + if (newTableEntryRes?.postInsertReturn?.insertId) { + tableId = newTableEntryRes.postInsertReturn.insertId; } } diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts index c75a73d..a57453d 100644 --- a/package-shared/types/index.ts +++ b/package-shared/types/index.ts @@ -1681,9 +1681,13 @@ export type ResponseQueryObject = { params?: (string | number)[]; }; -export type APIResponseObject = { +export type APIResponseObject< + T extends { [k: string]: any } = { [k: string]: any } +> = { success: boolean; - payload?: T; + payload?: T[] | null; + singleRes?: T | null; + postInsertReturn?: PostInsertReturn | null; payloadBase64?: string; payloadThumbnailBase64?: string; payloadURL?: string; diff --git a/package-shared/utils/data-fetching/crud.ts b/package-shared/utils/data-fetching/crud.ts index 7875602..9714726 100644 --- a/package-shared/utils/data-fetching/crud.ts +++ b/package-shared/utils/data-fetching/crud.ts @@ -127,7 +127,7 @@ export default async function dsqlCrud< return { success: Boolean(res.affectedRows), - payload: res, + postInsertReturn: res, queryObject: { sql: format(deleteQuery?.query || ""), params: deleteQuery?.values || [], diff --git a/package.json b/package.json index 26500dc..a0e0a99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.5.7", + "version": "5.5.8", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {