fix: Fixed error on getQrCode and sessionState (close #959)

wppconnect-team · Oct 23, 2022 · 5ed97e4 · Saifallak · Oct 23, 2022 · Saifallak
1 parent b0bf1f5
commit 5ed97e4
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/controller/sessionController.js b/src/controller/sessionController.js
@@ -272,7 +272,7 @@ export async function getSessionState(req, res) {
   try {
     const { waitQrCode = false } = req.body;
     const client = req.client;
-    const qr = await QRCode.toDataURL(client.urlcode);
+    const qr = client.urlcode ? await QRCode.toDataURL(client.urlcode) : null;
 
     if ((client == null || client.status == null) && !waitQrCode)
       return res.status(200).json({ status: 'CLOSED', qrcode: null });
@@ -291,14 +291,18 @@ export async function getSessionState(req, res) {
 
 export async function getQrCode(req, res) {
   try {
-    const qr = await QRCode.toDataURL(req.client.urlcode);
-    const img = Buffer.from(qr.replace(/^data:image\/(png|jpeg|jpg);base64,/, ''), 'base64');
+    if (req.client.urlcode) {
+      const qr = req.client.urlcode ? await QRCode.toDataURL(req.client.urlcode) : null;
+      const img = Buffer.from(qr.replace(/^data:image\/(png|jpeg|jpg);base64,/, ''), 'base64');
 
-    res.writeHead(200, {
-      'Content-Type': 'image/png',
-      'Content-Length': img.length,
-    });
-    res.end(img);
+      res.writeHead(200, {
+        'Content-Type': 'image/png',
+        'Content-Length': img.length,
+      });
+      res.end(img);
+    } else {
+      return res.status(200).json({ status: req.client.status, message: 'QRCode is not available...' });
+    }
   } catch (ex) {
     req.logger.error(ex);
     return res.status(500).json({ status: 'error', message: 'Error retrieving QRCode' });