streamby-core 0.21.5 → 0.21.7

package/dist/middleware/routes/project.js

@@ -4,8 +4,12 @@ exports.projectRouter = projectRouter;
 const express_1 = require("express");
 const manager_1 = require("../../models/manager");
 const auth_1 = require("../../utils/auth");
+const connectionManager_1 = require("../../adapters/database/connectionManager");
+const sql_1 = require("../../adapters/database/sql");
+const auth_2 = require("../../services/auth");
 function projectRouter(config) {
     const router = (0, express_1.Router)();
+    router.use((0, auth_2.authenticate)(config));
     const Project = (0, manager_1.getModel)('projects');
     const mapProjectToResponseFormat = (project, userId) => {
         const currentUserMember = project.members?.find((member) => member.userId === userId);
@@ -19,12 +23,7 @@ function projectRouter(config) {
     };
     router.get('/projects', async (req, res) => {
         try {
-            const auth = await config.authProvider(req);
-            if (!auth ||
-                !auth.userId ||
-                !auth.role) {
-                return res.status(401).json({ error: 'Unauthorized' });
-            }
+            const auth = req.auth;
             const archivedQuery = req.query.archived;
             const filterArchived = archivedQuery !== undefined ? String(archivedQuery).toLowerCase() === 'true' : undefined;
             const allProjects = await Project.find({}); // Fetch all projects
@@ -49,12 +48,7 @@ function projectRouter(config) {
     });
     router.post('/projects/create', async (req, res) => {
         try {
-            const auth = await config.authProvider(req);
-            if (!auth ||
-                !auth.userId ||
-                !auth.role) {
-                return res.status(401).json({ error: 'Unauthorized' });
-            }
+            const auth = req.auth;
             if (auth.role !== 'admin' && auth.role !== 'editor') {
                 return res.status(403).json({ error: 'Permission denied' });
             }
@@ -84,12 +78,7 @@ function projectRouter(config) {
     });
     router.get('/projects/:id', async (req, res) => {
         try {
-            const auth = await config.authProvider(req);
-            if (!auth ||
-                !auth.userId ||
-                !auth.role) {
-                return res.status(401).json({ error: 'Unauthorized' });
-            }
+            const auth = req.auth;
             const projectId = req.params.id;
             const project = await Project.findOne({ _id: projectId });
             if (!project) {
@@ -106,12 +95,7 @@ function projectRouter(config) {
     });
     router.patch('/projects/:id', async (req, res) => {
         try {
-            const auth = await config.authProvider(req);
-            if (!auth ||
-                !auth.userId ||
-                !auth.role) {
-                return res.status(401).json({ error: 'Unauthorized' });
-            }
+            const auth = req.auth;
             if (auth.role !== 'admin' && auth.role !== 'editor') {
                 return res.status(403).json({ error: 'Permission denied' });
             }
@@ -139,12 +123,7 @@ function projectRouter(config) {
     });
     router.delete('/projects/:id', async (req, res) => {
         try {
-            const auth = await config.authProvider(req);
-            if (!auth ||
-                !auth.userId ||
-                !auth.role) {
-                return res.status(401).json({ error: 'Unauthorized' });
-            }
+            const auth = req.auth;
             const projectId = req.params.id;
             const project = await Project.findOne({ _id: projectId });
             if (!project) {
@@ -162,18 +141,26 @@ function projectRouter(config) {
     });
     router.patch('/projects/:id/archive', async (req, res) => {
         try {
-            const auth = await config.authProvider(req);
-            if (!auth ||
-                !auth.userId ||
-                !auth.role) {
-                return res.status(401).json({ error: 'Unauthorized' });
-            }
+            const auth = req.auth;
             const projectId = req.params.id;
             const project = await Project.findOne({ _id: projectId });
             if (!project || !(0, auth_1.isProjectMember)(project, auth.userId)) {
                 return res.status(403).json({ error: 'Unauthorized project access' });
             }
-            await Project.update({ _id: projectId, "members.userId": auth.userId }, { "members.$.archived": true, "members.$.archivedBy": auth.userId, "members.$.archivedAt": new Date() });
+            if (project.dbType === 'sql') {
+                const connection = (0, connectionManager_1.getConnection)(config.databases?.find(db => db.main)?.id || '').client;
+                await sql_1.sqlAdapter.update(connection, 'project_members', { projectId: projectId, userId: auth.userId }, { archived: true, archivedBy: auth.userId, archivedAt: new Date() });
+            }
+            else {
+                const memberIndex = project.members.findIndex((member) => member.userId === auth.userId);
+                if (memberIndex === -1) {
+                    return res.status(403).json({ error: 'Unauthorized project access' });
+                }
+                project.members[memberIndex].archived = true;
+                project.members[memberIndex].archivedBy = auth.userId;
+                project.members[memberIndex].archivedAt = new Date();
+                await Project.update({ _id: projectId }, { members: project.members });
+            }
             // Re-fetch all projects for the user to ensure the list is up-to-date
             const allProjects = await Project.find({});
             const projects = allProjects
@@ -190,18 +177,26 @@ function projectRouter(config) {
     });
     router.patch('/projects/:id/unarchive', async (req, res) => {
         try {
-            const auth = await config.authProvider(req);
-            if (!auth ||
-                !auth.userId ||
-                !auth.role) {
-                return res.status(401).json({ error: 'Unauthorized' });
-            }
+            const auth = req.auth;
             const projectId = req.params.id;
             const project = await Project.findOne({ _id: projectId });
             if (!project || !(0, auth_1.isProjectMember)(project, auth.userId)) {
                 return res.status(403).json({ error: 'Unauthorized project access' });
             }
-            await Project.update({ _id: projectId, "members.userId": auth.userId }, { "members.$.archived": false, "members.$.archivedBy": null, "members.$.archivedAt": null });
+            if (project.dbType === 'sql') {
+                const connection = (0, connectionManager_1.getConnection)(config.databases?.find(db => db.main)?.id || '').client;
+                await sql_1.sqlAdapter.update(connection, 'project_members', { projectId: projectId, userId: auth.userId }, { archived: false, archivedBy: null, archivedAt: null });
+            }
+            else {
+                const memberIndex = project.members.findIndex((member) => member.userId === auth.userId);
+                if (memberIndex === -1) {
+                    return res.status(403).json({ error: 'Unauthorized project access' });
+                }
+                project.members[memberIndex].archived = false;
+                project.members[memberIndex].archivedBy = null;
+                project.members[memberIndex].archivedAt = null;
+                await Project.update({ _id: projectId }, { members: project.members });
+            }
             // Re-fetch all projects for the user to ensure the list is up-to-date
             const allProjects = await Project.find({});
             const projects = allProjects
@@ -218,12 +213,7 @@ function projectRouter(config) {
     });
     router.get('/projects/:id/members', async (req, res) => {
         try {
-            const auth = await config.authProvider(req);
-            if (!auth ||
-                !auth.userId ||
-                !auth.role) {
-                return res.status(401).json({ error: 'Unauthorized' });
-            }
+            const auth = req.auth;
             const projectId = req.params.id;
             const project = await Project.findOne({ _id: projectId });
             if (!project) {
@@ -255,12 +245,7 @@ function projectRouter(config) {
     });
     router.post('/projects/:id/image', async (req, res) => {
         try {
-            const auth = await config.authProvider(req);
-            if (!auth ||
-                !auth.userId ||
-                !auth.role) {
-                return res.status(401).json({ error: 'Unauthorized' });
-            }
+            const auth = req.auth;
             if (auth.role !== 'admin' && auth.role !== 'editor') {
                 return res.status(403).json({ error: 'Permission denied' });
             }

package/dist/services/auth.d.ts

@@ -1,2 +1,5 @@
-import { AuthContext } from '../types';
-export declare function checkRole(auth: AuthContext, required: 'viewer' | 'editor' | 'admin'): void;
+import { Auth } from '../types';
+import { Request, Response, NextFunction } from 'express';
+import { StreamByConfig } from '../types';
+export declare const authenticate: (config: StreamByConfig) => (req: Request, res: Response, next: NextFunction) => Promise<Response<any, Record<string, any>> | undefined>;
+export declare function checkRole(auth: Auth, required: 'viewer' | 'editor' | 'admin'): void;

package/dist/services/auth.js

@@ -1,6 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.authenticate = void 0;
 exports.checkRole = checkRole;
+const authenticate = (config) => async (req, res, next) => {
+    try {
+        const auth = await config.authProvider(req);
+        if (!auth || !auth.userId || !auth.role) {
+            return res.status(401).json({ error: 'Unauthorized' });
+        }
+        req.auth = auth;
+        next();
+    }
+    catch (error) {
+        console.error('Authentication failed:', error);
+        return res.status(401).json({ error: 'Unauthorized' });
+    }
+};
+exports.authenticate = authenticate;
 function checkRole(auth, required) {
     const roles = ['viewer', 'editor', 'admin'];
     const userIdx = roles.indexOf(auth.role);

package/dist/types/index.d.ts

@@ -61,12 +61,12 @@ export interface StreamByConfig {
     databases?: DatabaseCredential[];
     adapter?: StorageAdapter;
 }
-export interface AuthContext {
+export interface Auth {
     userId: string;
     username: string;
     role: 'viewer' | 'editor' | 'admin';
 }
-export type AuthProvider = (req: Request) => Promise<AuthContext>;
+export type AuthProvider = (req: Request) => Promise<Auth>;
 export interface Export {
     _id?: string;
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "streamby-core",
-  "version": "0.21.5",
+  "version": "0.21.7",
   "description": "StreamBy middleware framework for media storage management",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -49,7 +49,7 @@
     "@types/pg": "^8.15.4",
     "@types/supertest": "^6.0.3",
     "cors": "^2.8.5",
-    "supertest": "^7.1.0",
+    "supertest": "^7.1.4",
     "ts-node-dev": "^2.0.0",
     "typescript": "^5.8.3",
     "vitest": "^3.1.1"