Redirect Response, Add Auth Factory, jwt improvements

.gitignore

@@ -177,4 +177,5 @@ bun.lockb
 .DS_Store
 
 .vscode
-.npmrc
+.npmrc
+.history

index.ts

@@ -4,7 +4,7 @@ import * as dataGen from "./modules/data-gen";
 import * as deploy from "./modules/deploy";
 import * as fetcher from "./modules/fetcher";
 import * as filesFolders from "./modules/files-folders";
-import * as hash from "./modules/hash";
+import * as auth from "./modules/auth";
 import * as htmlody from "./modules/htmlody";
 import * as jwt from "./modules/jwt";
 import * as logger from "./modules/logger";
@@ -25,7 +25,7 @@ export {
     deploy,
     fetcher,
     filesFolders,
-    hash,
+    auth,
     htmlody,
     jwt,
     logger,

modules/auth/README.md

@@ -0,0 +1 @@
+# Auth Module

modules/hash/non-secure-hash-factory.test.ts → modules/auth/hash-factory.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { createNonSecureHashFactory } from "./non-secure-hash-factory";
+import { createNonSecureHashFactory } from "./hash-factory";
 
 describe("NonSecureHashFactory", () => {
   const factory = createNonSecureHashFactory();

modules/auth/index.ts

@@ -0,0 +1,9 @@
+export { createNonSecureHashFactory } from "./hash-factory";
+export { createSecureHashFactory } from "./secure-hash-factory";
+
+export {
+  createSecurityToken,
+  createToken,
+  getTokenExpireEpoch,
+  verifyToken
+} from "./security-token";

modules/hash/secure-hash-factory.ts → modules/auth/secure-hash-factory.ts

@@ -1,4 +1,4 @@
-type SecureHashConfig = {
+export type SecureHashConfig = {
   algorithm: "bcrypt";
   memoryCost?: number;
   timeCost?: number;

modules/auth/security-token.test.ts

@@ -0,0 +1,68 @@
+import { describe, it } from "bun:test";
+import { expect } from "bun:test";
+import {
+  getTokenExpireEpoch,
+  createToken,
+  verifyToken,
+  createSecurityToken,
+} from ".";
+
+describe("Token Utilities", () => {
+  describe("getTokenExpireEpoch", () => {
+    it("should return the correct expiration epoch", () => {
+      const date = new Date("2023-10-26T12:00:00Z");
+      const tokenValidTimeSec = 3600; // 1 hour in seconds
+      const expected = date.getTime() + tokenValidTimeSec * 1000; // convert seconds to milliseconds
+      const result = getTokenExpireEpoch(date, tokenValidTimeSec);
+
+      // Diagnostics
+      console.log("Original Date Epoch:", date.getTime());
+      console.log(
+        "Token Valid Time in Milliseconds:",
+        tokenValidTimeSec * 1000
+      );
+      console.log("Expected:", expected);
+      console.log("Received:", result);
+
+      expect(result).toEqual(expected);
+    });
+  });
+  describe("verifyToken", () => {
+    it("should verify the token correctly", async () => {
+      const salt = "randomSalt";
+      const originalString = "testToken";
+      const hashedToken = await createToken(originalString, salt);
+      const isVerified = await verifyToken(originalString, salt, hashedToken);
+      expect(isVerified).toBe(true);
+    });
+  });
+
+  describe("createToken", () => {
+    it("should create a hashed token", async () => {
+      const salt = "randomSalt";
+      const originalString = "testToken";
+      const hashedToken = await createToken(originalString, salt);
+      expect(hashedToken).toBeTruthy();
+      expect(hashedToken).not.toEqual(originalString); // Ensure the hashed token is not the same as the original string
+    });
+  });
+
+  describe("createSecurityToken", () => {
+    it("should create a security token with default expiration time", async () => {
+
+
+      const result = await createSecurityToken(5000);
+      expect(result.securityToken).toBeTruthy();
+      expect(result.tokenId).toBeTruthy();
+      expect(result.tokenExpireEpoch).toBeGreaterThan(Date.now());
+    });
+
+    it("should create a security token with specified expiration time", async () => {
+      const currentTime = new Date();
+      const tokenValidTime = 60 * 15; // 15 minutes
+      const result = await createSecurityToken(tokenValidTime, currentTime);
+      const expectedExpiration = currentTime.getTime() + (tokenValidTime * 1000);
+      expect(result.tokenExpireEpoch).toBeCloseTo(expectedExpiration, -2); // -2 is for a precision of 10 milliseconds
+    });
+  });
+});

modules/auth/security-token.ts

@@ -0,0 +1,58 @@
+import { v7 as uuid } from "mod/uuid";
+
+export const getTokenExpireEpoch = (date: Date, tokenValidTimeSec: number) => {
+  const expireEpoch = date.getTime() + tokenValidTimeSec * 1000;
+
+  console.log(
+    "Inside getTokenExpireEpoch:",
+    date.getTime(),
+    tokenValidTimeSec,
+    expireEpoch
+  );
+
+  return expireEpoch;
+};
+
+export async function verifyToken(
+  tokenString: string,
+  salt: string,
+  storedHash: string
+) {
+  const fullPassword = tokenString + salt;
+  const isMatch = await Bun.password.verify(fullPassword, storedHash);
+
+  return isMatch;
+}
+
+export async function createToken(string: string, salt: string) {
+  const fullPassword = string + salt;
+  return await Bun.password.hash(fullPassword, {
+    algorithm: "argon2id",
+    memoryCost: 65536,
+    timeCost: 3,
+  });
+}
+
+export const createSecurityToken = async (
+  tokenValidTime: number,
+  currentDate?: Date
+) => {
+  const salt = uuid();
+  const { uuid: tokenId, timestamp } = uuid({
+    returnTimestamp: true,
+    dateTime: currentDate,
+  });
+
+  console.log("createSecurityToken Timestamp:", currentDate, timestamp);
+
+  console.log(currentDate?.getTime(), timestamp.getTime());
+
+  const securityToken = await createToken(tokenId, salt);
+  const tokenExpireEpoch = getTokenExpireEpoch(timestamp, tokenValidTime);
+
+  return {
+    securityToken,
+    tokenId,
+    tokenExpireEpoch,
+  };
+};

modules/htmlody/html-factory.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from "bun:test";
 import { CRNode } from ".";
 import { cc } from "./css-engine";
-import { htmlFactory } from "./html-factory";
+import { pageGenerator } from "./html-factory";
 import type { JsonHtmlNodeMap } from "./html-type-engine";
 import { htmlBody } from "./html-type-engine.test";
 
@@ -22,66 +22,55 @@ describe("htmlFactory", () => {
   };
 
   it("renders basic elements correctly", () => {
-    const factory = htmlFactory(mockHeadConfig, mockBodyConfig, {
-      pageTitle: "Test Page",
-    });
-    const htmlOut = factory.getHtmlOut();
+    const factory = pageGenerator(mockHeadConfig);
+    const htmlOut = factory.buildHtml(mockBodyConfig);
 
     expect(htmlOut).toContain('<div class="bg-blue-500">');
     expect(htmlOut).toContain("Test Content");
     expect(htmlOut).toContain("</div>");
   });
 
   it("renders attributes correctly", () => {
-    const factory = htmlFactory(mockHeadConfig, mockBodyConfig, {
-      pageTitle: "Test Page",
-    });
-    const htmlOut = factory.getHtmlOut();
+    const factory = pageGenerator(mockHeadConfig);
+    const htmlOut = factory.buildHtml(mockBodyConfig);
 
     expect(htmlOut).toContain('class="bg-blue-500"');
   });
 
   it("renders nested children correctly", () => {
-    const factory = htmlFactory(mockHeadConfig, mockBodyConfig, {
-      pageTitle: "Test Page",
-    });
-    const htmlOut = factory.getHtmlOut();
+    const factory = pageGenerator(mockHeadConfig);
+    const htmlOut = factory.buildHtml(mockBodyConfig);
 
     expect(htmlOut).toContain("<span>");
     expect(htmlOut).toContain("Child Content");
     expect(htmlOut).toContain("</span>");
   });
 
   it("handles optional configurations correctly", () => {
-    const factory = htmlFactory(mockHeadConfig, mockBodyConfig, {
-      pageTitle: "Test Page",
-      useTailwind: true,
+    const factory = pageGenerator(mockHeadConfig, {
       useHtmx: true,
     });
-    const htmlOut = factory.getHtmlOut();
+    const htmlOut = factory.buildHtml(mockBodyConfig);
 
-    expect(htmlOut).toContain(
-      '<script src="https://cdn.tailwindcss.com"></script>'
-    );
     expect(htmlOut).toContain(
       '<script src="https://unpkg.com/htmx.org"></script>'
     );
   });
 });
 
 const createPageFactory = () => {
-  return htmlFactory({ title: "My Title" }, htmlBody, {
-    pageTitle: "My Page",
-    // tailwindConfig,
-    useHtmx: true,
-    useTailwind: true,
-  });
+  return pageGenerator(
+    { title: "My Title" },
+    {
+      useHtmx: true,
+    }
+  );
 };
 
 describe("htmlFactory", () => {
   it("renders complete HTML structure based on provided config", () => {
     const factory = createPageFactory();
-    const htmlOut = factory.getHtmlOut();
+    const htmlOut = factory.buildHtml(htmlBody);
 
     expect(htmlOut).toContain(
       '<h1 class="bg-blue-500" id="title-id">Hello World</h1>'
@@ -97,11 +86,8 @@ describe("htmlFactory", () => {
 
   it("includes optional configurations like Tailwind and htmx", () => {
     const factory = createPageFactory();
-    const htmlOut = factory.getHtmlOut();
+    const htmlOut = factory.buildHtml(htmlBody);
 
-    expect(htmlOut).toContain(
-      '<script src="https://cdn.tailwindcss.com"></script>'
-    );
     expect(htmlOut).toContain(
       '<script src="https://unpkg.com/htmx.org"></script>'
     );