Updates

dist/package-shared/shell/mariadb-users/handleGrants.d.ts

@@ -1,16 +0,0 @@
-export interface GrantType {
-    database: string;
-    table: string;
-    privileges: string[];
-}
-type Param = {
-    username?: string;
-    host?: string;
-    grants?: GrantType[];
-    userId: string;
-};
-/**
- * # Handle Grants for Users
- */
-export default function handleGrants({ username, host, grants, userId, }: Param): Promise<boolean>;
-export {};

dist/package-shared/shell/mariadb-users/handleGrants.js

@@ -1,74 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = handleGrants;
-const noDatabaseDbHandler_1 = __importDefault(require("../utils/noDatabaseDbHandler"));
-/**
- * # Handle Grants for Users
- */
-function handleGrants(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ username, host, grants, userId, }) {
-        var _b;
-        let success = false;
-        console.log(`Handling Grants for User =>`, username, host);
-        if (!username) {
-            console.log(`No username provided.`);
-            return success;
-        }
-        if (!host) {
-            console.log(`No Host provided. \x1b[35m\`--host\`\x1b[0m flag is required`);
-            return success;
-        }
-        if (!grants) {
-            console.log(`No grants Array provided.`);
-            return success;
-        }
-        try {
-            const existingUser = yield (0, noDatabaseDbHandler_1.default)(`SELECT * FROM mysql.user WHERE User = '${username}' AND Host = '${host}'`);
-            const isUserExisting = Boolean((_b = existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) === null || _b === void 0 ? void 0 : _b.User);
-            if (isUserExisting) {
-                const userGrants = yield (0, noDatabaseDbHandler_1.default)(`SHOW GRANTS FOR '${username}'@'${host}'`);
-                for (let i = 0; i < userGrants.length; i++) {
-                    const grantObject = userGrants[i];
-                    const grant = grantObject === null || grantObject === void 0 ? void 0 : grantObject[Object.keys(grantObject)[0]];
-                    if (grant === null || grant === void 0 ? void 0 : grant.match(/GRANT .* PRIVILEGES ON .* TO/)) {
-                        const revokeGrantText = grant
-                            .replace(/GRANT/, "REVOKE")
-                            .replace(/ TO /, " FROM ");
-                        const revokePrivilege = yield (0, noDatabaseDbHandler_1.default)(revokeGrantText);
-                    }
-                }
-                const grantsArray = grants;
-                for (let i = 0; i < grantsArray.length; i++) {
-                    const grantObject = grantsArray[i];
-                    const { database, table, privileges } = grantObject;
-                    const tableText = table == "*" ? "*" : `\`${table}\``;
-                    const databaseText = database == "*"
-                        ? `\`${process.env.DSQL_USER_DB_PREFIX}${userId}_%\``
-                        : `\`${database}\``;
-                    const privilegesText = privileges.includes("ALL")
-                        ? "ALL PRIVILEGES"
-                        : privileges.join(", ");
-                    const grantText = `GRANT ${privilegesText} ON ${databaseText}.${tableText} TO '${username}'@'${host}'`;
-                    const grantPriviledge = yield (0, noDatabaseDbHandler_1.default)(grantText);
-                }
-            }
-            success = true;
-        }
-        catch ( /** @type {any} */error) {
-            console.log(`Error in adding SQL user =>`, error.message);
-        }
-        return success;
-    });
-}

dist/package-shared/shell/mariadb-users/resetSQLPasswords.d.ts

@@ -1 +0,0 @@
-export {};

dist/package-shared/shell/mariadb-users/resetSQLPasswords.js

@@ -1,72 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-require("dotenv").config({ path: "../../.env" });
-const generate_password_1 = __importDefault(require("generate-password"));
-const noDatabaseDbHandler_1 = __importDefault(require("../utils/noDatabaseDbHandler"));
-const dbHandler_1 = __importDefault(require("../../functions/backend/dbHandler"));
-const encrypt_1 = __importDefault(require("../../functions/dsql/encrypt"));
-const grab_sql_key_name_1 = __importDefault(require("../../utils/grab-sql-key-name"));
-/**
- * # Reset SQL Passwords
- */
-function resetSQLCredentialsPasswords() {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const users = (yield (0, dbHandler_1.default)({
-            query: `SELECT * FROM users`,
-        }));
-        if (!users) {
-            process.exit();
-        }
-        for (let i = 0; i < users.length; i++) {
-            const user = users[i];
-            if (!user)
-                continue;
-            try {
-                const maridbUsers = (yield (0, dbHandler_1.default)({
-                    query: `SELECT * FROM mysql.user WHERE User = '${(0, grab_sql_key_name_1.default)({ type: "user", userId: user.id })}'`,
-                }));
-                for (let j = 0; j < maridbUsers.length; j++) {
-                    const { User, Host } = maridbUsers[j];
-                    const password = generate_password_1.default.generate({
-                        length: 16,
-                        numbers: true,
-                        symbols: true,
-                        uppercase: true,
-                        exclude: "*#.'`\"",
-                    });
-                    const encryptedPassword = (0, encrypt_1.default)({
-                        data: password,
-                        encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD,
-                        encryptionSalt: process.env.DSQL_ENCRYPTION_SALT,
-                    });
-                    yield (0, noDatabaseDbHandler_1.default)(`SET PASSWORD FOR '${User}'@'${Host}' = PASSWORD('${password}')`);
-                    if (user.mariadb_user == User && user.mariadb_host == Host) {
-                        const updateUser = yield (0, dbHandler_1.default)({
-                            query: `UPDATE users SET mariadb_pass = ? WHERE id = ?`,
-                            values: [encryptedPassword, user.id],
-                        });
-                    }
-                    console.log(`User ${user.id}: ${user.first_name} ${user.last_name} Password Updated successfully added.`);
-                }
-            }
-            catch (error) {
-                (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Resetting MariaDB User Password`, error);
-            }
-        }
-        process.exit();
-    });
-}
-resetSQLCredentialsPasswords();

dist/package-shared/shell/mariadb-users/users/create-user.js

@@ -17,7 +17,7 @@ require("dotenv").config({ path: "../../../.env" });
 const fs_1 = __importDefault(require("fs"));
 const child_process_1 = require("child_process");
 const ejson_1 = __importDefault(require("../../../utils/ejson"));
-const DB_HANDLER_1 = __importDefault(require("../../../utils/backend/global-db/DB_HANDLER"));
+const dbHandler_1 = __importDefault(require("../../../functions/backend/dbHandler"));
 const addDbEntry_1 = __importDefault(require("../../../functions/backend/db/addDbEntry"));
 const addMariadbUser_1 = __importDefault(require("../../../functions/backend/addMariadbUser"));
 const updateDbEntry_1 = __importDefault(require("../../../functions/backend/db/updateDbEntry"));
@@ -29,7 +29,7 @@ const tmpDir = process.argv[process.argv.length - 1];
  */
 function createUser() {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         /**
          * Validate Form
          *
@@ -67,7 +67,9 @@ function createUser() {
                 encryptionKey: process.env.DSQL_ENCRYPTION_PASSWORD || "",
                 password: password,
             });
-            let existingUser = yield (0, DB_HANDLER_1.default)(`SELECT * FROM users WHERE email='${email}'`);
+            let existingUser = (yield (0, dbHandler_1.default)({
+                query: `SELECT * FROM users WHERE email='${email}'`,
+            }));
             if (existingUser === null || existingUser === void 0 ? void 0 : existingUser[0]) {
                 console.log("User Exists");
                 return false;
@@ -128,7 +130,7 @@ function createUser() {
             return true;
         }
         catch (error) {
-            (_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Error Creating User`, error);
+            console.log("Error =\u003e", error.message);
             return false;
         }
     });

dist/package-shared/shell/mariadb-users/users/update-user.js

@@ -24,7 +24,6 @@ const tmpDir = process.argv[process.argv.length - 1];
  */
 function createUser() {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         /**
          * Validate Form
          *
@@ -66,7 +65,7 @@ function createUser() {
             return true;
         }
         catch (error) {
-            (_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Error Updating User`, error);
+            console.log("Error =\u003e", error.message);
             return false;
         }
     });