Skip to content
Snippets Groups Projects

Change style of generated QR code

Merged Alexey Lunin requested to merge 954-qr-code-style into master
4 files
+ 16
138
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -10,7 +10,6 @@ import {
} from "../utilities/stringUtilities";
import { extractMessageID } from "../helpers/mailparser";
const QRCode = require("qrcode");
const Penpal = require("penpal").default;
import {
@@ -817,7 +816,7 @@ const connection = Penpal.connectToParent({
await setIdentityInLocalStorage(loginIdentity);
}
} else if (mode === LOGIN_MODES.NEW_DEVICE) {
const dataUrl = await QRCode.toDataURL(
const dataUrl = await generateQrCode(
`${data.ActionID},${data.QrCode}`
);
Object.assign(responseToClient.data, { image: dataUrl });
@@ -863,14 +862,13 @@ const connection = Penpal.connectToParent({
viamApi,
viamApi.identityAddNewDevice,
null
).then(executeResult => {
).then(async executeResult => {
if (executeResult.code === "200") {
const actionID = executeResult.data["ActionID"];
const QrCode = executeResult.data["QrCode"];
QRCode.toDataURL(actionID + "," + QrCode, function(err, url) {
executeResult.data["image"] = url;
result(executeResult);
});
const dataUrl = await generateQrCode(actionID + "," + QrCode);
executeResult.data["image"] = dataUrl;
result(executeResult);
} else {
result(executeResult);
}
@@ -2304,10 +2302,9 @@ connection.promise.then(parent => {
const eventCopy = JSON.parse(JSON.stringify(event));
QRCode.toDataURL(actionID + "," + QrCode, function(err, url) {
eventCopy["payloads"].push(url);
parent.onEvent(eventCopy);
});
const dataUrl = await generateQrCode(actionID + "," + QrCode);
eventCopy["payloads"].push(dataUrl);
parent.onEvent(eventCopy);
break;
}
@@ -2377,10 +2374,9 @@ connection.promise.then(parent => {
const eventCopy = JSON.parse(JSON.stringify(event));
QRCode.toDataURL(actionID + "," + QrCode, function(err, url) {
eventCopy["payloads"].push(url);
parent.onEvent(eventCopy);
});
const dataUrl = await generateQrCode(actionID + "," + QrCode);
eventCopy["payloads"].push(dataUrl);
parent.onEvent(eventCopy);
} else {
parent.onEvent(event);
}
@@ -2425,11 +2421,9 @@ connection.promise.then(parent => {
const eventCopy = JSON.parse(JSON.stringify(event));
QRCode.toDataURL(actionID + "," + QrCode, function(err, url) {
eventCopy["payloads"].push(url);
parent.onEvent(eventCopy);
});
const dataUrl = await generateQrCode(actionID + "," + QrCode);
eventCopy["payloads"].push(dataUrl);
parent.onEvent(eventCopy);
continue;
}
Loading