Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0e0a0b91d1 | |||
| f8fb1c3f4b |
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "picpeak-backend",
|
"name": "picpeak-backend",
|
||||||
"version": "1.0.96",
|
"version": "1.0.97",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "picpeak-backend",
|
"name": "picpeak-backend",
|
||||||
"version": "1.0.96",
|
"version": "1.0.97",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@aws-sdk/client-s3": "^3.850.0",
|
"@aws-sdk/client-s3": "^3.850.0",
|
||||||
"@aws-sdk/lib-storage": "^3.850.0",
|
"@aws-sdk/lib-storage": "^3.850.0",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "picpeak-backend",
|
"name": "picpeak-backend",
|
||||||
"version": "1.0.96",
|
"version": "1.0.97",
|
||||||
"description": "Backend for PicPeak event photo sharing platform",
|
"description": "Backend for PicPeak event photo sharing platform",
|
||||||
"main": "server.js",
|
"main": "server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -20,6 +20,12 @@ const ATTEMPT_WINDOW = 15 * 60 * 1000; // 15 minutes window for counting attempt
|
|||||||
*/
|
*/
|
||||||
async function trackFailedAttempt(identifier, ipAddress, userAgent) {
|
async function trackFailedAttempt(identifier, ipAddress, userAgent) {
|
||||||
try {
|
try {
|
||||||
|
// Check if table exists first
|
||||||
|
const tableExists = await db.schema.hasTable('login_attempts');
|
||||||
|
if (!tableExists) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
await db('login_attempts').insert({
|
await db('login_attempts').insert({
|
||||||
identifier,
|
identifier,
|
||||||
ip_address: ipAddress,
|
ip_address: ipAddress,
|
||||||
@@ -48,6 +54,12 @@ async function trackFailedAttempt(identifier, ipAddress, userAgent) {
|
|||||||
*/
|
*/
|
||||||
async function trackSuccessfulLogin(identifier, ipAddress, userAgent) {
|
async function trackSuccessfulLogin(identifier, ipAddress, userAgent) {
|
||||||
try {
|
try {
|
||||||
|
// Check if table exists first
|
||||||
|
const tableExists = await db.schema.hasTable('login_attempts');
|
||||||
|
if (!tableExists) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
await db('login_attempts').insert({
|
await db('login_attempts').insert({
|
||||||
identifier,
|
identifier,
|
||||||
ip_address: ipAddress,
|
ip_address: ipAddress,
|
||||||
@@ -75,6 +87,12 @@ async function trackSuccessfulLogin(identifier, ipAddress, userAgent) {
|
|||||||
*/
|
*/
|
||||||
async function checkAccountLockout(identifier) {
|
async function checkAccountLockout(identifier) {
|
||||||
try {
|
try {
|
||||||
|
// Check if table exists first
|
||||||
|
const tableExists = await db.schema.hasTable('login_attempts');
|
||||||
|
if (!tableExists) {
|
||||||
|
return { isLocked: false };
|
||||||
|
}
|
||||||
|
|
||||||
const recentWindow = new Date(Date.now() - ATTEMPT_WINDOW);
|
const recentWindow = new Date(Date.now() - ATTEMPT_WINDOW);
|
||||||
|
|
||||||
// Get recent failed attempts
|
// Get recent failed attempts
|
||||||
@@ -114,6 +132,12 @@ async function checkAccountLockout(identifier) {
|
|||||||
*/
|
*/
|
||||||
async function checkSuspiciousActivity(identifier, ipAddress) {
|
async function checkSuspiciousActivity(identifier, ipAddress) {
|
||||||
try {
|
try {
|
||||||
|
// Check if table exists first
|
||||||
|
const tableExists = await db.schema.hasTable('login_attempts');
|
||||||
|
if (!tableExists) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Check for rapid attempts from different IPs
|
// Check for rapid attempts from different IPs
|
||||||
const recentWindow = new Date(Date.now() - 5 * 60 * 1000); // 5 minutes
|
const recentWindow = new Date(Date.now() - 5 * 60 * 1000); // 5 minutes
|
||||||
|
|
||||||
@@ -153,6 +177,13 @@ function getGenericAuthError() {
|
|||||||
*/
|
*/
|
||||||
async function cleanupOldAttempts() {
|
async function cleanupOldAttempts() {
|
||||||
try {
|
try {
|
||||||
|
// Check if table exists first
|
||||||
|
const tableExists = await db.schema.hasTable('login_attempts');
|
||||||
|
if (!tableExists) {
|
||||||
|
// Table doesn't exist, skip cleanup
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const cutoffDate = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000); // 7 days
|
const cutoffDate = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000); // 7 days
|
||||||
|
|
||||||
const deleted = await db('login_attempts')
|
const deleted = await db('login_attempts')
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ services:
|
|||||||
- FRONTEND_URL=${FRONTEND_URL:-http://localhost:3000}
|
- FRONTEND_URL=${FRONTEND_URL:-http://localhost:3000}
|
||||||
- ADMIN_URL=${ADMIN_URL:-http://localhost:3001}
|
- ADMIN_URL=${ADMIN_URL:-http://localhost:3001}
|
||||||
- TZ=${TZ:-UTC}
|
- TZ=${TZ:-UTC}
|
||||||
|
- STORAGE_PATH=/app/storage
|
||||||
volumes:
|
volumes:
|
||||||
- ./events:/app/events
|
- ./events:/app/events
|
||||||
- ./data:/app/data
|
- ./data:/app/data
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "picpeak-frontend",
|
"name": "picpeak-frontend",
|
||||||
"version": "1.0.96",
|
"version": "1.0.97",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "picpeak-frontend",
|
"name": "picpeak-frontend",
|
||||||
"version": "1.0.96",
|
"version": "1.0.97",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tanstack/react-query": "^5.0.0",
|
"@tanstack/react-query": "^5.0.0",
|
||||||
"@tiptap/extension-character-count": "^2.26.1",
|
"@tiptap/extension-character-count": "^2.26.1",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "picpeak-frontend",
|
"name": "picpeak-frontend",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "1.0.96",
|
"version": "1.0.97",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
Reference in New Issue
Block a user