aaex-cli 2.0.2 → 2.1.0

package/README.md

@@ -1,6 +1,6 @@
 # AaExJS
 
-## V.2.0.1
+## V.2.1.0
 
 Bug fix for css modules
 

package/create-aaex-app.js

@@ -66,9 +66,11 @@ async function createPackageJson() {
       "aaex-file-router": "^2.0.0",
       jsonwebtoken: "^9.0.3",
       mongodb: "^7.0.0",
+      pg: "^8.16.3",
+
       bcrypt: "^6.0.0",
       dotenv: "^17.2.3",
-      "aaexjs": "^2.0.2"
+      aaexjs: "^2.1.5",
     },
     devDependencies: {
       typescript: "~5.9.2",
@@ -76,6 +78,8 @@ async function createPackageJson() {
       "@types/react-dom": "^19.1.9",
       "@types/express": "^5.0.3",
       "@vitejs/plugin-react": "^5.0.2",
+      "@types/pg": "^8.16.0",
+
       vite: "^7.1.5",
       "cross-env": "^10.0.0",
       "@types/bcrypt": "^6.0.0",
@@ -108,8 +112,8 @@ async function main() {
       message: "Which database do you want to use?",
       choices: [
         "MongoDB",
-        "MySQL - not implemented",
-        "PostgreSQL - not implemented",
+        "MySQL --not implemented",
+        "PostgreSQL --not fully implemented",
       ],
       default: 0,
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aaex-cli",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Command line interface for creating aaexjs app",
   "license": "ISC",
   "author": "",
@@ -16,6 +16,7 @@
     "@types/express": "^5.0.6",
     "@types/jsonwebtoken": "^9.0.10",
     "@types/node": "^24.10.1",
+    "@types/pg": "^8.16.0",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "^5.1.1",
@@ -24,6 +25,7 @@
     "express": "^5.2.1",
     "jsonwebtoken": "^9.0.3",
     "mongodb": "^7.0.0",
+    "pg": "^8.16.3",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
     "react-router": "^7.10.1",

package/template/src/api/auth/login.ts

@@ -0,0 +1,53 @@
+import type { Request, Response } from "express";
+import jwt from "jsonwebtoken";
+import UserModel, { LoginUser, UserShape } from "../../models/User";
+
+export const POST = async (req: Request, res: Response) => {
+  const { email, password }: LoginUser = req.body;
+
+  if (!email || !password) {
+    return res.status(400).json({ error: "Missing fields!" });
+  }
+
+  if (!process.env.JWT_SECRET) {
+    console.error("Missing: JWT_SECRET from environment variables");
+    return res
+      .status(500)
+      .json({ error: "Internal server error! Try again later" });
+  }
+
+  const normalizedEmail = email.trim().toLowerCase();
+  const user = await UserModel.findOne<UserShape>({ email: normalizedEmail });
+
+  if (!user) {
+    return res.status(400).json({ error: "Invalid email or password" });
+  }
+
+  const compared = await UserModel.comparePassword(password, user.password);
+
+  if (!compared) {
+    return res.status(400).json({ error: "Invalid email or password" });
+  }
+
+  const expiration = process.env.JWT_EXP ?? "24h";
+
+  const token = jwt.sign(
+    {
+      id: user.id,
+      email: user.email,
+      username: user.username,
+    },
+    process.env.JWT_SECRET as string,
+    { expiresIn: expiration as any } //fixes stupid thing where it wont accept the sring variable because its not number | ms.stringvlue | undefined
+  );
+
+  return res.status(200).json({
+    ok: true,
+    user: {
+      id: user.id,
+      name: user.username,
+      email: user.email,
+    },
+    token,
+  });
+};

package/template/src/api/auth/register.ts

@@ -0,0 +1,34 @@
+import { Request, Response } from "express";
+import UserModel, { CreateUser, UserShape } from "../../models/User";
+export const POST = async (req: Request, res: Response) => {
+  const { email, username, password, confirmPass }: CreateUser = req.body;
+
+  if (!username || !email || !password || !confirmPass)
+    return res.status(400).json({ error: "Missing fields" });
+
+  if (password !== confirmPass)
+    return res.status(400).json({ error: "Passwords do not match" });
+
+  const exists = await UserModel.findOne<UserShape>({ email });
+  if (exists)
+    return res
+      .status(409)
+      .json({ error: "User with that email already exists" });
+
+  const salt = 10;
+  const hashed = await UserModel.hashPassword(password, salt);
+
+  const created = await UserModel.create<Omit<CreateUser, "confirmPass">>({
+    username,
+    email,
+    password: hashed,
+    createdAt: new Date(),
+  });
+
+  if (!created) {
+    return res.status(500).json({ error: "User creation failed" });
+  }
+  return res
+    .status(201)
+    .json({ ok: true, insertedId: (created as UserShape).id });
+};

package/template/src/api/auth/validate.ts

@@ -0,0 +1,18 @@
+import jwt from "jsonwebtoken";
+import type { Request, Response } from "express";
+
+export async function POST(req: Request, res: Response) {
+  const { token } = req.body;
+
+  if (!process.env.JWT_SECRET) {
+    console.error("Missing: JWT_SECRET from environment");
+    return res.status(500).json({error: "Internal server error!"});
+  }
+
+  try {
+    const decoded = jwt.verify(token, process.env.JWT_SECRET);
+    return res.status(200).json({ valid: true, user: decoded });
+  } catch (err) {
+    return res.status(401).json({ valid: false });
+  }
+}

package/template/src/models/User.ts

@@ -1,13 +1,53 @@
-export type User = {
-  id: string;
+export interface UserShape {
+  id: string; // normalized for both mongodb and postgres
   email: string;
   username: string;
   password: string;
+  createdAt: Date;
+}
+
+//helper types for api and forms
+export type CreateUser = Omit<UserShape, "id"> & {
   confirmPass: string;
 };
 
-export type CreateUser = Omit<User, "id">; //should not be edited
+export type LoginUser = Pick<UserShape, "email" | "password">;
+
+export type CookieUser = Omit<UserShape, "password" | "confirmPass">;
+
+//the model
+import { Model } from "aaexjs/database";
+import bcrypt from "bcrypt";
+
+export default class User extends Model<User> {
+  static collection = "users"; //defines the collection for the users
 
-export type LoginUser = Pick<User, "email" | "password">; //should not be edited
+  // ===================================================
+  // ============= Collection specific =================
+  // ===================================================
+  /**
+   * Hash a plain password
+   * @param password - The password to hash
+   * @param salt - The number of salt rounds default 10
+   * @returns Promise resolving to the hashed password
+   */
+  static async hashPassword(
+    password: string,
+    salt: number = 10
+  ): Promise<string> {
+    return bcrypt.hash(password, salt);
+  }
 
-export type CookieUser = Omit<User, "password" | "confirmPass">;
+  /**
+   * Compare a plain password with a hash
+   * @param password - Plain password
+   * @param hash - Hashed password
+   * @returns Promise resolving to true if match
+   */
+  static async comparePassword(
+    password: string,
+    hash: string
+  ): Promise<boolean> {
+    return bcrypt.compare(password, hash);
+  }
+}

package/template/src/pages/test/[slug].tsx

@@ -1,7 +0,0 @@
-import { useParams } from "react-router";
-
-export default function Test() {
-  const { slug } = useParams();
-
-  return <>{slug}</>;
-}