diff --git a/package-lock.json b/package-lock.json index 0615cbcbe..79c159e01 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1101,6 +1101,196 @@ "@sinonjs/commons": "^1.7.0" } }, + "@solid/identity-token-verifier": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@solid/identity-token-verifier/-/identity-token-verifier-0.4.3.tgz", + "integrity": "sha512-LwE3QOImK4prBMR2Q79Jx70Aghk5K+rH+BrsSlgqYVv+zl0u2Ir47LtptBvxTq6CjpYeoZ7Hxgao5g8B/AMCQw==", + "requires": { + "cross-fetch": "^3.0.6", + "jose": "^3.5.0", + "lru-cache": "^6.0.0", + "n3": "^1.7.0", + "nmspc": "^0.2.4", + "rdf-data-factory": "^1.0.4", + "rdf-dereference": "^1.6.0", + "rdf-parse": "^1.6.1", + "rdf-store-stream": "^1.1.0", + "ts-guards": "^0.5.1" + }, + "dependencies": { + "@comunica/actor-abstract-mediatyped": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/actor-abstract-mediatyped/-/actor-abstract-mediatyped-1.18.1.tgz", + "integrity": "sha512-pjAf0agOpADEVBKp11XhFGH33FML4LTxO08JJmr6Qf6FlbMAhU3KFBrK34nYZ/5QNdhZwE2i8eFmjNC/2CbOKA==" + }, + "@comunica/actor-http-native": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/actor-http-native/-/actor-http-native-1.18.1.tgz", + "integrity": "sha512-nQ7dlB3GkP46h28XVyOi43Q4fuc1pUaYWFz6YQeTOgyJMnm/fgNvu9ECsFdG4rYVo3377VVxpvCylGx936S+wQ==", + "requires": { + "@types/parse-link-header": "^1.0.0", + "cross-fetch": "^3.0.5", + "follow-redirects": "^1.5.1", + "parse-link-header": "^1.0.1" + } + }, + "@comunica/actor-rdf-parse-html": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-html/-/actor-rdf-parse-html-1.18.1.tgz", + "integrity": "sha512-Wx5c/4bN7ohJjsp397JeX8YTDZXMp3VWEFilIjl4/CtAoGV4BzYlHPFo3ZCuRjRpn2EPyJF0Itxedio0b30u3A==", + "requires": { + "@comunica/bus-rdf-parse-html": "^1.18.1", + "@types/rdf-js": "*", + "htmlparser2": "^5.0.0" + } + }, + "@comunica/actor-rdf-parse-html-rdfa": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-html-rdfa/-/actor-rdf-parse-html-rdfa-1.18.1.tgz", + "integrity": "sha512-c1ae+6F+ohTIAscItsVI/+dKY5tKx7sJwKrrznwgXoPlkFxk7aI9W03Du8X1FsT+spNlk3+CIA/lUPrZ53Lhhw==", + "requires": { + "rdfa-streaming-parser": "^1.4.0" + } + }, + "@comunica/actor-rdf-parse-html-script": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-html-script/-/actor-rdf-parse-html-script-1.18.1.tgz", + "integrity": "sha512-KI3h3Qb+/IibzFJjLWYVFn43pM0oyRaDovm9VzyGass4wbxmMUVm69lgOLTEcsmOVmTPNcvNI4dYa03g/zjwjA==", + "requires": { + "@comunica/bus-rdf-parse-html": "^1.18.1", + "@types/rdf-js": "*", + "relative-to-absolute-iri": "^1.0.5" + } + }, + "@comunica/actor-rdf-parse-jsonld": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-jsonld/-/actor-rdf-parse-jsonld-1.18.1.tgz", + "integrity": "sha512-3X3REVIqRTgjzWUsfVgJQsyZ75J/SSl7mHfFchNncxRdm14hq67RApO0gztdSLj4t4Kv1HtciEm/zs+nEuKmNw==", + "requires": { + "@types/rdf-js": "*", + "jsonld-context-parser": "^2.1.1", + "jsonld-streaming-parser": "^2.1.1", + "stream-to-string": "^1.2.0" + } + }, + "@comunica/actor-rdf-parse-n3": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-n3/-/actor-rdf-parse-n3-1.18.1.tgz", + "integrity": "sha512-5GQ+PaabjXSgu3mR8tN2ZWyy+pSaq6rIyHDNKAbh3AkG70j6tQWxfa4OZIk2+ImDEjtPVofYsJZnY5VSZhZEwg==", + "requires": { + "@types/n3": "^1.4.4", + "n3": "^1.6.3" + } + }, + "@comunica/actor-rdf-parse-rdfxml": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-rdfxml/-/actor-rdf-parse-rdfxml-1.18.1.tgz", + "integrity": "sha512-qCn8UovKW6xNCoYgR13MBPi8mOOSorRxPLpSOt7eVFEADFMkjzVJAbyExN+8EzHgrJj2DIwQixD2kYnGaEkz+Q==", + "requires": { + "rdfxml-streaming-parser": "^1.4.0" + } + }, + "@comunica/actor-rdf-parse-xml-rdfa": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-xml-rdfa/-/actor-rdf-parse-xml-rdfa-1.18.1.tgz", + "integrity": "sha512-99g5zw57ZbxSKiv0daZiEWhu70Efs0dqKQsf4hIHl+1mZJ7gjYdXrA1gSb2h/bnvezZKyiqjkc9VxzD+J7dv0A==", + "requires": { + "rdfa-streaming-parser": "^1.3.0" + } + }, + "@comunica/bus-http": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/bus-http/-/bus-http-1.18.1.tgz", + "integrity": "sha512-ovEy1HEagq2cla3WSCLyrA6LGMsfNyc7sm9UBJUnaX4KnYlOoombibsCwqiJhGfvHHV019yFj1l7NDICF3ZD3Q==", + "requires": { + "is-stream": "^2.0.0", + "web-streams-node": "^0.4.0" + } + }, + "@comunica/bus-init": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/bus-init/-/bus-init-1.18.1.tgz", + "integrity": "sha512-eXIfQM4cl3dKwSd5GVt2lxcTxiSqxZZ/u8rjQeS/vncdRDfIAY7WS1qBHARUXEgeLRu5LX5W4Bq13TGwn+dkNQ==" + }, + "@comunica/bus-rdf-parse": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/bus-rdf-parse/-/bus-rdf-parse-1.18.1.tgz", + "integrity": "sha512-GNNCd1cEp+mjVeUG8eHI3u1x8+ic6MatHRET/ujMeouC0kI1jX31R57PoX9QWzopOx73tueI2i9E+5xLQDa29A==", + "requires": { + "@comunica/actor-abstract-mediatyped": "^1.18.1", + "@types/rdf-js": "*" + } + }, + "@comunica/bus-rdf-parse-html": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/bus-rdf-parse-html/-/bus-rdf-parse-html-1.18.1.tgz", + "integrity": "sha512-bV4N7ABCshWi0S4VliibGLtazYGiToVyeMqhFBMyl/v8IaPOW+2QbE4JfXcen8+ieHqonFt28W/x9gbh7VEZeA==", + "requires": { + "@types/rdf-js": "*" + } + }, + "@comunica/core": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/core/-/core-1.18.1.tgz", + "integrity": "sha512-wXLOu/Wkt0zUy6XwI4W7IaXkcLmEkxs0P/xWY3huMdG5ixvFxVlOz+EuKz5sNCpeGiqZsMON4I9YvgiUlnZv0Q==", + "requires": { + "immutable": "^3.8.2" + } + }, + "@comunica/mediator-combine-union": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/mediator-combine-union/-/mediator-combine-union-1.18.1.tgz", + "integrity": "sha512-w4S4WNwjh+8zjz154YaEL1p4VWYYD5yNhPTH/mIvk5IS2R6TLqTQ0qlk5JvOvDA5aL8IiOndG0rTPXxFS8dhxw==" + }, + "@comunica/mediator-number": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/mediator-number/-/mediator-number-1.18.1.tgz", + "integrity": "sha512-nJNrMi01l9eLEttWlcIvabLoOEr31Dw19VoOClYvPC315e60DYuX4b5PTZNIuTTjv5x39DVRQ2qjFVMdFjn3sQ==" + }, + "@comunica/mediator-race": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/@comunica/mediator-race/-/mediator-race-1.18.1.tgz", + "integrity": "sha512-UN9yT62mHTbIvCxyMyMx63wbYVB2Z7tq0pzHrVOUTlx09QMHkyIr8wVkaAiTzXfm/PKTX9awNNpmXrAz9Sw8kA==" + }, + "htmlparser2": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz", + "integrity": "sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^3.3.0", + "domutils": "^2.4.2", + "entities": "^2.0.0" + } + }, + "rdf-parse": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/rdf-parse/-/rdf-parse-1.6.1.tgz", + "integrity": "sha512-WBylJN11cuvo2GAvS/drqus+94tb9evl1QvUSbkNAVxYWUc5chnyV9ZpWPZW/F2pXJlPLqet9kE8U52eXKMo3Q==", + "requires": { + "@comunica/actor-http-native": "~1.18.0", + "@comunica/actor-rdf-parse-html": "~1.18.0", + "@comunica/actor-rdf-parse-html-microdata": "~1.18.0", + "@comunica/actor-rdf-parse-html-rdfa": "~1.18.0", + "@comunica/actor-rdf-parse-html-script": "~1.18.0", + "@comunica/actor-rdf-parse-jsonld": "~1.18.0", + "@comunica/actor-rdf-parse-n3": "~1.18.0", + "@comunica/actor-rdf-parse-rdfxml": "~1.18.0", + "@comunica/actor-rdf-parse-xml-rdfa": "~1.18.0", + "@comunica/bus-http": "~1.18.0", + "@comunica/bus-init": "~1.18.0", + "@comunica/bus-rdf-parse": "~1.18.0", + "@comunica/bus-rdf-parse-html": "~1.18.0", + "@comunica/core": "~1.18.0", + "@comunica/mediator-combine-union": "~1.18.0", + "@comunica/mediator-number": "~1.18.0", + "@comunica/mediator-race": "~1.18.0", + "@types/rdf-js": "*", + "stream-to-string": "^1.2.0" + } + } + } + }, "@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", @@ -9474,196 +9664,6 @@ "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz", "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==" }, - "ts-dpop": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/ts-dpop/-/ts-dpop-0.4.2.tgz", - "integrity": "sha512-zWfSfLfu4ml7KA5urhKgp2HZUktXFUowbnyrw/Dech8ffGh51D6duYU40yLV2LJ30MTYVSaw2YcQ2lU5+GbLzg==", - "requires": { - "cross-fetch": "^3.0.6", - "jose": "^3.5.0", - "lru-cache": "^6.0.0", - "n3": "^1.6.4", - "nmspc": "^0.2.4", - "rdf-data-factory": "^1.0.4", - "rdf-dereference": "^1.6.0", - "rdf-parse": "^1.6.1", - "rdf-store-stream": "^1.1.0", - "ts-guards": "^0.5.1" - }, - "dependencies": { - "@comunica/actor-abstract-mediatyped": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/actor-abstract-mediatyped/-/actor-abstract-mediatyped-1.18.1.tgz", - "integrity": "sha512-pjAf0agOpADEVBKp11XhFGH33FML4LTxO08JJmr6Qf6FlbMAhU3KFBrK34nYZ/5QNdhZwE2i8eFmjNC/2CbOKA==" - }, - "@comunica/actor-http-native": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/actor-http-native/-/actor-http-native-1.18.1.tgz", - "integrity": "sha512-nQ7dlB3GkP46h28XVyOi43Q4fuc1pUaYWFz6YQeTOgyJMnm/fgNvu9ECsFdG4rYVo3377VVxpvCylGx936S+wQ==", - "requires": { - "@types/parse-link-header": "^1.0.0", - "cross-fetch": "^3.0.5", - "follow-redirects": "^1.5.1", - "parse-link-header": "^1.0.1" - } - }, - "@comunica/actor-rdf-parse-html": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-html/-/actor-rdf-parse-html-1.18.1.tgz", - "integrity": "sha512-Wx5c/4bN7ohJjsp397JeX8YTDZXMp3VWEFilIjl4/CtAoGV4BzYlHPFo3ZCuRjRpn2EPyJF0Itxedio0b30u3A==", - "requires": { - "@comunica/bus-rdf-parse-html": "^1.18.1", - "@types/rdf-js": "*", - "htmlparser2": "^5.0.0" - } - }, - "@comunica/actor-rdf-parse-html-rdfa": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-html-rdfa/-/actor-rdf-parse-html-rdfa-1.18.1.tgz", - "integrity": "sha512-c1ae+6F+ohTIAscItsVI/+dKY5tKx7sJwKrrznwgXoPlkFxk7aI9W03Du8X1FsT+spNlk3+CIA/lUPrZ53Lhhw==", - "requires": { - "rdfa-streaming-parser": "^1.4.0" - } - }, - "@comunica/actor-rdf-parse-html-script": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-html-script/-/actor-rdf-parse-html-script-1.18.1.tgz", - "integrity": "sha512-KI3h3Qb+/IibzFJjLWYVFn43pM0oyRaDovm9VzyGass4wbxmMUVm69lgOLTEcsmOVmTPNcvNI4dYa03g/zjwjA==", - "requires": { - "@comunica/bus-rdf-parse-html": "^1.18.1", - "@types/rdf-js": "*", - "relative-to-absolute-iri": "^1.0.5" - } - }, - "@comunica/actor-rdf-parse-jsonld": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-jsonld/-/actor-rdf-parse-jsonld-1.18.1.tgz", - "integrity": "sha512-3X3REVIqRTgjzWUsfVgJQsyZ75J/SSl7mHfFchNncxRdm14hq67RApO0gztdSLj4t4Kv1HtciEm/zs+nEuKmNw==", - "requires": { - "@types/rdf-js": "*", - "jsonld-context-parser": "^2.1.1", - "jsonld-streaming-parser": "^2.1.1", - "stream-to-string": "^1.2.0" - } - }, - "@comunica/actor-rdf-parse-n3": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-n3/-/actor-rdf-parse-n3-1.18.1.tgz", - "integrity": "sha512-5GQ+PaabjXSgu3mR8tN2ZWyy+pSaq6rIyHDNKAbh3AkG70j6tQWxfa4OZIk2+ImDEjtPVofYsJZnY5VSZhZEwg==", - "requires": { - "@types/n3": "^1.4.4", - "n3": "^1.6.3" - } - }, - "@comunica/actor-rdf-parse-rdfxml": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-rdfxml/-/actor-rdf-parse-rdfxml-1.18.1.tgz", - "integrity": "sha512-qCn8UovKW6xNCoYgR13MBPi8mOOSorRxPLpSOt7eVFEADFMkjzVJAbyExN+8EzHgrJj2DIwQixD2kYnGaEkz+Q==", - "requires": { - "rdfxml-streaming-parser": "^1.4.0" - } - }, - "@comunica/actor-rdf-parse-xml-rdfa": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/actor-rdf-parse-xml-rdfa/-/actor-rdf-parse-xml-rdfa-1.18.1.tgz", - "integrity": "sha512-99g5zw57ZbxSKiv0daZiEWhu70Efs0dqKQsf4hIHl+1mZJ7gjYdXrA1gSb2h/bnvezZKyiqjkc9VxzD+J7dv0A==", - "requires": { - "rdfa-streaming-parser": "^1.3.0" - } - }, - "@comunica/bus-http": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/bus-http/-/bus-http-1.18.1.tgz", - "integrity": "sha512-ovEy1HEagq2cla3WSCLyrA6LGMsfNyc7sm9UBJUnaX4KnYlOoombibsCwqiJhGfvHHV019yFj1l7NDICF3ZD3Q==", - "requires": { - "is-stream": "^2.0.0", - "web-streams-node": "^0.4.0" - } - }, - "@comunica/bus-init": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/bus-init/-/bus-init-1.18.1.tgz", - "integrity": "sha512-eXIfQM4cl3dKwSd5GVt2lxcTxiSqxZZ/u8rjQeS/vncdRDfIAY7WS1qBHARUXEgeLRu5LX5W4Bq13TGwn+dkNQ==" - }, - "@comunica/bus-rdf-parse": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/bus-rdf-parse/-/bus-rdf-parse-1.18.1.tgz", - "integrity": "sha512-GNNCd1cEp+mjVeUG8eHI3u1x8+ic6MatHRET/ujMeouC0kI1jX31R57PoX9QWzopOx73tueI2i9E+5xLQDa29A==", - "requires": { - "@comunica/actor-abstract-mediatyped": "^1.18.1", - "@types/rdf-js": "*" - } - }, - "@comunica/bus-rdf-parse-html": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/bus-rdf-parse-html/-/bus-rdf-parse-html-1.18.1.tgz", - "integrity": "sha512-bV4N7ABCshWi0S4VliibGLtazYGiToVyeMqhFBMyl/v8IaPOW+2QbE4JfXcen8+ieHqonFt28W/x9gbh7VEZeA==", - "requires": { - "@types/rdf-js": "*" - } - }, - "@comunica/core": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/core/-/core-1.18.1.tgz", - "integrity": "sha512-wXLOu/Wkt0zUy6XwI4W7IaXkcLmEkxs0P/xWY3huMdG5ixvFxVlOz+EuKz5sNCpeGiqZsMON4I9YvgiUlnZv0Q==", - "requires": { - "immutable": "^3.8.2" - } - }, - "@comunica/mediator-combine-union": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/mediator-combine-union/-/mediator-combine-union-1.18.1.tgz", - "integrity": "sha512-w4S4WNwjh+8zjz154YaEL1p4VWYYD5yNhPTH/mIvk5IS2R6TLqTQ0qlk5JvOvDA5aL8IiOndG0rTPXxFS8dhxw==" - }, - "@comunica/mediator-number": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/mediator-number/-/mediator-number-1.18.1.tgz", - "integrity": "sha512-nJNrMi01l9eLEttWlcIvabLoOEr31Dw19VoOClYvPC315e60DYuX4b5PTZNIuTTjv5x39DVRQ2qjFVMdFjn3sQ==" - }, - "@comunica/mediator-race": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@comunica/mediator-race/-/mediator-race-1.18.1.tgz", - "integrity": "sha512-UN9yT62mHTbIvCxyMyMx63wbYVB2Z7tq0pzHrVOUTlx09QMHkyIr8wVkaAiTzXfm/PKTX9awNNpmXrAz9Sw8kA==" - }, - "htmlparser2": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz", - "integrity": "sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^3.3.0", - "domutils": "^2.4.2", - "entities": "^2.0.0" - } - }, - "rdf-parse": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/rdf-parse/-/rdf-parse-1.6.1.tgz", - "integrity": "sha512-WBylJN11cuvo2GAvS/drqus+94tb9evl1QvUSbkNAVxYWUc5chnyV9ZpWPZW/F2pXJlPLqet9kE8U52eXKMo3Q==", - "requires": { - "@comunica/actor-http-native": "~1.18.0", - "@comunica/actor-rdf-parse-html": "~1.18.0", - "@comunica/actor-rdf-parse-html-microdata": "~1.18.0", - "@comunica/actor-rdf-parse-html-rdfa": "~1.18.0", - "@comunica/actor-rdf-parse-html-script": "~1.18.0", - "@comunica/actor-rdf-parse-jsonld": "~1.18.0", - "@comunica/actor-rdf-parse-n3": "~1.18.0", - "@comunica/actor-rdf-parse-rdfxml": "~1.18.0", - "@comunica/actor-rdf-parse-xml-rdfa": "~1.18.0", - "@comunica/bus-http": "~1.18.0", - "@comunica/bus-init": "~1.18.0", - "@comunica/bus-rdf-parse": "~1.18.0", - "@comunica/bus-rdf-parse-html": "~1.18.0", - "@comunica/core": "~1.18.0", - "@comunica/mediator-combine-union": "~1.18.0", - "@comunica/mediator-number": "~1.18.0", - "@comunica/mediator-race": "~1.18.0", - "@types/rdf-js": "*", - "stream-to-string": "^1.2.0" - } - } - } - }, "ts-guards": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/ts-guards/-/ts-guards-0.5.1.tgz", diff --git a/package.json b/package.json index 1b9ccf2e2..bd88baadc 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,7 @@ ], "dependencies": { "@rdfjs/data-model": "^1.2.0", + "@solid/identity-token-verifier": "^0.4.3", "@types/arrayify-stream": "^1.0.0", "@types/async-lock": "^1.1.2", "@types/cors": "^2.8.6", @@ -101,7 +102,6 @@ "sparqlalgebrajs": "^2.3.1", "sparqljs": "^3.1.2", "streamify-array": "^1.0.1", - "ts-dpop": "^0.4.2", "uuid": "^8.3.0", "winston": "^3.3.3", "winston-transport": "^4.4.0", diff --git a/src/authentication/BearerWebIdExtractor.ts b/src/authentication/BearerWebIdExtractor.ts index 02253948c..09636ff18 100644 --- a/src/authentication/BearerWebIdExtractor.ts +++ b/src/authentication/BearerWebIdExtractor.ts @@ -1,5 +1,5 @@ -import type { SolidTokenVerifierFunction } from 'ts-dpop'; -import { createSolidTokenVerifier } from 'ts-dpop'; +import type { SolidTokenVerifierFunction } from '@solid/identity-token-verifier'; +import { createSolidTokenVerifier } from '@solid/identity-token-verifier'; import { getLoggerFor } from '../logging/LogUtil'; import type { HttpRequest } from '../server/HttpRequest'; import { BadRequestHttpError } from '../util/errors/BadRequestHttpError'; diff --git a/src/authentication/DPoPWebIdExtractor.ts b/src/authentication/DPoPWebIdExtractor.ts index d00fab1dd..ddf137c27 100644 --- a/src/authentication/DPoPWebIdExtractor.ts +++ b/src/authentication/DPoPWebIdExtractor.ts @@ -1,5 +1,5 @@ -import type { SolidTokenVerifierFunction, RequestMethod } from 'ts-dpop'; -import { createSolidTokenVerifier } from 'ts-dpop'; +import type { SolidTokenVerifierFunction, RequestMethod } from '@solid/identity-token-verifier'; +import { createSolidTokenVerifier } from '@solid/identity-token-verifier'; import type { TargetExtractor } from '../ldp/http/TargetExtractor'; import { getLoggerFor } from '../logging/LogUtil'; import type { HttpRequest } from '../server/HttpRequest'; diff --git a/test/__mocks__/ts-dpop.ts b/test/__mocks__/@solid/identity-token-verifier.ts similarity index 76% rename from test/__mocks__/ts-dpop.ts rename to test/__mocks__/@solid/identity-token-verifier.ts index 2f0c87d47..1390124b6 100644 --- a/test/__mocks__/ts-dpop.ts +++ b/test/__mocks__/@solid/identity-token-verifier.ts @@ -1,4 +1,4 @@ -import type { SolidTokenVerifierFunction } from 'ts-dpop'; +import type { SolidTokenVerifierFunction } from '@solid/identity-token-verifier'; const solidTokenVerifier = jest.fn().mockResolvedValue({ aud: 'solid', exp: 1234, iat: 1234, iss: 'example.com/idp', webid: 'http://alice.example/card#me' }); export const createSolidTokenVerifier = jest.fn((): SolidTokenVerifierFunction => solidTokenVerifier); diff --git a/test/unit/authentication/BearerWebIdExtractor.test.ts b/test/unit/authentication/BearerWebIdExtractor.test.ts index 3c5c02cb0..4392df0f8 100644 --- a/test/unit/authentication/BearerWebIdExtractor.test.ts +++ b/test/unit/authentication/BearerWebIdExtractor.test.ts @@ -1,4 +1,4 @@ -import { createSolidTokenVerifier } from 'ts-dpop'; +import { createSolidTokenVerifier } from '@solid/identity-token-verifier'; import { BearerWebIdExtractor } from '../../../src/authentication/BearerWebIdExtractor'; import type { HttpRequest } from '../../../src/server/HttpRequest'; import { BadRequestHttpError } from '../../../src/util/errors/BadRequestHttpError'; diff --git a/test/unit/authentication/DPoPWebIdExtractor.test.ts b/test/unit/authentication/DPoPWebIdExtractor.test.ts index 8a703b9eb..caae34a15 100644 --- a/test/unit/authentication/DPoPWebIdExtractor.test.ts +++ b/test/unit/authentication/DPoPWebIdExtractor.test.ts @@ -1,4 +1,4 @@ -import { createSolidTokenVerifier } from 'ts-dpop'; +import { createSolidTokenVerifier } from '@solid/identity-token-verifier'; import { DPoPWebIdExtractor } from '../../../src/authentication/DPoPWebIdExtractor'; import type { HttpRequest } from '../../../src/server/HttpRequest'; import { BadRequestHttpError } from '../../../src/util/errors/BadRequestHttpError';