diff --git a/javascript/package.json b/javascript/package.json
index dd5e3a5305e5b53e23f678b76aa094a57ad7da96..c5cfef3d0a040be51f69793a8137e639782623cc 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -34,7 +34,6 @@
"penpal": "^3.0.3",
"pkijs": "^2.1.69",
"pvutils": "^1.0.16",
- "qrcode": "^1.3.0",
"webcrypto-liner": "^1.1.4"
},
"devDependencies": {
diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js
index f0ac9a75d69c5bf742d94e884f297e62a41d4223..944bf6743e4244b63e6207b0b8953048fa3a9646 100644
--- a/javascript/src/iframe/viamapi-iframe.js
+++ b/javascript/src/iframe/viamapi-iframe.js
@@ -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;
}
diff --git a/javascript/src/utilities/generateQrCode.js b/javascript/src/utilities/generateQrCode.js
index f48055fa08501b6f049b8f69823acdbd5c26fa55..5331f29d521e47aa80c102393edc20d09d3e653e 100644
--- a/javascript/src/utilities/generateQrCode.js
+++ b/javascript/src/utilities/generateQrCode.js
@@ -12,6 +12,7 @@ export default async (content, width = 160, height = 160, logoWidth = 80, logoHe
quietZone: 0,
colorDark: "#000000",
colorLight: "#ffffff",
+ dotScale: 0.7,
PO: "#d51d32",
PI: "#d51d32",
diff --git a/javascript/yarn.lock b/javascript/yarn.lock
index 3d2e3f48da2b9f625782e83233af552000b5275b..e0a36ac486014152da670433c3925a3127ccdbdc 100644
--- a/javascript/yarn.lock
+++ b/javascript/yarn.lock
@@ -1300,12 +1300,6 @@ camelcase@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-can-promise@^0.0.1:
- version "0.0.1"
- resolved "https://registry.yarnpkg.com/can-promise/-/can-promise-0.0.1.tgz#7a7597ad801fb14c8b22341dfec314b6bd6ad8d3"
- dependencies:
- window-or-global "^1.0.1"
-
caniuse-lite@^1.0.30000899:
version "1.0.30000903"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000903.tgz#86d46227759279b3db345ddbe778335dbba9e858"
@@ -1393,14 +1387,6 @@ cli-width@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-cliui@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
- dependencies:
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
- wrap-ansi "^2.0.0"
-
cliui@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
@@ -1591,14 +1577,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
-cross-spawn@^5.0.1:
- version "5.1.0"
- resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
- dependencies:
- lru-cache "^4.0.1"
- shebang-command "^1.2.0"
- which "^1.2.9"
-
cross-spawn@^6.0.0, cross-spawn@^6.0.5:
version "6.0.5"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -1689,10 +1667,6 @@ debug@^4.1.0:
dependencies:
ms "^2.1.1"
-decamelize@^1.1.1:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
decamelize@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
@@ -1801,10 +1775,6 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"
-dijkstrajs@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b"
-
dir-glob@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
@@ -2165,18 +2135,6 @@ execa@^0.10.0:
signal-exit "^3.0.0"
strip-eof "^1.0.0"
-execa@^0.7.0:
- version "0.7.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
- dependencies:
- cross-spawn "^5.0.1"
- get-stream "^3.0.0"
- is-stream "^1.1.0"
- npm-run-path "^2.0.0"
- p-finally "^1.0.0"
- signal-exit "^3.0.0"
- strip-eof "^1.0.0"
-
expand-brackets@^2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -2831,10 +2789,6 @@ invariant@^2.2.2:
dependencies:
loose-envify "^1.0.0"
-invert-kv@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
-
invert-kv@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
@@ -3027,10 +2981,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-isarray@^2.0.1:
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz#38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7"
-
isexe@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -3135,12 +3085,6 @@ kind-of@^6.0.0, kind-of@^6.0.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-lcid@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
- dependencies:
- invert-kv "^1.0.0"
-
lcid@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
@@ -3241,7 +3185,7 @@ lower-case@^1.1.1:
version "1.1.4"
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
-lru-cache@^4.0.1, lru-cache@^4.1.1:
+lru-cache@^4.1.1:
version "4.1.3"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
dependencies:
@@ -3282,12 +3226,6 @@ media-typer@0.3.0:
version "0.3.0"
resolved "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-mem@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
- dependencies:
- mimic-fn "^1.0.0"
-
mem@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/mem/-/mem-4.0.0.tgz#6437690d9471678f6cc83659c00cbafcd6b0cdaf"
@@ -3713,14 +3651,6 @@ os-homedir@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-os-locale@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
- dependencies:
- execa "^0.7.0"
- lcid "^1.0.0"
- mem "^1.1.0"
-
os-locale@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.0.1.tgz#3b014fbf01d87f60a1e5348d80fe870dc82c4620"
@@ -3960,10 +3890,6 @@ pluralize@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-pngjs@^3.3.0:
- version "3.3.3"
- resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.3.3.tgz#85173703bde3edac8998757b96e5821d0966a21b"
-
portfinder@^1.0.9:
version "1.0.19"
resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"
@@ -4071,16 +3997,6 @@ pvutils@^1.0.16, pvutils@latest:
version "1.0.16"
resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.0.16.tgz#b85984388e4d2770686712a2246202d11750d083"
-qrcode@^1.3.0:
- version "1.3.0"
- resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.3.0.tgz#a30dfe636225893501ea03af9ca10634ff1473a5"
- dependencies:
- can-promise "^0.0.1"
- dijkstrajs "^1.0.1"
- isarray "^2.0.1"
- pngjs "^3.3.0"
- yargs "^8.0.2"
-
qs@6.5.2:
version "6.5.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -5215,10 +5131,6 @@ wide-align@^1.1.0:
dependencies:
string-width "^1.0.2 || 2"
-window-or-global@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/window-or-global/-/window-or-global-1.0.1.tgz#dbe45ba2a291aabc56d62cf66c45b7fa322946de"
-
winston-color@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/winston-color/-/winston-color-1.0.0.tgz#7dcf28fded016585247f2aadc10ce8aafbe1fac6"
@@ -5271,10 +5183,6 @@ xtend@^4.0.0, xtend@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
-y18n@^3.2.1:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-
"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -5293,12 +5201,6 @@ yargs-parser@^10.1.0:
dependencies:
camelcase "^4.1.0"
-yargs-parser@^7.0.0:
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
- dependencies:
- camelcase "^4.1.0"
-
yargs@12.0.2, yargs@^12.0.2:
version "12.0.2"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
@@ -5315,21 +5217,3 @@ yargs@12.0.2, yargs@^12.0.2:
which-module "^2.0.0"
y18n "^3.2.1 || ^4.0.0"
yargs-parser "^10.1.0"
-
-yargs@^8.0.2:
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
- dependencies:
- camelcase "^4.1.0"
- cliui "^3.2.0"
- decamelize "^1.1.1"
- get-caller-file "^1.0.1"
- os-locale "^2.0.0"
- read-pkg-up "^2.0.0"
- require-directory "^2.1.1"
- require-main-filename "^1.0.1"
- set-blocking "^2.0.0"
- string-width "^2.0.0"
- which-module "^2.0.0"
- y18n "^3.2.1"
- yargs-parser "^7.0.0"