Merge pull request #5 from solid/remove-json-document

Remove dependency on json-document.

Author: dmitrizagidulin

LICENSE.md

@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 - present [Anvil Research, Inc.](http://anvil.io)
+Copyright (c) 2016 [Anvil Research, Inc.](http://anvil.io)
+Copyright (c) 2017-2019 The Solid Project
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -5,7 +5,6 @@
 - [x] Based on Webcrypto API
 - [ ] CryptoKey as expected key argument
 - [x] Isomorphic (Node.js and Browser)
-- [ ] JWT Header and Payload Validation with JSON Schema
 - [ ] Extensible JWT/JWS/JWE classes
 
 ## Dependencies
@@ -86,4 +85,7 @@ $ npm run karma
 
 ## MIT License
 
+[The MIT License](LICENSE.md)
+
 Copyright (c) 2016 Anvil Research, Inc.
+Copyright (c) 2017-2019 The Solid Project

examples/HS256.js

@@ -1,4 +1,4 @@
-const crypto = require('@trust/webcrypto')
+const crypto = require('isomorphic-webcrypto')
 const JWA = require('../src/jose/JWA')
 
 let key

examples/JWS.js

@@ -1,5 +1,5 @@
 require('../src/formats')
-const crypto = require('@trust/webcrypto')
+const crypto = require('isomorphic-webcrypto')
 const JWT = require('../src/jose/JWT')
 
 let key, jwt

examples/RS256.js

@@ -1,4 +1,4 @@
-const crypto = require('@trust/webcrypto')
+const crypto = require('isomorphic-webcrypto')
 const JWA = require('../src/jose/JWA')
 
 let privateKey, publicKey

package-lock.json

@@ -2,21 +2,18 @@
   "name": "@solid/jose",
   "version": "0.1.8",
   "description": "JSON Object Signing and Encryption",
-  "main": "lib/index.js",
+  "main": "src/index.js",
   "directories": {
     "test": "test"
   },
   "files": [
-    "lib",
+    "src",
     "dist"
   ],
   "scripts": {
-    "build-lib": "babel src -d lib",
-    "build": "npm run clean-lib && npm run build-lib",
-    "clean-lib": "rm -rf lib/*",
     "build-dist": "webpack --progress",
-    "dist": "npm run build && npm run build-dist",
-    "prepare": "npm run build && npm run build-dist",
+    "dist": "npm run build-dist",
+    "prepare": "npm run build-dist",
     "test": "mocha test",
     "jsdoc": "jsdoc -c jsdoc.json -r"
   },
@@ -47,18 +44,17 @@
   },
   "homepage": "https://github.com/solid/jose#README",
   "dependencies": {
+    "@sinonjs/text-encoding": "^0.7.1",
     "base64url": "^3.0.0",
-    "@trust/json-document": "^0.1.4",
-    "text-encoding": "^0.6.4",
-    "@trust/webcrypto": "^0.9.2"
+    "isomorphic-webcrypto": "^2.3.2"
   },
   "devDependencies": {
     "babel-cli": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "dirty-chai": "^2.0.1",
-    "mocha": "^5.2.0",
+    "mocha": "^6.2.2",
     "webpack": "^4.8.3",
     "webpack-cli": "^3.0.2"
   }

package.json

@@ -5,7 +5,7 @@
  * @ignore
  */
 const base64url = require('base64url')
-const crypto = require('@trust/webcrypto')
+const crypto = require('isomorphic-webcrypto')
 const TextEncoder = require('../text-encoder')
 
 /**

src/algorithms/HMAC.js

@@ -5,7 +5,7 @@
  * @ignore
  */
 const base64url = require('base64url')
-const crypto = require('@trust/webcrypto')
+const crypto = require('isomorphic-webcrypto')
 const TextEncoder = require('../text-encoder')
 
 /**
@@ -85,7 +85,7 @@ class RSASSA_PKCS1_v1_5 {
    * @param {JWK} key
    * @returns {Promise}
    */
-  importKey (key) {
+  async importKey (key) {
     let jwk = Object.assign({}, key)
     let algorithm = this.params
     let usages = key['key_ops'] || []