create-warlock 2.6.2 → 2.7.1

package/templates/warlock/src/app/users/controllers/auth/resend-activation-code.ts

@@ -1,45 +1,45 @@
-import { Random } from "@mongez/reinforcements";
-import type { Request, Response } from "@warlock.js/core";
-import { ExistsRule } from "@warlock.js/core";
-import { User } from "app/users/models/user";
-
-export default async function resendActivationCode(
-  request: Request,
-  response: Response,
-) {
-  //
-  const user = await User.first({
-    email: request.input("email"),
-  });
-
-  if (!user) {
-    return response.badRequest({
-      error: "User not found",
-    });
-  }
-
-  if (user.get("isActive")) {
-    return response.badRequest({
-      error: "User already activated",
-    });
-  }
-
-  user
-    .save({
-      activationCode: Random.int(100000, 999999),
-      codeExpiresAt: true,
-    })
-    .then(() => {
-      // send mail
-    });
-
-  return response.success({
-    message: "Activation code sent",
-  });
-}
-
-resendActivationCode.validation = {
-  rules: {
-    email: ["required", "email", new ExistsRule(User, "email").insensitive()],
-  },
-};
+import { Random } from "@mongez/reinforcements";
+import type { Request, Response } from "@warlock.js/core";
+import { ExistsRule } from "@warlock.js/core";
+import { User } from "app/users/models/user";
+
+export default async function resendActivationCode(
+  request: Request,
+  response: Response,
+) {
+  //
+  const user = await User.first({
+    email: request.input("email"),
+  });
+
+  if (!user) {
+    return response.badRequest({
+      error: "User not found",
+    });
+  }
+
+  if (user.get("isActive")) {
+    return response.badRequest({
+      error: "User already activated",
+    });
+  }
+
+  user
+    .save({
+      activationCode: Random.int(100000, 999999),
+      codeExpiresAt: true,
+    })
+    .then(() => {
+      // send mail
+    });
+
+  return response.success({
+    message: "Activation code sent",
+  });
+}
+
+resendActivationCode.validation = {
+  rules: {
+    email: ["required", "email", new ExistsRule(User, "email").insensitive()],
+  },
+};

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

@@ -1,43 +1,43 @@
-import { ExistsRule, type Request, type Response } from "@warlock.js/core";
-import { User } from "app/users/models/user";
-
-export default async function resetPassword(
-  request: Request<User>,
-  response: Response,
-) {
-  const currentUser = request.user;
-
-  currentUser.unset("activationCode", "codeExpiresAt");
-
-  currentUser.save({
-    password: request.input("password"),
-  });
-
-  request.clearCurrentUser();
-
-  return response.success();
-}
-
-resetPassword.validation = {
-  rules: {
-    email: ["required", "email", new ExistsRule(User, "email").insensitive()],
-    password: ["required", "confirmed", "minLength:8"],
-    code: ["required", "int", "length:6"],
-  },
-  validate: async (request: Request, response: Response) => {
-    try {
-      const user = await User.first({
-        email: request.input("email"),
-        activationCode: request.int("code"),
-      });
-
-      if (!user) {
-        return response.notFound();
-      }
-
-      request.user = user;
-    } catch (error: any) {
-      return response.badRequest(error.message);
-    }
-  },
-};
+import { ExistsRule, type Request, type Response } from "@warlock.js/core";
+import { User } from "app/users/models/user";
+
+export default async function resetPassword(
+  request: Request<User>,
+  response: Response,
+) {
+  const currentUser = request.user;
+
+  currentUser.unset("activationCode", "codeExpiresAt");
+
+  currentUser.save({
+    password: request.input("password"),
+  });
+
+  request.clearCurrentUser();
+
+  return response.success();
+}
+
+resetPassword.validation = {
+  rules: {
+    email: ["required", "email", new ExistsRule(User, "email").insensitive()],
+    password: ["required", "confirmed", "minLength:8"],
+    code: ["required", "int", "length:6"],
+  },
+  validate: async (request: Request, response: Response) => {
+    try {
+      const user = await User.first({
+        email: request.input("email"),
+        activationCode: request.int("code"),
+      });
+
+      if (!user) {
+        return response.notFound();
+      }
+
+      request.user = user;
+    } catch (error: any) {
+      return response.badRequest(error.message);
+    }
+  },
+};

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

@@ -1,18 +1,18 @@
-import { UniqueRule, type Request, type Response } from "@warlock.js/core";
-import { User } from "app/users/models/user";
-
-export default async function verifyForgetPasswordCode(
-  request: Request,
-  response: Response,
-) {
-  // your code here
-
-  return response.success({});
-}
-
-verifyForgetPasswordCode.validation = {
-  rules: {
-    email: ["required", "email", new UniqueRule(User)],
-    code: ["required", "int", "length:6"],
-  },
-};
+import { UniqueRule, type Request, type Response } from "@warlock.js/core";
+import { User } from "app/users/models/user";
+
+export default async function verifyForgetPasswordCode(
+  request: Request,
+  response: Response,
+) {
+  // your code here
+
+  return response.success({});
+}
+
+verifyForgetPasswordCode.validation = {
+  rules: {
+    email: ["required", "email", new UniqueRule(User)],
+    code: ["required", "int", "length:6"],
+  },
+};

package/templates/warlock/src/app/users/controllers/profile/change-password.ts

@@ -1,31 +1,31 @@
-import { v, type Request, type Response } from "@warlock.js/core";
-import type { User } from "app/users/models/user";
-
-export default async function changePassword(
-  request: Request,
-  response: Response,
-) {
-  const user = request.user;
-
-  await user.save({
-    password: request.input("password"),
-  });
-
-  return response.success();
-}
-
-changePassword.validation = {
-  schema: v.object({
-    password: v.string().minLength(8).required(),
-    confirmPassword: v.string().required().matches("password"),
-  }),
-  validate: (request: Request<User>, response: Response) => {
-    const user = request.user;
-
-    if (!user.confirmPassword(request.input("currentPassword"))) {
-      return response.badRequest({
-        error: "Invalid current password",
-      });
-    }
-  },
-};
+import { v, type Request, type Response } from "@warlock.js/core";
+import type { User } from "app/users/models/user";
+
+export default async function changePassword(
+  request: Request,
+  response: Response,
+) {
+  const user = request.user;
+
+  await user.save({
+    password: request.input("password"),
+  });
+
+  return response.success();
+}
+
+changePassword.validation = {
+  schema: v.object({
+    password: v.string().minLength(8).required(),
+    confirmPassword: v.string().required().matches("password"),
+  }),
+  validate: (request: Request<User>, response: Response) => {
+    const user = request.user;
+
+    if (!user.confirmPassword(request.input("currentPassword"))) {
+      return response.badRequest({
+        error: "Invalid current password",
+      });
+    }
+  },
+};

package/templates/warlock/src/app/users/controllers/profile/my-profile.ts

@@ -1,10 +1,10 @@
-import type { Request, Response } from "@warlock.js/core";
-import type { User } from "app/users/models/user";
-
-export default function myProfile(request: Request<User>, response: Response) {
-  const currentUser = request.user;
-
-  return response.success({
-    user: currentUser,
-  });
-}
+import type { Request, Response } from "@warlock.js/core";
+import type { User } from "app/users/models/user";
+
+export default function myProfile(request: Request<User>, response: Response) {
+  const currentUser = request.user;
+
+  return response.success({
+    user: currentUser,
+  });
+}

package/templates/warlock/src/app/users/controllers/profile/update-profile.ts

@@ -1,25 +1,25 @@
-import type { Request, Response } from "@warlock.js/core";
-import { UniqueRule } from "@warlock.js/core";
-import { User } from "app/users/models/user";
-
-export default async function updateProfile(
-  request: Request<User>,
-  response: Response,
-) {
-  await request.user.save(request.validated());
-
-  return response.success();
-}
-
-updateProfile.validation = {
-  rules: {
-    name: ["required", "minLength:2"],
-    gender: ["in:male,female"],
-    phoneNumber: ["required", new UniqueRule(User).exceptCurrentUser()],
-    email: [
-      "required",
-      "email",
-      new UniqueRule(User).insensitive().exceptCurrentUser(),
-    ],
-  },
-};
+import type { Request, Response } from "@warlock.js/core";
+import { UniqueRule } from "@warlock.js/core";
+import { User } from "app/users/models/user";
+
+export default async function updateProfile(
+  request: Request<User>,
+  response: Response,
+) {
+  await request.user.save(request.validated());
+
+  return response.success();
+}
+
+updateProfile.validation = {
+  rules: {
+    name: ["required", "minLength:2"],
+    gender: ["in:male,female"],
+    phoneNumber: ["required", new UniqueRule(User).exceptCurrentUser()],
+    email: [
+      "required",
+      "email",
+      new UniqueRule(User).insensitive().exceptCurrentUser(),
+    ],
+  },
+};

package/templates/warlock/src/app/users/controllers/restful-users.ts

@@ -1,26 +1,26 @@
-import { Restful, type RouteResource, UniqueRule } from "@warlock.js/core";
-import { User } from "../models/user";
-import { usersRepository } from "../repositories/users.repository";
-
-class RestfulUsers extends Restful<User> implements RouteResource {
-  /**
-   * {@inheritDoc}
-   */
-  protected repository = usersRepository;
-
-  /**
-   * {@inheritDoc}
-   */
-  public validation: RouteResource["validation"] = {
-    create: {
-      rules: {
-        name: ["required", "min:2"],
-        // If the request is a create request, except current id  will be ignored
-        // otherwise, the id in the update request will be used as a filter to ignore the current id
-        email: ["required", "email", new UniqueRule(User).exceptCurrentId()],
-      },
-    },
-  };
-}
-
-export const restfulUsers = new RestfulUsers();
+import { Restful, type RouteResource, v } from "@warlock.js/core";
+import { User } from "../models/user";
+import { usersRepository } from "../repositories/users.repository";
+
+class RestfulUsers extends Restful<User> implements RouteResource {
+  /**
+   * {@inheritDoc}
+   */
+  protected repository = usersRepository;
+
+  /**
+   * {@inheritDoc}
+   */
+  public validation: RouteResource["validation"] = {
+    create: {
+      schema: v.object({
+        name: v.string().minLength(2).required(),
+        email: v.string().email().required().unique(User, {
+          except: "id",
+        }),
+      }),
+    },
+  };
+}
+
+export const restfulUsers = new RestfulUsers();

package/templates/warlock/src/app/users/events/attach-user-to-response.ts

@@ -1,18 +1,18 @@
-import { Response } from "@warlock.js/core";
-
-export function attachCurrentUserToResponse(response: Response) {
-  if (!response.isJson) return;
-
-  const responseData = response.body;
-
-  if (!responseData || responseData.user) return;
-
-  const currentUser = response.request.user;
-
-  if (!currentUser) return;
-
-  responseData.user = currentUser;
-}
-
-// add current user to response
-Response.on("sending", attachCurrentUserToResponse);
+import { Response } from "@warlock.js/core";
+
+export function attachCurrentUserToResponse(response: Response) {
+  if (!response.isJson) return;
+
+  const responseData = response.body;
+
+  if (!responseData || responseData.user) return;
+
+  const currentUser = response.request.user;
+
+  if (!currentUser) return;
+
+  responseData.user = currentUser;
+}
+
+// add current user to response
+Response.on("sending", attachCurrentUserToResponse);

package/templates/warlock/src/app/users/events/register-current-user-to-model-authors.ts

@@ -1,28 +1,28 @@
-/**
- * This event is responsible for adding the current user to any model that is being saved
- * Such as createdBy and updatedBy so you don't need to add it manually.
- */
-import { isEmpty } from "@mongez/supportive-is";
-import { Model } from "@warlock.js/cascade";
-import { useRequestStore } from "@warlock.js/core";
-import type { User } from "../models/user";
-
-Model.events()
-  .onSaving((model: Model, oldModel?: Model) => {
-    const { user } = useRequestStore<User>();
-
-    if (!user) return;
-
-    if (!oldModel && isEmpty(model.get("createdBy"))) {
-      model.set("createdBy", user.embeddedData);
-    }
-
-    model.set("updatedBy", user.embeddedData);
-  })
-  .onDeleting((model: Model) => {
-    const { user } = useRequestStore<User>();
-
-    if (!user || user.userType === "guest") return;
-
-    model.set("deletedBy", user.embeddedData);
-  });
+/**
+ * This event is responsible for adding the current user to any model that is being saved
+ * Such as createdBy and updatedBy so you don't need to add it manually.
+ */
+import { isEmpty } from "@mongez/supportive-is";
+import { Model } from "@warlock.js/cascade";
+import { useRequestStore } from "@warlock.js/core";
+import type { User } from "../models/user";
+
+Model.events()
+  .onSaving((model: Model, oldModel?: Model) => {
+    const { user } = useRequestStore<User>();
+
+    if (!user) return;
+
+    if (!oldModel && isEmpty(model.get("createdBy"))) {
+      model.set("createdBy", user.embeddedData);
+    }
+
+    model.set("updatedBy", user.embeddedData);
+  })
+  .onDeleting((model: Model) => {
+    const { user } = useRequestStore<User>();
+
+    if (!user || user.userType === "guest") return;
+
+    model.set("deletedBy", user.embeddedData);
+  });

package/templates/warlock/src/app/users/events/update-authors.ts

@@ -1,19 +1,19 @@
-import { Aggregate, database } from "@warlock.js/cascade";
-import { User } from "../models/user";
-
-User.events().onSaved(async (user: User) => {
-  // list all collections in the database
-  const collections = await database.listCollectionNames();
-
-  // this will update the createdBy and updatedBy fields in all collections
-  // it may take some time if you have a lot of collections or documents but it's the best way to do it
-  for (const collection of collections) {
-    new Aggregate(collection).where("createdBy.id", user.id).update({
-      createdBy: user.embeddedData,
-    });
-
-    new Aggregate(collection).where("updatedBy.id", user.id).update({
-      updatedBy: user.embeddedData,
-    });
-  }
-});
+import { Aggregate, database } from "@warlock.js/cascade";
+import { User } from "../models/user";
+
+User.events().onSaved(async (user: User) => {
+  // list all collections in the database
+  const collections = await database.listCollectionNames();
+
+  // this will update the createdBy and updatedBy fields in all collections
+  // it may take some time if you have a lot of collections or documents but it's the best way to do it
+  for (const collection of collections) {
+    new Aggregate(collection).where("createdBy.id", user.id).update({
+      createdBy: user.embeddedData,
+    });
+
+    new Aggregate(collection).where("updatedBy.id", user.id).update({
+      updatedBy: user.embeddedData,
+    });
+  }
+});

package/templates/warlock/src/app/users/mail/send-forget-password-email.ts

@@ -1,20 +1,20 @@
-import { sendMail } from "@warlock.js/core";
-import type { User } from "../models/user";
-
-export default async function sendForgetPasswordEmail(user: User) {
-  await sendMail({
-    to: user.get("email"),
-    subject: "Reset Password",
-    html: `
-    <h3>Hello, ${user.get("name")}</h3>
-
-    <p>Use the following code to reset your password:</p>
-
-    <p>Please note that this code will expire in 10 minutes.</p>
-
-    <p>Your reset password code is: <strong>${user.get(
-      "activationCode",
-    )}</strong></p>
-    `,
-  });
-}
+import { sendMail } from "@warlock.js/core";
+import type { User } from "../models/user";
+
+export default async function sendForgetPasswordEmail(user: User) {
+  await sendMail({
+    to: user.get("email"),
+    subject: "Reset Password",
+    html: `
+    <h3>Hello, ${user.get("name")}</h3>
+
+    <p>Use the following code to reset your password:</p>
+
+    <p>Please note that this code will expire in 10 minutes.</p>
+
+    <p>Your reset password code is: <strong>${user.get(
+      "activationCode",
+    )}</strong></p>
+    `,
+  });
+}

package/templates/warlock/src/app/users/models/user/index.ts

@@ -1 +1 @@
-export * from "./user.model";
+export * from "./user.model";

package/templates/warlock/src/app/users/models/user/migrations/20-10-2024_07-59-54-user.migration.ts

@@ -1,15 +1,15 @@
-import { migrationOffice } from "@warlock.js/cascade";
-import { User } from "../user.model";
-
-export default migrationOffice.register({
-  name: "users",
-  blueprint: User.blueprint(),
-  up: blueprint => {
-    blueprint.unique("id");
-    blueprint.unique("email");
-  },
-  down(blueprint) {
-    blueprint.dropUniqueIndex("id");
-    blueprint.dropUniqueIndex("email");
-  },
-});
+import { migrationOffice } from "@warlock.js/cascade";
+import { User } from "../user.model";
+
+export default migrationOffice.register({
+  name: "users",
+  blueprint: User.blueprint(),
+  up: blueprint => {
+    blueprint.unique("id");
+    blueprint.unique("email");
+  },
+  down(blueprint) {
+    blueprint.dropUniqueIndex("id");
+    blueprint.dropUniqueIndex("email");
+  },
+});