This commit is contained in:
Benjamin Toby 2025-07-18 19:35:02 +01:00
parent 20a390e4a8
commit 05d6d13ef0
7 changed files with 1 additions and 88 deletions

View File

@ -15,12 +15,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.default = handleSocialDb;
const fs_1 = __importDefault(require("fs"));
const handleNodemailer_1 = __importDefault(require("../../backend/handleNodemailer"));
const addMariadbUser_1 = __importDefault(require("../../backend/addMariadbUser"));
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_dir_names_1 = __importDefault(require("../../../utils/backend/names/grab-dir-names"));
const grab_db_full_name_1 = __importDefault(require("../../../utils/grab-db-full-name"));
/**
* # Handle Social DB
@ -121,12 +119,6 @@ function handleSocialDb(_a) {
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) {
if (!database) {
/**
* Add a Mariadb User for this User
*/
yield (0, addMariadbUser_1.default)({ userId: newUser.payload.insertId });
}
const newUserQueriedQuery = `SELECT * FROM users WHERE id='${newUser.payload.insertId}'`;
const newUserQueried = (yield (0, dbHandler_1.default)({
database: finalDbName,
@ -161,20 +153,6 @@ function handleSocialDb(_a) {
.replace(/{{token}}/, generatedToken || ""),
}).then(() => { });
}
const { userPrivateMediaDir, userPublicMediaDir } = (0, grab_dir_names_1.default)({
userId: newUser.payload.insertId,
});
/**
* Create new user folder and file
*
* @description Create new user folder and file
*/
if (!database || (database === null || database === void 0 ? void 0 : database.match(/^datasquirel$/))) {
userPublicMediaDir &&
fs_1.default.mkdirSync(userPublicMediaDir, { recursive: true });
userPrivateMediaDir &&
fs_1.default.mkdirSync(userPrivateMediaDir, { recursive: true });
}
return yield (0, loginSocialUser_1.default)({
user: newUserQueried[0],
social_platform,

View File

@ -19,7 +19,6 @@ const child_process_1 = require("child_process");
const ejson_1 = __importDefault(require("../../../utils/ejson"));
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"));
const hashPassword_1 = __importDefault(require("../../../functions/dsql/hashPassword"));
const grab_dir_names_1 = __importDefault(require("../../../utils/backend/names/grab-dir-names"));
@ -81,10 +80,6 @@ function createUser() {
});
if (!((_a = newUser === null || newUser === void 0 ? void 0 : newUser.payload) === null || _a === void 0 ? void 0 : _a.insertId))
return false;
/**
* Add a Mariadb User for this User
*/
yield (0, addMariadbUser_1.default)({ userId: newUser.payload.insertId });
const { STATIC_ROOT } = (0, grab_dir_names_1.default)();
if (!STATIC_ROOT) {
console.log("Static File ENV not Found!");

View File

@ -15,8 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.default = createUserSQLUser;
const generate_password_1 = require("generate-password");
const dbHandler_1 = __importDefault(require("../functions/backend/dbHandler"));
const crud_1 = __importDefault(require("./data-fetching/crud"));
const encrypt_1 = __importDefault(require("../functions/dsql/encrypt"));
const grab_user_main_sql_user_name_1 = __importDefault(require("./grab-user-main-sql-user-name"));
const grab_db_names_1 = __importDefault(require("./grab-db-names"));
const handle_mariadb_user_creation_1 = require("../functions/web-app/mariadb-user/handle-mariadb-user-creation");
@ -37,17 +35,6 @@ function createUserSQLUser(user) {
const updateWebHostGrants = (yield (0, dbHandler_1.default)({
query: `GRANT ALL PRIVILEGES ON \`${userDbPrefix.replace(/\_/g, "\\_")}%\`.* TO '${mariaDBUsername}'@'${webHost}'`,
}));
const updateUser = yield (0, crud_1.default)({
action: "update",
table: "users",
targetField: "id",
targetValue: user.id,
data: {
mariadb_host: webHost,
mariadb_pass: (0, encrypt_1.default)({ data: newPassword }) || undefined,
mariadb_user: mariaDBUsername,
},
});
return {
fullName,
host,

View File

@ -1,7 +1,5 @@
import fs from "fs";
import handleNodemailer from "../../backend/handleNodemailer";
import path from "path";
import addMariadbUser from "../../backend/addMariadbUser";
import dbHandler from "../../backend/dbHandler";
import encrypt from "../../dsql/encrypt";
import addDbEntry from "../../backend/db/addDbEntry";
@ -10,7 +8,6 @@ import {
APIResponseObject,
HandleSocialDbFunctionParams,
} from "../../../types";
import grabDirNames from "../../../utils/backend/names/grab-dir-names";
import grabDbFullName from "../../../utils/grab-db-full-name";
/**
@ -151,13 +148,6 @@ export default async function handleSocialDb({
});
if (newUser?.payload?.insertId) {
if (!database) {
/**
* Add a Mariadb User for this User
*/
await addMariadbUser({ userId: newUser.payload.insertId });
}
const newUserQueriedQuery = `SELECT * FROM users WHERE id='${newUser.payload.insertId}'`;
const newUserQueried = (await dbHandler({
@ -200,22 +190,6 @@ export default async function handleSocialDb({
}).then(() => {});
}
const { userPrivateMediaDir, userPublicMediaDir } = grabDirNames({
userId: newUser.payload.insertId,
});
/**
* Create new user folder and file
*
* @description Create new user folder and file
*/
if (!database || database?.match(/^datasquirel$/)) {
userPublicMediaDir &&
fs.mkdirSync(userPublicMediaDir, { recursive: true });
userPrivateMediaDir &&
fs.mkdirSync(userPrivateMediaDir, { recursive: true });
}
return await loginSocialUser({
user: newUserQueried[0],
social_platform,

View File

@ -5,7 +5,6 @@ import { execSync } from "child_process";
import EJSON from "../../../utils/ejson";
import dbHandler from "../../../functions/backend/dbHandler";
import addDbEntry from "../../../functions/backend/db/addDbEntry";
import addMariadbUser from "../../../functions/backend/addMariadbUser";
import updateDbEntry from "../../../functions/backend/db/updateDbEntry";
import hashPassword from "../../../functions/dsql/hashPassword";
import { DSQL_DATASQUIREL_USERS } from "../../../types/dsql";
@ -80,11 +79,6 @@ async function createUser() {
if (!newUser?.payload?.insertId) return false;
/**
* Add a Mariadb User for this User
*/
await addMariadbUser({ userId: newUser.payload.insertId });
const { STATIC_ROOT } = grabDirNames();
if (!STATIC_ROOT) {

View File

@ -48,21 +48,6 @@ export default async function createUserSQLUser(user: UserType) {
)}%\`.* TO '${mariaDBUsername}'@'${webHost}'`,
})) as any[];
const updateUser = await dsqlCrud<
DSQL_DATASQUIREL_USERS,
(typeof DsqlTables)[number]
>({
action: "update",
table: "users",
targetField: "id",
targetValue: user.id,
data: {
mariadb_host: webHost,
mariadb_pass: encrypt({ data: newPassword }) || undefined,
mariadb_user: mariaDBUsername,
},
});
return {
fullName,
host,

View File

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