Merge pull request #116 from square/mbyczkowski/fix-imports

Fix the way WebCryptographer is exported
square · Aug 8, 2019 · 56135fd · 56135fd
2 parents de4a169 + 2705cb1
commit 56135fd
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 13 deletions.
diff --git a/dist/jose.js b/dist/jose.js
diff --git a/dist/jose.js.map b/dist/jose.js.map
diff --git a/dist/jose.min.js b/dist/jose.min.js
diff --git a/lib/jose-core.js b/lib/jose-core.js
@@ -18,6 +18,7 @@ import { Encrypter } from './jose-jwe-encrypt';
 import { Decrypter } from './jose-jwe-decrypt';
 import { Signer } from './jose-jws-sign';
 import { Verifier } from './jose-jws-verify';
+import { WebCryptographer } from './jose-jwe-webcryptographer';
 
 export var crypto;
 /**
@@ -28,8 +29,6 @@ export var crypto;
 
 export var Utils = JoseUtils;
 
-export { WebCryptographer } from './jose-jwe-webcryptographer';
-
 /**
  * Initializes a JoseJWE object.
  */
@@ -46,10 +45,10 @@ const JoseJWS = {
   Verifier
 };
 
-const Jose = { JoseJWS, JoseJWE };
+const Jose = { JoseJWS, JoseJWE, WebCryptographer };
 
-export default { Jose };
-export { Jose, JoseJWE, JoseJWS };
+export default { Jose, WebCryptographer };
+export { Jose, JoseJWE, JoseJWS, WebCryptographer };
 
 /**
  * Set crypto provider to use (window.crypto, node-webcrypto-ossl, node-webcrypto-pkcs11 etc.).

diff --git a/lib/jose-core.test.js b/lib/jose-core.test.js
@@ -1,6 +1,26 @@
+// eslint-disable-next-line import/no-duplicates
 import DefaultJose, { Jose } from './jose-core.js';
+// eslint-disable-next-line import/no-duplicates
+import * as AsJose from './jose-core.js';
 
 it('ensure imports work', () => {
   expect(Jose).not.toBeUndefined();
+  expect(Jose.JoseJWS).not.toBeUndefined();
+  expect(Jose.JoseJWE).not.toBeUndefined();
+  expect(Jose.WebCryptographer).not.toBeUndefined();
+
+  console.log(Jose);
   expect(DefaultJose).not.toBeUndefined();
+  expect(DefaultJose.WebCryptographer).not.toBeUndefined();
+  expect(DefaultJose.Jose).not.toBeUndefined();
+  expect(DefaultJose.Jose.JoseJWS).not.toBeUndefined();
+  expect(DefaultJose.Jose.JoseJWE).not.toBeUndefined();
+  expect(DefaultJose.Jose.WebCryptographer).not.toBeUndefined();
+
+  expect(AsJose).not.toBeUndefined();
+  expect(AsJose.WebCryptographer).not.toBeUndefined();
+  expect(AsJose.Jose).not.toBeUndefined();
+  expect(AsJose.Jose.JoseJWS).not.toBeUndefined();
+  expect(AsJose.Jose.JoseJWE).not.toBeUndefined();
+  expect(AsJose.Jose.WebCryptographer).not.toBeUndefined();
 });