This commit is contained in:
Benjamin Toby
2025-02-19 20:01:50 +01:00
parent c08db13f3d
commit e9bb9fb07f
113 changed files with 253 additions and 63 deletions
+2
View File
@@ -22,6 +22,7 @@ const grab_query_and_values_1 = __importDefault(require("../../../utils/grab-que
*/
function apiGet(_a) {
return __awaiter(this, arguments, void 0, function* ({ query, dbFullName, queryValues, tableName, dbSchema, debug, dbContext, forceLocal, }) {
var _b;
const queryAndValues = (0, grab_query_and_values_1.default)({
query,
values: queryValues,
@@ -78,6 +79,7 @@ function apiGet(_a) {
component: "/api/query/get/lines-85-94",
message: error.message,
});
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `API Get Error`, error);
if (debug && global.DSQL_USE_LOCAL) {
console.log("apiGet:error", error.message);
}
+2 -1
View File
@@ -21,7 +21,7 @@ const runQuery_1 = __importDefault(require("../../backend/db/runQuery"));
*/
function apiPost(_a) {
return __awaiter(this, arguments, void 0, function* ({ query, dbFullName, queryValues, tableName, dbSchema, dbContext, forceLocal, }) {
var _b;
var _b, _c;
if (typeof query === "string" && (query === null || query === void 0 ? void 0 : query.match(/^create |^alter |^drop /i))) {
return { success: false, msg: "Wrong Input" };
}
@@ -75,6 +75,7 @@ function apiPost(_a) {
component: "/api/query/post/lines-132-142",
message: error.message,
});
(_c = global.ERROR_CALLBACK) === null || _c === void 0 ? void 0 : _c.call(global, `API Post Error`, error);
return {
success: false,
payload: results,
@@ -22,7 +22,7 @@ const hashPassword_1 = __importDefault(require("../../dsql/hashPassword"));
*/
function googleLogin(_a) {
return __awaiter(this, arguments, void 0, function* ({ usertype, foundUser, isSocialValidated, isUserValid, reqBody, serverRes, loginFailureReason, }) {
var _b;
var _b, _c;
const client = new google_auth_library_1.OAuth2Client(process.env.DSQL_GOOGLE_CLIENT_ID);
let isGoogleAuthValid = false;
let newFoundUser = null;
@@ -114,6 +114,7 @@ function googleLogin(_a) {
component: "googleLogin",
message: error.message,
});
(_c = global.ERROR_CALLBACK) === null || _c === void 0 ? void 0 : _c.call(global, `Google Login Error`, error);
loginFailureReason = error;
isUserValid = false;
isSocialValidated = false;
@@ -26,6 +26,7 @@ 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, debug, }) {
var _b;
try {
const finalDbName = global.DSQL_USE_LOCAL
? undefined
@@ -209,6 +210,7 @@ function handleSocialDb(_a) {
}
catch (error) {
console.log("ERROR in 'handleSocialDb.ts' backend function =>", error.message);
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Handle Social DB Error`, error);
return {
success: false,
payload: null,
@@ -27,6 +27,7 @@ const LOCAL_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-d
*/
function addAdminUserOnLogin(_a) {
return __awaiter(this, arguments, void 0, function* ({ query, user, }) {
var _b;
try {
const finalDbHandler = global.DSQL_USE_LOCAL
? LOCAL_DB_HANDLER_1.default
@@ -100,6 +101,7 @@ function addAdminUserOnLogin(_a) {
}
}
catch (error) {
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Add Admin User On Login Error`, error);
(0, serverError_1.default)({
component: "addAdminUserOnLogin",
message: error.message,
@@ -16,6 +16,7 @@ const grabAuthDirs = () => {
};
exports.grabAuthDirs = grabAuthDirs;
const initAuthFiles = () => {
var _a;
try {
const authDirs = (0, exports.grabAuthDirs)();
if (!fs_1.default.existsSync(authDirs.root))
@@ -26,6 +27,7 @@ const initAuthFiles = () => {
}
catch (error) {
console.log(`Error initializing Auth Files: ${error.message}`);
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Initializing Auth Files`, error);
return false;
}
};
+2 -1
View File
@@ -24,7 +24,7 @@ const check_if_is_master_1 = __importDefault(require("../../../utils/check-if-is
*/
function addDbEntry(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, }) {
var _b, _c;
var _b, _c, _d;
/**
* Initialize variables
*/
@@ -132,6 +132,7 @@ function addDbEntry(_a) {
}
catch (error) {
console.log("DSQL: Error in parsing data keys =>", error.message);
(_d = global.ERROR_CALLBACK) === null || _d === void 0 ? void 0 : _d.call(global, `Error parsing Data Keys`, error);
continue;
}
}
@@ -21,6 +21,7 @@ const conn_db_handler_1 = __importDefault(require("../../../utils/db/conn-db-han
*/
function deleteDbEntry(_a) {
return __awaiter(this, arguments, void 0, function* ({ dbContext, dbFullName, tableName, identifierColumnName, identifierValue, forceLocal, }) {
var _b;
try {
const isMaster = forceLocal
? true
@@ -46,6 +47,7 @@ function deleteDbEntry(_a) {
return deletedEntry;
}
catch (error) {
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Deleting Entry`, error);
return null;
}
});
+2 -1
View File
@@ -22,7 +22,7 @@ const path_1 = __importDefault(require("path"));
*/
function dbHandler(...args) {
return __awaiter(this, void 0, void 0, function* () {
var _a;
var _a, _b;
((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.match(/dev/)) &&
fs_1.default.appendFileSync("./.tmp/sqlQuery.sql", args[0] + "\n" + Date() + "\n\n\n", "utf8");
const CONNECTION = (0, grab_dsql_connection_1.default)();
@@ -50,6 +50,7 @@ function dbHandler(...args) {
fs_1.default.mkdirSync(tmpFolder, { recursive: true });
fs_1.default.appendFileSync(path_1.default.resolve(tmpFolder, "./dbErrorLogs.txt"), JSON.stringify(error, null, 4) + "\n" + Date() + "\n\n\n", "utf8");
results = null;
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `DB Handler Error`, error);
(0, serverError_1.default)({
component: "dbHandler",
message: error.message,
@@ -21,6 +21,7 @@ const serverError_1 = __importDefault(require("./serverError"));
*/
function fullAccessDbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ queryString, tableSchema, queryValuesArray, forceLocal, }) {
var _b;
/**
* Declare variables
*
@@ -41,6 +42,7 @@ function fullAccessDbHandler(_a) {
}
catch (error) {
////////////////////////////////////////
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Full Access DB Handler Error`, error);
(0, serverError_1.default)({
component: "fullAccessDbHandler",
message: error.message,
@@ -11,6 +11,7 @@ const path_1 = __importDefault(require("path"));
* # Grab User Schema Data
*/
function grabUserSchemaData({ userId, }) {
var _a;
try {
const userSchemaFilePath = path_1.default.resolve(process.cwd(), `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${userId}/main.json`);
const userSchemaData = JSON.parse(fs_1.default.readFileSync(userSchemaFilePath, "utf-8"));
@@ -21,6 +22,7 @@ function grabUserSchemaData({ userId, }) {
component: "grabUserSchemaData",
message: error.message,
});
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Grabbing User Schema Data`, error);
return null;
}
}
@@ -11,6 +11,7 @@ const path_1 = __importDefault(require("path"));
* # Set User Schema Data
*/
function setUserSchemaData({ userId, schemaData, }) {
var _a;
try {
const userSchemaFilePath = path_1.default.resolve(process.cwd(), `${process.env.DSQL_USER_DB_SCHEMA_PATH}/user-${userId}/main.json`);
fs_1.default.writeFileSync(userSchemaFilePath, JSON.stringify(schemaData), "utf8");
@@ -21,6 +22,7 @@ function setUserSchemaData({ userId, schemaData, }) {
component: "/functions/backend/setUserSchemaData",
message: error.message,
});
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Setting User Schema`, error);
return false;
}
}
@@ -23,7 +23,7 @@ const grabSchemaFieldsFromData_1 = __importDefault(require("./grabSchemaFieldsFr
*/
function updateUsersTableSchema(_a) {
return __awaiter(this, arguments, void 0, function* ({ userId, database, newFields, newPayload, }) {
var _b, _c;
var _b, _c, _d;
try {
const dbFullName = database;
const userSchemaData = (0, grabUserSchemaData_1.default)({ userId });
@@ -52,7 +52,7 @@ function updateUsersTableSchema(_a) {
return `Done!`;
}
catch (error) {
console.log(`addUsersTableToDb.ts ERROR: ${error.message}`);
(_d = global.ERROR_CALLBACK) === null || _d === void 0 ? void 0 : _d.call(global, `Error Updating User Table Schema`, error);
(0, serverError_1.default)({
component: "addUsersTableToDb",
message: error.message,
@@ -22,6 +22,7 @@ const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handle
*/
function varDatabaseDbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, database, tableSchema, debug, }) {
var _b;
let CONNECTION = (0, grab_dsql_connection_1.default)({ fa: true });
if (global.DSQL_USE_LOCAL)
CONNECTION = (0, grab_dsql_connection_1.default)({ local: true });
@@ -47,6 +48,7 @@ function varDatabaseDbHandler(_a) {
}
catch (error) {
console.log("\x1b[31mvarDatabaseDbHandler ERROR\x1b[0m =>", database, error);
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `VarDb Handler Error`, error);
(0, serverError_1.default)({
component: "varDatabaseDbHandler/lines-52-53",
message: error.message,
@@ -22,6 +22,7 @@ const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handle
*/
function varReadOnlyDatabaseDbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, tableSchema, forceLocal, }) {
var _b;
let results;
const DB_CONN = forceLocal
? global.DSQL_DB_CONN
@@ -35,6 +36,7 @@ function varReadOnlyDatabaseDbHandler(_a) {
message: error.message,
noMail: true,
});
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `VarReadOnlyDB Handler Error`, error);
return error.message;
}
finally {
+2
View File
@@ -12,6 +12,7 @@ const grab_keys_1 = __importDefault(require("../../utils/grab-keys"));
* # Decrypt Function
*/
function decrypt({ encryptedString, encryptionKey, encryptionSalt, }) {
var _a;
if (!(encryptedString === null || encryptedString === void 0 ? void 0 : encryptedString.match(/./))) {
console.log("Encrypted string is invalid");
return encryptedString;
@@ -35,6 +36,7 @@ function decrypt({ encryptedString, encryptionKey, encryptionSalt, }) {
}
catch (error) {
console.log("Error in decrypting =>", error.message);
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Decrypting data`, error);
return encryptedString;
}
}
+2
View File
@@ -12,6 +12,7 @@ const grab_keys_1 = __importDefault(require("../../utils/grab-keys"));
* # Encrypt String
*/
function encrypt({ data, encryptionKey, encryptionSalt, }) {
var _a;
if (!(data === null || data === void 0 ? void 0 : data.match(/./))) {
console.log("Encryption string is invalid");
return data;
@@ -36,6 +37,7 @@ function encrypt({ data, encryptionKey, encryptionSalt, }) {
}
catch (error) {
console.log("Error in encrypting =>", error.message);
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Encrypting Data`, error);
return data;
}
}