Add a bugfix for the polyfil

webview-crypto · Jul 29, 2016 · 1974af7 · 1974af7
1 parent c813039
commit 1974af7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/inject/index.ts b/inject/index.ts
@@ -1,3 +1,5 @@
+require("imports?this=>window!webcrypto-shim");
+
 import {parse, stringify} from "../src/serializeBinary";
 
 declare var require: any;

diff --git a/inject/webpack.config.js b/inject/webpack.config.js
@@ -2,7 +2,7 @@ var failPlugin = require('webpack-fail-plugin');
 var webpack = require('webpack');
 
 module.exports = {
-  entry: ['babel-polyfill', 'webcrypto-shim', './index.ts'],
+  entry: ['babel-polyfill', './index.ts'],
   output: {
     filename: "./dist/index.js",
   },

diff --git a/src/serializeBinary.ts b/src/serializeBinary.ts
@@ -130,7 +130,7 @@ const CryptoKeySerializer: Serializer<CryptoKeyWithData | CryptoKey, CryptoKeySe
   isType: (o: any) => {
     const localStr = o.toLocaleString();
     // can't use CryptoKey or constructor on WebView iOS
-    const isCryptoKey = localStr === "[object CryptoKey]" || localStr === "[object Key]";
+    const isCryptoKey = localStr === "[object CryptoKey]" || localStr === "[object Key]" || (o.constructor && o.constructor.name === "CryptoKey");
     const isCryptoKeyWithData = o._jwk && !o.serialized;
     return isCryptoKey || isCryptoKeyWithData;
   },