fix some issues, use Traefik instead of nginx

Author: krusche

.gitignore

@@ -12,6 +12,7 @@
 
 # Package Files #
 *.jar
+!gradle/wrapper/gradle-wrapper.jar
 *.war
 *.nar
 *.ear

docker/client.Dockerfile

@@ -11,19 +11,16 @@ ENV NODE_ENV=production
 
 RUN npm run build
 
-# Serve the production build with nginx
-FROM nginx:1.29-alpine AS runner
+# Serve the production build with Caddy
+FROM caddy:2-alpine AS runner
 
-# Install curl for health checks
-RUN apk add --no-cache curl
-
-COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=builder /app/dist /usr/share/nginx/html
+COPY --from=builder /app/dist /srv
 COPY docker/docker-entrypoint.sh /docker-entrypoint.sh
 
-RUN chmod +x /docker-entrypoint.sh
+RUN chmod +x /docker-entrypoint.sh && \
+    echo ':80 { root * /srv; file_server; try_files {path} /index.html; encode gzip }' > /etc/caddy/Caddyfile
 
 EXPOSE 80
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile"]

docker/docker-compose-prod.yml

@@ -59,6 +59,12 @@ services:
       STAFFPLAN_CORS_ALLOWED_ORIGINS: ${CLIENT_HOST}
     networks:
       - staffplan-network
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.staffplan-api.rule=Host(`${DOMAIN}`) && PathPrefix(`/api`, `/actuator`)"
+      - "traefik.http.routers.staffplan-api.entrypoints=websecure"
+      - "traefik.http.routers.staffplan-api.tls.certresolver=letsencrypt"
+      - "traefik.http.services.staffplan-api.loadbalancer.server.port=8080"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/actuator/health"]
       interval: 10s
@@ -72,8 +78,6 @@ services:
         condition: service_healthy
     environment:
       KEYCLOAK_URL: ${KEYCLOAK_URL}
-    volumes:
-      - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
     networks:
       - staffplan-network
     labels:
@@ -83,7 +87,7 @@ services:
       - "traefik.http.routers.staffplan.tls.certresolver=letsencrypt"
       - "traefik.http.services.staffplan.loadbalancer.server.port=80"
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost"]
+      test: ["CMD", "wget", "-q", "--spider", "http://localhost"]
       interval: 10s
       retries: 5
 

gradle/wrapper/gradle-wrapper.jar

@@ -73,7 +73,7 @@ public void assertSameResearchGroupIfNotPrivileged(ResearchGroup target) {
          assertCanAccessResearchGroup(target);
       }
    }
-   
+
    public void assertCanAccessResearchGroup(ResearchGroup target) {
       if(target != null && target.isArchived()){
          throw new AccessDeniedException("The research group is archived.");

src/main/java/de/tum/cit/aet/core/security/CurrentUserProvider.java

@@ -9,8 +9,6 @@
 import org.hibernate.annotations.UpdateTimestamp;
 import org.hibernate.type.SqlTypes;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.time.Instant;
 import java.util.*;
 

src/main/java/de/tum/cit/aet/usermanagement/domain/User.java

@@ -1,6 +1,5 @@
 package de.tum.cit.aet.usermanagement.service;
 
-import de.tum.cit.aet.core.exceptions.ResourceNotFoundException;
 import de.tum.cit.aet.usermanagement.domain.User;
 import de.tum.cit.aet.usermanagement.domain.UserGroup;
 import de.tum.cit.aet.usermanagement.domain.key.UserGroupId;
@@ -10,7 +9,6 @@
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.time.Instant;
 import java.util.HashSet;
@@ -101,7 +99,7 @@ public User updateAuthenticatedUser(JwtAuthenticationToken jwt) {
 
         return userRepository.save(user);
     }
-    
+
     private String getUniversityId(JwtAuthenticationToken jwt) {
         return jwt.getName();
     }

src/main/java/de/tum/cit/aet/usermanagement/service/AuthenticationService.java

@@ -2,7 +2,10 @@
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
   "cli": {
-    "packageManager": "npm"
+    "packageManager": "npm",
+    "schematicCollections": [
+      "angular-eslint"
+    ]
   },
   "newProjectRoot": "projects",
   "projects": {
@@ -71,6 +74,15 @@
         },
         "test": {
           "builder": "@angular/build:unit-test"
+        },
+        "lint": {
+          "builder": "@angular-eslint/builder:lint",
+          "options": {
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
+            ]
+          }
         }
       }
     }

src/main/webapp/angular.json

@@ -0,0 +1,44 @@
+// @ts-check
+const eslint = require("@eslint/js");
+const { defineConfig } = require("eslint/config");
+const tseslint = require("typescript-eslint");
+const angular = require("angular-eslint");
+
+module.exports = defineConfig([
+  {
+    files: ["**/*.ts"],
+    extends: [
+      eslint.configs.recommended,
+      tseslint.configs.recommended,
+      tseslint.configs.stylistic,
+      angular.configs.tsRecommended,
+    ],
+    processor: angular.processInlineTemplates,
+    rules: {
+      "@angular-eslint/directive-selector": [
+        "error",
+        {
+          type: "attribute",
+          prefix: "app",
+          style: "camelCase",
+        },
+      ],
+      "@angular-eslint/component-selector": [
+        "error",
+        {
+          type: "element",
+          prefix: "app",
+          style: "kebab-case",
+        },
+      ],
+    },
+  },
+  {
+    files: ["**/*.html"],
+    extends: [
+      angular.configs.templateRecommended,
+      angular.configs.templateAccessibility,
+    ],
+    rules: {},
+  }
+]);