@1auth/authn-recovery-codes 0.0.0-alpha.7 → 0.0.0-alpha.70

package/index.js

@@ -1,64 +1,132 @@
-import { recoveryCode } from '@1auth/crypto'
 import {
-  options as authnOptions,
-  create as authnCreate,
-  authenticate as authnVerifyAuthentication
-} from '@1auth/authn'
-
-const options = {
-  id: 'recovery',
-  count: 5
-}
-export default (params) => {
-  Object.assign(options, authnOptions, { secret: recoveryCode }, params)
-}
+  makeRandomConfigObject,
+  createSecretHash,
+  verifySecretHash,
+} from "@1auth/crypto";
+import {
+  getOptions as authnGetOptions,
+  count as authnCount,
+  //select as authnSelect,
+  list as authnList,
+  // create as authnCreate,
+  createList as authnCreateList,
+  authenticate as authnAuthenticate,
+  remove as authnRemove,
+} from "@1auth/authn";
+
+// aka lookup secret
+const id = "recoveryCodes";
+
+export const secret = ({
+  type = "secret",
+  entropy = 112,
+  otp = true,
+  encode = (value) => createSecretHash(value),
+  decode = (value) => value,
+  verify = (value, hash) => verifySecretHash(hash, value),
+  ...params
+} = {}) =>
+  makeRandomConfigObject({
+    id,
+    type,
+    entropy,
+    otp,
+    encode,
+    decode,
+    verify,
+    ...params,
+  });
+
+const defaults = {
+  id,
+  secret: secret(),
+  count: 5,
+};
+const options = {};
+export default (opt = {}) => {
+  Object.assign(options, authnGetOptions(), defaults, opt);
+};
+
+export const count = async (sub) => {
+  if (options.log) {
+    options.log("@1auth/authn-recovery-codes count(", sub, ")");
+  }
+  return await authnCount(options.secret, sub);
+};
+
+// export const select = async (sub, id) => {
+//   if (options.log) {
+//     options.log("@1auth/authn-recovery-codes select(", sub, id, ")");
+//   }
+//   return await authnSelect(options.secret, sub, id);
+// };
+
+export const list = async (sub) => {
+  if (options.log) {
+    options.log("@1auth/authn-recovery-codes list(", sub, ")");
+  }
+  return await authnList(options.secret, sub);
+};
 
 export const authenticate = async (username, secret) => {
-  const { sub } = await authnVerifyAuthentication(username, secret, options)
-  return sub
-}
+  return await authnAuthenticate(options.secret, username, secret);
+};
 
 export const create = async (sub) => {
-  const secrets = await createSecrets(sub)
-  return secrets
-}
+  if (options.log) {
+    options.log("@1auth/authn-recovery-codes create(", sub, ")");
+  }
+  const secrets = await createSecrets(sub, options.count);
+  await options.notify.trigger("authn-recovery-codes-create", sub);
+  return secrets;
+};
 
 export const update = async (sub) => {
-  const secrets = await createSecrets(sub)
-  await options.notify.trigger('authn-recovery-codes-update', sub)
-  return secrets
-}
-
-/* export const verifySecret = async (sub, ids) => {
-  if (!Array.isArray(ids)) ids = [ids]
-  for (const id of ids) {
-    await authnVerifySecret(sub, id, options)
+  if (options.log) {
+    options.log("@1auth/authn-recovery-codes update(", sub, ")");
   }
-} */
-
-const createSecrets = async (sub) => {
   const existingSecrets = await options.store.selectList(options.table, {
     sub,
-    type: options.id + '-' + options.secret.type
-  })
-  const secrets = []
-  for (let i = options.count; i--;) {
-    const secret = await options.secret.create()
-    const id = await authnCreate(
-      options.secret.type,
-      { sub, value: secret },
-      options
-    )
-    secrets.push({ id, secret })
-  }
+    type: options.secret.id + "-" + options.secret.type,
+  });
+  const secrets = await createSecrets(sub, options.count);
+
+  const id = existingSecrets.map((item) => item.id);
+  await authnRemove(options.secret, sub, id);
+
+  await options.notify.trigger("authn-recovery-codes-update", sub);
+  return secrets;
+};
 
-  for (const item of existingSecrets) {
-    options.store.remove(options.table, { id: item.id, sub })
+export const remove = async (sub, id) => {
+  if (options.log) {
+    options.log("@1auth/authn-recovery-codes remove(", sub, id, ")");
   }
 
-  return secrets
-}
+  id ??= await options.store
+    .selectList(options.table, {
+      sub,
+      type: options.id + "-" + options.secret.type,
+    })
+    .then((res) => res.map((item) => item.id));
+
+  await authnRemove(options.secret, sub, id);
+
+  await options.notify.trigger("authn-recovery-codes-remove", sub);
+};
+
+const createSecrets = async (sub, count = options.count) => {
+  const secrets = [];
+  const now = nowInSeconds();
+  for (let i = count; i--; ) {
+    const secret = await options.secret.create();
+    secrets.push({
+      value: secret,
+      verify: now,
+    });
+  }
+  await authnCreateList(options.secret, sub, secrets);
+  return secrets;
+};
 
-export const list = async (sub, type = options.id + '-secret') => {
-  return options.store.selectList(options.table, { sub, type })
-}
+const nowInSeconds = () => Math.floor(Date.now() / 1000);

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@1auth/authn-recovery-codes",
-  "version": "0.0.0-alpha.7",
+  "version": "0.0.0-alpha.70",
   "description": "",
   "type": "module",
   "engines": {
-    "node": ">=16"
+    "node": ">=20"
   },
   "engineStrict": true,
   "publishConfig": {
@@ -27,7 +27,7 @@
   ],
   "scripts": {
     "test": "npm run test:unit",
-    "test:unit": "ava"
+    "test:unit": "node --test"
   },
   "license": "MIT",
   "funding": {
@@ -41,16 +41,16 @@
   },
   "repository": {
     "type": "git",
-    "url": "github:willfarrell/1auth",
+    "url": "git+https://github.com/willfarrell/1auth.git",
     "directory": "packages/authn-recovery-codes"
   },
   "bugs": {
     "url": "https://github.com/willfarrell/1auth/issues"
   },
   "homepage": "https://github.com/willfarrell/1auth",
-  "gitHead": "39c704fcab5798f6bee8d00b2bcf574ba250a4cf",
+  "gitHead": "7a6c0fbb8ab71d6a2171e678697de9f237568431",
   "dependencies": {
-    "@1auth/authn": "0.0.0-alpha.7",
-    "@1auth/crypto": "0.0.0-alpha.7"
+    "@1auth/authn": "0.0.0-alpha.70",
+    "@1auth/crypto": "0.0.0-alpha.70"
   }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 will Farrell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.