create-warlock 1.0.6 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-warlock",
-    "version": "1.0.6",
+    "version": "1.0.8",
     "main": "./esm/index.js",
     "license": "MIT",
     "type": "module",

package/templates/warlock/package.json

@@ -29,7 +29,7 @@
     "@warlock.js/auth": "^1.0.2",
     "@warlock.js/cache": "^1.1.0",
     "@warlock.js/cascade": "^1.0.4",
-    "@warlock.js/core": "^1.0.18",
+    "@warlock.js/core": "^1.0.19",
     "@warlock.js/logger": "^1.0.6",
     "@warlock.js/postman": "^1.0.2",
     "dayjs": "^1.11.10"

package/templates/warlock/src/app/users/controllers/auth/activate-account.ts

@@ -1,48 +1,49 @@
-import type { Request, Response } from "@warlock.js/core";
-import { User } from "app/users/models/user";
-
-export default async function activateAccount(
-  request: Request,
-  response: Response,
-) {
-  const currentUser = request.user;
-
-  currentUser.unset("codeExpiresAt", "activationCode");
-
-  currentUser.save({
-    isActive: true,
-    activatedAt: new Date(),
-  });
-
-  const accessToken = await currentUser.generateAccessToken();
-
-  return response.success({
-    user: {
-      ...(await currentUser.toJSON()),
-      accessToken: accessToken,
-      userType: currentUser.userType,
-    },
-  });
-}
-
-activateAccount.validation = {
-  rules: {
-    code: ["required"],
-    email: ["required", "email"],
-  },
-  validate: async (request: Request, response: Response) => {
-    const user = await User.aggregate()
-      .where("email", String(request.input("email")).toLowerCase())
-      .where("isActive", false)
-      .where("activationCode", request.input("code"))
-      .first();
-
-    if (!user) {
-      return response.notFound({
-        error: "Invalid activation code",
-      });
-    }
-
-    request.user = user;
-  },
-};
+import type { Request, Response } from "@warlock.js/core";
+import usersRepository from "app/users/repositories/users-repository";
+
+
+export default async function activateAccount(
+  request: Request,
+  response: Response,
+) {
+  const currentUser = request.user;
+
+  currentUser.unset("codeExpiresAt", "activationCode");
+
+  currentUser.save({
+    isActive: true,
+    activatedAt: new Date(),
+  });
+
+  const accessToken = await currentUser.generateAccessToken();
+
+  return response.success({
+    user: {
+      ...(await currentUser.toJSON()),
+      accessToken: accessToken,
+      userType: currentUser.userType,
+    },
+  });
+}
+
+activateAccount.validation = {
+  rules: {
+    code: ["required"],
+    email: ["required", "email"],
+  },
+  validate: async (request: Request, response: Response) => {
+    const user = await usersRepository.first({
+      isActive: false,
+      email: request.input("email"),
+      activationCode: request.int("code"),
+    });
+
+    if (!user) {
+      return response.notFound({
+        error: "Invalid activation code",
+      });
+    }
+
+    request.user = user;
+  },
+};

package/templates/warlock/src/app/users/controllers/auth/forget-password.ts

@@ -1,39 +1,39 @@
-import { Random } from "@mongez/reinforcements";
-import { UniqueRule, type Request, type Response } from "@warlock.js/core";
-import sendForgetPasswordEmail from "app/users/mail/send-forget-password-email";
-import { User } from "app/users/models/user";
-
-export default async function forgetPassword(
-  request: Request<User>,
-  response: Response,
-) {
-  const currentUser = request.user;
-
-  currentUser
-    .save({
-      activatedAt: new Date(),
-      activationCode: Random.int(100000, 999999),
-    })
-    .then(sendForgetPasswordEmail);
-
-  return response.success();
-}
-
-forgetPassword.validation = {
-  rules: {
-    email: ["required", "email", new UniqueRule(User)],
-  },
-  validate: async (request: Request, response: Response) => {
-    const user = await User.first({
-      email: request.input("email"),
-      // if the app requires an active account, uncomment the following line
-      // isActive: true,
-    });
-
-    if (!user) {
-      return response.notFound();
-    }
-
-    request.user = user;
-  },
-};
+import { Random } from "@mongez/reinforcements";
+import { UniqueRule, type Request, type Response } from "@warlock.js/core";
+import sendForgetPasswordEmail from "app/users/mail/send-forget-password-email";
+import { User } from "app/users/models/user";
+
+export default async function forgetPassword(
+  request: Request<User>,
+  response: Response,
+) {
+  const currentUser = request.user;
+
+  currentUser
+    .save({
+      activatedAt: new Date(),
+      activationCode: Random.int(100000, 999999),
+    })
+    .then(sendForgetPasswordEmail);
+
+  return response.success();
+}
+
+forgetPassword.validation = {
+  rules: {
+    email: ["required", "email"],
+  },
+  validate: async (request: Request, response: Response) => {
+    const user = await User.first({
+      email: request.input("email"),
+      // if the app requires an active account, uncomment the following line
+      // isActive: true,
+    });
+
+    if (!user) {
+      return response.notFound();
+    }
+
+    request.user = user;
+  },
+};

package/templates/warlock/src/app/users/repositories/users-repository.ts

@@ -1,28 +1,29 @@
-import type { FilterByOptions, RepositoryOptions } from "@warlock.js/core";
-import { RepositoryManager } from "@warlock.js/core";
-
-import { User } from "../models/user";
-
-export class UsersRepository extends RepositoryManager<User> {
-  /**
-   * {@inheritDoc}
-   */
-  public model = User;
-
-  /**
-   * List default options
-   */
-  protected defaultOptions: RepositoryOptions = this.withDefaultOptions({});
-
-  /**
-   * Filter By options
-   */
-  protected filterBy: FilterByOptions = this.withDefaultFilters({
-    name: "like",
-    isActive: "bool",
-  });
-}
-
-const usersRepository = new UsersRepository();
-
-export default usersRepository;
+import type { FilterByOptions, RepositoryOptions } from "@warlock.js/core";
+import { RepositoryManager } from "@warlock.js/core";
+
+import { User } from "../models/user";
+
+export class UsersRepository extends RepositoryManager<User> {
+  /**
+   * {@inheritDoc}
+   */
+  public model = User;
+
+  /**
+   * List default options
+   */
+  protected defaultOptions: RepositoryOptions = this.withDefaultOptions({});
+
+  /**
+   * Filter By options
+   */
+  protected filterBy: FilterByOptions = this.withDefaultFilters({
+    name: "like",
+    isActive: "bool",
+    activationCode: '='
+  });
+}
+
+const usersRepository = new UsersRepository();
+
+export default usersRepository;