Changes calls.

This commit is contained in:
Pierre Lannoy 2024-10-30 09:44:39 +01:00
commit 010728cb59
Signed by: Pierre Lannoy
GPG key ID: D27231EF87D53F31
2 changed files with 9 additions and 9 deletions

View file

@ -1,6 +1,6 @@
{ {
"name": "domain-forward", "name": "domain-forward",
"version": "1.0.0", "version": "1.1.0",
"description": "Service to forward domain via Hosterra DoH", "description": "Service to forward domain via Hosterra DoH",
"main": "app.js", "main": "app.js",
"type": "module", "type": "module",

View file

@ -1,11 +1,11 @@
import fs from "fs"; import fs from "fs";
import path from "path"; import path from "path";
import {promisify} from "util"; import {promisify} from "util";
import fromKeyLike from "jose/jwk/from_key_like"; import {exportJWK} from "jose";
import generateKeyPair from "jose/util/generate_key_pair"; import {generateKeyPair} from "jose";
import calculateThumbprint from "jose/jwk/thumbprint"; import {calculateJwkThumbprint} from "jose";
import SignJWT from "jose/jwt/sign"; import {SignJWT} from "jose";
import CompactSign from "jose/jws/compact/sign"; import {CompactSign} from "jose";
import pem from "pem"; import pem from "pem";
import * as common from "./common.js"; import * as common from "./common.js";
import request from "./request.js"; import request from "./request.js";
@ -232,12 +232,12 @@ class Client {
return Promise.reject(new Error('Account key pair not generated')); return Promise.reject(new Error('Account key pair not generated'));
} }
const [publicJwk, accountPrivateJwk] = await Promise.all([ const [publicJwk, accountPrivateJwk] = await Promise.all([
fromKeyLike(this.accountPublicKey), exportJWK(this.accountPublicKey),
fromKeyLike(this.accountPrivateKey) exportJWK(this.accountPrivateKey)
]); ]);
this.accountPublicJwk = publicJwk; this.accountPublicJwk = publicJwk;
this.accountPrivateJwk = accountPrivateJwk; this.accountPrivateJwk = accountPrivateJwk;
this.thumbprint = await calculateThumbprint(publicJwk); this.thumbprint = await calculateJwkThumbprint(publicJwk);
} }
async newAccount(...emails) { async newAccount(...emails) {