@aeriajs/builtins 0.0.64 → 0.0.66

package/dist/collections/user/activate.js

@@ -1,12 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activate = exports.ActivationErrors = void 0;
 const core_1 = require("@aeriajs/core");
 const common_1 = require("@aeriajs/common");
-const bcrypt_1 = __importDefault(require("bcrypt"));
 var ActivationErrors;
 (function (ActivationErrors) {
     ActivationErrors["UserNotFound"] = "USER_NOT_FOUND";
@@ -31,7 +50,8 @@ const activate = async (payload, context) => {
     if (user.active) {
         return (0, common_1.left)(ActivationErrors.AlreadyActiveUser);
     }
-    const equal = await bcrypt_1.default.compare(user._id.toString(), token);
+    const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
+    const equal = await bcrypt.compare(user._id.toString(), token);
     if (!equal) {
         return (0, common_1.left)(ActivationErrors.InvalidLink);
     }
@@ -46,7 +66,7 @@ const activate = async (payload, context) => {
         }, {
             $set: {
                 active: true,
-                password: await bcrypt_1.default.hash(payload.password, 10),
+                password: await bcrypt.hash(payload.password, 10),
             },
         });
         return (0, common_1.right)(true);

package/dist/collections/user/activate.mjs

@@ -1,7 +1,6 @@
 "use strict";
 import { ObjectId } from "@aeriajs/core";
 import { left, right } from "@aeriajs/common";
-import bcrypt from "bcrypt";
 export var ActivationErrors = /* @__PURE__ */ ((ActivationErrors2) => {
   ActivationErrors2["UserNotFound"] = "USER_NOT_FOUND";
   ActivationErrors2["AlreadyActiveUser"] = "ALREADY_ACTIVE_USER";
@@ -29,6 +28,7 @@ export const activate = async (payload, context) => {
   if (user.active) {
     return left("ALREADY_ACTIVE_USER" /* AlreadyActiveUser */);
   }
+  const bcrypt = await import("bcrypt");
   const equal = await bcrypt.compare(user._id.toString(), token);
   if (!equal) {
     return left("INVALID_LINK" /* InvalidLink */);

package/dist/collections/user/authenticate.d.ts

@@ -1,20 +1,18 @@
-import type { Context, SchemaWithId } from '@aeriajs/types';
+import type { Context, SchemaWithId, TokenRecipient } from '@aeriajs/types';
 import type { description } from './description.js';
 import type { ObjectId } from '@aeriajs/core';
 type Props = {
     email: string;
     password: string;
 } | {
+    token?: TokenRecipient;
     revalidate: true;
 };
 type Return = {
     user: Pick<SchemaWithId<typeof description>, 'name' | 'email' | 'roles' | 'active'> & {
         _id: ObjectId | null;
     };
-    token: {
-        type: 'bearer';
-        content: string;
-    };
+    token: TokenRecipient;
 };
 export declare enum AuthenticationErrors {
     Unauthenticated = "UNAUTHENTICATED",

package/dist/collections/user/authenticate.js

@@ -1,7 +1,29 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authenticate = exports.getDefaultUser = exports.AuthenticationErrors = void 0;
-const bcrypt_1 = require("bcrypt");
 const core_1 = require("@aeriajs/core");
 const common_1 = require("@aeriajs/common");
 var AuthenticationErrors;
@@ -81,11 +103,15 @@ const getDefaultUser = async () => {
 exports.getDefaultUser = getDefaultUser;
 const authenticate = async (props, context) => {
     if ('revalidate' in props) {
-        if (!context.token.authenticated) {
+        const { token } = props;
+        if (!token && !context.token.authenticated) {
             return (0, common_1.left)(AuthenticationErrors.Unauthenticated);
         }
-        return (0, common_1.right)(context.token.sub
-            ? await getUser(context.token.sub, context)
+        const decodedToken = token
+            ? await (0, core_1.decodeToken)(token.content)
+            : context.token;
+        return (0, common_1.right)(decodedToken.sub
+            ? await getUser(decodedToken.sub, context)
             : await (0, exports.getDefaultUser)());
     }
     if (typeof props.email !== 'string') {
@@ -105,7 +131,8 @@ const authenticate = async (props, context) => {
             active: 1,
         },
     });
-    if (!user || !user.password || !await (0, bcrypt_1.compare)(props.password, user.password)) {
+    const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
+    if (!user || !user.password || !await bcrypt.compare(props.password, user.password)) {
         return (0, common_1.left)(AuthenticationErrors.InvalidCredentials);
     }
     if (!user.active) {

package/dist/collections/user/authenticate.mjs

@@ -1,6 +1,5 @@
 "use strict";
-import { compare as bcryptCompare } from "bcrypt";
-import { signToken } from "@aeriajs/core";
+import { signToken, decodeToken } from "@aeriajs/core";
 import { left, right } from "@aeriajs/common";
 export var AuthenticationErrors = /* @__PURE__ */ ((AuthenticationErrors2) => {
   AuthenticationErrors2["Unauthenticated"] = "UNAUTHENTICATED";
@@ -77,10 +76,12 @@ export const getDefaultUser = async () => {
 };
 export const authenticate = async (props, context) => {
   if ("revalidate" in props) {
-    if (!context.token.authenticated) {
+    const { token } = props;
+    if (!token && !context.token.authenticated) {
       return left("UNAUTHENTICATED" /* Unauthenticated */);
     }
-    return right(context.token.sub ? await getUser(context.token.sub, context) : await getDefaultUser());
+    const decodedToken = token ? await decodeToken(token.content) : context.token;
+    return right(decodedToken.sub ? await getUser(decodedToken.sub, context) : await getDefaultUser());
   }
   if (typeof props.email !== "string") {
     return left("INVALID_CREDENTIALS" /* InvalidCredentials */);
@@ -102,7 +103,8 @@ export const authenticate = async (props, context) => {
       }
     }
   );
-  if (!user || !user.password || !await bcryptCompare(props.password, user.password)) {
+  const bcrypt = await import("bcrypt");
+  if (!user || !user.password || !await bcrypt.compare(props.password, user.password)) {
     return left("INVALID_CREDENTIALS" /* InvalidCredentials */);
   }
   if (!user.active) {

package/dist/collections/user/createAccount.js

@@ -1,12 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAccount = void 0;
 const common_1 = require("@aeriajs/common");
 const validation_1 = require("@aeriajs/validation");
-const bcrypt_1 = __importDefault(require("bcrypt"));
 const createAccount = async (payload, context) => {
     const user = Object.assign({}, payload);
     if (!context.config.allowSignup) {
@@ -47,7 +66,8 @@ const createAccount = async (payload, context) => {
         Object.assign(user, context.config.signupDefaults);
     }
     if (user.password) {
-        user.password = await bcrypt_1.default.hash(user.password, 10);
+        const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
+        user.password = await bcrypt.hash(user.password, 10);
     }
     if (!context.token.authenticated) {
         Object.assign(user, {

package/dist/collections/user/createAccount.mjs

@@ -1,7 +1,6 @@
 "use strict";
 import { isLeft, unwrapEither, left, right } from "@aeriajs/common";
 import { validate } from "@aeriajs/validation";
-import bcrypt from "bcrypt";
 export const createAccount = async (payload, context) => {
   const user = Object.assign({}, payload);
   if (!context.config.allowSignup) {
@@ -42,6 +41,7 @@ export const createAccount = async (payload, context) => {
     Object.assign(user, context.config.signupDefaults);
   }
   if (user.password) {
+    const bcrypt = await import("bcrypt");
     user.password = await bcrypt.hash(user.password, 10);
   }
   if (!context.token.authenticated) {

package/dist/collections/user/getActivationLink.js

@@ -1,14 +1,34 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActivationLink = void 0;
 const entrypoint_1 = require("@aeriajs/entrypoint");
-const bcrypt_1 = __importDefault(require("bcrypt"));
 const getActivationLink = async (userId) => {
     const config = await (0, entrypoint_1.getConfig)();
-    const activationToken = await bcrypt_1.default.hash(userId.toString(), 10);
+    const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
+    const activationToken = await bcrypt.hash(userId.toString(), 10);
     const link = `${config.publicUrl}/user/activate?u=${userId.toString()}&t=${activationToken}`;
     return link;
 };

package/dist/collections/user/getActivationLink.mjs

@@ -1,8 +1,8 @@
 "use strict";
 import { getConfig } from "@aeriajs/entrypoint";
-import bcrypt from "bcrypt";
 export const getActivationLink = async (userId) => {
   const config = await getConfig();
+  const bcrypt = await import("bcrypt");
   const activationToken = await bcrypt.hash(userId.toString(), 10);
   const link = `${config.publicUrl}/user/activate?u=${userId.toString()}&t=${activationToken}`;
   return link;

package/dist/collections/user/getInfo.js

@@ -1,12 +1,31 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getInfo = exports.ActivationErrors = void 0;
 const core_1 = require("@aeriajs/core");
 const common_1 = require("@aeriajs/common");
-const bcrypt_1 = __importDefault(require("bcrypt"));
 var ActivationErrors;
 (function (ActivationErrors) {
     ActivationErrors["UserNotFound"] = "USER_NOT_FOUND";
@@ -27,7 +46,8 @@ const getInfo = async (payload, context) => {
     if (user.active) {
         return (0, common_1.left)(ActivationErrors.AlreadyActiveUser);
     }
-    const equal = await bcrypt_1.default.compare(user._id.toString(), token);
+    const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
+    const equal = await bcrypt.compare(user._id.toString(), token);
     if (!equal) {
         return (0, common_1.left)(ActivationErrors.InvalidLink);
     }

package/dist/collections/user/getInfo.mjs

@@ -1,7 +1,6 @@
 "use strict";
 import { ObjectId } from "@aeriajs/core";
 import { left, right } from "@aeriajs/common";
-import bcrypt from "bcrypt";
 export var ActivationErrors = /* @__PURE__ */ ((ActivationErrors2) => {
   ActivationErrors2["UserNotFound"] = "USER_NOT_FOUND";
   ActivationErrors2["AlreadyActiveUser"] = "ALREADY_ACTIVE_USER";
@@ -25,6 +24,7 @@ export const getInfo = async (payload, context) => {
   if (user.active) {
     return left("ALREADY_ACTIVE_USER" /* AlreadyActiveUser */);
   }
+  const bcrypt = await import("bcrypt");
   const equal = await bcrypt.compare(user._id.toString(), token);
   if (!equal) {
     return left("INVALID_LINK" /* InvalidLink */);

package/dist/collections/user/index.d.ts

@@ -415,6 +415,7 @@ export declare const user: Omit<import("@aeriajs/types").Collection<{
             email: string;
             password: string;
         } | {
+            token?: import("@aeriajs/types").TokenRecipient | undefined;
             revalidate: true;
         }, context: import("@aeriajs/types").Context<{
             readonly $id: "user";
@@ -620,10 +621,7 @@ export declare const user: Omit<import("@aeriajs/types").Collection<{
             }>, "name" | "roles" | "email" | "active"> & {
                 _id: any;
             };
-            token: {
-                type: "bearer";
-                content: string;
-            };
+            token: import("@aeriajs/types").TokenRecipient;
         } | {
             user: {
                 _id: null;
@@ -1713,6 +1711,7 @@ export declare const user: Omit<import("@aeriajs/types").Collection<{
             email: string;
             password: string;
         } | {
+            token?: import("@aeriajs/types").TokenRecipient | undefined;
             revalidate: true;
         }, context: import("@aeriajs/types").Context<{
             readonly $id: "user";
@@ -1918,10 +1917,7 @@ export declare const user: Omit<import("@aeriajs/types").Collection<{
             }>, "name" | "roles" | "email" | "active"> & {
                 _id: any;
             };
-            token: {
-                type: "bearer";
-                content: string;
-            };
+            token: import("@aeriajs/types").TokenRecipient;
         } | {
             user: {
                 _id: null;

package/dist/collections/user/insert.js

@@ -24,10 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.insert = void 0;
-const bcrypt = __importStar(require("bcrypt"));
 const core_1 = require("@aeriajs/core");
 const insert = async (payload, context) => {
     if (payload.what.password) {
+        const bcrypt = await Promise.resolve().then(() => __importStar(require('bcrypt')));
         payload.what.password = await bcrypt.hash(payload.what.password, 10);
     }
     return core_1.functions.insert(payload, context);

package/dist/collections/user/insert.mjs

@@ -1,8 +1,8 @@
 "use strict";
-import * as bcrypt from "bcrypt";
 import { functions } from "@aeriajs/core";
 export const insert = async (payload, context) => {
   if (payload.what.password) {
+    const bcrypt = await import("bcrypt");
     payload.what.password = await bcrypt.hash(payload.what.password, 10);
   }
   return functions.insert(payload, context);

package/dist/functions/describe.d.ts

@@ -114,10 +114,7 @@ export declare const describe: (contextOrPayload: RouteContext | Payload) => Pro
         }>, "name" | "roles" | "email" | "active"> & {
             _id: any;
         };
-        token: {
-            type: "bearer";
-            content: string;
-        };
+        token: import("@aeriajs/types").TokenRecipient;
     } | {
         user: {
             _id: null;

package/dist/index.d.ts

@@ -1600,6 +1600,7 @@ export declare const collections: {
                 email: string;
                 password: string;
             } | {
+                token?: import("@aeriajs/types").TokenRecipient | undefined;
                 revalidate: true;
             }, context: import("@aeriajs/types").Context<{
                 readonly $id: "user";
@@ -1805,10 +1806,7 @@ export declare const collections: {
                 }>, "name" | "roles" | "email" | "active"> & {
                     _id: any;
                 };
-                token: {
-                    type: "bearer";
-                    content: string;
-                };
+                token: import("@aeriajs/types").TokenRecipient;
             } | {
                 user: {
                     _id: null;
@@ -2898,6 +2896,7 @@ export declare const collections: {
                 email: string;
                 password: string;
             } | {
+                token?: import("@aeriajs/types").TokenRecipient | undefined;
                 revalidate: true;
             }, context: import("@aeriajs/types").Context<{
                 readonly $id: "user";
@@ -3103,10 +3102,7 @@ export declare const collections: {
                 }>, "name" | "roles" | "email" | "active"> & {
                     _id: any;
                 };
-                token: {
-                    type: "bearer";
-                    content: string;
-                };
+                token: import("@aeriajs/types").TokenRecipient;
             } | {
                 user: {
                     _id: null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeriajs/builtins",
-  "version": "0.0.64",
+  "version": "0.0.66",
   "description": "## Installation",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -36,22 +36,22 @@
     "bcrypt": "^5.1.1"
   },
   "devDependencies": {
-    "@aeriajs/access-control": "^0.0.35",
-    "@aeriajs/core": "^0.0.64",
-    "@aeriajs/common": "^0.0.35",
-    "@aeriajs/entrypoint": "^0.0.35",
-    "@aeriajs/types": "^0.0.32",
-    "@aeriajs/validation": "^0.0.38",
+    "@aeriajs/access-control": "^0.0.36",
+    "@aeriajs/core": "^0.0.66",
+    "@aeriajs/common": "^0.0.36",
+    "@aeriajs/entrypoint": "^0.0.36",
+    "@aeriajs/types": "^0.0.33",
+    "@aeriajs/validation": "^0.0.39",
     "@types/bcrypt": "^5.0.2",
     "mongodb": "^6.5.0"
   },
   "peerDependencies": {
-    "@aeriajs/access-control": "^0.0.35",
-    "@aeriajs/core": "^0.0.64",
-    "@aeriajs/common": "^0.0.35",
-    "@aeriajs/entrypoint": "^0.0.35",
-    "@aeriajs/types": "^0.0.32",
-    "@aeriajs/validation": "^0.0.38"
+    "@aeriajs/access-control": "^0.0.36",
+    "@aeriajs/core": "^0.0.66",
+    "@aeriajs/common": "^0.0.36",
+    "@aeriajs/entrypoint": "^0.0.36",
+    "@aeriajs/types": "^0.0.33",
+    "@aeriajs/validation": "^0.0.39"
   },
   "scripts": {
     "test": "echo skipping",