turnierplan-NET · eliaspr · Jun 13, 2025 · Jun 13, 2025 · Jun 13, 2025 · Jun 13, 2025
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - release/**
+      - release
 
 jobs:
   container-image:

diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -3,6 +3,8 @@ on:
     branches:
       - main
   pull_request:
+    branches:
+      - main
     types: [opened, synchronize, reopened]
 
 jobs:

diff --git a/src/Turnierplan.App/Client/src/app/core/interceptors/authentication.interceptor.spec.ts b/src/Turnierplan.App/Client/src/app/core/interceptors/authentication.interceptor.spec.ts
@@ -0,0 +1,13 @@
+import { AuthenticationInterceptor } from './authentication.interceptor';
+
+describe('AuthenticationInterceptor', () => {
+  it('should determine correctly whether authentication is required or not', () => {
+    expect(AuthenticationInterceptor.doesPathRequireAuthentication(`/api`)).toBeTrue();
+    expect(AuthenticationInterceptor.doesPathRequireAuthentication(`/api/test`)).toBeTrue();
+    expect(AuthenticationInterceptor.doesPathRequireAuthentication(`/api/test/identity`)).toBeTrue();
+    expect(AuthenticationInterceptor.doesPathRequireAuthentication(`/api/identity`)).toBeFalse();
+    expect(AuthenticationInterceptor.doesPathRequireAuthentication(`/api/identity/test`)).toBeFalse();
+    expect(AuthenticationInterceptor.doesPathRequireAuthentication(`/something/api`)).toBeFalse();
+    expect(AuthenticationInterceptor.doesPathRequireAuthentication(`/something/api/identity`)).toBeFalse();
+  });
+});
diff --git a/src/Turnierplan.App/Client/src/app/core/interceptors/authentication.interceptor.ts b/src/Turnierplan.App/Client/src/app/core/interceptors/authentication.interceptor.ts
@@ -6,17 +6,14 @@ import { AuthenticationService } from '../services/authentication.service';
 
 @Injectable()
 export class AuthenticationInterceptor implements HttpInterceptor {
-  private readonly apiRoutesPrefix = `${window.origin}/api`;
-  private readonly identityRoutesPrefix = `${window.origin}/api/identity`;
-
   constructor(private readonly authenticationService: AuthenticationService) {}
 
   public intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
-    // IDEA: The check below could maybe be improved with a regex. Also, the API route for changing the user data also
-    //       requires authentication even though its path '/api/identity/user-data/' is excluded by the logic below.
-    const requireAuthentication = request.url.startsWith(this.apiRoutesPrefix) && !request.url.startsWith(this.identityRoutesPrefix);
+    if (!request.url.startsWith(window.origin)) {
+      return next.handle(request);
+    }
 
-    if (!requireAuthentication) {
+    if (!AuthenticationInterceptor.doesPathRequireAuthentication(request.url.substring(window.origin.length))) {
       return next.handle(request);
     }
 
@@ -30,4 +27,8 @@ export class AuthenticationInterceptor implements HttpInterceptor {
       })
     );
   }
+
+  public static doesPathRequireAuthentication(path: string): boolean {
+    return /^\/api(?!\/identity)/.test(path);
+  }
 }
diff --git a/src/Turnierplan.App/Constants/TurnierplanMetadata.cs b/src/Turnierplan.App/Constants/TurnierplanMetadata.cs
@@ -0,0 +1,13 @@
+namespace Turnierplan.App.Constants;
+
+internal static class TurnierplanMetadata
+{
+    public static readonly string Version = DetermineVersion();
+
+    private static string DetermineVersion()
+    {
+        var assemblyVersion = typeof(TurnierplanMetadata).Assembly.GetName().Version?.ToString();
+
+        return assemblyVersion?[..assemblyVersion.LastIndexOf('.')] ?? "?.?.?";
+    }
+}
diff --git a/src/Turnierplan.App/Pages/Shared/_Layout.cshtml b/src/Turnierplan.App/Pages/Shared/_Layout.cshtml
@@ -1,4 +1,5 @@
-<!doctype html>
+@using Turnierplan.App.Constants
+<!doctype html>
 <html lang="de">
 <head>
     <meta charset="UTF-8">
@@ -42,11 +43,11 @@
     <div class="bg-dark text-white">
         <div class="container px-5 py-4 d-flex flex-wrap flex-row">
             <div class="footer-section">
-                <span>turnierplan.NET</span><br/>
+                <span>turnierplan.NET <span class="small">v@(TurnierplanMetadata.Version)</span></span>
             </div>
-            <div class="footer-section footer-section-right">
+            <div class="footer-section footer-section-right d-flex">
                 <a class="text-white text-decoration-none d-flex flex-row align-items-center gap-2" target="_blank" href="https://github.com/turnierplan-NET/turnierplan.NET" rel="noopener">
-                    <img src="./assets/github.svg" alt="GitHub-Logo" />
+                    <img src="./assets/github.svg" alt="GitHub-Logo"/>
                     <span>GitHub</span>
                 </a>
             </div>

diff --git a/src/Turnierplan.App/wwwroot/assets/turnierplan.css b/src/Turnierplan.App/wwwroot/assets/turnierplan.css
@@ -24,7 +24,7 @@ html, body, .overlay-background {
     width: 50%;
   }
 
-  .footer-section-right a {
+  .footer-section-right {
     justify-content: end;
   }
 }
diff --git a/src/version.xml b/src/version.xml
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <Version>0.2.0</Version>
+        <Version>2025.1.0</Version>
     </PropertyGroup>
 </Project>