implement user database

Author: mms-gianni

server/.env.template

@@ -1,6 +1,6 @@
 PORT=2000
 DEBUG=*.*
-DATABASE_URL="file:../db/kubero.db"
+DATABASE_URL="file:../db/kubero.sqlite?mode=rwc&_journal=WAL&_busy_timeout=5000"
 LOGLEVEL=verbose
 NODE_ENV=production
 

server/package.json

@@ -21,10 +21,10 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
+    "prisma:init": "npx prisma migrate dev --name init --create-only",
     "prisma:generate": "npx prisma generate",
     "prisma:studio": "npx prisma studio",
     "prisma:reset": "npx prisma migrate reset --force",
-    "prisma:init": "npx prisma migrate dev --name init --create-only",
     "prisma:deploy": "npx prisma migrate deploy",
     "prisma:migrate": "npx prisma migrate deploy",
     "prisma:push": "npx prisma db push",

server/prisma/migrations/20250618115501_init/migration.sql renamed to server/prisma/migrations/20250620120259_init/migration.sql

@@ -2,7 +2,6 @@
 CREATE TABLE "Audit" (
     "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
     "timestamp" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "user" TEXT NOT NULL,
     "severity" TEXT NOT NULL DEFAULT 'normal',
     "action" TEXT NOT NULL,
     "namespace" TEXT NOT NULL,
@@ -11,14 +10,20 @@ CREATE TABLE "Audit" (
     "pipeline" TEXT NOT NULL,
     "resource" TEXT NOT NULL DEFAULT 'unknown',
     "message" TEXT NOT NULL,
+    "user" TEXT NOT NULL,
     "createdAt" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedAt" DATETIME NOT NULL
+    "updatedAt" DATETIME NOT NULL,
+    CONSTRAINT "Audit_user_fkey" FOREIGN KEY ("user") REFERENCES "User" ("id") ON DELETE RESTRICT ON UPDATE CASCADE
 );
 
 -- CreateTable
 CREATE TABLE "User" (
     "id" TEXT NOT NULL PRIMARY KEY,
-    "name" TEXT,
+    "username" TEXT NOT NULL,
+    "firstName" TEXT,
+    "lastName" TEXT,
+    "company" TEXT,
+    "location" TEXT,
     "email" TEXT NOT NULL,
     "emailVerified" DATETIME,
     "password" TEXT NOT NULL,
@@ -104,6 +109,9 @@ CREATE TABLE "_PermissionToToken" (
     CONSTRAINT "_PermissionToToken_B_fkey" FOREIGN KEY ("B") REFERENCES "Token" ("id") ON DELETE CASCADE ON UPDATE CASCADE
 );
 
+-- CreateIndex
+CREATE UNIQUE INDEX "User_username_key" ON "User"("username");
+
 -- CreateIndex
 CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
 

server/prisma/schema.prisma

@@ -21,7 +21,6 @@ generator client {
 model Audit {
   id        Int          @id @default(autoincrement())
   timestamp DateTime     @default(now())
-  user      String
   severity  Severity     @default(normal)
   action    String
   namespace String
@@ -31,6 +30,9 @@ model Audit {
   resource  ResourceType @default(unknown)
   message   String
 
+  user  String
+  users User   @relation(fields: [user], references: [id])
+
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 }
@@ -65,7 +67,11 @@ enum ResourceType {
 
 model User {
   id            String    @id @default(cuid())
-  name          String?
+  username      String    @unique
+  firstName     String?
+  lastName      String?
+  company       String?
+  location      String?
   email         String    @unique
   emailVerified DateTime?
   password      String
@@ -89,6 +95,7 @@ model User {
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
+  Audit     Audit[]
 }
 
 model UserGroup {
@@ -98,16 +105,16 @@ model UserGroup {
 
   users User[]
 
-  createdAt         DateTime            @default(now())
-  updatedAt         DateTime            @updatedAt
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
 }
 
 model Role {
   id          String  @id @default(cuid())
   name        String  @unique
   description String?
 
-  users User[] // Users associated with this role
+  users       User[] // Users associated with this role
   permissions Permission[] // Permissions directly assigned to this role
 
   createdAt DateTime @default(now())
@@ -127,8 +134,8 @@ model Token {
 
   permissions Permission[] // Permissions associated with this token
 
-  createdAt          DateTime             @default(now())
-  updatedAt          DateTime             @updatedAt
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
 }
 
 model Permission {
@@ -137,9 +144,9 @@ model Permission {
   action    String // e.g., "create", "read", "update", "delete"
   namespace String? // Optional namespace for scoping permissions
 
-  roles     Role[]     // Roles that have this permission
-  tokens    Token[]    // Tokens that have this permission
+  roles  Role[] // Roles that have this permission
+  tokens Token[] // Tokens that have this permission
 
-  createdAt          DateTime             @default(now())
-  updatedAt          DateTime             @updatedAt
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
 }

server/src/audit/audit.service.ts

@@ -29,7 +29,7 @@ export class AuditService {
       return;
     }
     const auditEntry: AuditEntry = {
-      user: 'kubero',
+      user: '1',
       severity: 'normal',
       action: 'start',
       namespace: '',
@@ -54,6 +54,12 @@ export class AuditService {
       return;
     }
     try {
+      if (entry.user === '' || entry.user === null) {
+        this.logger.debug(
+          'Audit log entry without user. Defaulting to system user.',
+        );
+        entry.user = '1'; // Default to system user if not provided
+      }
       await this.prisma.audit.create({
         data: {
           user: entry.user,
@@ -65,7 +71,6 @@ export class AuditService {
           pipeline: entry.pipeline,
           resource: entry.resource,
           message: entry.message,
-          // timestamp wird automatisch gesetzt, falls im Prisma-Schema so definiert
         },
       });
       await this.limit(this.logmaxbackups);

server/src/database/database.module.ts

@@ -2,7 +2,7 @@ import { Global, Module, Logger } from '@nestjs/common';
 import { DatabaseService } from './database.service';
 import { PrismaClient } from '@prisma/client';
 
-DatabaseService.Init(); // configing the database connection initialization
+//DatabaseService.Init(); // configing the database connection initialization
 
 @Global()
 @Module({

server/src/database/database.service.ts

@@ -1,10 +1,34 @@
 import { Injectable, Logger } from '@nestjs/common';
-import { PrismaClient } from '@prisma/client'; 
+import { PrismaClient } from '@prisma/client';
+import * as crypto from 'crypto';
+import * as bcrypt from 'bcrypt';
 
 @Injectable()
 export class DatabaseService {
 
-  public static async Init() {
+  private static readonly logger = new Logger(DatabaseService.name);
+  private static readonly prisma = new PrismaClient();
+
+  constructor() {
+    // Initialize the Prisma client
+    DatabaseService.prisma.$connect()
+      .then(() => {
+        DatabaseService.logger.log('Connected to the database successfully.');
+      })
+      .catch((error) => {
+        DatabaseService.logger.error('Failed to connect to the database.', error);
+      });
+    this.runMigrations()
+      .then(() => {
+        // create user after migrations
+        this.createAdminUser()
+      })
+      .catch((error) => {
+        DatabaseService.logger.error('Error during database migrations.', error);
+      });
+  }
+
+  private async init() {
     if (process.env.DATABASE_URL === '' || process.env.DATABASE_URL === undefined) {
       process.env.DATABASE_URL = 'file:../db/kubero.sqlite';
       process.env.DATABASE_TYPE = 'sqlite';
@@ -15,24 +39,89 @@ export class DatabaseService {
     }
   }
 
-  public static async RunMigrations() {
+  private async runMigrations() {
+    const { execSync } = await import('child_process');
 
-    await this.Init();
+    await this.init();
 
     const prisma = new PrismaClient();
 
     try {
       Logger.log('Running Prisma migrations...', 'Bootstrap');
       // @ts-ignore
       await prisma.$executeRawUnsafe?.('PRAGMA foreign_keys=OFF;'); // For SQLite, optional
-      await prisma.$disconnect();
       // Use CLI for migrations
-      const { execSync } = await import('child_process');
       execSync('npx prisma migrate deploy', { stdio: 'inherit' });
+      //execSync('npx prisma migrate deploy', {});
       Logger.log('Prisma migrations completed.', 'Bootstrap');
+      await prisma.$executeRaw`
+        INSERT INTO "User" (
+          "id", 
+          "email", 
+          "username", 
+          "password", 
+          "isActive",
+          createdAt,
+          updatedAt
+        ) VALUES (
+          "1", 
+          '[email protected]', 
+          'system', 
+          '', 
+          false,
+          CURRENT_TIMESTAMP,
+          CURRENT_TIMESTAMP
+        ) ON CONFLICT DO NOTHING;`
+      await prisma.$disconnect();
     } catch (err) {
       Logger.error('Prisma migration failed', err, 'Bootstrap');
       process.exit(1);
     }
   }
+
+  private async createAdminUser() {
+    const prisma = new PrismaClient();
+    
+    // Check if the admin user already exists
+    const existingUser = await prisma.user.findUnique({
+      where: { id: '2' },
+    });
+    if (existingUser) {
+      Logger.log('Admin user already exists. Skipping creation.', 'DatabaseService');
+      return;
+    }
+
+    const adminUser = process.env.KUBERO_ADMIN_USERNAME || 'admin';
+    const adminEmail = process.env.KUBERO_ADMIN_EMAIL || '[email protected]';
+
+    try {
+
+      // Generiere ein zufälliges Passwort
+      const plainPassword = crypto.randomBytes(25).toString('base64').slice(0, 19);
+      // Erstelle einen bcrypt-Hash
+      const passwordHash = await bcrypt.hash(plainPassword, 10);
+      console.log('\n\n\n', 'Admin account created since no user exists yet');
+      console.log('Please change the password after the first login.');
+      console.log('Admin credentials:');
+      console.log('  username: ', adminUser);
+      console.log('  password: ', plainPassword);
+      console.log('  email:    ', adminEmail, '\n\n\n');
+
+      await prisma.user.create({
+        data: {
+          id: '2',
+          username: adminUser,
+          email: adminEmail,
+          password: passwordHash,
+          isActive: true,
+          createdAt: new Date(),
+          updatedAt: new Date(),
+        },
+      });
+      Logger.log('Admin user created successfully.', 'DatabaseService');
+    } catch (error) {
+      Logger.error('Failed to create admin user.', error, 'DatabaseService');
+    }
+    await prisma.$disconnect();
+  }
 }

server/src/main.ts

@@ -31,7 +31,8 @@ async function bootstrap() {
     cors: true,
   });
 
-  DatabaseService.RunMigrations();
+  //DatabaseService.RunMigrations();
+  //DatabaseService.CreateAdminUser();
 
   app.use(
     helmet({

server/src/users/dto/users.dto.ts

@@ -0,0 +1,32 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UserDTO {
+  @ApiProperty()
+  id: string;
+
+  @ApiProperty({ required: true })
+  username: string;
+
+  @ApiProperty({ required: false })
+  firstName?: string;
+
+  @ApiProperty({ required: false })
+  lastName?: string;
+
+  @ApiProperty()
+  email: string;
+
+  @ApiProperty({ required: false })
+  emailVerified?: Date;
+
+  @ApiProperty({ required: false })
+  image?: string;
+
+  @ApiProperty({ required: false })
+  isActive?: boolean;
+}
+
+export class GetAllUsersDTO {
+  @ApiProperty({ type: [UserDTO] })
+  users: UserDTO[];
+}

server/src/users/users.controller.spec.ts

@@ -0,0 +1,18 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { UsersController } from './users.controller';
+
+describe('UsersController', () => {
+  let controller: UsersController;
+
+  beforeEach(async () => {
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [UsersController],
+    }).compile();
+
+    controller = module.get<UsersController>(UsersController);
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+});