Ateração na role para que somente o administrador acesse o /connections quando logado

backend/src/app.ts

@@ -6,6 +6,8 @@ import cors from "cors";
 import cookieParser from "cookie-parser";
 import * as Sentry from "@sentry/node";
 
+console.log('dddddddddddddddddddddddddddd')
+
 import "./database";
 import uploadConfig from "./config/upload";
 import AppError from "./errors/AppError";

backend/src/controllers/QueueController.ts

@@ -6,9 +6,13 @@ import ListQueuesService from "../services/QueueService/ListQueuesService";
 import ShowQueueService from "../services/QueueService/ShowQueueService";
 import UpdateQueueService from "../services/QueueService/UpdateQueueService";
 
+ 
+
 export const index = async (req: Request, res: Response): Promise<Response> => {
   const queues = await ListQueuesService();
 
+ 
+
   return res.status(200).json(queues);
 };
 

backend/src/controllers/TicketController.ts

@@ -9,6 +9,8 @@ import UpdateTicketService from "../services/TicketServices/UpdateTicketService"
 import SendWhatsAppMessage from "../services/WbotServices/SendWhatsAppMessage";
 import ShowWhatsAppService from "../services/WhatsappService/ShowWhatsAppService";
 
+ 
+
 type IndexQuery = {
   searchParam: string;
   pageNumber: string;
@@ -26,6 +28,8 @@ interface TicketData {
   userId: number;
 } 
 
+
+
 export const index = async (req: Request, res: Response): Promise<Response> => {
   const {
     pageNumber,

backend/src/libs/wbot.ts

@@ -24,6 +24,7 @@ const syncUnreadMessages = async (wbot: Session) => {
       });
 
       for (const msg of unreadMessages) {
+        console.log('--BACKEND MSG: ', msg)
         await handleMessage(msg, wbot);
       }
 

backend/src/routes/index.ts

@@ -13,6 +13,8 @@ import quickAnswerRoutes from "./quickAnswerRoutes";
 
 const routes = Router();
 
+
+
 routes.use(userRoutes);
 routes.use("/auth", authRoutes);
 routes.use(settingRoutes);

backend/src/routes/settingRoutes.ts

@@ -5,6 +5,8 @@ import * as SettingController from "../controllers/SettingController";
 
 const settingRoutes = Router();
 
+
+
 settingRoutes.get("/settings", isAuth, SettingController.index);
 
 // routes.get("/settings/:settingKey", isAuth, SettingsController.show);

backend/src/routes/ticketRoutes.ts

@@ -5,6 +5,8 @@ import * as TicketController from "../controllers/TicketController";
 
 const ticketRoutes = express.Router();
 
+ 
+
 ticketRoutes.get("/tickets", isAuth, TicketController.index);
 
 ticketRoutes.get("/tickets/:ticketId", isAuth, TicketController.show);

backend/src/routes/userRoutes.ts

@@ -5,6 +5,8 @@ import * as UserController from "../controllers/UserController";
 
 const userRoutes = Router();
 
+
+
 userRoutes.get("/users", isAuth, UserController.index);
 
 userRoutes.post("/users", isAuth, UserController.store);

backend/src/routes/whatsappRoutes.ts

@@ -5,6 +5,8 @@ import * as WhatsAppController from "../controllers/WhatsAppController";
 
 const whatsappRoutes = express.Router();
 
+
+
 whatsappRoutes.get("/whatsapp/", isAuth, WhatsAppController.index);
 
 whatsappRoutes.post("/whatsapp/", isAuth, WhatsAppController.store);

backend/src/routes/whatsappSessionRoutes.ts

@@ -5,6 +5,8 @@ import WhatsAppSessionController from "../controllers/WhatsAppSessionController"
 
 const whatsappSessionRoutes = Router();
 
+
+
 whatsappSessionRoutes.post(
   "/whatsappsession/:whatsappId",
   isAuth,

backend/src/services/MessageServices/CreateMessageService.ts

@@ -16,9 +16,7 @@ interface Request {
   messageData: MessageData;
 }
 
-const CreateMessageService = async ({
+const CreateMessageService = async ({messageData}: Request): Promise<Message> => {
-  messageData
-}: Request): Promise<Message> => {
   await Message.upsert(messageData);
 
   const message = await Message.findByPk(messageData.id, {
@@ -41,6 +39,8 @@ const CreateMessageService = async ({
     throw new Error("ERR_CREATING_MESSAGE");
   }
 
+  //console.log('SERVER SIDE MESSAGE: ', message)
+
   const io = getIO();
   io.to(message.ticketId.toString())
     .to(message.ticket.status)

backend/src/services/WbotServices/wbotMessageListener.ts

@@ -86,7 +86,7 @@ const verifyMediaMessage = async (
     );
   } catch (err) {
     Sentry.captureException(err);
-    logger.error(err);
+    logger.error(`There was an error: wbotMessageLitener.ts: ${err}`);
   }
 
   const messageData = {
@@ -135,8 +135,11 @@ const verifyQueue = async (
   ticket: Ticket,
   contact: Contact
 ) => {
+
   const { queues, greetingMessage } = await ShowWhatsAppService(wbot.id!);
 
+  console.log('---greetingMessage: ',greetingMessage)
+
   if (queues.length === 1) {
     await UpdateTicketService({
       ticketData: { queueId: queues[0].id },
@@ -170,6 +173,8 @@ const verifyQueue = async (
 
     const body = `\u200e${greetingMessage}\n${options}`;
 
+    console.log('BACKEND BODY TEST: ', body)
+
     const debouncedSentMessage = debounce(
       async () => {
         const sentMessage = await wbot.sendMessage(
@@ -226,7 +231,11 @@ const handleMessage = async (
 
       msgContact = await wbot.getContactById(msg.to);
     } else {
+
       msgContact = await msg.getContact();
+ 
+      console.log('---msgContact: ', msgContact, '  |  msg.body: ', msg.body)   
+ 
     }
 
     const chat = await msg.getChat();
@@ -249,6 +258,7 @@ const handleMessage = async (
 
     const contact = await verifyContact(msgContact); 
     
+
     if ( unreadMessages === 0 &&  whatsapp.farewellMessage && whatsapp.farewellMessage === msg.body) return;
 
       const ticket = await FindOrCreateTicketService(
@@ -258,12 +268,19 @@ const handleMessage = async (
         groupContact
       );
 
+      console.log('---passou 1')
+      
+
       if (msg.hasMedia) {
         await verifyMediaMessage(msg, ticket, contact);
       } else {
         await verifyMessage(msg, ticket, contact);
       }
 
+      console.log('---passou 2 ') 
+      //await verifyQueue(wbot, msg, ticket, contact);
+      
+
       if (
         !ticket.queue &&
         !chat.isGroup &&
@@ -276,6 +293,8 @@ const handleMessage = async (
 
 
 
+
+
   } catch (err) {
     Sentry.captureException(err);
     logger.error(`Error handling whatsapp message: Err: ${err}`);

frontend/src/components/MessagesList/index.js

@@ -283,6 +283,7 @@ const reducer = (state, action) => {
       state[messageIndex] = newMessage;
     } else {
       state.push(newMessage);
+      console.log(' TESTANDO NOVA MENSAGEM: ', newMessage)
     }
 
     return [...state];
@@ -363,6 +364,9 @@ const MessagesList = ({ ticketId, isGroup }) => {
     socket.on("appMessage", (data) => {
       if (data.action === "create") {
         dispatch({ type: "ADD_MESSAGE", payload: data.message });
+
+        console.log('* NOVA MENSAGEM CAP: ', data.message) 
+
         scrollToBottom();
       }
 
@@ -513,6 +517,8 @@ const MessagesList = ({ ticketId, isGroup }) => {
       let messageUser = messagesList[index].fromMe;
       let previousMessageUser = messagesList[index - 1].fromMe;
 
+
+
       if (messageUser !== previousMessageUser) {
         return (
           <span style={{ marginTop: 16 }} key={`divider-${message.id}`}></span>

frontend/src/context/Auth/AuthContext.js

@@ -7,6 +7,8 @@ const AuthContext = createContext();
 const AuthProvider = ({ children }) => {
 	const { loading, user, isAuth, handleLogin, handleLogout } = useAuth();
 
+	//{console.log('authContext teste:  ', user)}
+
 	return (
 		<AuthContext.Provider
 			value={{ loading, user, isAuth, handleLogin, handleLogout }}

frontend/src/pages/Connections/index.js

@@ -41,6 +41,11 @@ import { i18n } from "../../translate/i18n";
 import { WhatsAppsContext } from "../../context/WhatsApp/WhatsAppsContext";
 import toastError from "../../errors/toastError";
 
+//--------
+import { AuthContext } from "../../context/Auth/AuthContext";
+import { Can } from "../../components/Can";
+
+  
 const useStyles = makeStyles(theme => ({
 	mainPaper: {
 		flex: 1,
@@ -93,6 +98,11 @@ const CustomToolTip = ({ title, content, children }) => {
 };
 
 const Connections = () => {
+	 
+	//--------
+	const { user } = useContext(AuthContext); 
+	 
+	
 	const classes = useStyles();
 
 	const { whatsApps, loading } = useContext(WhatsAppsContext);
@@ -100,6 +110,8 @@ const Connections = () => {
 	const [qrModalOpen, setQrModalOpen] = useState(false);
 	const [selectedWhatsApp, setSelectedWhatsApp] = useState(null);
 	const [confirmModalOpen, setConfirmModalOpen] = useState(false); 
+
+	 
 	const confirmationModalInitialState = {
 		action: "",
 		title: "",
@@ -290,7 +302,12 @@ const Connections = () => {
 	};
 
 	return ( 
-		<MainContainer>
+
+		<Can
+          role={user.profile}
+          perform="connections-view:show"
+          yes={() => (
+            <MainContainer>
 			<ConfirmationModal
 				title={confirmModalInfo.title}
 				open={confirmModalOpen}
@@ -394,7 +411,115 @@ const Connections = () => {
 					</TableBody>
 				</Table>
 			</Paper>
-		</MainContainer>
+			</MainContainer>
+          )}
+        />
+
+		/*<MainContainer>
+			<ConfirmationModal
+				title={confirmModalInfo.title}
+				open={confirmModalOpen}
+				onClose={setConfirmModalOpen}
+				onConfirm={handleSubmitConfirmationModal}
+			>
+				{confirmModalInfo.message}
+			</ConfirmationModal>
+			<QrcodeModal
+				open={qrModalOpen}
+				onClose={handleCloseQrModal}
+				whatsAppId={!whatsAppModalOpen && selectedWhatsApp?.id}
+			/>
+			<WhatsAppModal
+				open={whatsAppModalOpen}
+				onClose={handleCloseWhatsAppModal}
+				whatsAppId={!qrModalOpen && selectedWhatsApp?.id}
+			/>
+			<MainHeader>
+				<Title>{i18n.t("connections.title")}</Title>
+				<MainHeaderButtonsWrapper>
+					<Button
+						variant="contained"
+						color="primary"
+						onClick={handleOpenWhatsAppModal}
+					>
+						{i18n.t("connections.buttons.add")}
+					</Button>
+				</MainHeaderButtonsWrapper>
+			</MainHeader>
+			<Paper className={classes.mainPaper} variant="outlined">
+				<Table size="small">
+					<TableHead>
+						<TableRow>
+							<TableCell align="center">
+								{i18n.t("connections.table.name")}
+							</TableCell>
+							<TableCell align="center">
+								{i18n.t("connections.table.status")}
+							</TableCell>
+							<TableCell align="center">
+								{i18n.t("connections.table.session")}
+							</TableCell>
+							<TableCell align="center">
+								{i18n.t("connections.table.lastUpdate")}
+							</TableCell>
+							<TableCell align="center">
+								{i18n.t("connections.table.default")}
+							</TableCell>
+							<TableCell align="center">
+								{i18n.t("connections.table.actions")}
+							</TableCell>
+						</TableRow>
+					</TableHead>
+					<TableBody>
+						{loading ? (
+							<TableRowSkeleton />
+						) : (
+							<>
+								{whatsApps?.length > 0 &&
+									whatsApps.map(whatsApp => (
+										<TableRow key={whatsApp.id}>
+											<TableCell align="center">{whatsApp.name}</TableCell>
+											<TableCell align="center">
+												{renderStatusToolTips(whatsApp)}
+											</TableCell>
+											<TableCell align="center">
+												{renderActionButtons(whatsApp)}
+											</TableCell>
+											<TableCell align="center">
+												{format(parseISO(whatsApp.updatedAt), "dd/MM/yy HH:mm")}
+											</TableCell>
+											<TableCell align="center">
+												{whatsApp.isDefault && (
+													<div className={classes.customTableCell}>
+														<CheckCircle style={{ color: green[500] }} />
+													</div>
+												)}
+											</TableCell>
+											<TableCell align="center">
+												<IconButton
+													size="small"
+													onClick={() => handleEditWhatsApp(whatsApp)}
+												>
+													<Edit />
+												</IconButton>
+
+												<IconButton
+													size="small"
+													onClick={e => {
+														handleOpenConfirmationModal("delete", whatsApp.id);
+													}}
+												>
+													<DeleteOutline />
+												</IconButton>
+											</TableCell>
+										</TableRow>
+									))}
+							</>
+						)}
+					</TableBody>
+				</Table>
+			</Paper>
+			</MainContainer>*/
 	);
 };
 

frontend/src/pages/Login/index.js

@@ -133,6 +133,7 @@ const Login = () => {
           </Button>
           <Grid container>
             <Grid item>
+             
               <Link
                 href="#"
                 variant="body2"
@@ -141,6 +142,7 @@ const Login = () => {
               >
                 {i18n.t("login.buttons.register")}
               </Link>
+
             </Grid>
           </Grid>
         </form>

frontend/src/pages/Users/index.js

@@ -219,13 +219,15 @@ const Users = () => {
               ),
             }}
           />
-          <Button
+          
+           <Button
             variant="contained"
             color="primary"
             onClick={handleOpenUserModal}
           >
             {i18n.t("users.buttons.add")}
           </Button> 
+
         </MainHeaderButtonsWrapper>
       </MainHeader>
       <Paper
@@ -243,9 +245,11 @@ const Users = () => {
               <TableCell align="center">
                 {i18n.t("users.table.profile")}
               </TableCell>
+              
               <TableCell align="center">
                 {i18n.t("users.table.actions")}
               </TableCell>
+
             </TableRow>
           </TableHead>
           <TableBody>
@@ -255,7 +259,9 @@ const Users = () => {
                   <TableCell align="center">{user.name}</TableCell>
                   <TableCell align="center">{user.email}</TableCell>
                   <TableCell align="center">{user.profile}</TableCell>
+                  
                   <TableCell align="center">
+                    
                     <IconButton
                       size="small"
                       onClick={() => handleEditUser(user)}
@@ -263,7 +269,7 @@ const Users = () => {
                       <EditIcon />
                     </IconButton>
 
-                    <IconButton
+                     <IconButton
                       size="small"
                       onClick={(e) => {
                         setConfirmModalOpen(true);
@@ -272,7 +278,9 @@ const Users = () => {
                     >
                       <DeleteOutlineIcon />
                     </IconButton> 
+
                   </TableCell>
+
                 </TableRow>
               ))}
               {loading && <TableRowSkeleton columns={4} />}

frontend/src/routes/index.js

@@ -17,6 +17,11 @@ import { AuthProvider } from "../context/Auth/AuthContext";
 import { WhatsAppsProvider } from "../context/WhatsApp/WhatsAppsContext";
 import Route from "./Route";
  
+//console.log('---AuthProvider: ',AuthProvider)
+
+
+ 
+
 const Routes = () => {
   return (
     <BrowserRouter>
@@ -33,12 +38,14 @@ const Routes = () => {
                 component={Tickets}
                 isPrivate
               />
+              
               <Route 
                 exact
                 path="/connections"
                 component={Connections}
                 isPrivate
               />
+
               <Route exact path="/contacts" component={Contacts} isPrivate />
               <Route exact path="/users" component={Users} isPrivate />
               <Route

frontend/src/rules.js

@@ -11,6 +11,8 @@ const rules = {
 			"user-modal:editQueues",
 			"ticket-options:deleteTicket",
 			"contacts-page:deleteContact",
+
+			"connections-view:show",
 		],
 	},
 };