diff options
| -rw-r--r-- | packages/server/package.json | 7 | ||||
| -rw-r--r-- | packages/server/src/helpers/isCertRevoked.ts | 4 | ||||
| -rw-r--r-- | packages/server/src/services/metadataService.ts | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/packages/server/package.json b/packages/server/package.json index 1eeceb9..fcbbb19 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -53,16 +53,17 @@ "@peculiar/asn1-schema": "^2.1.7", "@peculiar/asn1-x509": "^2.1.7", "cbor-x": "^1.4.1", + "cross-fetch": "^3.1.5", "debug": "^4.3.2", "jsrsasign": "^10.4.0", - "jwk-to-pem": "^2.0.4", - "node-fetch-native": "^0.1.8" + "jwk-to-pem": "^2.0.4" }, "gitHead": "ba039fdd5fdff87f78d3bd246e9bea5f7aa39ccb", "devDependencies": { "@simplewebauthn/typescript-types": "*", "@types/debug": "^4.1.7", "@types/jsrsasign": "^8.0.13", - "@types/jwk-to-pem": "^2.0.1" + "@types/jwk-to-pem": "^2.0.1", + "@types/node": "^18.11.9" } } diff --git a/packages/server/src/helpers/isCertRevoked.ts b/packages/server/src/helpers/isCertRevoked.ts index a0b3935..5c5fa0f 100644 --- a/packages/server/src/helpers/isCertRevoked.ts +++ b/packages/server/src/helpers/isCertRevoked.ts @@ -1,5 +1,5 @@ import { X509 } from 'jsrsasign'; -import fetch from 'node-fetch-native'; +import fetch from 'cross-fetch'; import { AsnParser } from '@peculiar/asn1-schema'; import { CertificateList } from '@peculiar/asn1-x509'; @@ -63,7 +63,7 @@ export async function isCertRevoked(cert: X509): Promise<boolean> { try { const respCRL = await fetch(crlURL[0]); const dataCRL = await respCRL.arrayBuffer(); - const dataPEM = convertCertBufferToPEM(dataCRL); + const dataPEM = convertCertBufferToPEM(new Uint8Array(dataCRL)); crlCert.readCertPEM(dataPEM); } catch (err) { return false; diff --git a/packages/server/src/services/metadataService.ts b/packages/server/src/services/metadataService.ts index 6f943bf..c532f11 100644 --- a/packages/server/src/services/metadataService.ts +++ b/packages/server/src/services/metadataService.ts @@ -1,4 +1,4 @@ -import fetch from 'node-fetch-native'; +import fetch from 'cross-fetch'; import { KJUR } from 'jsrsasign'; import { validateCertificatePath } from '../helpers/validateCertificatePath'; |