@1auth/account 0.0.0-alpha.3 → 0.0.0-alpha.30

package/index.js

@@ -1,20 +1,26 @@
 import {
-  subject,
+  randomId,
+  subject as randomSubject,
   makeSymetricKey,
   makeAsymmetricKeys,
-  encrypt,
-  decrypt
+  encryptFields,
+  decryptFields
 } from '@1auth/crypto'
 
 const options = {
   store: undefined,
   notify: undefined,
   table: 'accounts',
+  idGenerate: true,
+  idPrefix: 'account',
+  subPrefix: 'sub',
+  randomId: undefined,
+  randomSubject: undefined,
   encryptedKeys: []
 }
 
 export default (params) => {
-  Object.assign(options, { id: subject }, params)
+  Object.assign(options, { randomId, randomSubject }, params)
 }
 export const getOptions = () => options
 
@@ -24,40 +30,37 @@ export const exists = async (sub) => {
 
 export const lookup = async (sub) => {
   const item = options.store.select(options.table, { sub })
-  for (const key of options.encryptedKeys) {
-    item[key] = await decrypt(item[key], item.encryptionKey, sub)
-  }
+  decryptFields(item, item.encryptionKey, sub, options.encryptedKeys)
   delete item.encryptionKey
   delete item.privateKey
   return item
 }
 
 export const create = async (values = {}) => {
-  const sub = await options.id.create()
+  const sub = await options.randomSubject.create(options.subPrefix)
 
-  // const notifications = {}
-  // const authorization = {}
-  const now = nowInSeconds()
   const { encryptionKey, encryptedKey } = makeSymetricKey(sub)
   const { publicKey, privateKey } = await makeAsymmetricKeys(encryptionKey)
 
-  for (const key of options.encryptedKeys) {
-    values[key] &&= await encrypt(values[key], encryptionKey, sub)
-  }
+  // TODO optimize: don't decrypt encryptionKey
+  encryptFields(values, encryptedKey, sub, options.encryptedKeys)
 
-  await options.store.insert(options.table, {
+  const now = nowInSeconds()
+  const params = {
+    create: now, // allow use for migration import
     ...values,
     sub,
     encryptionKey: encryptedKey,
     publicKey,
     privateKey,
-    create: now,
     update: now
-    // notifications,
-    // authorization
-  })
+  }
+  if (options.idGenerate) {
+    params.id = await options.randomId.create(options.idPrefix)
+  }
+  await options.store.insert(options.table, params)
 
-  // TODO update session, attach sub
+  // TODO update guest session, attach sub
   return sub
 }
 
@@ -67,9 +70,8 @@ export const update = async (sub, values = {}) => {
     sub
   })
 
-  for (const key of options.encryptedKeys) {
-    values[key] &&= await encrypt(values[key], encryptionKey, sub)
-  }
+  encryptFields(values, encryptionKey, sub, options.encryptedKeys)
+
   await options.store.update(
     options.table,
     { sub },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1auth/account",
-  "version": "0.0.0-alpha.3",
+  "version": "0.0.0-alpha.30",
   "description": "",
   "type": "module",
   "engines": {
@@ -48,8 +48,8 @@
     "url": "https://github.com/willfarrell/1auth/issues"
   },
   "homepage": "https://github.com/willfarrell/1auth",
-  "gitHead": "a02b1e01f039718f213d79b91d04ed660a955c73",
+  "gitHead": "bba2971096bfd6bcc30e7613fae272896456ecfa",
   "dependencies": {
-    "@1auth/crypto": "0.0.0-alpha.3"
+    "@1auth/crypto": "0.0.0-alpha.30"
   }
 }