From 8e0841826ae06be63df77515753e49df2e31b634 Mon Sep 17 00:00:00 2001 From: Christoph Fabianek Date: Wed, 21 Feb 2024 22:50:21 +0100 Subject: [PATCH] remove did-jwt dependency --- oydid-js/dist/oydid.js | 5 +- oydid-js/dist/test.js | 3 +- oydid-js/package-lock.json | 109 +++++++++---------------------------- oydid-js/package.json | 4 +- oydid-js/src/oydid.ts | 5 +- oydid-js/src/test.ts | 3 +- 6 files changed, 37 insertions(+), 92 deletions(-) diff --git a/oydid-js/dist/oydid.js b/oydid-js/dist/oydid.js index 67a8b74..31062a5 100644 --- a/oydid-js/dist/oydid.js +++ b/oydid-js/dist/oydid.js @@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", { value: true }); exports.hexToMulti = exports.didAuth = exports.verify = exports.sign = exports.decrypt = exports.encrypt = exports.deactivate = exports.update = exports.read = exports.create = exports.DEFAULT_ENCODING = exports.DEFAULT_DIGEST = void 0; -const did_jwt_1 = __importDefault(require("did-jwt")); +// import didJWT from 'did-jwt'; const axios_1 = __importDefault(require("axios")); const base58_1 = require("multiformats/bases/base58"); exports.DEFAULT_DIGEST = "sha2-256"; @@ -167,7 +167,8 @@ exports.didAuth = didAuth; * @returns base58btc Multiformat encoded object */ const hexToMulti = (hexKey, options) => __awaiter(void 0, void 0, void 0, function* () { - const keyBytes = did_jwt_1.default.hexToBytes(hexKey); + const keyBytes = Buffer.from(hexKey, "hex"); + // const keyBytes = didJWT.hexToBytes(hexKey); const multiformatKey = base58_1.base58btc.encode(keyBytes); return multiformatKey; }); diff --git a/oydid-js/dist/test.js b/oydid-js/dist/test.js index e41795b..1309df4 100644 --- a/oydid-js/dist/test.js +++ b/oydid-js/dist/test.js @@ -18,8 +18,9 @@ const cipher_message = { value: "82ba7d8ec5800786d9ae1414cd70ba864f438051085be7834cbde39d093684f9f90a0d9a1ccd9b7337baa2e00a94ccbaf29b70acd391471b0a9cd27731cbd214ea98e1c5d11670e37a6b6b0eb1", nonce: "9266f52178bfa1df25fa16b6fb984e67e02c0a223ee34b33" }; -const private_key_hex = "001320d119a71ed168aab7f4bd0a686e7bf2c32ac243c1463642ebaa7d40a93ecb4aa3"; +const private_key_hex = "001320d019a71ed168aab7f4bd0a686e7bf2c32ac243c1463642ebaa7d40a93ecb4aa3"; const private_key = (0, oydid_1.hexToMulti)(private_key_hex).then(key => { + // console.log(key); (0, oydid_1.decrypt)(cipher_message, key).then(response => { console.log(response.toString()); }); diff --git a/oydid-js/package-lock.json b/oydid-js/package-lock.json index 9e7bad7..8625214 100644 --- a/oydid-js/package-lock.json +++ b/oydid-js/package-lock.json @@ -1,23 +1,20 @@ { "name": "oydid", - "version": "0.0.8", + "version": "0.0.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "oydid", - "version": "0.0.8", + "version": "0.0.9", "license": "MIT", "dependencies": { "axios": "^1.5.0", "did-jwt": "^8.0.0", - "libsodium-wrappers-sumo": "^0.7.13", "multiformats": "^9.9.0" }, "devDependencies": { - "@types/libsodium-wrappers": "^0.7.11", - "@types/libsodium-wrappers-sumo": "^0.7.6", - "libsodium-wrappers": "^0.7.13", + "@types/node": "^20.11.19", "multibase": "^4.0.6", "typescript": "^5.2.2" } @@ -65,19 +62,13 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/@types/libsodium-wrappers": { - "version": "0.7.11", - "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz", - "integrity": "sha512-8avZYJny690B6lFZQEDz4PEdCgC8D8qmGE/mhJBzCwzZvsqne61tCRbtJOhxsjYMItEZd3k4SoR4xKKLnI9Ztg==", - "dev": true - }, - "node_modules/@types/libsodium-wrappers-sumo": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.6.tgz", - "integrity": "sha512-86R2bYU/DKVWw3q2btxTUlFO3lYKLyodbCsxxSybNQonPzPxmQkNtKCYmkV0dWQ9ZQsGIOzNNPU9RjJUALjoEg==", + "node_modules/@types/node": { + "version": "20.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz", + "integrity": "sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==", "dev": true, "dependencies": { - "@types/libsodium-wrappers": "*" + "undici-types": "~5.26.4" } }, "node_modules/asynckit": { @@ -172,34 +163,6 @@ "node": ">= 6" } }, - "node_modules/libsodium": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.13.tgz", - "integrity": "sha512-mK8ju0fnrKXXfleL53vtp9xiPq5hKM0zbDQtcxQIsSmxNgSxqCj6R7Hl9PkrNe2j29T4yoDaF7DJLK9/i5iWUw==", - "dev": true - }, - "node_modules/libsodium-sumo": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium-sumo/-/libsodium-sumo-0.7.13.tgz", - "integrity": "sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ==" - }, - "node_modules/libsodium-wrappers": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz", - "integrity": "sha512-kasvDsEi/r1fMzKouIDv7B8I6vNmknXwGiYodErGuESoFTohGSKZplFtVxZqHaoQ217AynyIFgnOVRitpHs0Qw==", - "dev": true, - "dependencies": { - "libsodium": "^0.7.13" - } - }, - "node_modules/libsodium-wrappers-sumo": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.13.tgz", - "integrity": "sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ==", - "dependencies": { - "libsodium-sumo": "^0.7.13" - } - }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -262,6 +225,12 @@ "dependencies": { "multiformats": "^9.4.2" } + }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true } }, "dependencies": { @@ -293,19 +262,13 @@ "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.5.tgz", "integrity": "sha512-Brj9FiG2W1MRQSTB212YVPRrcbjkv48FoZi/u4l/zds/ieRrqsh7aUf6CLwkAq61oKXr/ZlTzlY66gLIj3TFTQ==" }, - "@types/libsodium-wrappers": { - "version": "0.7.11", - "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers/-/libsodium-wrappers-0.7.11.tgz", - "integrity": "sha512-8avZYJny690B6lFZQEDz4PEdCgC8D8qmGE/mhJBzCwzZvsqne61tCRbtJOhxsjYMItEZd3k4SoR4xKKLnI9Ztg==", - "dev": true - }, - "@types/libsodium-wrappers-sumo": { - "version": "0.7.6", - "resolved": "https://registry.npmjs.org/@types/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.6.tgz", - "integrity": "sha512-86R2bYU/DKVWw3q2btxTUlFO3lYKLyodbCsxxSybNQonPzPxmQkNtKCYmkV0dWQ9ZQsGIOzNNPU9RjJUALjoEg==", + "@types/node": { + "version": "20.11.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz", + "integrity": "sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ==", "dev": true, "requires": { - "@types/libsodium-wrappers": "*" + "undici-types": "~5.26.4" } }, "asynckit": { @@ -377,34 +340,6 @@ "mime-types": "^2.1.12" } }, - "libsodium": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.13.tgz", - "integrity": "sha512-mK8ju0fnrKXXfleL53vtp9xiPq5hKM0zbDQtcxQIsSmxNgSxqCj6R7Hl9PkrNe2j29T4yoDaF7DJLK9/i5iWUw==", - "dev": true - }, - "libsodium-sumo": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium-sumo/-/libsodium-sumo-0.7.13.tgz", - "integrity": "sha512-zTGdLu4b9zSNLfovImpBCbdAA4xkpkZbMnSQjP8HShyOutnGjRHmSOKlsylh1okao6QhLiz7nG98EGn+04cZjQ==" - }, - "libsodium-wrappers": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.13.tgz", - "integrity": "sha512-kasvDsEi/r1fMzKouIDv7B8I6vNmknXwGiYodErGuESoFTohGSKZplFtVxZqHaoQ217AynyIFgnOVRitpHs0Qw==", - "dev": true, - "requires": { - "libsodium": "^0.7.13" - } - }, - "libsodium-wrappers-sumo": { - "version": "0.7.13", - "resolved": "https://registry.npmjs.org/libsodium-wrappers-sumo/-/libsodium-wrappers-sumo-0.7.13.tgz", - "integrity": "sha512-lz4YdplzDRh6AhnLGF2Dj2IUj94xRN6Bh8T0HLNwzYGwPehQJX6c7iYVrFUPZ3QqxE0bqC+K0IIqqZJYWumwSQ==", - "requires": { - "libsodium-sumo": "^0.7.13" - } - }, "mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", @@ -449,6 +384,12 @@ "requires": { "multiformats": "^9.4.2" } + }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true } } } diff --git a/oydid-js/package.json b/oydid-js/package.json index 7959fd0..a4df9ba 100644 --- a/oydid-js/package.json +++ b/oydid-js/package.json @@ -1,6 +1,6 @@ { "name": "oydid", - "version": "0.0.8", + "version": "0.0.9", "description": "", "main": "dist/index.js", "scripts": { @@ -13,12 +13,12 @@ "author": "", "license": "MIT", "devDependencies": { + "@types/node": "^20.11.19", "multibase": "^4.0.6", "typescript": "^5.2.2" }, "dependencies": { "axios": "^1.5.0", - "did-jwt": "^8.0.0", "multiformats": "^9.9.0" } } diff --git a/oydid-js/src/oydid.ts b/oydid-js/src/oydid.ts index 9cc658a..2165120 100644 --- a/oydid-js/src/oydid.ts +++ b/oydid-js/src/oydid.ts @@ -1,4 +1,4 @@ -import didJWT from 'did-jwt'; +// import didJWT from 'did-jwt'; import axios from 'axios'; import { base58btc } from 'multiformats/bases/base58'; @@ -272,7 +272,8 @@ export const didAuth = async(did: string, key: string, regapi_url: string) : Pro * @returns base58btc Multiformat encoded object */ export const hexToMulti = async(hexKey: string, options?: Partial) : Promise => { - const keyBytes = didJWT.hexToBytes(hexKey); + const keyBytes = Buffer.from(hexKey, "hex"); + // const keyBytes = didJWT.hexToBytes(hexKey); const multiformatKey = base58btc.encode(keyBytes); return multiformatKey; } diff --git a/oydid-js/src/test.ts b/oydid-js/src/test.ts index 292f881..5c94a6d 100644 --- a/oydid-js/src/test.ts +++ b/oydid-js/src/test.ts @@ -20,9 +20,10 @@ const cipher_message = { value: "82ba7d8ec5800786d9ae1414cd70ba864f438051085be7834cbde39d093684f9f90a0d9a1ccd9b7337baa2e00a94ccbaf29b70acd391471b0a9cd27731cbd214ea98e1c5d11670e37a6b6b0eb1", nonce: "9266f52178bfa1df25fa16b6fb984e67e02c0a223ee34b33" } as CipherMessage; -const private_key_hex = "001320d119a71ed168aab7f4bd0a686e7bf2c32ac243c1463642ebaa7d40a93ecb4aa3"; +const private_key_hex = "001320d019a71ed168aab7f4bd0a686e7bf2c32ac243c1463642ebaa7d40a93ecb4aa3"; const private_key = hexToMulti(private_key_hex).then(key => { + // console.log(key); decrypt(cipher_message, key).then(response => { console.log(response.toString()); })