vestauth 0.3.3 → 0.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vestauth",
-  "version": "0.3.3",
+  "version": "0.4.2",
   "description": "auth for agents–from the creator of dotenvx",
   "keywords": [
     "vestauth"

package/src/lib/api/postAgentRegister.js

@@ -0,0 +1,34 @@
+const { http } = require('../helpers/http')
+const buildApiError = require('../helpers/buildApiError')
+
+class PostAgentRegister {
+  constructor (hostname, publicJwk) {
+    this.hostname = hostname || 'https://api.vestauth.com'
+    this.publicJwk = publicJwk
+  }
+
+  async run () {
+    const url = `${this.hostname}/api/agent/register`
+    const publicJwk = this.publicJwk
+
+    const resp = await http(url, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        public_jwk: publicJwk
+      })
+    })
+
+    if (resp.statusCode >= 400) {
+      const json = await resp.body.json()
+      throw buildApiError(resp.statusCode, json)
+    }
+
+    const json = await resp.body.json()
+    return json
+  }
+}
+
+module.exports = PostAgentRegister

package/src/lib/helpers/agentHeaders.js

@@ -1,13 +1,8 @@
 const headers = require('./headers')
-const dotenvx = require('@dotenvx/dotenvx')
+const identity = require('./identity')
 
 async function agentHeaders (httpMethod, uri, tag = 'vestauth', nonce = null) {
-  let publicKey = null
-  let privateKey = null
-  try { publicKey = dotenvx.get('AGENT_PUBLIC_KEY', { strict: true }) } catch (_e) {}
-  try { privateKey = dotenvx.get('AGENT_PRIVATE_KEY', { strict: true }) } catch (_e) {}
-
-  if (!publicKey && !privateKey) throw new Error('missing AGENT_PUBLIC_KEY and AGENT_PRIVATE_KEY. Run [vestauth agent init]')
+  const { privateKey } = identity()
 
   return await headers(httpMethod, uri, privateKey, tag, nonce)
 }

package/src/lib/helpers/agentInit.js

@@ -1,14 +1,14 @@
 const dotenvx = require('@dotenvx/dotenvx')
+const identity = require('./identity')
 const keypair = require('./keypair')
 const touch = require('./touch')
+const PostAgentRegister = require('../api/postAgentRegister')
 
-function agentInit () {
+async function agentInit () {
   const envPath = '.env'
 
   // keypair
-  let currentPrivateKey = null
-  try { currentPrivateKey = dotenvx.get('AGENT_PRIVATE_KEY', { strict: true }) } catch (e) {}
-
+  const currentPrivateKey = identity(false).privateKey
   const kp = keypair(currentPrivateKey, 'agent')
 
   touch(envPath)
@@ -17,6 +17,10 @@ function agentInit () {
   dotenvx.set('AGENT_PUBLIC_KEY', JSON.stringify(kp.publicKey), { path: envPath, plain: true, quiet: true })
   dotenvx.set('AGENT_PRIVATE_KEY', JSON.stringify(kp.privateKey), { path: envPath, plain: true, quiet: true })
 
+  // register agent with api
+  const postAgentRegister = new PostAgentRegister(null, kp.publicKey)
+  await postAgentRegister.run()
+
   return {
     AGENT_PUBLIC_KEY: kp.publicKey,
     AGENT_PRIVATE_KEY: kp.privateKey,

package/src/lib/helpers/env.js

@@ -0,0 +1,11 @@
+const dotenvx = require('@dotenvx/dotenvx')
+
+function env (key) {
+  try {
+    return dotenvx.get(key, { strict: true })
+  } catch {
+    return null
+  }
+}
+
+module.exports = env

package/src/lib/helpers/identity.js

@@ -0,0 +1,15 @@
+const env = require('./env')
+
+function identity (raiseError = true) {
+  const publicKey = env('AGENT_PUBLIC_KEY')
+  const privateKey = env('AGENT_PRIVATE_KEY')
+
+  if (raiseError && !(publicKey || !privateKey)) throw new Error('missing AGENT_PUBLIC_KEY and AGENT_PRIVATE_KEY. Run [vestauth agent init]')
+
+  return {
+    publicKey,
+    privateKey
+  }
+}
+
+module.exports = identity

package/src/lib/helpers/providerVerify.js

@@ -4,13 +4,13 @@ const parseSignatureInputHeader = require('./parseSignatureInputHeader')
 const stripDictionaryKey = require('./stripDictionaryKey')
 const authorityMessage = require('./authorityMessage')
 const edPublicKeyObject = require('./edPublicKeyObject')
-const epoch = require('./epoch')
 
 function providerVerify (httpMetod, uri, signatureHeader, signatureInputHeader, publicKey) {
   const { values } = parseSignatureInputHeader(signatureInputHeader)
+  const { expires } = values
 
   // return early false, since expired
-  if (values.expires && values.expires < epoch(new Date())) {
+  if (expires && expires < (Math.floor(Date.now() / 1000))) {
     return {
       success: false
     }

package/src/lib/helpers/touch.js

@@ -1,7 +1,9 @@
 const fs = require('fs')
 
 function touch (filepath) {
-  fs.closeSync(fs.openSync(filepath, 'a'))
+  if (!fs.existsSync(filepath)) {
+    fs.writeFileSync(filepath, '# vestauth. auth for agents–from the creator of `dotenvx`\n')
+  }
 }
 
 module.exports = touch

package/src/lib/helpers/agentAuth.js

@@ -1,50 +0,0 @@
-const { http } = require('./http')
-const sign = require('./sign')
-const dotenvx = require('@dotenvx/dotenvx')
-
-async function agentAuth (website) {
-  let publicKey = null
-  let privateKey = null
-  try { publicKey = dotenvx.get('AGENT_PUBLIC_KEY', { strict: true }) } catch (_e) {}
-  try { privateKey = dotenvx.get('AGENT_PRIVATE_KEY', { strict: true }) } catch (_e) {}
-
-  if (!publicKey && !privateKey) throw new Error('missing AGENT_PUBLIC_KEY and AGENT_PRIVATE_KEY. Run [vestauth agent init]')
-
-  let signature
-  const url = `${website}/agent/auth`
-
-  if (!signature) {
-    const resp = await http(url, {
-      method: 'POST',
-      headers: {
-        Authorization: `Agent ${publicKey}:${signature}`,
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({})
-    })
-
-    const json = await resp.body.json()
-    const challenge = json.challenge // grab challenge
-    signature = await sign(challenge, privateKey)
-  }
-
-  const resp = await http(url, {
-    method: 'POST',
-    headers: {
-      Authorization: `Agent ${publicKey}:${signature}`,
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify({})
-  })
-
-  if (resp.statusCode >= 400) {
-    const json = await resp.body.json()
-    return json
-  }
-
-  const json = await resp.body.json()
-  // ok and if a success what should i do here? should i store the challenge to the .env file?
-  return json
-}
-
-module.exports = agentAuth