cleaning

src/api/jose/detached.ts

@@ -1,5 +1,7 @@
 import * as jose from 'jose'
-import { detachedHeaderParams } from '../controller/utils'
+
+
+const detachedHeaderParams = { b64: false, crit: ['b64'] }
 
 // TODO Remote KMS.
 const signer = async (privateKeyJwk) => {

src/cli/cose/diagnostic/diagnose.ts

@@ -13,16 +13,15 @@ const diagnose = async (argv: RequestDiagnose) => {
   const { input, output } = argv
 
   const payload = fs.readFileSync(path.resolve(process.cwd(), input))
-  const items = await cose.rfc.diag(payload)
-  const markdown = await cose.rfc.blocks(items)
+  // TODO: use @transmute/edn
+  const edn = await cose.cbor.diagnose(payload)
   if (output) {
     fs.writeFileSync(
       path.resolve(process.cwd(), output),
-      markdown
+      edn
     )
   } else {
-
-    console.info(markdown)
+    console.info(edn)
   }
 
 }

src/cli/cose/module.ts

@@ -1,11 +1,22 @@
 
-import key from "./key"
+
 import diagnostic from "./diagnostic"
 
 export const command = 'cose <resource> <action>'
 
 export const describe = 'cose operations'
 
+const resources = {
+  diagnostic
+}
+
+export const handler = async function (argv) {
+  const { resource, action } = argv
+  if (resources[resource][action]) {
+    resources[resource][action](argv)
+  }
+}
+
 export const builder = (yargs) => {
   return yargs
     .positional('resource', {
@@ -44,14 +55,3 @@ export const builder = (yargs) => {
     })
 }
 
-const resources = {
-  key,
-  diagnostic
-}
-
-export const handler = async function (argv) {
-  const { resource, action } = argv
-  if (resources[resource][action]) {
-    resources[resource][action](argv)
-  }
-}

src/cli/graph/index.ts

@@ -1,7 +1,7 @@
 import fs from 'fs'
 import path from 'path'
 import jsongraph from '../../api/rdf/jsongraph'
-import * as contants from '../../constants'
+
 import cypher from '../../api/cypher'
 
 import operationSwitch from '../../action/operationSwitch'

src/cli/scitt/certificate/create.ts

@@ -121,7 +121,8 @@ const createLeafCertificate = async (argv: RequestCertificate) => {
   const userKeys = await crypto.subtle.generateKey(alg, extractable, ["sign", "verify"]);
 
   const issuerPrivateKeyCose = fs.readFileSync(path.resolve(process.cwd(), argv.issuerPrivateKey))
-  const issuerPrivateKey = cose.key.exportJWK(cose.cbor.decode(issuerPrivateKeyCose))
+  const coseKey = cose.cbor.decode(issuerPrivateKeyCose)
+  const issuerPrivateKeyJwk = await cose.key.convertCoseKeyToJsonWebKey<any>(coseKey)
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const extensions: any = []
   if (argv.subjectGuid) {
@@ -144,7 +145,7 @@ const createLeafCertificate = async (argv: RequestCertificate) => {
     publicKey: userKeys.publicKey, // leaf public key
     signingKey: await crypto.subtle.importKey(
       "jwk",
-      issuerPrivateKey,
+      issuerPrivateKeyJwk,
       alg,
       true,
       ["sign"],
@@ -189,7 +190,9 @@ const create = async (argv: RequestCertificate) => {
   if (!argv.issuerCertificate) {
     // root cert
     cert = await createRootCertificate(argv)
-    const subjectPrivateKey = cose.cbor.encode(cose.key.importJWK(JSON.parse(cert.subjectPrivateKey)))
+    const subjectPrivateKeyJwk = JSON.parse(cert.subjectPrivateKey)
+    const subjectPrivateKeyCose = await cose.key.convertJsonWebKeyToCoseKey<any>(subjectPrivateKeyJwk)
+    const subjectPrivateKey = cose.cbor.encode(subjectPrivateKeyCose)
     fs.writeFileSync(
       path.resolve(process.cwd(), argv.subjectPrivateKey),
       Buffer.from(subjectPrivateKey)
@@ -203,10 +206,10 @@ const create = async (argv: RequestCertificate) => {
     // leaf cert
     cert = await createLeafCertificate(argv)
 
-    const subjectPublicCoseKeyMap = cose.key.importJWK(JSON.parse(cert.subjectPublicKey))
+    const subjectPublicCoseKeyMap = await cose.key.convertCoseKeyToJsonWebKey<any>(JSON.parse(cert.subjectPublicKey))
     const subjectPublicKey = cose.cbor.encode(subjectPublicCoseKeyMap)
-    const subjectPrivateCoseKeyMap = cose.key.importJWK(JSON.parse(cert.subjectPrivateKey))
-    subjectPrivateCoseKeyMap.set(-66666, subjectPublicCoseKeyMap.get(-66666) as any)
+    const subjectPrivateCoseKeyMap = await cose.key.convertCoseKeyToJsonWebKey<any>(JSON.parse(cert.subjectPrivateKey))
+
     const subjectPrivateKey = cose.cbor.encode(subjectPrivateCoseKeyMap)
 
     fs.writeFileSync(