updated BE file naming convention

This commit is contained in:
subnub
2024-08-10 01:54:22 -04:00
parent 9a97489e0e
commit 831dc78bf5
70 changed files with 163 additions and 174 deletions
@@ -1,23 +1,23 @@
import { Request, Response } from "express";
import FileService from "../services/fileService/fileService";
import User, { UserInterface } from "../models/userModel";
import FileService from "../services/file-service/file-service";
import User, { UserInterface } from "../models/user-model";
import sendShareEmail from "../utils/sendShareEmail";
import {
createStreamVideoCookie,
removeStreamVideoCookie,
} from "../cookies/createCookies";
import ChunkService from "../services/chunkService/chunkService";
} from "../cookies/create-cookies";
import ChunkService from "../services/chunk-service/chunk-service";
import streamToBuffer from "../utils/streamToBuffer";
import env from "../enviroment/env";
import getFileSize from "../services/chunkService/utils/getFileSize";
import File, { FileMetadateInterface } from "../models/fileModel";
import getFileSize from "../services/chunk-service/utils/getFileSize";
import File, { FileMetadateInterface } from "../models/file-model";
import imageChecker from "../utils/imageChecker";
import videoChecker from "../utils/videoChecker";
import { S3Actions } from "../services/chunkService/actions/S3Actions";
import { FilesystemActions } from "../services/chunkService/actions/fileSystemActions";
import createVideoThumbnail from "../services/chunkService/utils/createVideoThumbnail";
import { S3Actions } from "../services/chunk-service/actions/S3-actions";
import { FilesystemActions } from "../services/chunk-service/actions/file-system-actions";
import createVideoThumbnail from "../services/chunk-service/utils/createVideoThumbnail";
import NotAuthorizedError from "../utils/NotAuthorizedError";
import createThumbnail from "../services/chunkService/utils/createImageThumbnail";
import createThumbnail from "../services/chunk-service/utils/createImageThumbnail";
const fileService = new FileService();
type userAccessType = {
@@ -1,6 +1,6 @@
import FolderService from "../services/folderService/folderService";
import FolderService from "../services/folder-service/folder-service";
import { Request, Response } from "express";
import ChunkService from "../services/chunkService/chunkService";
import ChunkService from "../services/chunk-service/chunk-service";
const folderService = new FolderService();
@@ -1,7 +1,7 @@
import disk from "diskusage";
import env from "../enviroment/env";
import { Request, Response } from "express";
import { UserInterface } from "../models/userModel";
import { UserInterface } from "../models/user-model";
type userAccessType = {
_id: string;
@@ -1,11 +1,11 @@
import env from "../enviroment/env";
import UserService from "../services/userService/userService";
import UserService from "../services/user-service/user-service";
import { Request, Response } from "express";
import { UserInterface } from "../models/userModel";
import { UserInterface } from "../models/user-model";
import {
createLoginCookie,
createLogoutCookie,
} from "../cookies/createCookies";
} from "../cookies/create-cookies";
import NotFoundError from "../utils/NotFoundError";
import InternalServerError from "../utils/InternalServerError";
+2 -2
View File
@@ -1,7 +1,7 @@
import mongoose from "../connections/mongoose";
import { ObjectId } from "mongodb";
import File from "../../models/fileModel";
import { UserInterface } from "../../models/userModel";
import File from "../../models/file-model";
import { UserInterface } from "../../models/user-model";
import { QueryInterface } from "../../utils/createQuery";
class DbUtil {
+1 -1
View File
@@ -1,4 +1,4 @@
import Folder, { FolderInterface } from "../../models/folderModel";
import Folder, { FolderInterface } from "../../models/folder-model";
import { ObjectId } from "mongodb";
class DbUtil {
@@ -1,6 +1,6 @@
import { Router } from "express";
import auth from "../middleware/auth";
import FileController from "../controllers/fileController";
import FileController from "../controllers/file-controller";
import authFullUser from "../middleware/authFullUser";
import authStreamVideo from "../middleware/authStreamVideo";
@@ -1,7 +1,7 @@
import { Router } from "express";
import auth from "../middleware/auth";
import FolderController from "../controllers/folderController";
import { moveFolderListValidationRules } from "../middleware/folders/folderMiddleware";
import FolderController from "../controllers/folder-controller";
import { moveFolderListValidationRules } from "../middleware/folders/folder-middleware";
const folderController = new FolderController();
const router = Router();
@@ -1,7 +1,7 @@
import { Router } from "express";
import auth from "../middleware/auth";
import authNoEmailVerification from "../middleware/authNoEmailVerificication";
import UserController from "../controllers/userController";
import UserController from "../controllers/user-controller";
import authRefresh from "../middleware/authRefresh";
import authLogout from "../middleware/authLogout";
+27
View File
@@ -0,0 +1,27 @@
import env from "../enviroment/env";
import crypto from "crypto";
import getWebUIKey from "./get-web-UI-key";
const getKey = async () => {
if (process.env.KEY) {
// For Docker
const password = process.env.KEY;
env.key = crypto.createHash("md5").update(password).digest("hex");
} else if (process.env.NODE_ENV === "production") {
let password = await getWebUIKey();
password = crypto.createHash("md5").update(password).digest("hex");
env.key = password;
} else {
let password = "1234";
password = crypto.createHash("md5").update(password).digest("hex");
env.key = password;
}
};
export default getKey;
-32
View File
@@ -1,32 +0,0 @@
import env from "../enviroment/env";
import crypto from "crypto";
import getWebUIKey from "./getWebUIKey";
const getKey = async() => {
if (process.env.KEY) {
// For Docker
const password = process.env.KEY;
env.key = crypto.createHash("md5").update(password).digest("hex");
} else if (process.env.NODE_ENV === "production") {
let password = await getWebUIKey();
password = crypto.createHash("md5").update(password).digest("hex");
env.key = password;
} else {
let password = "1234";
password = crypto.createHash("md5").update(password).digest("hex");
env.key = password;
}
}
export default getKey;
+1 -1
View File
@@ -1,5 +1,5 @@
import jwt from "jsonwebtoken";
import User, { UserInterface } from "../models/userModel";
import User, { UserInterface } from "../models/user-model";
import env from "../enviroment/env";
import { Request, Response, NextFunction } from "express";
+1 -1
View File
@@ -1,7 +1,7 @@
import jwt from "jsonwebtoken";
import env from "../enviroment/env";
import { Request, Response, NextFunction } from "express";
import { createLogoutCookie } from "../cookies/createCookies";
import { createLogoutCookie } from "../cookies/create-cookies";
interface RequestType extends Request {
user?: userAccessType;
@@ -1,5 +1,5 @@
import jwt from "jsonwebtoken";
import User, { UserInterface } from "../models/userModel";
import User, { UserInterface } from "../models/user-model";
import env from "../enviroment/env";
import { Request, Response, NextFunction } from "express";
import userUpdateCheck from "../utils/userUpdateCheck";
+1 -1
View File
@@ -1,5 +1,5 @@
import jwt from "jsonwebtoken";
import User, { UserInterface } from "../models/userModel";
import User, { UserInterface } from "../models/user-model";
import env from "../enviroment/env";
import { Request, Response, NextFunction } from "express";
import { ObjectId } from "mongodb";
+1 -1
View File
@@ -1,5 +1,5 @@
import jwt from "jsonwebtoken";
import User, { UserInterface } from "../models/userModel";
import User, { UserInterface } from "../models/user-model";
import env from "../enviroment/env";
import { Request, Response, NextFunction } from "express";
import { ObjectId } from "mongodb";
@@ -1,6 +1,6 @@
import { query, validationResult } from "express-validator";
import { Request, Response, NextFunction } from "express";
import { middlewareValidationFunction } from "../Utils/MiddlewareUtils";
import { middlewareValidationFunction } from "../utils/middleware-utils";
export const moveFileValidationRules = [
query("fileID").isString().withMessage("Parent must be a string"),
@@ -1,6 +1,6 @@
import { query, validationResult } from "express-validator";
import { Request, Response, NextFunction } from "express";
import { middlewareValidationFunction } from "../Utils/MiddlewareUtils";
import { middlewareValidationFunction } from "../utils/middleware-utils";
export const moveFolderListValidationRules = [
query("parent").optional().isString().withMessage("Parent must be a string"),
+36
View File
@@ -0,0 +1,36 @@
import getEnvVariables from "../enviroment/get-env-variables";
getEnvVariables();
import getKey from "../key/get-key";
import servers from "./server";
const { server, serverHttps } = servers;
const serverStart = async () => {
await getKey();
console.log("ENV", process.env.NODE_ENV);
if (process.env.NODE_ENV === "production" && process.env.SSL === "true") {
server.listen(process.env.HTTP_PORT, process.env.URL, () => {
console.log("Http Server Running On Port:", process.env.HTTP_PORT);
});
serverHttps.listen(process.env.HTTPS_PORT, function () {
console.log("Https Server Running On Port:", process.env.HTTPS_PORT);
});
} else if (process.env.NODE_ENV === "production") {
const port = process.env.HTTP_PORT || process.env.PORT;
server.listen(port, process.env.URL, () => {
console.log("Http Server (No-SSL) Running On Port:", port);
});
} else {
const port = process.env.HTTP_PORT || process.env.PORT;
server.listen(port, process.env.URL, () => {
console.log("Development Server Running On Port:", port);
});
}
};
serverStart();
+3 -3
View File
@@ -1,8 +1,8 @@
import express, { Request, Response } from "express";
import path from "path";
import userRouter from "../express-routers/userRouter";
import fileRouter from "../express-routers/fileRouter";
import folderRouter from "../express-routers/folderRouter";
import userRouter from "../express-routers/user-router";
import fileRouter from "../express-routers/file-router";
import folderRouter from "../express-routers/folder-router";
import bodyParser from "body-parser";
import https from "https";
import fs from "fs";
-42
View File
@@ -1,42 +0,0 @@
import getEnvVariables from "../enviroment/getEnvVariables";
getEnvVariables();
import getKey from "../key/getKey";
import servers from "./server";
const {server, serverHttps} = servers;
const serverStart = async() => {
await getKey();
console.log("ENV", process.env.NODE_ENV);
if (process.env.NODE_ENV === 'production' && process.env.SSL === "true") {
server.listen(process.env.HTTP_PORT,process.env.URL, () => {
console.log("Http Server Running On Port:", process.env.HTTP_PORT);
})
serverHttps.listen(process.env.HTTPS_PORT, function () {
console.log( 'Https Server Running On Port:', process.env.HTTPS_PORT);
} );
} else if (process.env.NODE_ENV === 'production') {
const port = process.env.HTTP_PORT || process.env.PORT;
server.listen(port, process.env.URL, () => {
console.log("Http Server (No-SSL) Running On Port:", port);
})
} else {
const port = process.env.HTTP_PORT || process.env.PORT;
server.listen(port, process.env.URL, () => {
console.log("Development Server Running On Port:", port);
})
}
}
serverStart();
@@ -1,6 +1,6 @@
import s3 from "../../../db/connections/s3";
import env from "../../../enviroment/env";
import { GenericParams, IStorageActions } from "../storeTypes";
import { GenericParams, IStorageActions } from "../store-types";
import internal from "stream";
import { PassThrough } from "stream";
@@ -1,6 +1,6 @@
import fs from "fs";
import { UserInterface } from "../../../models/userModel";
import { GenericParams, IStorageActions } from "../storeTypes";
import { UserInterface } from "../../../models/user-model";
import { GenericParams, IStorageActions } from "../store-types";
import env from "../../../enviroment/env";
class FilesystemActions implements IStorageActions {
@@ -1,23 +1,23 @@
import { Response, Request } from "express";
import { UserInterface } from "../../models/userModel";
import { UserInterface } from "../../models/user-model";
import NotAuthorizedError from "../../utils/NotAuthorizedError";
import NotFoundError from "../../utils/NotFoundError";
import crypto from "crypto";
import getBusboyData from "./utils/getBusboyData";
import videoChecker from "../../utils/videoChecker";
import uuid from "uuid";
import File, { FileInterface } from "../../models/fileModel";
import File, { FileInterface } from "../../models/file-model";
import FileDB from "../../db/mongoDB/fileDB";
import FolderDB from "../../db/mongoDB/folderDB";
import Thumbnail, { ThumbnailInterface } from "../../models/thumbnailModel";
import User from "../../models/userModel";
import Thumbnail, { ThumbnailInterface } from "../../models/thumbnail-model";
import User from "../../models/user-model";
import env from "../../enviroment/env";
import fixStartChunkLength from "./utils/fixStartChunkLength";
import Folder, { FolderInterface } from "../../models/folderModel";
import Folder, { FolderInterface } from "../../models/folder-model";
import ForbiddenError from "../../utils/ForbiddenError";
import { ObjectId } from "mongodb";
import { S3Actions } from "./actions/S3Actions";
import { FilesystemActions } from "./actions/fileSystemActions";
import { S3Actions } from "./actions/S3-actions";
import { FilesystemActions } from "./actions/file-system-actions";
import { createGenericParams } from "./utils/storageHelper";
const fileDB = new FileDB();
@@ -1,7 +1,7 @@
import { UserInterface } from "../../../models/userModel";
import { FileInterface } from "../../../models/fileModel";
import { UserInterface } from "../../../models/user-model";
import { FileInterface } from "../../../models/file-model";
import { Request, Response } from "express";
import { FolderInterface } from "../../../models/folderModel";
import { FolderInterface } from "../../../models/folder-model";
import crypto from "crypto";
interface ChunkInterface {
@@ -1,4 +1,4 @@
import { UserInterface } from "../../../models/userModel";
import { UserInterface } from "../../../models/user-model";
import env from "../../../enviroment/env";
const addToStoageSize = async (
@@ -1,17 +1,17 @@
import mongoose from "../../../db/connections/mongoose";
import crypto from "crypto";
import Thumbnail from "../../../models/thumbnailModel";
import Thumbnail from "../../../models/thumbnail-model";
import sharp from "sharp";
import { FileInterface } from "../../../models/fileModel";
import { UserInterface } from "../../../models/userModel";
import { FileInterface } from "../../../models/file-model";
import { UserInterface } from "../../../models/user-model";
import fs from "fs";
import uuid from "uuid";
import env from "../../../enviroment/env";
import { ObjectId } from "mongodb";
import File from "../../../models/fileModel";
import File from "../../../models/file-model";
import { createGenericParams } from "./storageHelper";
import { S3Actions } from "../actions/S3Actions";
import { FilesystemActions } from "../actions/fileSystemActions";
import { S3Actions } from "../actions/S3-actions";
import { FilesystemActions } from "../actions/file-system-actions";
const conn = mongoose.connection;
@@ -1,5 +1,5 @@
import { FileInterface } from "../../../models/fileModel";
import { UserInterface } from "../../../models/userModel";
import { FileInterface } from "../../../models/file-model";
import { UserInterface } from "../../../models/user-model";
import createThumbnailS3 from "./createThumbnailS3";
import createThumbnailFilesystem from "./createThumbnailFS";
import env from "../../../enviroment/env";
@@ -1,14 +1,14 @@
import mongoose from "../../../db/connections/mongoose";
import crypto from "crypto";
import Thumbnail from "../../../models/thumbnailModel";
import Thumbnail from "../../../models/thumbnail-model";
import sharp from "sharp";
import { FileInterface } from "../../../models/fileModel";
import { UserInterface } from "../../../models/userModel";
import { FileInterface } from "../../../models/file-model";
import { UserInterface } from "../../../models/user-model";
import fs from "fs";
import uuid from "uuid";
import env from "../../../enviroment/env";
import { ObjectId } from "mongodb";
import File from "../../../models/fileModel";
import File from "../../../models/file-model";
const conn = mongoose.connection;
@@ -1,9 +1,9 @@
import mongoose from "../../../db/connections/mongoose";
import crypto from "crypto";
import Thumbnail from "../../../models/thumbnailModel";
import Thumbnail from "../../../models/thumbnail-model";
import sharp from "sharp";
import { FileInterface } from "../../../models/fileModel";
import { UserInterface } from "../../../models/userModel";
import { FileInterface } from "../../../models/file-model";
import { UserInterface } from "../../../models/user-model";
import uuid from "uuid";
import env from "../../../enviroment/env";
import s3 from "../../../db/connections/s3";
@@ -1,18 +1,18 @@
import mongoose from "../../../db/connections/mongoose";
import crypto from "crypto";
import Thumbnail from "../../../models/thumbnailModel";
import Thumbnail from "../../../models/thumbnail-model";
import sharp from "sharp";
import { FileInterface } from "../../../models/fileModel";
import { UserInterface } from "../../../models/userModel";
import { FileInterface } from "../../../models/file-model";
import { UserInterface } from "../../../models/user-model";
import fs from "fs";
import uuid from "uuid";
import env from "../../../enviroment/env";
import { ObjectId } from "mongodb";
import File from "../../../models/fileModel";
import File from "../../../models/file-model";
import ffmpeg from "fluent-ffmpeg";
import tempCreateVideoThumbnailFS from "./tempCreateVideoThumbnailFS";
import { S3Actions } from "../actions/S3Actions";
import { FilesystemActions } from "../actions/fileSystemActions";
import { S3Actions } from "../actions/S3-actions";
import { FilesystemActions } from "../actions/file-system-actions";
import { createGenericParams } from "./storageHelper";
const storageActions =
@@ -1,14 +1,14 @@
import mongoose from "../../../db/connections/mongoose";
import crypto from "crypto";
import Thumbnail from "../../../models/thumbnailModel";
import Thumbnail from "../../../models/thumbnail-model";
import sharp from "sharp";
import { FileInterface } from "../../../models/fileModel";
import { UserInterface } from "../../../models/userModel";
import { FileInterface } from "../../../models/file-model";
import { UserInterface } from "../../../models/user-model";
import fs from "fs";
import uuid from "uuid";
import env from "../../../enviroment/env";
import { ObjectId } from "mongodb";
import File from "../../../models/fileModel";
import File from "../../../models/file-model";
import ffmpeg from "fluent-ffmpeg";
import tempCreateVideoThumbnailFS from "./tempCreateVideoThumbnailFS";
@@ -1,6 +1,6 @@
import s3 from "../../../db/s3";
import env from "../../../enviroment/env";
import { UserInterface } from "../../../models/userModel";
import { UserInterface } from "../../../models/user-model";
const getPrevIV = (
start: number,
@@ -1,4 +1,4 @@
import { UserInterface } from "../../../models/userModel";
import { UserInterface } from "../../../models/user-model";
const removeTempToken = async (user: UserInterface, tempToken: any) => {
user.tempTokens = user.tempTokens.filter((filterToken) => {
@@ -1,4 +1,4 @@
import User, { UserInterface } from "../../../models/userModel";
import User, { UserInterface } from "../../../models/user-model";
import env from "../../../enviroment/env";
const subtractFromStorageSize = async (
@@ -1,17 +1,17 @@
import mongoose from "../../../db/connections/mongoose";
import crypto from "crypto";
import Thumbnail from "../../../models/thumbnailModel";
import Thumbnail from "../../../models/thumbnail-model";
import sharp from "sharp";
import { FileInterface } from "../../../models/fileModel";
import { UserInterface } from "../../../models/userModel";
import { FileInterface } from "../../../models/file-model";
import { UserInterface } from "../../../models/user-model";
import fs from "fs";
import uuid from "uuid";
import env from "../../../enviroment/env";
import { ObjectId } from "mongodb";
import File from "../../../models/fileModel";
import File from "../../../models/file-model";
import ffmpeg from "fluent-ffmpeg";
import { S3Actions } from "../actions/S3Actions";
import { FilesystemActions } from "../actions/fileSystemActions";
import { S3Actions } from "../actions/S3-actions";
import { FilesystemActions } from "../actions/file-system-actions";
import { createGenericParams } from "./storageHelper";
const storageActions =
@@ -1,14 +1,14 @@
import mongoose from "../../../db/connections/mongoose";
import crypto from "crypto";
import Thumbnail from "../../../models/thumbnailModel";
import Thumbnail from "../../../models/thumbnail-model";
import sharp from "sharp";
import { FileInterface } from "../../../models/fileModel";
import { UserInterface } from "../../../models/userModel";
import { FileInterface } from "../../../models/file-model";
import { UserInterface } from "../../../models/user-model";
import fs from "fs";
import uuid from "uuid";
import env from "../../../enviroment/env";
import { ObjectId } from "mongodb";
import File from "../../../models/fileModel";
import File from "../../../models/file-model";
import ffmpeg from "fluent-ffmpeg";
const tempCreateVideoThumbnailFS = (
@@ -2,15 +2,15 @@ import NotAuthorizedError from "../../utils/NotAuthorizedError";
import NotFoundError from "../../utils/NotFoundError";
import env from "../../enviroment/env";
import jwt from "jsonwebtoken";
import Folder, { FolderInterface } from "../../models/folderModel";
import Folder, { FolderInterface } from "../../models/folder-model";
import sortBySwitch from "../../utils/sortBySwitch";
import createQuery from "../../utils/createQuery";
import FileDB from "../../db/mongoDB/fileDB";
import FolderDB from "../../db/mongoDB/folderDB";
import { UserInterface } from "../../models/userModel";
import { FileInterface } from "../../models/fileModel";
import { UserInterface } from "../../models/user-model";
import { FileInterface } from "../../models/file-model";
import tempStorage from "../../tempStorage/tempStorage";
import FolderService from "../folderService/folderService";
import FolderService from "../folder-service/folder-service";
const fileDB = new FileDB();
const folderDB = new FolderDB();
@@ -1,10 +1,10 @@
import Folder, { FolderInterface } from "../../models/folderModel";
import Folder, { FolderInterface } from "../../models/folder-model";
import InternalServerError from "../../utils/InternalServerError";
import NotFoundError from "../../utils/NotFoundError";
import FileDB from "../../db/mongoDB/fileDB";
import FolderDB from "../../db/mongoDB/folderDB";
import sortBySwitch from "../../utils/sortBySwitchFolder";
import { UserInterface } from "../../models/userModel";
import { UserInterface } from "../../models/user-model";
type userAccessType = {
_id: string;
@@ -1,9 +1,9 @@
import User, { UserInterface } from "../../models/userModel";
import User, { UserInterface } from "../../models/user-model";
import bcrypt from "bcrypt";
import NotFoundError from "../../utils/NotFoundError";
import InternalServerError from "../../utils/InternalServerError";
import sendEmailVerification from "../../utils/sendVerificationEmail";
import File from "../../models/fileModel";
import File from "../../models/file-model";
import env from "../../enviroment/env";
import jwt from "jsonwebtoken";
import sendVerificationEmail from "../../utils/sendVerificationEmail";
+1 -1
View File
@@ -1,5 +1,5 @@
import videoChecker from "./videoChecker";
import { FileInterface } from "../models/fileModel";
import { FileInterface } from "../models/file-model";
const convertDriveToMongo = (
driveObj: any,
+1 -1
View File
@@ -1,5 +1,5 @@
import env from "../enviroment/env";
import { UserInterface } from "../models/userModel";
import { UserInterface } from "../models/user-model";
// import sgMail from "@sendgrid/mail";
const sendPasswordResetEmail = async (
+1 -1
View File
@@ -1,6 +1,6 @@
import SMTPTransport from "nodemailer/lib/smtp-transport";
import env from "../enviroment/env";
import { UserInterface } from "../models/userModel";
import { UserInterface } from "../models/user-model";
import nodemailer from "nodemailer";
type MailOptionsType = {
+1 -1
View File
@@ -1,4 +1,4 @@
import { FolderInterface } from "../models/folderModel";
import { FolderInterface } from "../models/folder-model";
const sortGoogleMongoFolderList = (
combinedList: FolderInterface[],
+1 -1
View File
@@ -1,4 +1,4 @@
import { FileInterface } from "../models/fileModel";
import { FileInterface } from "../models/file-model";
const sortGoogleMongoList = (fileList: FileInterface[], query: any) => {
let combinedList = fileList;
+2 -2
View File
@@ -1,8 +1,8 @@
import User, { UserInterface } from "../models/userModel";
import User, { UserInterface } from "../models/user-model";
import mongoose from "mongoose";
import { Request, Response, NextFunction } from "express";
import NotFoundError from "./NotFoundError";
import { createLoginCookie } from "../cookies/createCookies";
import { createLoginCookie } from "../cookies/create-cookies";
// interface RequestType extends Request {
// user?: userAccessType,