From 9b4ed31bc5625098930ae7e0e669500f3ea5ee0a Mon Sep 17 00:00:00 2001 From: mansourkira Date: Sun, 17 Mar 2024 21:36:35 +0100 Subject: [PATCH] chore : update files to js & npm test --- test/index.spec.js | 10 +--- tsconfig.json | 4 +- www/src/@sikka/hajar/core/auth/index.js | 6 +++ www/src/@sikka/hajar/core/auth/index.ts | 1 - .../hajar/core/auth/{login.ts => login.js} | 21 ++------ .../@sikka/hajar/core/{init.ts => init.js} | 54 +++++++++---------- www/src/@sikka/hajar/core/utils/HajarError.js | 11 ++++ www/src/@sikka/hajar/core/utils/HajarError.ts | 22 -------- www/src/@sikka/hajar/index.js | 11 ++++ www/src/@sikka/hajar/index.ts | 9 ---- 10 files changed, 63 insertions(+), 86 deletions(-) create mode 100644 www/src/@sikka/hajar/core/auth/index.js delete mode 100644 www/src/@sikka/hajar/core/auth/index.ts rename www/src/@sikka/hajar/core/auth/{login.ts => login.js} (53%) rename www/src/@sikka/hajar/core/{init.ts => init.js} (52%) create mode 100644 www/src/@sikka/hajar/core/utils/HajarError.js delete mode 100644 www/src/@sikka/hajar/core/utils/HajarError.ts create mode 100644 www/src/@sikka/hajar/index.js delete mode 100644 www/src/@sikka/hajar/index.ts diff --git a/test/index.spec.js b/test/index.spec.js index 3d966d3..cff950a 100644 --- a/test/index.spec.js +++ b/test/index.spec.js @@ -1,13 +1,7 @@ -const Hajar = require("../src/index").default; +const { hajar } = require("../www/src/@sikka/hajar/index"); -// Replace with actual tests describe("Hajar.src.js", () => { it("should get the library's version", () => { - expect(Hajar.version).toEqual("1.0.41"); - }); - - it("should get the library's name", () => { - const name = Hajar._name; - expect(name).toEqual("Hajar"); + expect(hajar.version).toEqual("1.0.41"); }); }); diff --git a/tsconfig.json b/tsconfig.json index 3942105..c60b3b1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -20,8 +20,8 @@ "forceConsistentCasingInFileNames": true // Disallow inconsistently-cased references to the same file }, "include": [ - "www/src/@sikka/hajar/core/**/*", // Include all files in the src directory - "www/src/@sikka/hajar/index.ts" + "www/src/@sikka/hajar/core/**/*", + "www/src/@sikka/hajar/index.js" ], "exclude": [ "node_modules", // Exclude the node_modules directory diff --git a/www/src/@sikka/hajar/core/auth/index.js b/www/src/@sikka/hajar/core/auth/index.js new file mode 100644 index 0000000..c82615c --- /dev/null +++ b/www/src/@sikka/hajar/core/auth/index.js @@ -0,0 +1,6 @@ +const login = require("./login"); + +// @TODO add register function here +module.exports = { + login, +}; diff --git a/www/src/@sikka/hajar/core/auth/index.ts b/www/src/@sikka/hajar/core/auth/index.ts deleted file mode 100644 index f54d11b..0000000 --- a/www/src/@sikka/hajar/core/auth/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "./login"; diff --git a/www/src/@sikka/hajar/core/auth/login.ts b/www/src/@sikka/hajar/core/auth/login.js similarity index 53% rename from www/src/@sikka/hajar/core/auth/login.ts rename to www/src/@sikka/hajar/core/auth/login.js index f76ea4a..f419261 100644 --- a/www/src/@sikka/hajar/core/auth/login.ts +++ b/www/src/@sikka/hajar/core/auth/login.js @@ -1,19 +1,8 @@ -import jwt from "jsonwebtoken"; -import bcrypt from "bcrypt"; -import { secret } from "../init"; -import { User } from "../init"; +const jwt = require("jsonwebtoken"); +const bcrypt = require("bcrypt"); +const { User, secret } = require("../init.js"); -interface ILoginResponse { - success: boolean; - user: object; - token: string; -} - -async function login( - userType: string, - email: string, - password: string -): Promise { +async function login(userType, email, password) { const user = await User.findOne({ email, ref: userType }); if (!user) { @@ -33,4 +22,4 @@ async function login( }; } -export default login; +module.exports = login; diff --git a/www/src/@sikka/hajar/core/init.ts b/www/src/@sikka/hajar/core/init.js similarity index 52% rename from www/src/@sikka/hajar/core/init.ts rename to www/src/@sikka/hajar/core/init.js index 29da62b..6288d1f 100644 --- a/www/src/@sikka/hajar/core/init.ts +++ b/www/src/@sikka/hajar/core/init.js @@ -1,30 +1,18 @@ -import mongoose, { Model } from "mongoose"; - -interface IUser { - findOne: (query: any) => Promise; -} - -interface IAdmin { - findOne: (query: any) => Promise; -} - -interface IClient { - findOne: (query: any) => Promise; -} +const mongoose = require("mongoose"); let initialized = false; -let secret: string; -let mongooseInstance: typeof mongoose; -let User: IUser; -let Admin: IAdmin; -let Client: IClient; +let secret; +let mongooseInstance; +let User; +let Admin; +let Client; -export function initHajar( - jwtSecret: string, - inputMongooseInstance: typeof mongoose, - userModel: IUser, - adminModel: IAdmin, - clientModel: IClient +function initHajar( + jwtSecret, + inputMongooseInstance, + userModel, + adminModel, + clientModel ) { if (initialized) { throw new Error("Hajar is already initialized"); @@ -38,7 +26,7 @@ export function initHajar( initialized = true; } -export async function getUserType(email: string): Promise { +async function getUserType(email) { const user = await User.findOne({ email }); if (!user) { throw new Error("User not found"); @@ -46,7 +34,7 @@ export async function getUserType(email: string): Promise { return user.ref; } -export async function getAdminData(user: any): Promise { +async function getAdminData(user) { if (user.ref === "admin") { const adminData = await Admin.findOne({ uid: user._id }); if (!adminData) { @@ -57,7 +45,7 @@ export async function getAdminData(user: any): Promise { return null; } -export async function getClientData(user: any): Promise { +async function getClientData(user) { if (user.ref === "client") { const clientData = await Client.findOne({ uid: user._id }); if (!clientData) { @@ -68,4 +56,14 @@ export async function getClientData(user: any): Promise { return null; } -export { secret, mongooseInstance, User, Admin, Client }; +module.exports = { + initHajar, + getUserType, + getAdminData, + getClientData, + secret, + mongooseInstance, + User, + Admin, + Client, +}; diff --git a/www/src/@sikka/hajar/core/utils/HajarError.js b/www/src/@sikka/hajar/core/utils/HajarError.js new file mode 100644 index 0000000..0d088e3 --- /dev/null +++ b/www/src/@sikka/hajar/core/utils/HajarError.js @@ -0,0 +1,11 @@ +class HajarError extends Error { + constructor(message, slug, customProperties) { + super(message); + this.slug = slug; + if (customProperties) { + Object.assign(this, customProperties); + } + } +} + +module.exports = HajarError; diff --git a/www/src/@sikka/hajar/core/utils/HajarError.ts b/www/src/@sikka/hajar/core/utils/HajarError.ts deleted file mode 100644 index 6f068d5..0000000 --- a/www/src/@sikka/hajar/core/utils/HajarError.ts +++ /dev/null @@ -1,22 +0,0 @@ -interface CustomProperties { - [key: string]: any; -} - -class HajarError extends Error { - slug: string; - customProperties?: CustomProperties; - - constructor( - message: string, - slug: string, - customProperties?: CustomProperties - ) { - super(message); - this.slug = slug; - if (customProperties) { - Object.assign(this, customProperties); - } - } -} - -export default HajarError; diff --git a/www/src/@sikka/hajar/index.js b/www/src/@sikka/hajar/index.js new file mode 100644 index 0000000..b7cfe0d --- /dev/null +++ b/www/src/@sikka/hajar/index.js @@ -0,0 +1,11 @@ +// index.js +/* const auth = require("./core/auth"); */ +const initHajar = require("./core/init.js"); + +const hajar = { + /* auth: auth, */ + initHajar, + version: "1.0.41", +}; + +module.exports = { hajar }; diff --git a/www/src/@sikka/hajar/index.ts b/www/src/@sikka/hajar/index.ts deleted file mode 100644 index 8d4523f..0000000 --- a/www/src/@sikka/hajar/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -import * as auth from "./core/auth"; -import { initHajar } from "./core/init"; -//import * as aws from "./aws"; -const hajar = { - auth, - initHajar, -}; - -export { hajar };