(wip: http basic auth)

apps/vdb-backend/package.json

@@ -19,27 +19,32 @@
 	"license": "ISC",
 	"packageManager": "pnpm@10.11.0",
 	"dependencies": {
-		"@feathersjs/feathers": "^5.0.6",
+		"@feathersjs/feathers": "^5.0.49",
 		"@google-cloud/local-auth": "^3.0.1",
 		"@repo/common": "workspace:*",
+		"bcrypt": "^6.0.0",
 		"cors": "^2.8.6",
-		"csv-parser": "^3.2.0",
-		"express": "^5.1.0",
+		"csv-parser": "^3.2.1",
+		"express": "^5.2.1",
 		"google-auth-library": "^9.15.1",
 		"googleapis": "^149.0.0",
 		"node-fetch": "^3.3.2",
 		"passport": "^0.7.0",
+		"passport-http": "^0.3.0",
 		"reflect-metadata": "^0.2.2",
 		"sqlite3": "^5.1.7",
 		"typeorm": "0.3.26",
-		"zod": "^4.1.8"
+		"zod": "^4.4.3"
 	},
 	"devDependencies": {
 		"@total-typescript/ts-reset": "^0.6.1",
+		"@types/bcrypt": "^6.0.0",
 		"@types/cors": "^2.8.19",
-		"@types/express": "^5.0.3",
-		"@types/node": "^22.5.1",
-		"tsx": "^4.19.4",
-		"turbo": "^2.8.0"
+		"@types/express": "^5.0.6",
+		"@types/node": "^22.20.1",
+		"@types/passport": "^1.0.17",
+		"@types/passport-http": "^0.3.11",
+		"tsx": "^4.23.12",
+		"turbo": "^2.10.11"
 	}
 }

apps/vdb-backend/src/db/dbmodel.ts

@@ -10,13 +10,16 @@ import {
 	ManyToMany,
 	JoinTable,
 } from "typeorm";
+import * as bcrypt from 'bcrypt';
 
 @Entity()
 export class Lemma extends BaseEntity {
 	@PrimaryColumn({ type: "text" })
 	lemma_name: string;
 
-	@OneToMany(() => WordForm, (word_form) => word_form.lemma, { cascade: true})
+	@OneToMany(() => WordForm, (word_form) => word_form.lemma, {
+		cascade: true,
+	})
 	word_forms: WordForm[];
 
 	@OneToMany(() => Example, (example) => example.lemma)
@@ -119,21 +122,39 @@ export class PartOfSpeech extends BaseEntity {
 
 @Entity()
 export class User extends BaseEntity {
-	@PrimaryColumn({ type: "text", nullable: false })
+	@PrimaryGeneratedColumn("uuid")
+	user_id: string;
+
+	@Column({ type: "text", nullable: false })
 	user_name: string;
 
-	@ManyToMany(() => Role, (role) => role.users, {eager:true})
+	@Column({ type: "text", nullable: false })
+	password_hash: string;
+
+	@ManyToMany(() => Role, (role) => role.users, { eager: true })
 	@JoinTable()
 	roles: Role[];
 
+	setPassword(plainPassword: string) {
+		this.password_hash = bcrypt.hashSync(plainPassword, 10);
+	}
+
+	checkPassword(plainPassword: string) {
+		return bcrypt.compareSync(plainPassword, this.password_hash);
+	}
+
 }
 
 @Entity()
 export class Role extends BaseEntity {
-	@PrimaryColumn({ type: "text", nullable: false})
+	@PrimaryGeneratedColumn("uuid")
+	role_id: string;
+
+	@Column({ type: "text", nullable: false })
 	role_name: string;
 
-	@ManyToMany(() => User, (user) => user.roles, {eager:true})
+	@ManyToMany(() => User, (user) => user.roles)
 	@JoinTable()
 	users: User[];
-}
+	
+}

apps/vdb-backend/src/index.ts

@@ -9,7 +9,8 @@ import { appDataSource } from "./config/dbconfig.js";
 import { Lemma, WordForm, Lect, Definition, Example, Role, User } from "./db/dbmodel.js";
 import "@total-typescript/ts-reset";
 import { Like, In } from "typeorm";
-import cors from "cors";
+import { BasicStrategy } from "passport-http";
+import passport from "passport";
 
 const RELOAD_SHEET_ON_START = false;
 const SOURCE_FILE = "res/sample.tsv";
@@ -22,77 +23,62 @@ appDataSource
 
 		if (RELOAD_SHEET_ON_START) {
 			await loadSheet();
-			await ensureDefaultRoles();
 		}
+
+		await ensureDefaultRoles();
 	})
 	.catch((error) => console.log(error));
 
 async function ensureDefaultRoles(){
-	const ADMIN_NAME = "admin"
-	const EDITOR_NAME = "editor"
-	const READER_NAME = "reader"
-	
-	let admin_role = new Role();
-	admin_role.role_name = ADMIN_NAME;
+	const ADMIN_NAME = "admin";
+	const EDITOR_NAME = "editor";
+	const READER_NAME = "reader";
 
-	let editor_role = new Role();
-	editor_role.role_name = EDITOR_NAME;
+	let admin_role: Role;
+	let editor_role: Role;
+	let reader_role: Role;
 
-	let reader_role = new Role();
-	reader_role.role_name = READER_NAME;
+	// Initialize roles if they don't exist yet
+	try {
+		[admin_role, editor_role, reader_role] = await Promise.all([
+			Role.findOneBy({ role_name: ADMIN_NAME }).then(r => r || Role.save({ role_name: ADMIN_NAME })),
+			Role.findOneBy({ role_name: EDITOR_NAME }).then(r => r || Role.save({ role_name: EDITOR_NAME })),
+			Role.findOneBy({ role_name: READER_NAME }).then(r => r || Role.save({ role_name: READER_NAME })),
+		]);
+	} catch (error) {
+		console.error("Role initialization failed:", error);
+	}
+
+	// Initialize sample users
 
-	Role.save([admin_role, editor_role, reader_role]);
-	
 	let admin_user: User;
 	let editor_user: User;
 	let reader_user: User;
 
-	await User.findOne({where:
-		{user_name:ADMIN_NAME}
-	}).then(async (u)=>{
-		//if no admin user is detected, generate one with the admin role
-		if (!u){
-			admin_user = new User();
-			admin_user.user_name = ADMIN_NAME;
-			admin_user.roles = [admin_role];
-			await admin_user
-				.save()
-				.then((u)=>{
-					admin_user = u;
-				});
-		}
-	})
+	try {
+		[admin_user, editor_user, reader_user] = await Promise.all([
+			User.findOne({ where: { user_name: ADMIN_NAME } })
+				.then(u => 
+					u || User.save(generate_user(ADMIN_NAME, ADMIN_NAME, [admin_role]))),
+			User.findOne({ where: { user_name: EDITOR_NAME } })
+				.then(u => 
+					u || User.save(generate_user(EDITOR_NAME, EDITOR_NAME, [editor_role]))),
+			User.findOne({ where: { user_name: READER_NAME } })
+				.then(u => 
+					u || User.save(generate_user(READER_NAME, READER_NAME, [reader_role]))),
+		]);
+	} catch (error) {
+		console.error("User initialization failed:", error);
+	}
 
-	await User.findOne({where:
-		{user_name:EDITOR_NAME}
-	}).then(async (u)=>{
-		if (!u){
-			editor_user = new User();
-			editor_user.user_name = EDITOR_NAME;
-			editor_user.roles = [editor_role];
-			await editor_user
-				.save()
-				.then((u)=>{
-					editor_user = u;
-				});
-		}
-	})
-
-	await User.findOne({where:
-		{user_name:READER_NAME}
-	}).then(async (u)=>{
-		if (!u){
-			reader_user = new User();
-			reader_user.user_name = READER_NAME;
-			reader_user.roles = [reader_role];
-			await reader_user
-				.save()
-				.then((u)=>{
-					reader_user = u;
-				});
-		}
-	})
+}
 
+function generate_user(user_name: string, password: string, roles:Role[]): User{
+	let user = new User();
+	user.user_name = user_name;
+	user.roles = roles;
+	user.setPassword(password);
+	return user;
 }
 
 function initExpress() {
@@ -102,6 +88,29 @@ function initExpress() {
 	console.info(path.join(__dirname, '../../ktb-static'));
 
 	app.use(express.json(), express.static(path.join(__dirname, '../../ktb-static')));
+	
+	passport.use(new BasicStrategy(
+		async function(user_name, password, cb) {
+			const user = await User.findOneBy({user_name});
+			if(!user){
+				return cb(null, false);
+			}
+			if(!user.checkPassword(password)){
+				return cb(null, false);
+			}
+
+			return cb(null, user);
+		}
+	));
+	
+	app.use(passport.initialize());
+	app.use(passport.session());
+
+	app.get("/login", 
+		passport.authenticate('basic', { session: false }),
+		(_req, res) => {
+		res.status(200).send();
+	});
 
 	app.get("/sample", (_req, res) => {
 		res.status(200).send(SAMPLE);