add e2e

.env.e2e

@@ -0,0 +1,6 @@
+DATABASE_USER=test
+DATABASE_PASS=test
+DATABASE_HOST=localhost
+DATABASE_NAME=test
+DATABASE_PORT=4401
+JWT_SECRET="secret"

.gitignore

@@ -1,7 +1,7 @@
 # compiled output
-dist
-node_modules
-build
+/dist
+/node_modules
+/build
 
 # Logs
 logs
@@ -16,11 +16,11 @@ lerna-debug.log*
 .DS_Store
 
 # Tests
-coverage
-.nyc_output
+/coverage
+/.nyc_output
 
 # IDEs and editors
-.idea
+/.idea
 .project
 .classpath
 .c9/

admin/.editorconfig

@@ -1,17 +0,0 @@
-# Editor configuration, see https://editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.ts]
-quote_type = single
-ij_typescript_use_double_quotes = false
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false

admin/.gitignore

@@ -1,43 +0,0 @@
-# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
-
-# Compiled output
-/dist
-/tmp
-/out-tsc
-/bazel-out
-
-# Node
-/node_modules
-npm-debug.log
-yarn-error.log
-
-# IDEs and editors
-.idea/
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# Visual Studio Code
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-.history/*
-
-# Miscellaneous
-/.angular/cache
-.sass-cache/
-/connect.lock
-/coverage
-/libpeerconnection.log
-testem.log
-/typings
-__screenshots__/
-
-# System files
-.DS_Store
-Thumbs.db

admin/.postcssrc.json

@@ -1,5 +0,0 @@
-{
-  "plugins": {
-    "@tailwindcss/postcss": {}
-  }
-}

admin/.vscode/extensions.json

@@ -1,4 +0,0 @@
-{
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
-  "recommendations": ["angular.ng-template"]
-}

admin/.vscode/launch.json

@@ -1,20 +0,0 @@
-{
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "name": "ng serve",
-      "type": "chrome",
-      "request": "launch",
-      "preLaunchTask": "npm: start",
-      "url": "http://localhost:4200/"
-    },
-    {
-      "name": "ng test",
-      "type": "chrome",
-      "request": "launch",
-      "preLaunchTask": "npm: test",
-      "url": "http://localhost:9876/debug.html"
-    }
-  ]
-}

admin/.vscode/tasks.json

@@ -1,42 +0,0 @@
-{
-  // For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "type": "npm",
-      "script": "start",
-      "isBackground": true,
-      "problemMatcher": {
-        "owner": "typescript",
-        "pattern": "$tsc",
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": {
-            "regexp": "(.*?)"
-          },
-          "endsPattern": {
-            "regexp": "bundle generation complete"
-          }
-        }
-      }
-    },
-    {
-      "type": "npm",
-      "script": "test",
-      "isBackground": true,
-      "problemMatcher": {
-        "owner": "typescript",
-        "pattern": "$tsc",
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": {
-            "regexp": "(.*?)"
-          },
-          "endsPattern": {
-            "regexp": "bundle generation complete"
-          }
-        }
-      }
-    }
-  ]
-}

admin/README.md

@@ -1,59 +0,0 @@
-# Admin
-
-This project was generated using [Angular CLI](https://github.com/angular/angular-cli) version 20.3.9.
-
-## Development server
-
-To start a local development server, run:
-
-```bash
-ng serve
-```
-
-Once the server is running, open your browser and navigate to `http://localhost:4200/`. The application will automatically reload whenever you modify any of the source files.
-
-## Code scaffolding
-
-Angular CLI includes powerful code scaffolding tools. To generate a new component, run:
-
-```bash
-ng generate component component-name
-```
-
-For a complete list of available schematics (such as `components`, `directives`, or `pipes`), run:
-
-```bash
-ng generate --help
-```
-
-## Building
-
-To build the project run:
-
-```bash
-ng build
-```
-
-This will compile your project and store the build artifacts in the `dist/` directory. By default, the production build optimizes your application for performance and speed.
-
-## Running unit tests
-
-To execute unit tests with the [Karma](https://karma-runner.github.io) test runner, use the following command:
-
-```bash
-ng test
-```
-
-## Running end-to-end tests
-
-For end-to-end (e2e) testing, run:
-
-```bash
-ng e2e
-```
-
-Angular CLI does not come with an end-to-end testing framework by default. You can choose one that suits your needs.
-
-## Additional Resources
-
-For more information on using the Angular CLI, including detailed command references, visit the [Angular CLI Overview and Command Reference](https://angular.dev/tools/cli) page.

admin/angular.json

@@ -1,85 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "version": 1,
-  "newProjectRoot": "projects",
-  "projects": {
-    "admin": {
-      "projectType": "application",
-      "schematics": {},
-      "root": "",
-      "sourceRoot": "src",
-      "prefix": "app",
-      "architect": {
-        "build": {
-          "builder": "@angular/build:application",
-          "options": {
-            "browser": "src/main.ts",
-            "tsConfig": "tsconfig.app.json",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
-            ],
-            "styles": [
-              "src/styles.css"
-            ]
-          },
-          "configurations": {
-            "production": {
-              "budgets": [
-                {
-                  "type": "initial",
-                  "maximumWarning": "500kB",
-                  "maximumError": "1MB"
-                },
-                {
-                  "type": "anyComponentStyle",
-                  "maximumWarning": "4kB",
-                  "maximumError": "8kB"
-                }
-              ],
-              "outputHashing": "all"
-            },
-            "development": {
-              "optimization": false,
-              "extractLicenses": false,
-              "sourceMap": true
-            }
-          },
-          "defaultConfiguration": "production"
-        },
-        "serve": {
-          "builder": "@angular/build:dev-server",
-          "configurations": {
-            "production": {
-              "buildTarget": "admin:build:production"
-            },
-            "development": {
-              "buildTarget": "admin:build:development"
-            }
-          },
-          "defaultConfiguration": "development"
-        },
-        "extract-i18n": {
-          "builder": "@angular/build:extract-i18n"
-        },
-        "test": {
-          "builder": "@angular/build:karma",
-          "options": {
-            "tsConfig": "tsconfig.spec.json",
-            "assets": [
-              {
-                "glob": "**/*",
-                "input": "public"
-              }
-            ],
-            "styles": [
-              "src/styles.css"
-            ]
-          }
-        }
-      }
-    }
-  }
-}

admin/package.json

@@ -1,51 +0,0 @@
-{
-  "name": "admin",
-  "version": "0.0.0",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve --proxy-config proxy.conf.json",
-    "build": "ng build",
-    "watch": "ng build --watch --configuration development",
-    "test": "ng test"
-  },
-  "prettier": {
-    "printWidth": 100,
-    "singleQuote": true,
-    "overrides": [
-      {
-        "files": "*.html",
-        "options": {
-          "parser": "angular"
-        }
-      }
-    ]
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/common": "^20.3.0",
-    "@angular/compiler": "^20.3.0",
-    "@angular/core": "^20.3.0",
-    "@angular/forms": "^20.3.0",
-    "@angular/platform-browser": "^20.3.0",
-    "@angular/router": "^20.3.0",
-    "@tailwindcss/postcss": "^4.1.17",
-    "daisyui": "^5.4.5",
-    "postcss": "^8.5.6",
-    "rxjs": "~7.8.0",
-    "tailwindcss": "^4.1.17",
-    "tslib": "^2.3.0"
-  },
-  "devDependencies": {
-    "@angular/build": "^20.3.9",
-    "@angular/cli": "^20.3.9",
-    "@angular/compiler-cli": "^20.3.0",
-    "@types/jasmine": "~5.1.0",
-    "jasmine-core": "~5.9.0",
-    "karma": "~6.4.0",
-    "karma-chrome-launcher": "~3.2.0",
-    "karma-coverage": "~2.2.0",
-    "karma-jasmine": "~5.1.0",
-    "karma-jasmine-html-reporter": "~2.1.0",
-    "typescript": "~5.9.2"
-  }
-}

admin/proxy.conf.json

@@ -1,8 +0,0 @@
-{
-  "/api": {
-    "target": "http://localhost:3000",
-    "secure": false,
-    "logLevel": "debug",
-    "changeOrigin": true
-  }
-}

admin/src/app/app.config.ts

@@ -1,23 +0,0 @@
-import {
-  ApplicationConfig, provideBrowserGlobalErrorListeners, provideZoneChangeDetection,
-  provideZonelessChangeDetection,
-} from '@angular/core';
-import { provideRouter } from '@angular/router';
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import { routes } from './app.routes';
-import { JwtInterceptor } from './auth/jwt.interceptor';
-import { AuthService } from './auth/auth.service';
-import { AuthGuard } from './auth/auth.guard';
-
-export const appConfig: ApplicationConfig = {
-  providers: [
-    provideBrowserGlobalErrorListeners(),
-    provideZonelessChangeDetection(),
-    provideRouter(routes),
-    provideHttpClient(withInterceptorsFromDi()),
-    AuthService,
-    AuthGuard,
-    { provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
-  ],
-};

admin/src/app/app.html

@@ -1,5 +0,0 @@
-<div>
-  <button (click)="logout()">Logout</button>
-</div>
-<app-main-menu></app-main-menu>
-<router-outlet />

admin/src/app/app.routes.ts

@@ -1,10 +0,0 @@
-import { Routes } from '@angular/router';
-import { LoginComponent } from './components/login/login.component';
-import { AuthGuard } from './auth/auth.guard';
-import { HomeComponent } from './components/home/home.component'; // Assuming you have a HomeComponent
-
-export const routes: Routes = [
-  { path: 'login', component: LoginComponent },
-  { path: '', component: HomeComponent, canActivate: [AuthGuard] },
-  { path: '**', redirectTo: '' } // Redirect to home for any other route
-];

admin/src/app/app.spec.ts

@@ -1,25 +0,0 @@
-import { provideZonelessChangeDetection } from '@angular/core';
-import { TestBed } from '@angular/core/testing';
-import { App } from './app';
-
-describe('App', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [App],
-      providers: [provideZonelessChangeDetection()]
-    }).compileComponents();
-  });
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(App);
-    const app = fixture.componentInstance;
-    expect(app).toBeTruthy();
-  });
-
-  it('should render title', () => {
-    const fixture = TestBed.createComponent(App);
-    fixture.detectChanges();
-    const compiled = fixture.nativeElement as HTMLElement;
-    expect(compiled.querySelector('h1')?.textContent).toContain('Hello, admin');
-  });
-});

admin/src/app/app.ts

@@ -1,33 +0,0 @@
-import { Component, signal } from '@angular/core';
-import { Router, RouterOutlet } from '@angular/router';
-import { MainMenu } from './components/main-menu/main-menu';
-import { AuthService } from './auth/auth.service';
-import { AdminLayout } from './layout/admin-layout/admin-layout';
-import { finalize } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-root',
-  imports: [RouterOutlet, AdminLayout,MainMenu],
-  templateUrl: './app.html',
-  styleUrl: './app.css'
-})
-export class App {
-  protected readonly title = signal('admin');
-
-  constructor(private authService: AuthService, private router: Router) {}
-
-  logout(): void {
-    // With the interceptor fixed, this is now the correct and robust way.
-    // The error from a failed server logout will propagate here.
-    this.authService.serverSideLogout().subscribe({
-      next: () => {
-        console.log('Server-side logout successful.');
-        this.authService.clientSideLogout();
-      },
-      error: (err) => {
-        console.error('Server-side logout failed, logging out client-side anyway.', err);
-        this.authService.clientSideLogout();
-      },
-    });
-  }
-}

admin/src/app/auth/auth.guard.ts

@@ -1,23 +0,0 @@
-import { Injectable } from '@angular/core';
-import { CanActivate, Router, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { Observable } from 'rxjs';
-import { AuthService } from './auth.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AuthGuard implements CanActivate {
-  constructor(private authService: AuthService, private router: Router) {}
-
-  canActivate(
-    route: ActivatedRouteSnapshot,
-    state: RouterStateSnapshot
-  ): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
-    if (this.authService.isLoggedIn()) {
-      return true;
-    } else {
-      // Redirect to the login page
-      return this.router.createUrlTree(['/login']);
-    }
-  }
-}

admin/src/app/auth/auth.service.ts

@@ -1,76 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-import { Observable, of, throwError } from 'rxjs';
-import { tap } from 'rxjs/operators';
-import { Router } from '@angular/router';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class AuthService {
-  private readonly ACCESS_TOKEN_KEY = 'accessToken';
-  private readonly REFRESH_TOKEN_KEY = 'refreshToken';
-  private apiUrl = 'http://localhost:4200/api/auth'; // Adjust if your server URL is different
-
-  constructor(private http: HttpClient, private router: Router) {}
-
-  login(credentials: { username: string; password: string }): Observable<any> {
-    return this.http.post<{ accessToken: string; refreshToken: string }>(`${this.apiUrl}/login`, credentials).pipe(
-      tap((response) => this.setTokens(response.accessToken, response.refreshToken))
-    );
-  }
-
-  /**
-   * Makes a best-effort call to the server to invalidate the refresh token.
-   */
-  serverSideLogout(): Observable<any> {
-    return this.http.post(`${this.apiUrl}/logout`, {});
-  }
-
-  /**
-   * Performs the client-side cleanup, removing tokens and redirecting to login.
-   * This is the definitive logout action from the user's perspective.
-   */
-  clientSideLogout(): void {
-    console.info("clientSideLogout")
-    this.removeTokens();
-    this.router.navigate(['/login']);
-  }
-
-  refreshToken(): Observable<any> {
-    const refreshToken = this.getRefreshToken();
-    if (!refreshToken) {
-      // If no refresh token is present, logout and return an error.
-      this.clientSideLogout();
-      return throwError(() => new Error('No refresh token available'));
-    }
-
-    return this.http.post<{ accessToken: string; refreshToken: string }>(`${this.apiUrl}/refresh`, {}, {
-      headers: { Authorization: `Bearer ${refreshToken}` }
-    }).pipe(
-      tap((response) => this.setTokens(response.accessToken, response.refreshToken))
-    );
-  }
-
-  getAccessToken(): string | null {
-    return localStorage.getItem(this.ACCESS_TOKEN_KEY);
-  }
-
-  getRefreshToken(): string | null {
-    return localStorage.getItem(this.REFRESH_TOKEN_KEY);
-  }
-
-  isLoggedIn(): boolean {
-    return this.getAccessToken() !== null;
-  }
-
-  private setTokens(accessToken: string, refreshToken: string): void {
-    localStorage.setItem(this.ACCESS_TOKEN_KEY, accessToken);
-    localStorage.setItem(this.REFRESH_TOKEN_KEY, refreshToken);
-  }
-
-  private removeTokens(): void {
-    localStorage.removeItem(this.ACCESS_TOKEN_KEY);
-    localStorage.removeItem(this.REFRESH_TOKEN_KEY);
-  }
-}

admin/src/app/auth/jwt.interceptor.ts

@@ -1,84 +0,0 @@
-import { Injectable } from '@angular/core';
-import {
-  HttpEvent,
-  HttpHandler,
-  HttpInterceptor,
-  HttpRequest,
-  HttpErrorResponse,
-} from '@angular/common/http';
-import { Observable, throwError, BehaviorSubject } from 'rxjs';
-import { catchError, switchMap, filter, take, finalize } from 'rxjs/operators'; // Import finalize
-import { AuthService } from './auth.service';
-
-@Injectable()
-export class JwtInterceptor implements HttpInterceptor {
-  private isRefreshing = false;
-  // Initialize refreshTokenSubject with null
-  private refreshTokenSubject: BehaviorSubject<any> = new BehaviorSubject<any>(null);
-
-  constructor(private authService: AuthService) {}
-
-  intercept(
-    request: HttpRequest<any>,
-    next: HttpHandler
-  ): Observable<HttpEvent<any>> {
-    if (request.url.includes('/auth/refresh')) {
-      return next.handle(request);
-    }
-
-    const accessToken = this.authService.getAccessToken();
-    if (accessToken) {
-      request = this.addToken(request, accessToken);
-    }
-
-    return next.handle(request).pipe(
-      catchError((error) => {
-        if (error instanceof HttpErrorResponse && error.status === 401) {
-          return this.handle401Error(request, next);
-        }
-          return throwError(() => error);
-      })
-    );
-  }
-
-  private handle401Error(request: HttpRequest<any>, next: HttpHandler): Observable<any> {
-    if (!this.isRefreshing) {
-      this.isRefreshing = true;
-      // Reset the refreshTokenSubject to null so that subsequent requests will wait
-      // this.refreshTokenSubject.next(null);
-      this.refreshTokenSubject  = new BehaviorSubject<any>(null);
-
-
-      return this.authService.refreshToken().pipe(
-        switchMap((token: any) => {
-          this.refreshTokenSubject.next(token.accessToken);
-          return next.handle(this.addToken(request, token.accessToken));
-        }),
-        catchError((err) => {
-          // If refresh fails, logout the user
-          this.authService.clientSideLogout();
-          return throwError(() => err);
-        }),
-        finalize(() => {
-          // When the refresh attempt completes, set isRefreshing to false
-          this.isRefreshing = false;
-        })
-      );
-    } else {
-      // If a refresh is already in progress, wait for it to complete
-      return this.refreshTokenSubject.pipe(
-        filter(token => token != null),
-        take(1),
-        switchMap(jwt => next.handle(this.addToken(request, jwt)))
-      );
-    }
-  }
-
-  private addToken(request: HttpRequest<any>, token: string) {
-    return request.clone({
-      setHeaders: {
-        Authorization: `Bearer ${token}`,
-      },
-    });
-  }
-}

admin/src/app/components/footer/footer.html

@@ -1,22 +0,0 @@
-<footer class="footer sm:footer-horizontal bg-neutral text-neutral-content p-10">
-  <nav>
-    <h6 class="footer-title">Services</h6>
-    <a class="link link-hover">Branding</a>
-    <a class="link link-hover">Design</a>
-    <a class="link link-hover">Marketing</a>
-    <a class="link link-hover">Advertisement</a>
-  </nav>
-  <nav>
-    <h6 class="footer-title">Company</h6>
-    <a class="link link-hover">About us</a>
-    <a class="link link-hover">Contact</a>
-    <a class="link link-hover">Jobs</a>
-    <a class="link link-hover">Press kit</a>
-  </nav>
-  <nav>
-    <h6 class="footer-title">Legal</h6>
-    <a class="link link-hover">Terms of use</a>
-    <a class="link link-hover">Privacy policy</a>
-    <a class="link link-hover">Cookie policy</a>
-  </nav>
-</footer>

admin/src/app/components/footer/footer.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { Footer } from './footer';
-
-describe('Footer', () => {
-  let component: Footer;
-  let fixture: ComponentFixture<Footer>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [Footer]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(Footer);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

admin/src/app/components/footer/footer.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-footer',
-  imports: [],
-  templateUrl: './footer.html',
-  styleUrl: './footer.css',
-})
-export class Footer {
-
-}

admin/src/app/components/home/home.component.ts

@@ -1,8 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-home',
-  template: '<h1>Welcome to the Admin Panel!</h1>',
-  standalone: true,
-})
-export class HomeComponent {}

admin/src/app/components/login/login.component.html

@@ -1,15 +0,0 @@
-<div>
-  <h2>Login</h2>
-  <form [formGroup]="loginForm" (ngSubmit)="onSubmit()">
-    <div>
-      <label for="username">Username:</label>
-      <input id="username" formControlName="username" />
-    </div>
-    <div>
-      <label for="password">Password:</label>
-      <input id="password" type="password" formControlName="password" />
-    </div>
-    <button type="submit" [disabled]="loginForm.invalid">Log In</button>
-  </form>
-  <p *ngIf="errorMessage">{{ errorMessage }}</p>
-</div>

admin/src/app/components/login/login.component.ts

@@ -1,36 +0,0 @@
-import { Component } from '@angular/core';
-import { FormBuilder, FormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
-import { Router } from '@angular/router';
-import { AuthService } from '../../auth/auth.service';
-import { CommonModule } from '@angular/common';
-
-@Component({
-  selector: 'app-login',
-  templateUrl: './login.component.html',
-  standalone: true,
-  imports: [ReactiveFormsModule, CommonModule],
-})
-export class LoginComponent {
-  loginForm: FormGroup;
-  errorMessage: string = '';
-
-  constructor(
-    private fb: FormBuilder,
-    private authService: AuthService,
-    private router: Router
-  ) {
-    this.loginForm = this.fb.group({
-      username: ['', Validators.required],
-      password: ['', Validators.required],
-    });
-  }
-
-  onSubmit(): void {
-    if (this.loginForm.valid) {
-      this.authService.login(this.loginForm.value).subscribe({
-        next: () => this.router.navigate(['/']),
-        error: (err) => (this.errorMessage = 'Invalid username or password'),
-      });
-    }
-  }
-}

admin/src/app/components/main-menu/main-menu.html

@@ -1 +0,0 @@
-<p>main-menu works!</p>

admin/src/app/components/main-menu/main-menu.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MainMenu } from './main-menu';
-
-describe('MainMenu', () => {
-  let component: MainMenu;
-  let fixture: ComponentFixture<MainMenu>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [MainMenu]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(MainMenu);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

admin/src/app/components/main-menu/main-menu.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-main-menu',
-  imports: [],
-  templateUrl: './main-menu.html',
-  styleUrl: './main-menu.css',
-})
-export class MainMenu {
-
-}

admin/src/app/components/navbar/navbar.html

@@ -1,19 +0,0 @@
-<div class="navbar bg-base-100 shadow-sm">
-  <div class="flex-1">
-    <a class="btn btn-ghost text-xl">daisyUI</a>
-  </div>
-  <div class="flex-none">
-    <ul class="menu menu-horizontal px-1">
-      <li><a>Link</a></li>
-      <li>
-        <details>
-          <summary>Parent</summary>
-          <ul class="bg-base-100 rounded-t-none p-2">
-            <li><a>Link 1</a></li>
-            <li><a>Link 2</a></li>
-          </ul>
-        </details>
-      </li>
-    </ul>
-  </div>
-</div>

admin/src/app/components/navbar/navbar.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { Navbar } from './navbar';
-
-describe('Navbar', () => {
-  let component: Navbar;
-  let fixture: ComponentFixture<Navbar>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [Navbar]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(Navbar);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

admin/src/app/components/navbar/navbar.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-navbar',
-  imports: [],
-  templateUrl: './navbar.html',
-  styleUrl: './navbar.css',
-})
-export class Navbar {
-
-}

admin/src/app/layout/admin-layout/admin-layout.html

@@ -1,6 +0,0 @@
-<div class="row">
-  <div class="col-6">02</div>
-  <div class="col-6">
-    content
-  </div>
-</div>

admin/src/app/layout/admin-layout/admin-layout.spec.ts

@@ -1,23 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AdminLayout } from './admin-layout';
-
-describe('AdminLayout', () => {
-  let component: AdminLayout;
-  let fixture: ComponentFixture<AdminLayout>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [AdminLayout]
-    })
-    .compileComponents();
-
-    fixture = TestBed.createComponent(AdminLayout);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

admin/src/app/layout/admin-layout/admin-layout.ts

@@ -1,11 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
-  selector: 'app-admin-layout',
-  imports: [],
-  templateUrl: './admin-layout.html',
-  styleUrl: './admin-layout.css',
-})
-export class AdminLayout {
-
-}

admin/src/index.html

@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>Admin</title>
-  <base href="/">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
-</head>
-<body>
-  <app-root></app-root>
-</body>
-</html>

admin/src/main.ts

@@ -1,6 +0,0 @@
-import { bootstrapApplication } from '@angular/platform-browser';
-import { appConfig } from './app/app.config';
-import { App } from './app/app';
-
-bootstrapApplication(App, appConfig)
-  .catch((err) => console.error(err));

admin/src/styles.css

@@ -1,5 +0,0 @@
-/* You can add global styles to this file, and also import other style files */
-
-@import "tailwindcss";
-@import "./styles/grid.css";
-@plugin "daisyui";

admin/src/styles/grid.css

@@ -1,17 +0,0 @@
-@utility row {
-  --col-num: 12;
-  display: flex;
-  flex-wrap: wrap;
-}
-@utility cols-* {
-  &.row {
-    --col-num: --value(integer);
-  }
-}
-@utility col-* {
-  &:where(.row > *) {
-    flex: 0 0 calc((100% / var(--col-num)) * --value(integer));
-    max-width: calc((100% / var(--col-num)) * --value(integer));
-    padding: 0 calc(var(--spacing) * 2);
-  }
-}

admin/tsconfig.app.json

@@ -1,15 +0,0 @@
-/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
-/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/app",
-    "types": []
-  },
-  "include": [
-    "src/**/*.ts"
-  ],
-  "exclude": [
-    "src/**/*.spec.ts"
-  ]
-}

admin/tsconfig.json

@@ -1,34 +0,0 @@
-/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
-/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "skipLibCheck": true,
-    "isolatedModules": true,
-    "experimentalDecorators": true,
-    "importHelpers": true,
-    "target": "ES2022",
-    "module": "preserve"
-  },
-  "angularCompilerOptions": {
-    "enableI18nLegacyMessageIdFormat": false,
-    "strictInjectionParameters": true,
-    "strictInputAccessModifiers": true,
-    "typeCheckHostBindings": true,
-    "strictTemplates": true
-  },
-  "files": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}

admin/tsconfig.spec.json

@@ -1,14 +0,0 @@
-/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
-/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "./out-tsc/spec",
-    "types": [
-      "jasmine"
-    ]
-  },
-  "include": [
-    "src/**/*.ts"
-  ]
-}

api.http

@@ -0,0 +1,34 @@
+POST http://localhost:3000/auth/login
+Content-Type: application/json
+
+{
+  "username": "admin",
+  "password": "123456"
+}
+
+> {% client.global.set("auth_token", response.body.access_token); %}
+
+
+### GET request with parameter
+GET http://localhost:3000/users
+Accept: application/json
+Authorization: Bearer {{auth_token}}
+
+### POST create user
+POST http://localhost:3000/users
+Content-Type: application/json
+Accept: application/json
+Authorization: Bearer {{auth_token}}
+
+{
+  "username": "test1",
+  "password": "123456",
+  "email": "test1@gmail.com",
+  "groups": [
+    {
+      "id": 1
+    }
+  ]
+}
+
+

environment/e2e/docker-compose.yaml

@@ -0,0 +1,17 @@
+version: '3.8'
+services:
+  postgres:
+    image: postgres:18
+    restart: always
+    environment:
+      POSTGRES_USER: test
+      POSTGRES_PASSWORD: test
+      POSTGRES_DB: test
+    ports:
+      - '4401:5432'
+    volumes:
+      - e2epgdata:/var/lib/postgresql
+
+
+volumes:
+  e2epgdata: {}

package.json

@@ -29,7 +29,6 @@
     "@nestjs/jwt": "^11.0.1",
     "@nestjs/passport": "^11.0.5",
     "@nestjs/platform-express": "^11.0.1",
-    "@nestjs/swagger": "^11.2.1",
     "@nestjs/typeorm": "^11.0.0",
     "bcrypt": "^5.1.1",
     "class-transformer": "^0.5.1",
@@ -53,6 +52,7 @@
     "@types/node": "^22.10.7",
     "@types/passport-jwt": "^4.0.0",
     "@types/supertest": "^6.0.2",
+    "dotenv": "^16.4.5",
     "eslint": "^9.18.0",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.2",
@@ -61,6 +61,7 @@
     "prettier": "^3.4.2",
     "source-map-support": "^0.5.21",
     "supertest": "^7.0.0",
+    "testcontainers": "^10.9.0",
     "ts-jest": "^29.2.5",
     "ts-loader": "^9.5.2",
     "ts-node": "^10.9.2",

server/api.http

@@ -1,22 +0,0 @@
-POST {{apiBaseUrl}}/auth/login
-Content-Type: application/json
-
-{
-  "username": "admin",
-  "password": "123456"
-}
-
-> {% client.global.set("auth_token", response.body.accessToken); %}
-
-
-### GET request with parameter
-GET {{apiBaseUrl}}/users
-Accept: application/json
-Authorization: Bearer {{auth_token}}
-
-
-
-### GET request with parameter
-POST {{apiBaseUrl}}/auth/logout
-Accept: application/json
-Authorization: Bearer {{auth_token}}

server/http-client.env.json

@@ -1,5 +0,0 @@
-{
-  "dev": {
-    "apiBaseUrl": "http://localhost:3000/api"
-  }
-}

server/src/auth/auth.controller.ts

@@ -1,37 +0,0 @@
-import {
-  Controller,
-  Post,
-  Body,
-  ValidationPipe,
-  UseGuards,
-  Req,
-} from '@nestjs/common';
-import { LoginRequestDto } from './dto/login-request.dto';
-import { JwtAuthGuard } from './jwt-auth.guard';
-import { JwtRefreshAuthGuard } from './jwt-refresh-auth.guard';
-import express from 'express';
-import { AuthService } from './auth.service';
-
-@Controller('auth')
-export class AuthController {
-  constructor(private authService: AuthService) {}
-
-  @Post('login')
-  async login(@Body(new ValidationPipe()) body: LoginRequestDto) {
-    return await this.authService.login(body);
-  }
-
-  @UseGuards(JwtAuthGuard)
-  @Post('logout')
-  async logout(@Req() req: express.Request) {
-    const user = req.user as { sub: number };
-    return await this.authService.logout(user.sub);
-  }
-
-  @UseGuards(JwtRefreshAuthGuard)
-  @Post('refresh')
-  async refresh(@Req() req: express.Request) {
-    const user = req.user as { sub: number; refreshToken: string };
-    return await this.authService.refreshToken(user.sub, user.refreshToken);
-  }
-}

server/src/auth/auth.service.ts

@@ -1,120 +0,0 @@
-import { Injectable, UnauthorizedException } from '@nestjs/common';
-import { UserService } from '../user/user.service';
-import { JwtService } from '@nestjs/jwt';
-import * as bcrypt from 'bcrypt';
-import { User } from '../entity/user';
-import { LoginRequest, LoginResponse } from '../types';
-import { ConfigService } from '@nestjs/config';
-import type { StringValue } from 'ms';
-
-@Injectable()
-export class AuthService {
-  constructor(
-    private userService: UserService,
-    private jwtService: JwtService,
-    private configService: ConfigService,
-  ) {}
-
-  async validateUser(username: string, pass: string): Promise<User | null> {
-    const user = await this.userService.findByUsername(username, {
-      groups: {
-        roles: true,
-      },
-    });
-    if (user && (await bcrypt.compare(pass, user.password))) {
-      return user;
-    }
-    return null;
-  }
-
-  async login(loginData: LoginRequest): Promise<LoginResponse> {
-    const user: User | null = await this.validateUser(
-      loginData.username,
-      loginData.password,
-    );
-
-    if (!user) {
-      throw new UnauthorizedException();
-    }
-
-    const tokens = await this.getTokens(user);
-    await this.userService.setRefreshToken(user.id, tokens.refreshToken);
-    return tokens;
-  }
-
-  async logout(userId: number): Promise<void> {
-    await this.userService.setRefreshToken(userId, null);
-  }
-
-  async refreshToken(
-    userId: number,
-    refreshToken: string,
-  ): Promise<LoginResponse> {
-    const user = await this.userService.findOne(userId);
-    if (!user || !user.hashedRefreshToken) {
-      throw new UnauthorizedException('Access Denied');
-    }
-
-    const refreshTokenMatches = await bcrypt.compare(
-      refreshToken,
-      user.hashedRefreshToken,
-    );
-
-    if (!refreshTokenMatches) {
-      throw new UnauthorizedException('Access Denied');
-    }
-
-    const tokens = await this.getTokens(user);
-    await this.userService.setRefreshToken(user.id, tokens.refreshToken);
-    return tokens;
-  }
-
-  private async getTokens(user: User): Promise<LoginResponse> {
-    const roles: Set<string> = new Set<string>();
-    for (const group of user.groups ?? []) {
-      for (const role of group.roles ?? []) {
-        roles.add(role.name);
-      }
-    }
-
-    const jwtSecret = this.configService.get<string>('JWT_SECRET');
-    const jwtexpirationtime = this.configService.get<string>(
-      'JWT_EXPIRATION_TIME',
-    );
-
-    console.info(
-      'creating. jwt secret is: ' + jwtSecret + ',' + jwtexpirationtime,
-    );
-
-    // let accessToken: string, refreshToken: string;
-    const [accessToken, refreshToken] = await Promise.all([
-      this.jwtService.signAsync(
-        {
-          username: user.username,
-          sub: user.id,
-          roles: Array.from(roles),
-        },
-        {
-          secret: this.configService.get<string>('JWT_SECRET'),
-          expiresIn: +this.configService.get<StringValue>('JWT_EXPIRATION_TIME')!,
-        },
-      ),
-      this.jwtService.signAsync(
-        {
-          sub: user.id,
-        },
-        {
-          secret: this.configService.get<string>('JWT_REFRESH_SECRET'),
-          expiresIn: this.configService.get<StringValue>(
-            'JWT_REFRESH_EXPIRATION_TIME',
-          ),
-        },
-      ),
-    ]);
-
-    return {
-      accessToken,
-      refreshToken,
-    };
-  }
-}

server/src/auth/jwt-refresh-auth.guard.ts

@@ -1,5 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { AuthGuard } from '@nestjs/passport';
-
-@Injectable()
-export class JwtRefreshAuthGuard extends AuthGuard('jwt-refresh') {}

server/src/auth/jwt-refresh.strategy.ts

@@ -1,47 +0,0 @@
-import { PassportStrategy } from '@nestjs/passport';
-import { ExtractJwt, Strategy, StrategyOptionsWithRequest } from 'passport-jwt';
-import { Request } from 'express';
-import { Injectable } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-
-// Define the shape of the JWT payload
-interface JwtPayload {
-  sub: number;
-  // iat and exp are automatically added by passport-jwt
-  iat: number;
-  exp: number;
-}
-
-// Define the shape of the object returned by the validate function
-interface JwtPayloadWithRefreshToken extends JwtPayload {
-  refreshToken: string;
-}
-
-@Injectable()
-export class JwtRefreshTokenStrategy extends PassportStrategy(
-  Strategy,
-  'jwt-refresh',
-) {
-  constructor(private configService: ConfigService) {
-    super({
-      jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
-      secretOrKey: configService.get<string>('JWT_REFRESH_SECRET'),
-      passReqToCallback: true,
-    } as StrategyOptionsWithRequest);
-  }
-
-  validate(req: Request, payload: JwtPayload): JwtPayloadWithRefreshToken {
-    const refreshToken = req.get('Authorization')?.replace('Bearer', '').trim();
-
-    // Ensure refreshToken is not undefined before returning
-    if (!refreshToken) {
-      // This case should be rare given the guard is used, but it's good practice
-      // to handle it. Depending on strictness, you might throw an error.
-      // For now, we'll proceed, but in a real-world scenario, logging or an error
-      // might be better.
-      return { ...payload, refreshToken: '' };
-    }
-
-    return { ...payload, refreshToken };
-  }
-}

server/src/auth/jwt.strategy.ts

@@ -1,38 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { PassportStrategy } from '@nestjs/passport';
-import { ExtractJwt, Strategy } from 'passport-jwt';
-import { ConfigService } from '@nestjs/config';
-import { Role } from './role.enum';
-import { Request } from 'express';
-
-@Injectable()
-export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
-  constructor(private configService: ConfigService) {
-    super({
-      jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
-      ignoreExpiration: false,
-      // DO NOT use secretOrKey here. It causes a race condition with ConfigService.
-      // Instead, use secretOrKeyProvider to look up the secret dynamically
-      // at request time, ensuring ConfigService is ready.
-      secretOrKeyProvider: (
-        request: Request,
-        rawJwtToken: any,
-        done: (err: any, secretOrKey?: string | Buffer) => void,
-      ) => {
-        const secretKey = this.configService.get<string>('JWT_SECRET');
-        console.info('secretKey', secretKey);
-        done(null, secretKey);
-      },
-    });
-  }
-
-  // The payload is already validated by passport-jwt at this point,
-  // so we can trust its contents.
-  validate(payload: { sub: number; username: string; roles: Role[] }) {
-    return {
-      userId: payload.sub,
-      username: payload.username,
-      roles: payload.roles,
-    };
-  }
-}

server/src/logger/dvbooking-logger.service.ts

@@ -1,24 +0,0 @@
-import { ConsoleLogger, Injectable } from '@nestjs/common';
-
-@Injectable()
-export class DvbookingLoggerService extends ConsoleLogger {
-  log(message: string, context?: string) {
-    super.log(message, context);
-  }
-
-  error(message: string, trace?: string, context?: string) {
-    super.error(message, trace, context);
-  }
-
-  warn(message: string, context?: string) {
-    super.warn(message, context);
-  }
-
-  debug(message: string, context?: string) {
-    super.debug(message, context);
-  }
-
-  verbose(message: string, context?: string) {
-    super.verbose(message, context);
-  }
-}

server/src/logger/logger.module.ts

@@ -1,9 +0,0 @@
-import { Global, Module } from '@nestjs/common';
-import { DvbookingLoggerService } from './dvbooking-logger.service';
-
-@Global()
-@Module({
-  providers: [DvbookingLoggerService],
-  exports: [DvbookingLoggerService],
-})
-export class LoggerModule {}

server/src/main.ts

@@ -1,23 +0,0 @@
-import { NestFactory } from '@nestjs/core';
-import { AppModule } from './app.module';
-import { DvbookingLoggerService } from './logger/dvbooking-logger.service';
-import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger';
-
-async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
-  app.useLogger(app.get(DvbookingLoggerService));
-
-  app.setGlobalPrefix('api');
-
-  const config = new DocumentBuilder()
-    .setTitle('DV Booking API')
-    .setDescription('The DV Booking API description')
-    .setVersion('1.0')
-    .addTag('dvbooking')
-    .build();
-  const document = SwaggerModule.createDocument(app, config);
-  SwaggerModule.setup('api', app, document);
-
-  await app.listen(process.env.PORT ?? 3000);
-}
-bootstrap();

server/src/migration/1763106308120-add_refresh_token_to_user_object.ts

@@ -1,14 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class AddRefreshTokenToUserObject1763106308120 implements MigrationInterface {
-    name = 'AddRefreshTokenToUserObject1763106308120'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "user" ADD "hashedRefreshToken" character varying`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "hashedRefreshToken"`);
-    }
-
-}

server/src/types.ts

@@ -1,10 +0,0 @@
-
-export interface LoginRequest{
-  username: string;
-  password: string;
-}
-
-export interface LoginResponse {
-  accessToken: string;
-  refreshToken: string;
-}

server/src/user/user.module.ts

@@ -1,13 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserService } from './user.service';
-import { UserController } from './user.controller';
-import { User } from '../entity/user';
-
-@Module({
-  imports: [TypeOrmModule.forFeature([User])],
-  providers: [UserService],
-  controllers: [UserController],
-  exports: [UserService],
-})
-export class UserModule {}

src/app.module.ts

@@ -8,12 +8,12 @@ import { AuthModule } from './auth/auth.module';
 import { User } from './entity/user';
 import { UserGroup } from './entity/user-group';
 import { UserRole } from './entity/user-role';
-import { LoggerModule } from './logger/logger.module';
 
 const moduleTypeOrm = TypeOrmModule.forRootAsync({
   imports: [ConfigModule],
   inject: [ConfigService],
   useFactory: (configService: ConfigService) => {
+    // console.log("config Service", configService)
     return {
       type: 'postgres',
       host: configService.get<string>('DATABASE_HOST'),
@@ -28,14 +28,16 @@ const moduleTypeOrm = TypeOrmModule.forRootAsync({
   },
 });
 
+const envFilePath =
+  process.env.NODE_ENV === 'test' ? '.env.e2e' : '.env';
+
+// throw new Error("envFilePath:"+envFilePath);
+const moduleConfig = ConfigModule.forRoot({
+  envFilePath,
+});
+
 @Module({
-  imports: [
-    ConfigModule.forRoot(),
-    moduleTypeOrm,
-    UserModule,
-    AuthModule,
-    LoggerModule,
-  ],
+  imports: [moduleConfig, moduleTypeOrm, UserModule, AuthModule],
   controllers: [AppController],
   providers: [AppService],
 })

src/auth/auth.controller.ts

@@ -0,0 +1,13 @@
+import { Controller, Post, Body, ValidationPipe } from '@nestjs/common';
+import { AuthService } from './auth.service';
+import { LoginRequestDto } from './dto/login-request.dto';
+
+@Controller('auth')
+export class AuthController {
+  constructor(private authService: AuthService) {}
+
+  @Post('login')
+  async login(@Body(new ValidationPipe()) body: LoginRequestDto) {
+    return await this.authService.login(body);
+  }
+}

src/auth/auth.module.ts

@@ -6,27 +6,22 @@ import { AuthService } from './auth.service';
 import { AuthController } from './auth.controller';
 import { JwtStrategy } from './jwt.strategy';
 import { ConfigModule, ConfigService } from '@nestjs/config';
-import { JwtRefreshTokenStrategy } from './jwt-refresh.strategy';
-import { StringValue } from 'ms';
 
 @Module({
   imports: [
-    ConfigModule,
+    ConfigModule, // <--- Import ConfigModule here
     UserModule,
     PassportModule,
-    // Restore the correct async registration for JwtModule
     JwtModule.registerAsync({
       imports: [ConfigModule],
       inject: [ConfigService],
       useFactory: (configService: ConfigService) => ({
         secret: configService.get<string>('JWT_SECRET'),
-        signOptions: {
-          expiresIn: configService.get<StringValue>('JWT_EXPIRATION_TIME'),
-        },
+        signOptions: { expiresIn: '60m' },
       }),
     }),
   ],
-  providers: [AuthService, JwtStrategy, JwtRefreshTokenStrategy],
+  providers: [AuthService, JwtStrategy],
   controllers: [AuthController],
 })
 export class AuthModule {}

src/auth/auth.service.ts

@@ -0,0 +1,52 @@
+import { Injectable, UnauthorizedException } from '@nestjs/common';
+import { UserService } from '../user/user.service';
+import { JwtService } from '@nestjs/jwt';
+import * as bcrypt from 'bcrypt';
+import { User } from '../entity/user';
+import { LoginRequest, LoginResponse } from '../types';
+
+@Injectable()
+export class AuthService {
+  constructor(
+    private userService: UserService,
+    private jwtService: JwtService,
+  ) {}
+
+  async validateUser(username: string, pass: string): Promise<User | null> {
+    const user = await this.userService.findByUsername(username, {
+      groups: {
+        roles: true,
+      },
+    });
+    if (user && (await bcrypt.compare(pass, user.password))) {
+      return user;
+    }
+    return null;
+  }
+
+  async login(loginData: LoginRequest): Promise<LoginResponse> {
+    const user: User | null = await this.validateUser(
+      loginData.username,
+      loginData.password,
+    );
+
+    if (!user) {
+      throw new UnauthorizedException();
+    }
+
+    const roles: Set<string> = new Set<string>();
+    for (const group of user.groups ?? []) {
+      for (const role of group.roles ?? []) {
+        roles.add(role.name);
+      }
+    }
+    const payload = {
+      username: user.username,
+      sub: user.id,
+      roles: Array.from(roles),
+    };
+    return {
+      access_token: this.jwtService.sign(payload),
+    };
+  }
+}

src/auth/dto/login-request.dto.ts

@@ -1,12 +1,9 @@
 import { IsString } from 'class-validator';
-import { ApiProperty } from '@nestjs/swagger';
 
 export class LoginRequestDto {
   @IsString()
-  @ApiProperty()
   username: string;
 
   @IsString()
-  @ApiProperty()
   password: string;
 }

src/auth/jwt.strategy.ts

@@ -0,0 +1,24 @@
+import { Injectable } from '@nestjs/common';
+import { PassportStrategy } from '@nestjs/passport';
+import { ExtractJwt, Strategy } from 'passport-jwt';
+import { ConfigService } from '@nestjs/config';
+import { Role } from './role.enum';
+
+@Injectable()
+export class JwtStrategy extends PassportStrategy(Strategy) {
+  constructor(configService: ConfigService) {
+    super({
+      jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
+      ignoreExpiration: false,
+      secretOrKey: configService.get<string>('JWT_SECRET') as string,
+    });
+  }
+
+  validate(payload: { sub: string; username: string; roles: Role[] }) {
+    return {
+      userId: payload.sub,
+      username: payload.username,
+      roles: payload.roles,
+    };
+  }
+}

src/data-source.ts

@@ -5,8 +5,14 @@ import { User } from './entity/user';
 import * as dotenv from 'dotenv';
 import { UserGroup } from './entity/user-group';
 import { UserRole } from './entity/user-role';
+import path from 'path';
 
-dotenv.config();
+let envFilePath = path.resolve(process.cwd(), '.env');
+if (process.env.DATA_SOURCE_ENV) {
+  envFilePath = path.resolve(process.cwd(), process.env.DATA_SOURCE_ENV);
+}
+
+dotenv.config({ path: envFilePath });
 
 export const AppDataSource = new DataSource({
   type: 'postgres',
@@ -18,8 +24,6 @@ export const AppDataSource = new DataSource({
   synchronize: false,
   logging: false,
   entities: [User, UserGroup, UserRole],
-  migrations: [
-    'src/migration/**/*.ts'
-  ],
+  migrations: ['src/migration/**/*.ts'],
   subscribers: [],
 });

src/entity/user.ts

@@ -24,7 +24,4 @@ export class User {
   @ManyToMany(() => UserGroup)
   @JoinTable()
   groups: UserGroup[];
-
-  @Column({ type: 'varchar', nullable: true })
-  hashedRefreshToken: string | null;
 }

src/main.ts

@@ -0,0 +1,8 @@
+import { NestFactory } from '@nestjs/core';
+import { AppModule } from './app.module';
+
+async function bootstrap() {
+  const app = await NestFactory.create(AppModule);
+  await app.listen(process.env.PORT ?? 3000);
+}
+bootstrap();

src/types.ts

@@ -0,0 +1,11 @@
+
+export interface LoginRequest{
+  username: string;
+  password: string;
+}
+
+export interface LoginResponse{
+  access_token: string;
+}
+
+

src/user/dto/create-user.dto.ts

@@ -1,18 +1,17 @@
-import { IsString, IsEmail, MinLength } from 'class-validator';
-import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsEmail, MinLength, IsArray } from 'class-validator';
 
 export class CreateUserDto {
   @IsString()
   @MinLength(3)
-  @ApiProperty()
   username: string;
 
   @IsEmail()
-  @ApiProperty()
   email: string;
 
   @IsString()
   @MinLength(6)
-  @ApiProperty()
   password: string;
+
+  @IsArray()
+  groups: [{ id: number }];
 }

src/user/dto/update-user.dto.ts

@@ -1,24 +1,17 @@
 import { IsString, IsEmail, MinLength, IsOptional } from 'class-validator';
-import { ApiProperty } from '@nestjs/swagger';
 
 export class UpdateUserDto {
   @IsOptional()
   @IsString()
   @MinLength(3)
-  @ApiProperty()
   username?: string;
 
-
   @IsOptional()
   @IsEmail()
-  @ApiProperty()
   email?: string;
 
-
   @IsOptional()
   @IsString()
   @MinLength(6)
-  @ApiProperty()
   password?: string;
-
 }

src/user/user-group.service.ts

@@ -0,0 +1,44 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { UserGroup } from '../entity/user-group';
+import { FindOptionsRelations } from 'typeorm/find-options/FindOptionsRelations';
+
+@Injectable()
+export class UserGroupService {
+  constructor(
+    @InjectRepository(UserGroup)
+    private userGroupRepository: Repository<UserGroup>,
+  ) {}
+
+  findByName(
+    name: string,
+    relations?: FindOptionsRelations<UserGroup>,
+  ): Promise<UserGroup | null> {
+    return this.userGroupRepository.findOne({ where: { name }, relations });
+  }
+  findAll(): Promise<UserGroup[]> {
+    return this.userGroupRepository.find();
+  }
+
+  findOne(id: number): Promise<UserGroup | null> {
+    return this.userGroupRepository.findOneBy({ id });
+  }
+
+  async create(userGroup: Partial<UserGroup>): Promise<UserGroup> {
+    const newUserGroup = this.userGroupRepository.create(userGroup);
+    return this.userGroupRepository.save(newUserGroup);
+  }
+
+  async update(
+    id: number,
+    userGroup: Partial<UserGroup>,
+  ): Promise<UserGroup | null> {
+    await this.userGroupRepository.update(id, userGroup);
+    return this.userGroupRepository.findOneBy({ id });
+  }
+
+  async remove(id: number): Promise<void> {
+    await this.userGroupRepository.delete(id);
+  }
+}

src/user/user-role.service.ts

@@ -0,0 +1,37 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { UserRole } from '../entity/user-role';
+
+@Injectable()
+export class UserRoleService {
+  constructor(
+    @InjectRepository(UserRole)
+    private userGroupRepository: Repository<UserRole>,
+  ) {}
+
+  findAll(): Promise<UserRole[]> {
+    return this.userGroupRepository.find();
+  }
+
+  findOne(id: number): Promise<UserRole | null> {
+    return this.userGroupRepository.findOneBy({ id });
+  }
+
+  async create(userGroup: Partial<UserRole>): Promise<UserRole> {
+    const newUserRole = this.userGroupRepository.create(userGroup);
+    return this.userGroupRepository.save(newUserRole);
+  }
+
+  async update(
+    id: number,
+    userRole: Partial<UserRole>,
+  ): Promise<UserRole | null> {
+    await this.userGroupRepository.update(id, userRole);
+    return this.userGroupRepository.findOneBy({ id });
+  }
+
+  async remove(id: number): Promise<void> {
+    await this.userGroupRepository.delete(id);
+  }
+}

src/user/user.controller.ts

@@ -33,6 +33,7 @@ export class UserController {
 
   @Get()
   findAll(): Promise<User[]> {
+    console.log("findall", process.env);
     return this.userService.findAll();
   }
 

src/user/user.module.ts

@@ -0,0 +1,17 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { UserService } from './user.service';
+import { UserController } from './user.controller';
+import { User } from '../entity/user';
+import { UserGroup } from '../entity/user-group';
+import { UserRole } from '../entity/user-role';
+import { UserGroupService } from './user-group.service';
+import { UserRoleService } from './user-role.service';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([User, UserGroup, UserRole])],
+  providers: [UserService, UserGroupService, UserRoleService],
+  controllers: [UserController],
+  exports: [UserService, UserGroupService, UserRoleService],
+})
+export class UserModule {}

src/user/user.service.ts

@@ -1,48 +1,59 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 import { User } from '../entity/user';
 import * as bcrypt from 'bcrypt';
 import { FindOptionsRelations } from 'typeorm/find-options/FindOptionsRelations';
-import { DvbookingLoggerService } from '../logger/dvbooking-logger.service';
+import { UserGroupService } from './user-group.service';
+import { CreateUserDto } from './dto/create-user.dto';
+import { UserGroup } from '../entity/user-group';
 
 @Injectable()
 export class UserService {
   constructor(
     @InjectRepository(User)
     private usersRepository: Repository<User>,
-    private readonly logger: DvbookingLoggerService,
+    private userGroupService: UserGroupService,
   ) {}
 
   findAll(): Promise<User[]> {
-    this.logger.log('Finding all users', 'UserService');
     return this.usersRepository.find();
   }
 
   findOne(id: number): Promise<User | null> {
-    this.logger.log(`Finding user with id: ${id}`, 'UserService');
     return this.usersRepository.findOneBy({ id });
   }
 
   findByUsername(
     username: string,
-    relations: FindOptionsRelations<User>,
+    relations?: FindOptionsRelations<User>,
   ): Promise<User | null> {
-    this.logger.log(`Finding user with username: ${username}`, 'UserService');
     return this.usersRepository.findOne({ where: { username }, relations });
   }
 
-  async create(user: Partial<User>): Promise<User> {
-    this.logger.log('Creating a new user', 'UserService');
+  async create(userDto: Partial<CreateUserDto>): Promise<User> {
+    const { groups, ...user } = userDto;
     if (user.password) {
       user.password = await bcrypt.hash(user.password, 12);
     }
+    if (groups) {
+      const userGroups: UserGroup[] = [];
+      for (const group of groups) {
+        const userGroup = await this.userGroupService.findOne(group.id);
+        if (userGroup) {
+          userGroups.push(userGroup);
+        } else {
+          throw new NotFoundException('User group does not exist:' + group.id);
+        }
+      }
+      (user as Partial<User>).groups = userGroups;
+    }
     const newUser = this.usersRepository.create(user);
+
     return this.usersRepository.save(newUser);
   }
 
   async update(id: number, user: Partial<User>): Promise<User | null> {
-    this.logger.log(`Updating user with id: ${id}`, 'UserService');
     if (user.password) {
       user.password = await bcrypt.hash(user.password, 12);
     }
@@ -51,23 +62,6 @@ export class UserService {
   }
 
   async remove(id: number): Promise<void> {
-    this.logger.log(`Removing user with id: ${id}`, 'UserService');
     await this.usersRepository.delete(id);
   }
-
-  async setRefreshToken(
-    id: number,
-    refreshToken: string | null,
-  ): Promise<void> {
-    this.logger.log(
-      `Updating refresh token for user with id: ${id}`,
-      'UserService',
-    );
-    if (refreshToken) {
-      const hashedRefreshToken = await bcrypt.hash(refreshToken, 10);
-      await this.usersRepository.update(id, { hashedRefreshToken });
-    } else {
-      await this.usersRepository.update(id, { hashedRefreshToken: null });
-    }
-  }
 }