diff --git a/javascript/src/utilities/signingUtilities.js b/javascript/src/utilities/signingUtilities.js index 89923fca926e52df8ef8a6b853b69c8647bb2d66..0151eac0d6156640a7b22fb424449bb2d8929a52 100644 --- a/javascript/src/utilities/signingUtilities.js +++ b/javascript/src/utilities/signingUtilities.js @@ -35,7 +35,14 @@ import { byteArrayToBase64 } from "../utilities/stringUtilities"; const libmime = require("libmime"); +const webcryptoLiner = require("webcrypto-liner/build/index"); const pkijs = require("pkijs"); + +pkijs.setEngine( + "webcrypto-liner", + webcryptoLiner.crypto, + new pkijs.CryptoEngine({ name: "webcrypto-liner", crypto: webcryptoLiner.crypto, subtle: webcryptoLiner.crypto.subtle }) +); const asn1js = require("asn1js"); const pvutils = require("pvutils"); diff --git a/javascript/webpack.config.dev.js b/javascript/webpack.config.dev.js index 6883e83cea072ba26ed0a403accb9db2f5c23a37..c895fac6b8a4bf6de1ec5851e8548f0e48eac2e9 100644 --- a/javascript/webpack.config.dev.js +++ b/javascript/webpack.config.dev.js @@ -10,6 +10,13 @@ module.exports = merge(common, { port: 9000, headers: { 'Access-Control-Allow-Origin': '*' + }, + proxy: { + '/api': { + target: 'https://alexeylunin.dev.vereign.com', + secure: false, + changeOrigin: true + } } }, plugins: [ diff --git a/javascript/webpack.config.js b/javascript/webpack.config.js index 70f7c3cc662ff0367c945e0c707635f1ec8f1d33..2c2452a0cb0c3103bf385b680efceffe4d22fb62 100644 --- a/javascript/webpack.config.js +++ b/javascript/webpack.config.js @@ -7,8 +7,6 @@ module.exports = { "viamapi-client": ["core-js/fn/promise", "./src/viamapi-client.js"], "viamapi-iframe": [ "babel-polyfill", - 'asmcrypto.js', - "webcrypto-liner", "./src/iframe/viamapi-iframe.js" ] },