diff --git a/backend/models/user-model.ts b/backend/models/user-model.ts index 0b47274..2881e59 100644 --- a/backend/models/user-model.ts +++ b/backend/models/user-model.ts @@ -1,7 +1,7 @@ import mongoose, { Document } from "mongoose"; import validator from "validator"; import crypto from "crypto"; -import bcrypt from "bcrypt"; +import bcrypt from "bcryptjs"; import jwt from "jsonwebtoken"; import env from "../enviroment/env"; import NotAuthorizedError from "../utils/NotAuthorizedError"; diff --git a/backend/services/user-service/user-service.ts b/backend/services/user-service/user-service.ts index be6560a..114ada8 100644 --- a/backend/services/user-service/user-service.ts +++ b/backend/services/user-service/user-service.ts @@ -1,5 +1,5 @@ import User, { UserInterface } from "../../models/user-model"; -import bcrypt from "bcrypt"; +import bcrypt from "bcryptjs"; import NotFoundError from "../../utils/NotFoundError"; import InternalServerError from "../../utils/InternalServerError"; import sendEmailVerification from "../../utils/sendVerificationEmail"; diff --git a/docker-compose-production.yml b/docker-compose-production.yml index 084e8e3..25a6e39 100644 --- a/docker-compose-production.yml +++ b/docker-compose-production.yml @@ -5,14 +5,35 @@ services: context: . dockerfile: Dockerfile.production container_name: mydrive_production - env_file: - - ./backend/config/.env.production volumes: - .:/usr/app-production - - /usr/app-production/node_modules - - ${FS_DIRECTORY}:/data + - ${FS_DIRECTORY:-/dev/null}:/data ports: - "${HTTP_PORT:-3000}:3000" - "${HTTPS_PORT:-8080}:8080" environment: - DOCKER=true + - MONGODB_URL= + - DB_TYPE= + - FS_DIRECTORY= + - S3_ID= + - S3_KEY= + - S3_BUCKET= + - KEY= + - HTTP_PORT= + - HTTPS_PORT= + - URL= + - EMAIL_VERIFICATION= + - EMAIL_DOMAIN= + - EMAIL_ADDRESS= + - EMAIL_API_KEY= + - EMAIL_HOST= + - REMOTE_URL= + - PASSWORD_ACCESS= + - PASSWORD_REFRESH= + - PASSWORD_COOKIE= + - VIDEO_THUMBNAILS_ENABLED= + - TEMP_DIRECTORY= + - TEMP_VIDEO_THUMBNAIL_LIMIT= + - SECURE_COOKIES= + - SSL= diff --git a/package.json b/package.json index 2d4a77c..ac4de18 100755 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "@babel/preset-react": "^7.8.3", "@babel/types": "^7.9.5", "@reduxjs/toolkit": "^2.2.5", - "@types/bcrypt": "^3.0.0", "@types/compression": "^1.7.0", "@types/concat-stream": "^1.6.0", "@types/connect-busboy": "0.0.2", @@ -61,7 +60,7 @@ "aws-sdk": "^2.657.0", "axios": "^1.7.2", "babel-polyfill": "^6.26.0", - "bcrypt": "^5.1.1", + "bcryptjs": "^3.0.2", "body-parser": "^1.20.2", "bytes": "^3.1.0", "classnames": "^2.5.1",