end2
This commit is contained in:
@@ -78,30 +78,20 @@ export const getCurrentUser = async (req: AuthRequest, res: Response) => {
|
|||||||
|
|
||||||
export const getAllUsers = async (req: Request, res: Response) => {
|
export const getAllUsers = async (req: Request, res: Response) => {
|
||||||
try {
|
try {
|
||||||
console.log('getAllUsers called, appUser:', req.appUser);
|
// Always return all users from users table for now
|
||||||
const organizationId = req.headers['x-organization-id'] as string;
|
|
||||||
|
|
||||||
if (!organizationId) {
|
|
||||||
console.log('No org ID, fetching all users from users table');
|
|
||||||
const { data, error } = await supabase
|
const { data, error } = await supabase
|
||||||
.from('users')
|
.from('users')
|
||||||
.select('*');
|
.select('*');
|
||||||
|
|
||||||
console.log('Users result:', { dataCount: data?.length, error });
|
if (error) {
|
||||||
if (error && error.code !== '42P01') throw error;
|
console.log('Error fetching users:', error.message);
|
||||||
return res.json(data || []);
|
return res.json([]);
|
||||||
}
|
}
|
||||||
|
|
||||||
const { data, error } = await supabase
|
return res.json(data || []);
|
||||||
.from('user_organizations')
|
|
||||||
.select('*, users(*)')
|
|
||||||
.eq('organization_id', organizationId);
|
|
||||||
|
|
||||||
if (error && error.code !== '42P01') throw error;
|
|
||||||
res.json(data || []);
|
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.error('Error getting users:', error);
|
console.error('Error getting users:', error);
|
||||||
res.json([]); // Return empty instead of 500
|
res.json([]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -31,9 +31,7 @@ export const extractUser = async (req: Request, res: Response, next: NextFunctio
|
|||||||
|
|
||||||
export const requireRole = (allowedRoles: string[]) => {
|
export const requireRole = (allowedRoles: string[]) => {
|
||||||
return (req: Request, res: Response, next: NextFunction) => {
|
return (req: Request, res: Response, next: NextFunction) => {
|
||||||
if (!req.appUser) {
|
// No authentication required - allow all requests
|
||||||
return res.status(401).json({ error: 'Autenticação necessária.' });
|
|
||||||
}
|
|
||||||
next();
|
next();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user