@aeriajs/builtins 0.0.112 → 0.0.114

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

@@ -451,15 +451,15 @@ export declare const file: Omit<import("@aeriajs/types").Collection<{
                     readonly ask: true;
                 };
             };
-        }>) => Promise<{
-            readonly _tag: "Result";
-            readonly error: undefined;
-            readonly result: any;
-        } | import("@aeriajs/types").Result.Error<{
+        }>) => Promise<import("@aeriajs/types").Result.Error<{
             readonly code: import("@aeriajs/types").ACError.ResourceNotFound;
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
-        }>>;
+        }> | {
+            readonly _tag: "Result";
+            readonly error: undefined;
+            readonly result: import("mongodb").WithId<Omit<import("@aeriajs/types").PackReferences<import("@aeriajs/types").SchemaWithId<import("@aeriajs/types").Description<any>>>, "_id">> | null;
+        }>;
         readonly removeAll: (payload: import("@aeriajs/types").RemoveAllPayload, context: import("@aeriajs/types").Context<{
             readonly $id: "file";
             readonly owned: "always";
@@ -509,15 +509,15 @@ export declare const file: Omit<import("@aeriajs/types").Collection<{
                     readonly ask: true;
                 };
             };
-        }>) => Promise<{
-            readonly _tag: "Result";
-            readonly error: undefined;
-            readonly result: any;
-        } | import("@aeriajs/types").Result.Error<{
+        }>) => Promise<import("@aeriajs/types").Result.Error<{
             readonly code: import("@aeriajs/types").ACError.ResourceNotFound;
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
-        }>>;
+        }> | {
+            readonly _tag: "Result";
+            readonly error: undefined;
+            readonly result: import("mongodb").WithId<Omit<import("@aeriajs/types").PackReferences<import("@aeriajs/types").SchemaWithId<import("@aeriajs/types").Description<any>>>, "_id">> | null;
+        }>;
     };
     exposedFunctions: {
         readonly get: "unauthenticated";
@@ -937,15 +937,15 @@ export declare const file: Omit<import("@aeriajs/types").Collection<{
                     readonly ask: true;
                 };
             };
-        }>) => Promise<{
-            readonly _tag: "Result";
-            readonly error: undefined;
-            readonly result: any;
-        } | import("@aeriajs/types").Result.Error<{
+        }>) => Promise<import("@aeriajs/types").Result.Error<{
             readonly code: import("@aeriajs/types").ACError.ResourceNotFound;
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
-        }>>;
+        }> | {
+            readonly _tag: "Result";
+            readonly error: undefined;
+            readonly result: import("mongodb").WithId<Omit<import("@aeriajs/types").PackReferences<import("@aeriajs/types").SchemaWithId<import("@aeriajs/types").Description<any>>>, "_id">> | null;
+        }>;
         readonly removeAll: (payload: import("@aeriajs/types").RemoveAllPayload, context: import("@aeriajs/types").Context<{
             readonly $id: "file";
             readonly owned: "always";
@@ -995,15 +995,15 @@ export declare const file: Omit<import("@aeriajs/types").Collection<{
                     readonly ask: true;
                 };
             };
-        }>) => Promise<{
-            readonly _tag: "Result";
-            readonly error: undefined;
-            readonly result: any;
-        } | import("@aeriajs/types").Result.Error<{
+        }>) => Promise<import("@aeriajs/types").Result.Error<{
             readonly code: import("@aeriajs/types").ACError.ResourceNotFound;
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
-        }>>;
+        }> | {
+            readonly _tag: "Result";
+            readonly error: undefined;
+            readonly result: import("mongodb").WithId<Omit<import("@aeriajs/types").PackReferences<import("@aeriajs/types").SchemaWithId<import("@aeriajs/types").Description<any>>>, "_id">> | null;
+        }>;
     };
     contracts: {
         readonly get?: import("@aeriajs/types").Contract | undefined;

package/dist/collections/file/remove.d.ts

@@ -1,11 +1,11 @@
 import type { Context, SchemaWithId, RemovePayload } from '@aeriajs/types';
 import type { description } from './description.js';
-export declare const remove: (payload: RemovePayload<SchemaWithId<typeof description>>, context: Context<typeof description>) => Promise<{
-    readonly _tag: "Result";
-    readonly error: undefined;
-    readonly result: any;
-} | import("@aeriajs/types").Result.Error<{
+export declare const remove: (payload: RemovePayload<SchemaWithId<typeof description>>, context: Context<typeof description>) => Promise<import("@aeriajs/types").Result.Error<{
     readonly code: import("@aeriajs/types").ACError.ResourceNotFound;
 } & {
     httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
-}>>;
+}> | {
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: import("mongodb").WithId<Omit<import("@aeriajs/types").PackReferences<SchemaWithId<import("@aeriajs/types").Description<any>>>, "_id">> | null;
+}>;

package/dist/collections/file/removeAll.d.ts

@@ -1,11 +1,11 @@
-import type { Context, RemoveAllPayload } from '@aeriajs/types';
+import type { Context, SchemaWithId, PackReferences, RemoveAllPayload } from '@aeriajs/types';
 import type { description } from './description.js';
-export declare const removeAll: (payload: RemoveAllPayload, context: Context<typeof description>) => Promise<{
-    readonly _tag: "Result";
-    readonly error: undefined;
-    readonly result: any;
-} | import("@aeriajs/types").Result.Error<{
+export declare const removeAll: (payload: RemoveAllPayload, context: Context<typeof description>) => Promise<import("@aeriajs/types").Result.Error<{
     readonly code: import("@aeriajs/types").ACError.ResourceNotFound;
 } & {
     httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
-}>>;
+}> | {
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: import("mongodb").WithId<Omit<PackReferences<SchemaWithId<import("@aeriajs/types").Description<any>>>, "_id">> | null;
+}>;

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

@@ -1,6 +1,6 @@
 import type { Context } from '@aeriajs/types';
 import type { description } from './description.js';
-import { HTTPStatus } from '@aeriajs/types';
+import { Result, ACError, HTTPStatus } from '@aeriajs/types';
 export declare enum ActivationError {
     UserNotFound = "USER_NOT_FOUND",
     AlreadyActiveUser = "ALREADY_ACTIVE_USER",
@@ -8,16 +8,36 @@ export declare enum ActivationError {
 }
 export declare const activate: (payload: {
     password: string;
-}, context: Context<typeof description>) => Promise<import("@aeriajs/types").GenericResponse | import("@aeriajs/types").Result.Error<{
+}, context: Context<typeof description> & {
+    request: {
+        query: {
+            u?: string;
+            t?: string;
+        };
+        payload: {
+            password?: string;
+        };
+    };
+}) => Promise<import("@aeriajs/types").GenericResponse | Result.Error<{
     readonly code: ActivationError.InvalidLink;
 } & {
     httpStatus: HTTPStatus.NotFound;
-}> | import("@aeriajs/types").Result.Error<{
+}> | Result.Error<{
     readonly code: ActivationError.UserNotFound;
 } & {
     httpStatus: HTTPStatus.NotFound;
-}> | import("@aeriajs/types").Result.Error<{
+}> | Result.Error<{
     readonly code: ActivationError.AlreadyActiveUser;
 } & {
     httpStatus: HTTPStatus.Forbidden;
-}> | undefined>;
+}> | Result.Error<{
+    readonly code: ACError.MalformedInput;
+} & {
+    httpStatus: HTTPStatus.UnprocessableContent;
+}> | {
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: {
+        readonly userId: any;
+    };
+} | undefined>;

package/dist/collections/user/activate.js

@@ -4,6 +4,7 @@ exports.activate = exports.ActivationError = void 0;
 const core_1 = require("@aeriajs/core");
 const types_1 = require("@aeriajs/types");
 const bcrypt = require("bcrypt");
+const getActivationLink_js_1 = require("./getActivationLink.js");
 var ActivationError;
 (function (ActivationError) {
     ActivationError["UserNotFound"] = "USER_NOT_FOUND";
@@ -34,7 +35,8 @@ const activate = async (payload, context) => {
             code: ActivationError.AlreadyActiveUser,
         });
     }
-    const equal = await bcrypt.compare(user._id.toString(), token);
+    const activationToken = await (0, getActivationLink_js_1.getActivationToken)(userId.toString(), context);
+    const equal = await bcrypt.compare(activationToken, token);
     if (!equal) {
         return context.error(types_1.HTTPStatus.NotFound, {
             code: ActivationError.InvalidLink,
@@ -42,8 +44,13 @@ const activate = async (payload, context) => {
     }
     if (!user.password) {
         if (!payload.password) {
-            return context.response.writeHead(302, {
-                location: `/user/activation?step=password&u=${userId}&t=${token}`,
+            if (context.request.method === 'GET') {
+                return context.response.writeHead(302, {
+                    location: `/user/activation?step=password&u=${userId}&t=${token}`,
+                }).end();
+            }
+            return context.error(types_1.HTTPStatus.UnprocessableContent, {
+                code: types_1.ACError.MalformedInput,
             });
         }
         await context.collection.model.updateOne({
@@ -63,8 +70,13 @@ const activate = async (payload, context) => {
             active: true,
         },
     });
-    return context.response.writeHead(302, {
-        location: '/user/activation',
+    if (context.request.method === 'GET') {
+        return context.response.writeHead(302, {
+            location: '/user/activation',
+        }).end();
+    }
+    return types_1.Result.result({
+        userId: user._id,
     });
 };
 exports.activate = activate;

package/dist/collections/user/activate.mjs

@@ -1,7 +1,8 @@
 "use strict";
 import { ObjectId } from "@aeriajs/core";
-import { HTTPStatus } from "@aeriajs/types";
+import { Result, ACError, HTTPStatus } from "@aeriajs/types";
 import * as bcrypt from "bcrypt";
+import { getActivationToken } from "./getActivationLink.mjs";
 export var ActivationError = /* @__PURE__ */ ((ActivationError2) => {
   ActivationError2["UserNotFound"] = "USER_NOT_FOUND";
   ActivationError2["AlreadyActiveUser"] = "ALREADY_ACTIVE_USER";
@@ -35,7 +36,8 @@ export const activate = async (payload, context) => {
       code: "ALREADY_ACTIVE_USER" /* AlreadyActiveUser */
     });
   }
-  const equal = await bcrypt.compare(user._id.toString(), token);
+  const activationToken = await getActivationToken(userId.toString(), context);
+  const equal = await bcrypt.compare(activationToken, token);
   if (!equal) {
     return context.error(HTTPStatus.NotFound, {
       code: "INVALID_LINK" /* InvalidLink */
@@ -43,8 +45,13 @@ export const activate = async (payload, context) => {
   }
   if (!user.password) {
     if (!payload.password) {
-      return context.response.writeHead(302, {
-        location: `/user/activation?step=password&u=${userId}&t=${token}`
+      if (context.request.method === "GET") {
+        return context.response.writeHead(302, {
+          location: `/user/activation?step=password&u=${userId}&t=${token}`
+        }).end();
+      }
+      return context.error(HTTPStatus.UnprocessableContent, {
+        code: ACError.MalformedInput
       });
     }
     await context.collection.model.updateOne(
@@ -70,7 +77,12 @@ export const activate = async (payload, context) => {
       }
     }
   );
-  return context.response.writeHead(302, {
-    location: "/user/activation"
+  if (context.request.method === "GET") {
+    return context.response.writeHead(302, {
+      location: "/user/activation"
+    }).end();
+  }
+  return Result.result({
+    userId: user._id
   });
 };

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

@@ -86,6 +86,11 @@ export declare const description: {
             readonly fetchItem: true;
             readonly translate: true;
         };
+        readonly copyActivationLink: {
+            readonly label: "copy_activation_link";
+            readonly icon: "link";
+            readonly translate: true;
+        };
     };
     readonly icon: "users";
     readonly filters: readonly ["name", "roles", "email", "phone_number"];

package/dist/collections/user/description.js

@@ -111,6 +111,11 @@ exports.description = (0, core_1.defineDescription)({
             fetchItem: true,
             translate: true,
         },
+        'copyActivationLink': {
+            label: 'copy_activation_link',
+            icon: 'link',
+            translate: true,
+        },
     },
     icon: 'users',
     filters: [

package/dist/collections/user/description.mjs

@@ -104,6 +104,11 @@ export const description = defineDescription({
       icon: "key",
       fetchItem: true,
       translate: true
+    },
+    "copyActivationLink": {
+      label: "copy_activation_link",
+      icon: "link",
+      translate: true
     }
   },
   icon: "users",

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

@@ -1,6 +1,22 @@
+import type { Context } from '@aeriajs/types';
 import type { ObjectId } from '@aeriajs/core';
-export declare const getActivationLink: (userId: ObjectId) => Promise<{
+import { Result, HTTPStatus } from '@aeriajs/types';
+import { ActivationError } from './activate.js';
+export declare const getActivationToken: (strId: string, context: Context) => Promise<string>;
+export declare const getActivationLink: (payload: {
+    userId: ObjectId | string;
+}, context: Context) => Promise<{
+    readonly _tag: "Error";
+    readonly error: import("@aeriajs/types").StrictEndpointError<import("@aeriajs/types").ACError.ResourceNotFound | import("@aeriajs/types").ACError.MalformedInput, unknown, HTTPStatus.BadRequest | HTTPStatus.NotFound>;
+    readonly result: undefined;
+} | Result.Error<{
+    readonly code: ActivationError.AlreadyActiveUser;
+} & {
+    httpStatus: HTTPStatus.Forbidden;
+}> | {
     readonly _tag: "Result";
     readonly error: undefined;
-    readonly result: string;
+    readonly result: {
+        readonly url: string;
+    };
 }>;

package/dist/collections/user/getActivationLink.js

@@ -1,13 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getActivationLink = void 0;
-const entrypoint_1 = require("@aeriajs/entrypoint");
+exports.getActivationLink = exports.getActivationToken = void 0;
 const types_1 = require("@aeriajs/types");
 const bcrypt = require("bcrypt");
-const getActivationLink = async (userId) => {
-    const config = await (0, entrypoint_1.getConfig)();
-    const activationToken = await bcrypt.hash(userId.toString(), 10);
-    const link = `${config.publicUrl}/user/activate?u=${userId.toString()}&t=${activationToken}`;
-    return types_1.Result.result(link);
+const activate_js_1 = require("./activate.js");
+const getActivationToken = async (strId, context) => {
+    if (context.calledFunction === 'getActivationToken') {
+        throw new Error('cannot be called externally');
+    }
+    if (!context.config.secret) {
+        throw new Error('config.secret is not set');
+    }
+    return `${context.config.secret}:${strId}`;
+};
+exports.getActivationToken = getActivationToken;
+const getActivationLink = async (payload, context) => {
+    const { error, result: user } = await context.collections.user.functions.get({
+        filters: {
+            _id: payload.userId,
+        },
+        project: ['active'],
+    });
+    if (error) {
+        return types_1.Result.error(error);
+    }
+    if (user.active) {
+        return context.error(types_1.HTTPStatus.Forbidden, {
+            code: activate_js_1.ActivationError.AlreadyActiveUser,
+        });
+    }
+    const activationToken = await (0, exports.getActivationToken)(payload.userId.toString(), context);
+    const encryptedActivationToken = await bcrypt.hash(activationToken, 10);
+    const url = `${context.config.publicUrl}/user/activate?u=${payload.userId.toString()}&t=${encryptedActivationToken}`;
+    return types_1.Result.result({
+        url,
+    });
 };
 exports.getActivationLink = getActivationLink;

package/dist/collections/user/getActivationLink.mjs

@@ -1,10 +1,35 @@
 "use strict";
-import { getConfig } from "@aeriajs/entrypoint";
-import { Result } from "@aeriajs/types";
+import { Result, HTTPStatus } from "@aeriajs/types";
 import * as bcrypt from "bcrypt";
-export const getActivationLink = async (userId) => {
-  const config = await getConfig();
-  const activationToken = await bcrypt.hash(userId.toString(), 10);
-  const link = `${config.publicUrl}/user/activate?u=${userId.toString()}&t=${activationToken}`;
-  return Result.result(link);
+import { ActivationError } from "./activate.mjs";
+export const getActivationToken = async (strId, context) => {
+  if (context.calledFunction === "getActivationToken") {
+    throw new Error("cannot be called externally");
+  }
+  if (!context.config.secret) {
+    throw new Error("config.secret is not set");
+  }
+  return `${context.config.secret}:${strId}`;
+};
+export const getActivationLink = async (payload, context) => {
+  const { error, result: user } = await context.collections.user.functions.get({
+    filters: {
+      _id: payload.userId
+    },
+    project: ["active"]
+  });
+  if (error) {
+    return Result.error(error);
+  }
+  if (user.active) {
+    return context.error(HTTPStatus.Forbidden, {
+      code: ActivationError.AlreadyActiveUser
+    });
+  }
+  const activationToken = await getActivationToken(payload.userId.toString(), context);
+  const encryptedActivationToken = await bcrypt.hash(activationToken, 10);
+  const url = `${context.config.publicUrl}/user/activate?u=${payload.userId.toString()}&t=${encryptedActivationToken}`;
+  return Result.result({
+    url
+  });
 };

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

@@ -92,6 +92,11 @@ export declare const getCurrentUser: (_payload: undefined, context: Context<type
                 readonly fetchItem: true;
                 readonly translate: true;
             };
+            readonly copyActivationLink: {
+                readonly label: "copy_activation_link";
+                readonly icon: "link";
+                readonly translate: true;
+            };
         };
         readonly icon: "users";
         readonly filters: readonly ["name", "roles", "email", "phone_number"];

package/dist/collections/user/getInfo.js

@@ -4,6 +4,7 @@ exports.getInfo = exports.ActivationError = void 0;
 const bcrypt = require("bcrypt");
 const types_1 = require("@aeriajs/types");
 const core_1 = require("@aeriajs/core");
+const getActivationLink_js_1 = require("./getActivationLink.js");
 var ActivationError;
 (function (ActivationError) {
     ActivationError["UserNotFound"] = "USER_NOT_FOUND";
@@ -30,7 +31,8 @@ const getInfo = async (payload, context) => {
             code: ActivationError.AlreadyActiveUser,
         });
     }
-    const equal = await bcrypt.compare(user._id.toString(), token);
+    const activationToken = await (0, getActivationLink_js_1.getActivationToken)(user._id.toString(), context);
+    const equal = await bcrypt.compare(activationToken, token);
     if (!equal) {
         return context.error(types_1.HTTPStatus.NotFound, {
             code: ActivationError.InvalidLink,

package/dist/collections/user/getInfo.mjs

@@ -2,6 +2,7 @@
 import * as bcrypt from "bcrypt";
 import { Result, HTTPStatus } from "@aeriajs/types";
 import { ObjectId } from "@aeriajs/core";
+import { getActivationToken } from "./getActivationLink.mjs";
 export var ActivationError = /* @__PURE__ */ ((ActivationError2) => {
   ActivationError2["UserNotFound"] = "USER_NOT_FOUND";
   ActivationError2["AlreadyActiveUser"] = "ALREADY_ACTIVE_USER";
@@ -31,7 +32,8 @@ export const getInfo = async (payload, context) => {
       code: "ALREADY_ACTIVE_USER" /* AlreadyActiveUser */
     });
   }
-  const equal = await bcrypt.compare(user._id.toString(), token);
+  const activationToken = await getActivationToken(user._id.toString(), context);
+  const equal = await bcrypt.compare(activationToken, token);
   if (!equal) {
     return context.error(HTTPStatus.NotFound, {
       code: "INVALID_LINK" /* InvalidLink */