@aeriajs/builtins 0.0.217 → 0.0.219

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

@@ -81,6 +81,11 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
                     readonly fetchItem: true;
                 };
             };
+            readonly copyRedefinePasswordLink: {
+                readonly label: "copy_redefine_password_link";
+                readonly icon: "link";
+                readonly translate: true;
+            };
             readonly copyActivationLink: {
                 readonly label: "copy_activation_link";
                 readonly icon: "link";
@@ -182,6 +187,11 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
                     readonly fetchItem: true;
                 };
             };
+            readonly copyRedefinePasswordLink: {
+                readonly label: "copy_redefine_password_link";
+                readonly icon: "link";
+                readonly translate: true;
+            };
             readonly copyActivationLink: {
                 readonly label: "copy_activation_link";
                 readonly icon: "link";
@@ -280,7 +290,9 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
             httpStatus: import("@aeriajs/types").HTTPStatus.Unauthorized;
         }>>;
         readonly activate: (payload: {
-            password: string;
+            password?: string;
+            userId?: string;
+            token?: string;
         }, context: Omit<Context, "token">) => Promise<import("@aeriajs/types").GenericResponse | import("@aeriajs/types").Result.Error<{
             readonly code: import("./activate.js").ActivationError.InvalidLink;
         } & {
@@ -293,6 +305,10 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
             readonly code: import("./activate.js").ActivationError.AlreadyActiveUser;
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
+        }> | import("@aeriajs/types").Result.Error<{
+            readonly code: import("./activate.js").ActivationError.InvalidToken;
+        } & {
+            httpStatus: import("@aeriajs/types").HTTPStatus.Unauthorized;
         }> | import("@aeriajs/types").Result.Error<{
             readonly code: import("@aeriajs/types").ACError.MalformedInput;
         } & {
@@ -385,6 +401,11 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
                         readonly fetchItem: true;
                     };
                 };
+                readonly copyRedefinePasswordLink: {
+                    readonly label: "copy_redefine_password_link";
+                    readonly icon: "link";
+                    readonly translate: true;
+                };
                 readonly copyActivationLink: {
                     readonly label: "copy_activation_link";
                     readonly icon: "link";
@@ -494,6 +515,11 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
                         readonly fetchItem: true;
                     };
                 };
+                readonly copyRedefinePasswordLink: {
+                    readonly label: "copy_redefine_password_link";
+                    readonly icon: "link";
+                    readonly translate: true;
+                };
                 readonly copyActivationLink: {
                     readonly label: "copy_activation_link";
                     readonly icon: "link";
@@ -526,15 +552,16 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
         }> | import("@aeriajs/types").Result.Error<{
-            readonly code: import("./getInfo.js").ActivationError.AlreadyActiveUser;
+            readonly code: import("./getInfo.js").ActivationError.InvalidToken;
         } & {
-            httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
+            httpStatus: import("@aeriajs/types").HTTPStatus.Unauthorized;
         }> | {
             readonly _tag: "Result";
             readonly error: undefined;
             readonly result: {
                 readonly name: string;
                 readonly email: string;
+                readonly active: boolean | undefined;
             };
         }>;
         readonly getCurrentUser: (payload: undefined, context: Omit<Context, "token">) => Promise<{
@@ -631,6 +658,11 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
                             readonly fetchItem: true;
                         };
                     };
+                    readonly copyRedefinePasswordLink: {
+                        readonly label: "copy_redefine_password_link";
+                        readonly icon: "link";
+                        readonly translate: true;
+                    };
                     readonly copyActivationLink: {
                         readonly label: "copy_activation_link";
                         readonly icon: "link";
@@ -697,6 +729,10 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
             }, never>>;
             readonly result: undefined;
         } | import("@aeriajs/types").Result.Error<{
+            readonly code: import("./activate.js").ActivationError.InvalidLink;
+        } & {
+            httpStatus: import("@aeriajs/types").HTTPStatus.BadRequest;
+        }> | import("@aeriajs/types").Result.Error<{
             readonly code: import("./activate.js").ActivationError.AlreadyActiveUser;
         } & {
             httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
@@ -707,6 +743,92 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
                 readonly url: string;
             };
         }>;
+        readonly getRedefinePasswordLink: (payload: {
+            userId: import("@aeriajs/core").ObjectId | string;
+        }, context: Omit<Context, "token">) => Promise<{
+            readonly _tag: "Error";
+            readonly error: Pick<{} & Omit<Readonly<import("@aeriajs/types").FilterReadonlyProperties<{
+                readonly httpStatus: {
+                    readonly enum: [import("@aeriajs/types").HTTPStatus.Forbidden, import("@aeriajs/types").HTTPStatus.NotFound, import("@aeriajs/types").HTTPStatus.BadRequest];
+                };
+                readonly code: {
+                    readonly enum: [import("@aeriajs/types").ACError.ResourceNotFound, import("@aeriajs/types").ACError.OwnershipError, import("@aeriajs/types").ACError.InsecureOperator, import("@aeriajs/types").ACError.MalformedInput];
+                };
+                readonly message: {
+                    readonly type: "string";
+                };
+                readonly details: {
+                    readonly type: "object";
+                    readonly additionalProperties: true;
+                };
+            }>> & {
+                code: import("@aeriajs/types").ACError.OwnershipError | import("@aeriajs/types").ACError.ResourceNotFound | import("@aeriajs/types").ACError.InsecureOperator | import("@aeriajs/types").ACError.MalformedInput;
+                httpStatus: import("@aeriajs/types").HTTPStatus.BadRequest | import("@aeriajs/types").HTTPStatus.Forbidden | import("@aeriajs/types").HTTPStatus.NotFound;
+                message: string;
+                details: any;
+            }, never>, "code" | "httpStatus"> & Partial<{} & Omit<Readonly<import("@aeriajs/types").FilterReadonlyProperties<{
+                readonly httpStatus: {
+                    readonly enum: [import("@aeriajs/types").HTTPStatus.Forbidden, import("@aeriajs/types").HTTPStatus.NotFound, import("@aeriajs/types").HTTPStatus.BadRequest];
+                };
+                readonly code: {
+                    readonly enum: [import("@aeriajs/types").ACError.ResourceNotFound, import("@aeriajs/types").ACError.OwnershipError, import("@aeriajs/types").ACError.InsecureOperator, import("@aeriajs/types").ACError.MalformedInput];
+                };
+                readonly message: {
+                    readonly type: "string";
+                };
+                readonly details: {
+                    readonly type: "object";
+                    readonly additionalProperties: true;
+                };
+            }>> & {
+                code: import("@aeriajs/types").ACError.OwnershipError | import("@aeriajs/types").ACError.ResourceNotFound | import("@aeriajs/types").ACError.InsecureOperator | import("@aeriajs/types").ACError.MalformedInput;
+                httpStatus: import("@aeriajs/types").HTTPStatus.BadRequest | import("@aeriajs/types").HTTPStatus.Forbidden | import("@aeriajs/types").HTTPStatus.NotFound;
+                message: string;
+                details: any;
+            }, never>>;
+            readonly result: undefined;
+        } | import("@aeriajs/types").Result.Error<{
+            readonly code: import("./redefinePassword.js").ActivationError.UserNotActive;
+        } & {
+            httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
+        }> | {
+            readonly _tag: "Result";
+            readonly error: undefined;
+            readonly result: {
+                readonly url: string;
+            };
+        }>;
+        readonly redefinePassword: (payload: {
+            password?: string;
+            userId?: string;
+            token?: string;
+        }, context: Omit<Context, "token">) => Promise<import("@aeriajs/types").Result.Error<{
+            readonly code: import("./redefinePassword.js").ActivationError.InvalidLink;
+        } & {
+            httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
+        }> | import("@aeriajs/types").Result.Error<{
+            readonly code: import("./redefinePassword.js").ActivationError.UserNotFound;
+        } & {
+            httpStatus: import("@aeriajs/types").HTTPStatus.NotFound;
+        }> | import("@aeriajs/types").Result.Error<{
+            readonly code: import("./redefinePassword.js").ActivationError.UserNotActive;
+        } & {
+            httpStatus: import("@aeriajs/types").HTTPStatus.Forbidden;
+        }> | import("@aeriajs/types").Result.Error<{
+            readonly code: import("./redefinePassword.js").ActivationError.InvalidToken;
+        } & {
+            httpStatus: import("@aeriajs/types").HTTPStatus.Unauthorized;
+        }> | import("@aeriajs/types").Result.Error<{
+            readonly code: import("@aeriajs/types").ACError.MalformedInput;
+        } & {
+            httpStatus: import("@aeriajs/types").HTTPStatus.UnprocessableContent;
+        }> | {
+            readonly _tag: "Result";
+            readonly error: undefined;
+            readonly result: {
+                readonly userId: import("@aeriajs/core").ObjectId;
+            };
+        }>;
     };
     contracts: {
         readonly get?: import("@aeriajs/types").Contract | undefined;
@@ -721,5 +843,7 @@ export declare const user: Omit<Collection<never>, "functions" | "description" |
         readonly getInfo?: import("@aeriajs/types").Contract | undefined;
         readonly getCurrentUser?: import("@aeriajs/types").Contract | undefined;
         readonly getActivationLink?: import("@aeriajs/types").Contract | undefined;
+        readonly getRedefinePasswordLink?: import("@aeriajs/types").Contract | undefined;
+        readonly redefinePassword?: import("@aeriajs/types").Contract | undefined;
     };
 };

package/dist/collections/user/index.js

@@ -10,6 +10,8 @@ const createAccount_js_1 = require("./createAccount.js");
 const getInfo_js_1 = require("./getInfo.js");
 const getCurrentUser_js_1 = require("./getCurrentUser.js");
 const getActivationLink_js_1 = require("./getActivationLink.js");
+const redefinePassword_js_1 = require("./redefinePassword.js");
+const getRedefinePasswordLink_js_1 = require("./getRedefinePasswordLink.js");
 const functions = {
     get: core_1.get,
     getAll: core_1.getAll,
@@ -23,6 +25,8 @@ const functions = {
     getInfo: getInfo_js_1.getInfo,
     getCurrentUser: getCurrentUser_js_1.getCurrentUser,
     getActivationLink: getActivationLink_js_1.getActivationLink,
+    getRedefinePasswordLink: getRedefinePasswordLink_js_1.getRedefinePasswordLink,
+    redefinePassword: redefinePassword_js_1.redefinePassword,
 };
 const exposedFunctions = {
     get: true,
@@ -32,11 +36,19 @@ const exposedFunctions = {
     removeFile: true,
     insert: true,
     authenticate: 'unauthenticated',
-    activate: 'unauthenticated',
+    activate: [
+        'unauthenticated',
+        'root',
+    ],
     createAccount: 'unauthenticated',
     getInfo: 'unauthenticated',
     getCurrentUser: true,
     getActivationLink: ['root'],
+    getRedefinePasswordLink: ['root'],
+    redefinePassword: [
+        'unauthenticated',
+        'root',
+    ],
 };
 exports.user = (0, core_1.defineCollection)({
     description: description_js_1.description,

package/dist/collections/user/index.mjs

@@ -8,6 +8,8 @@ import { createAccount } from "./createAccount.mjs";
 import { getInfo } from "./getInfo.mjs";
 import { getCurrentUser } from "./getCurrentUser.mjs";
 import { getActivationLink } from "./getActivationLink.mjs";
+import { redefinePassword } from "./redefinePassword.mjs";
+import { getRedefinePasswordLink } from "./getRedefinePasswordLink.mjs";
 const functions = {
   get,
   getAll,
@@ -20,7 +22,9 @@ const functions = {
   createAccount,
   getInfo,
   getCurrentUser,
-  getActivationLink
+  getActivationLink,
+  getRedefinePasswordLink,
+  redefinePassword
 };
 const exposedFunctions = {
   get: true,
@@ -30,11 +34,19 @@ const exposedFunctions = {
   removeFile: true,
   insert: true,
   authenticate: "unauthenticated",
-  activate: "unauthenticated",
+  activate: [
+    "unauthenticated",
+    "root"
+  ],
   createAccount: "unauthenticated",
   getInfo: "unauthenticated",
   getCurrentUser: true,
-  getActivationLink: ["root"]
+  getActivationLink: ["root"],
+  getRedefinePasswordLink: ["root"],
+  redefinePassword: [
+    "unauthenticated",
+    "root"
+  ]
 };
 export const user = defineCollection({
   description,

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

@@ -0,0 +1,41 @@
+import type { Context } from '@aeriajs/types';
+import type { description } from './description.js';
+import { ObjectId } from '@aeriajs/core';
+import { Result, ACError, HTTPStatus } from '@aeriajs/types';
+export declare enum ActivationError {
+    UserNotFound = "USER_NOT_FOUND",
+    UserNotActive = "USER_NOT_ACTIVE",
+    InvalidLink = "INVALID_LINK",
+    InvalidToken = "INVALID_TOKEN"
+}
+export declare const redefinePassword: (payload: {
+    password?: string;
+    userId?: string;
+    token?: string;
+}, context: Context<typeof description>) => Promise<Result.Error<{
+    readonly code: ActivationError.InvalidLink;
+} & {
+    httpStatus: HTTPStatus.NotFound;
+}> | Result.Error<{
+    readonly code: ActivationError.UserNotFound;
+} & {
+    httpStatus: HTTPStatus.NotFound;
+}> | Result.Error<{
+    readonly code: ActivationError.UserNotActive;
+} & {
+    httpStatus: HTTPStatus.Forbidden;
+}> | Result.Error<{
+    readonly code: ActivationError.InvalidToken;
+} & {
+    httpStatus: HTTPStatus.Unauthorized;
+}> | Result.Error<{
+    readonly code: ACError.MalformedInput;
+} & {
+    httpStatus: HTTPStatus.UnprocessableContent;
+}> | {
+    readonly _tag: "Result";
+    readonly error: undefined;
+    readonly result: {
+        readonly userId: ObjectId;
+    };
+}>;

package/dist/collections/user/redefinePassword.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redefinePassword = exports.ActivationError = void 0;
+const core_1 = require("@aeriajs/core");
+const types_1 = require("@aeriajs/types");
+const bcrypt = require("bcrypt");
+var ActivationError;
+(function (ActivationError) {
+    ActivationError["UserNotFound"] = "USER_NOT_FOUND";
+    ActivationError["UserNotActive"] = "USER_NOT_ACTIVE";
+    ActivationError["InvalidLink"] = "INVALID_LINK";
+    ActivationError["InvalidToken"] = "INVALID_TOKEN";
+})(ActivationError || (exports.ActivationError = ActivationError = {}));
+const redefinePassword = async (payload, context) => {
+    const { userId, token, password, } = payload;
+    if (!context.config.secret) {
+        throw new Error('config.secret is not set');
+    }
+    if (!userId || !token) {
+        return context.error(types_1.HTTPStatus.NotFound, {
+            code: ActivationError.InvalidLink,
+        });
+    }
+    const user = await context.collection.model.findOne({
+        _id: new core_1.ObjectId(userId),
+    }, {
+        projection: {
+            password: 1,
+            active: 1,
+        },
+    });
+    if (!user) {
+        return context.error(types_1.HTTPStatus.NotFound, {
+            code: ActivationError.UserNotFound,
+        });
+    }
+    if (!user.active) {
+        return context.error(types_1.HTTPStatus.Forbidden, {
+            code: ActivationError.UserNotActive,
+        });
+    }
+    const decoded = await (0, core_1.decodeToken)(token, context.config.secret);
+    if (!decoded) {
+        return context.error(types_1.HTTPStatus.Unauthorized, {
+            code: ActivationError.InvalidToken,
+        });
+    }
+    if (!password) {
+        /* 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({
+        _id: user._id,
+    }, {
+        $set: {
+            active: true,
+            password: await bcrypt.hash(password, 10),
+        },
+    });
+    return types_1.Result.result({
+        userId: user._id,
+    });
+};
+exports.redefinePassword = redefinePassword;

package/dist/collections/user/redefinePassword.mjs

@@ -0,0 +1,69 @@
+"use strict";
+import { decodeToken, ObjectId } from "@aeriajs/core";
+import { Result, ACError, HTTPStatus } from "@aeriajs/types";
+import * as bcrypt from "bcrypt";
+export var ActivationError = /* @__PURE__ */ ((ActivationError2) => {
+  ActivationError2["UserNotFound"] = "USER_NOT_FOUND";
+  ActivationError2["UserNotActive"] = "USER_NOT_ACTIVE";
+  ActivationError2["InvalidLink"] = "INVALID_LINK";
+  ActivationError2["InvalidToken"] = "INVALID_TOKEN";
+  return ActivationError2;
+})(ActivationError || {});
+export const redefinePassword = async (payload, context) => {
+  const {
+    userId,
+    token,
+    password
+  } = payload;
+  if (!context.config.secret) {
+    throw new Error("config.secret is not set");
+  }
+  if (!userId || !token) {
+    return context.error(HTTPStatus.NotFound, {
+      code: "INVALID_LINK" /* InvalidLink */
+    });
+  }
+  const user = await context.collection.model.findOne({
+    _id: new ObjectId(userId)
+  }, {
+    projection: {
+      password: 1,
+      active: 1
+    }
+  });
+  if (!user) {
+    return context.error(HTTPStatus.NotFound, {
+      code: "USER_NOT_FOUND" /* UserNotFound */
+    });
+  }
+  if (!user.active) {
+    return context.error(HTTPStatus.Forbidden, {
+      code: "USER_NOT_ACTIVE" /* UserNotActive */
+    });
+  }
+  const decoded = await decodeToken(token, context.config.secret);
+  if (!decoded) {
+    return context.error(HTTPStatus.Unauthorized, {
+      code: "INVALID_TOKEN" /* InvalidToken */
+    });
+  }
+  if (!password) {
+    return context.error(HTTPStatus.UnprocessableContent, {
+      code: ACError.MalformedInput
+    });
+  }
+  await context.collection.model.updateOne(
+    {
+      _id: user._id
+    },
+    {
+      $set: {
+        active: true,
+        password: await bcrypt.hash(password, 10)
+      }
+    }
+  );
+  return Result.result({
+    userId: user._id
+  });
+};