-
+ {/* Custom Login Form */}
+
+
Entrar na sua conta
+
+ {errorMsg && (
+
+ {errorMsg}
+
+ )}
+
+
diff --git a/src/client/services/api.ts b/src/client/services/api.ts
index 7b61baa..aabba75 100644
--- a/src/client/services/api.ts
+++ b/src/client/services/api.ts
@@ -17,14 +17,13 @@ const api = axios.create({
},
});
-// Store the current user's clerk ID and Organization ID/Name
-let currentClerkUserId: string | null = null;
+let currentToken: string | null = null;
let currentOrgId: string | null = null;
let currentOrgName: string | null = null;
-// Function to set the clerk user ID (called from AuthContext)
-export const setApiClerkUserId = (clerkId: string | null) => {
- currentClerkUserId = clerkId;
+// Function to set the JWT token
+export const setApiToken = (token: string | null) => {
+ currentToken = token;
};
// Function to set the organization ID and Name (called from Layout/Context)
@@ -45,11 +44,10 @@ export const setApiOrganizationId = setApiOrgId;
api.interceptors.request.use(
(config) => {
console.log(`[API Request] ${config.method?.toUpperCase()} ${config.url}`, {
- clerkId: currentClerkUserId,
orgId: currentOrgId
});
- if (currentClerkUserId) {
- config.headers['x-clerk-user-id'] = currentClerkUserId;
+ if (currentToken) {
+ config.headers['Authorization'] = `Bearer ${currentToken}`;
}
if (currentOrgId) {
config.headers['x-organization-id'] = currentOrgId;
diff --git a/src/server/app.ts b/src/server/app.ts
index 7a2016c..f970589 100644
--- a/src/server/app.ts
+++ b/src/server/app.ts
@@ -11,6 +11,7 @@ import yieldStudyRoutes from './routes/yieldStudyRoutes.js';
import userRoutes from './routes/userRoutes.js';
import systemSettingsRoutes from './routes/systemSettingsRoutes.js';
import geometryTypeRoutes from './routes/geometryTypeRoutes.js';
+import authRoutes from './routes/authRoutes.js';
import stockRoutes from './routes/stockRoutes.js';
import notificationRoutes from './routes/notificationRoutes.js';
@@ -24,17 +25,19 @@ const app = express();
app.use(cors({
origin: '*', // Be more specific in production
methods: ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS'],
- allowedHeaders: ['Content-Type', 'Authorization', 'x-clerk-user-id', 'x-organization-id']
+ allowedHeaders: ['Content-Type', 'Authorization', 'x-organization-id']
}));
app.use(express.json());
import { extractUser } from './middleware/roleMiddleware.js';
// LOG DE DEPURAÇÃO PARA CONEXÃO
app.use((req, res, next) => {
- console.log(`[${new Date().toISOString()}] ${req.method} ${req.url} - ClerkID: ${req.headers['x-clerk-user-id'] || 'None'}`);
+ console.log(`[${new Date().toISOString()}] ${req.method} ${req.url}`);
next();
});
+import { authMiddleware } from './middleware/auth.js';
+app.use(authMiddleware);
app.use(extractUser);
// Static Uploads
@@ -49,6 +52,7 @@ if (!fs.existsSync(uploadsPath)) {
app.use('/uploads', express.static(uploadsPath));
// Routes
+app.use('/api/auth', authRoutes);
app.use('/api/users', userRoutes);
app.use('/api/projects', projectRoutes);
app.use('/api/parts', partRoutes);
diff --git a/src/server/controllers/authController.ts b/src/server/controllers/authController.ts
new file mode 100644
index 0000000..48a0f7a
--- /dev/null
+++ b/src/server/controllers/authController.ts
@@ -0,0 +1,99 @@
+import { Request, Response } from 'express';
+import bcrypt from 'bcryptjs';
+import jwt from 'jsonwebtoken';
+import User from '../models/User.js';
+import { v4 as uuidv4 } from 'uuid';
+
+const JWT_SECRET = process.env.JWT_SECRET || 'fallback_secret_key_change_in_prod';
+
+export const register = async (req: Request, res: Response): Promise => {
+ try {
+ const { name, email, password } = req.body;
+
+ if (!name || !email || !password) {
+ res.status(400).json({ error: 'Todos os campos são obrigatórios' });
+ return;
+ }
+
+ const existingUser = await User.findOne({ email });
+ if (existingUser) {
+ res.status(400).json({ error: 'Email já cadastrado' });
+ return;
+ }
+
+ const salt = await bcrypt.genSalt(10);
+ const passwordHash = await bcrypt.hash(password, salt);
+
+ // Gere um clerkId falso apenas para manter retrocompatibilidade no banco
+ const fakeClerkId = `user_${uuidv4().replace(/-/g, '')}`;
+
+ const newUser = new User({
+ name,
+ email,
+ passwordHash,
+ clerkId: fakeClerkId,
+ role: 'member',
+ isBanned: false
+ });
+
+ await newUser.save();
+
+ const token = jwt.sign(
+ { userId: newUser._id.toString(), clerkId: newUser.clerkId, role: newUser.role, organizationId: newUser.organizationId },
+ JWT_SECRET,
+ { expiresIn: '7d' }
+ );
+
+ res.status(201).json({
+ message: 'Usuário criado com sucesso',
+ token,
+ user: { id: newUser._id, name: newUser.name, email: newUser.email, role: newUser.role, clerkId: newUser.clerkId }
+ });
+ } catch (error) {
+ console.error('Register Error:', error);
+ res.status(500).json({ error: 'Erro no servidor' });
+ }
+};
+
+export const login = async (req: Request, res: Response): Promise => {
+ try {
+ const { email, password } = req.body;
+
+ if (!email || !password) {
+ res.status(400).json({ error: 'Email e senha são obrigatórios' });
+ return;
+ }
+
+ const user = await User.findOne({ email });
+ if (!user) {
+ res.status(400).json({ error: 'Usuário não encontrado' });
+ return;
+ }
+
+ if (!user.passwordHash) {
+ res.status(400).json({ error: 'Usuário do sistema antigo. Por favor, solicite a redefinição de senha ou recrie sua conta se possível.' });
+ return;
+ }
+
+ const isMatch = await bcrypt.compare(password, user.passwordHash);
+ if (!isMatch) {
+ res.status(400).json({ error: 'Credenciais inválidas' });
+ return;
+ }
+
+ const token = jwt.sign(
+ { userId: user._id.toString(), clerkId: user.clerkId, role: user.role, organizationId: user.organizationId },
+ JWT_SECRET,
+ { expiresIn: '7d' }
+ );
+
+ res.status(200).json({
+ message: 'Login realizado com sucesso',
+ token,
+ user: { id: user._id, name: user.name, email: user.email, role: user.role, clerkId: user.clerkId }
+ });
+ } catch (error) {
+ console.error('Login Error:', error);
+ res.status(500).json({ error: 'Erro no servidor' });
+ }
+};
diff --git a/src/server/middleware/auth.ts b/src/server/middleware/auth.ts
new file mode 100644
index 0000000..3a11227
--- /dev/null
+++ b/src/server/middleware/auth.ts
@@ -0,0 +1,26 @@
+import { Request, Response, NextFunction } from 'express';
+import jwt from 'jsonwebtoken';
+
+const JWT_SECRET = process.env.JWT_SECRET || 'fallback_secret_key_change_in_prod';
+
+export const authMiddleware = (req: Request, res: Response, next: NextFunction) => {
+ try {
+ const authHeader = req.headers.authorization;
+ if (!authHeader || !authHeader.startsWith('Bearer ')) {
+ // Se não houver token autêntico JWT, prossegue limpo
+ return next();
+ }
+
+ const token = authHeader.split(' ')[1];
+ const decoded = jwt.verify(token, JWT_SECRET) as any;
+
+ // Injeta o clerkId no header para que o extractUser (roleMiddleware)
+ // continue seu trabalho de carregar o usuário do banco instanciado e popular req.appUser
+ req.headers['x-clerk-user-id'] = decoded.clerkId;
+
+ next();
+ } catch (error) {
+ console.error('Auth Middleware Error:', error);
+ res.status(401).json({ error: 'Token inválido ou expirado' });
+ }
+};
diff --git a/src/server/models/User.ts b/src/server/models/User.ts
index f3d5663..eb3360e 100644
--- a/src/server/models/User.ts
+++ b/src/server/models/User.ts
@@ -8,6 +8,7 @@ export interface IUser extends Document {
name: string;
role: UserRole;
isBanned: boolean;
+ passwordHash?: string;
organizationId?: string;
createdAt: Date;
updatedAt: Date;
@@ -21,6 +22,10 @@ const UserSchema: Schema = new Schema({
unique: true,
index: true
},
+ passwordHash: {
+ type: String,
+ required: false
+ },
organizationId: {
type: String,
index: true
diff --git a/src/server/routes/authRoutes.ts b/src/server/routes/authRoutes.ts
new file mode 100644
index 0000000..ef11d14
--- /dev/null
+++ b/src/server/routes/authRoutes.ts
@@ -0,0 +1,9 @@
+import express from 'express';
+import { login, register } from '../controllers/authController.js';
+
+const router = express.Router();
+
+router.post('/login', login);
+router.post('/register', register);
+
+export default router;