kybernus 3.0.1 → 3.2.0

package/templates/java-spring/clean/src/main/java/{{packagePath}}/infrastructure/stripe/StripeGateway.java.hbs

@@ -0,0 +1,63 @@
+package {{packageName}}.infrastructure.stripe;
+
+import com.stripe.model.Customer;
+import com.stripe.model.Event;
+import com.stripe.model.checkout.Session;
+import com.stripe.param.CustomerCreateParams;
+import com.stripe.param.checkout.SessionCreateParams;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+public class StripeGateway {
+
+    @Value("${stripe.secret-key:sk_test_dummy}")
+    private String secretKey;
+
+    @Value("${stripe.webhook-secret:whsec_dummy}")
+    private String webhookSecret;
+
+    @Value("${frontend.url:http://localhost:3000}")
+    private String frontendUrl;
+
+    @jakarta.annotation.PostConstruct
+    public void init() {
+        com.stripe.Stripe.apiKey = secretKey;
+    }
+
+    public Customer createCustomer(String email, String userId) throws Exception {
+        CustomerCreateParams params = CustomerCreateParams.builder()
+                .setEmail(email)
+                .putMetadata("userId", userId)
+                .build();
+        return Customer.create(params);
+    }
+
+    public Session createCheckoutSession(String customerId, String priceId, String userId) throws Exception {
+        SessionCreateParams params = SessionCreateParams.builder()
+                .setCustomer(customerId)
+                .setSuccessUrl(frontendUrl + "/success?session_id={CHECKOUT_SESSION_ID}")
+                .setCancelUrl(frontendUrl + "/cancel")
+                .addLineItem(SessionCreateParams.LineItem.builder()
+                        .setPrice(priceId)
+                        .setQuantity(1L)
+                        .build())
+                .setMode(SessionCreateParams.Mode.SUBSCRIPTION)
+                .setClientReferenceId(userId)
+                .build();
+        return Session.create(params);
+    }
+
+    public com.stripe.model.billingportal.Session createPortalSession(String customerId) throws Exception {
+        com.stripe.param.billingportal.SessionCreateParams params =
+                com.stripe.param.billingportal.SessionCreateParams.builder()
+                        .setCustomer(customerId)
+                        .setReturnUrl(frontendUrl + "/account")
+                        .build();
+        return com.stripe.model.billingportal.Session.create(params);
+    }
+
+    public Event constructWebhookEvent(String payload, String sigHeader) throws Exception {
+        return com.stripe.net.Webhook.constructEvent(payload, sigHeader, webhookSecret);
+    }
+}

package/templates/java-spring/clean/src/main/resources/application.properties.hbs

@@ -1,7 +1,7 @@
 spring.application.name={{projectNameKebabCase}}
 
 # Database Configuration
-spring.datasource.url=jdbc:postgresql://postgres:5432/{{projectNameKebabCase}}
+spring.datasource.url=jdbc:postgresql://${DB_HOST:localhost}:5432/{{projectNameKebabCase}}
 spring.datasource.username=postgres
 spring.datasource.password=postgres
 spring.datasource.driver-class-name=org.postgresql.Driver
@@ -12,14 +12,13 @@ spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
 
-# JWT
-application.security.jwt.secret-key={{jwtSecretKey}}
-application.security.jwt.expiration=86400000
-application.security.jwt.refresh-token.expiration=604800000
+# JWT (property name matches SecurityAdapters.java @Value)
+jwt.secret=${JWT_SECRET:{{jwtSecretKey}}}
+jwt.expiration=86400000
 
 # Stripe
-stripe.secret-key=${STRIPE_SECRET_KEY}
-stripe.webhook-secret=${STRIPE_WEBHOOK_SECRET}
+stripe.secret-key=${STRIPE_SECRET_KEY:sk_test_dummy}
+stripe.webhook-secret=${STRIPE_WEBHOOK_SECRET:whsec_dummy}
 
 # Frontend URL (for Stripe redirect URLs)
 frontend.url=${FRONTEND_URL:http://localhost:3000}

package/templates/java-spring/hexagonal/.gitignore.hbs

@@ -0,0 +1,72 @@
+# Compiled class files
+*.class
+
+# Log files
+*.log
+
+# Package files
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# Virtual machine crash logs
+hs_err_pid*
+replay_pid*
+
+# Maven
+target/
+.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+# Gradle
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+# Spring Boot
+spring-shell.log
+
+# STS / Eclipse
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+# IntelliJ IDEA
+.idea/
+*.iws
+*.iml
+*.ipr
+
+# VS Code
+.vscode/
+
+# NetBeans
+/nbproject/private/
+/nbbuild/
+/nbdist/
+/.nb-gradle/
+
+# Environment
+.env
+.env.local
+.env.*.local
+!.env.example
+application-local.yml
+application-local.properties
+application-dev.yml
+application-dev.properties
+
+# OS
+.DS_Store
+Thumbs.db

package/templates/java-spring/hexagonal/docker-compose.yml.hbs

@@ -1,7 +1,5 @@
-version: '3.8'
-
 services:
-  postgres:
+  db:
     image: postgres:15-alpine
     container_name: {{projectNameKebabCase}}-db
     environment:
@@ -13,6 +11,11 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 volumes:
   postgres_data:

package/templates/java-spring/hexagonal/src/main/java/{{packagePath}}/adapters/outbound/security/JwtFilter.java.hbs

@@ -0,0 +1,71 @@
+package {{packageName}}.adapters.outbound.security;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.crypto.SecretKey;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+
+@Component
+public class JwtFilter extends OncePerRequestFilter {
+
+    @Value("${application.security.jwt.secret-key}")
+    private String jwtSecret;
+
+    private SecretKey getSigningKey() {
+        return Keys.hmacShaKeyFor(jwtSecret.getBytes(StandardCharsets.UTF_8));
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+
+        final String authHeader = request.getHeader("Authorization");
+        if (authHeader == null || !authHeader.startsWith("Bearer ")) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        final String jwt = authHeader.substring(7);
+        try {
+            Claims claims = Jwts.parser()
+                    .verifyWith(getSigningKey())
+                    .build()
+                    .parseSignedClaims(jwt)
+                    .getPayload();
+
+            String userId = claims.getSubject();
+
+            if (userId != null && SecurityContextHolder.getContext().getAuthentication() == null) {
+                UserDetails userDetails = User.builder()
+                        .username(userId)
+                        .password("")
+                        .authorities(Collections.emptyList())
+                        .build();
+
+                UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(
+                        userDetails, null, userDetails.getAuthorities());
+
+                SecurityContextHolder.getContext().setAuthentication(authToken);
+            }
+        } catch (Exception e) {
+            // Token invalid or expired — continue without setting authentication
+        }
+
+        filterChain.doFilter(request, response);
+    }
+}

package/templates/java-spring/hexagonal/src/main/java/{{packagePath}}/adapters/outbound/security/SecurityConfig.java.hbs

@@ -0,0 +1,35 @@
+package {{packageName}}.adapters.outbound.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+
+    private final JwtFilter jwtFilter;
+
+    public SecurityConfig(JwtFilter jwtFilter) {
+        this.jwtFilter = jwtFilter;
+    }
+
+    @Bean
+    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+        return http
+                .csrf(csrf -> csrf.disable())
+                .authorizeHttpRequests(auth -> auth
+                        .requestMatchers("/api/auth/**").permitAll()
+                        .requestMatchers("/api/payments/webhook").permitAll()
+                        .requestMatchers("/actuator/**").permitAll()
+                        .anyRequest().authenticated()
+                )
+                .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
+                .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class)
+                .build();
+    }
+}

package/templates/java-spring/hexagonal/src/main/java/{{packagePath}}/core/service/PaymentService.java.hbs

@@ -23,7 +23,7 @@ public class PaymentService {
     }
 
     public String createCheckoutSession(String userId, String priceId) throws Exception {
-        User user = userRepository.findById(java.util.UUID.fromString(userId))
+        User user = userRepository.findById(userId)
                 .orElseThrow(() -> new RuntimeException("User not found"));
 
         String customerId = user.getStripeCustomerId();
@@ -39,7 +39,7 @@ public class PaymentService {
     }
 
     public String createPortalSession(String userId) throws Exception {
-        User user = userRepository.findById(java.util.UUID.fromString(userId))
+        User user = userRepository.findById(userId)
                 .orElseThrow(() -> new RuntimeException("User not found"));
 
         if (user.getStripeCustomerId() == null) {
@@ -57,7 +57,7 @@ public class PaymentService {
                 Session session = (Session) event.getDataObjectDeserializer().getObject().orElse(null);
                 if (session != null && session.getClientReferenceId() != null) {
                     String userId = session.getClientReferenceId();
-                    userRepository.findById(java.util.UUID.fromString(userId)).ifPresent(user -> {
+                    userRepository.findById(userId).ifPresent(user -> {
                         user.setStripeCustomerId(session.getCustomer());
                         userRepository.save(user);
                     });

package/templates/java-spring/hexagonal/src/main/resources/application.properties.hbs

@@ -1,7 +1,7 @@
 spring.application.name={{projectNameKebabCase}}
 
 # Database Configuration
-spring.datasource.url=jdbc:postgresql://postgres:5432/{{projectNameKebabCase}}
+spring.datasource.url=jdbc:postgresql://${DB_HOST:localhost}:5432/{{projectNameKebabCase}}
 spring.datasource.username=postgres
 spring.datasource.password=postgres
 spring.datasource.driver-class-name=org.postgresql.Driver
@@ -13,13 +13,13 @@ spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.format_sql=true
 
 # JWT
-application.security.jwt.secret-key={{jwtSecretKey}}
+application.security.jwt.secret-key=${JWT_SECRET:{{jwtSecretKey}}}
 application.security.jwt.expiration=86400000
 application.security.jwt.refresh-token.expiration=604800000
 
 # Stripe
-stripe.secret-key=${STRIPE_SECRET_KEY}
-stripe.webhook-secret=${STRIPE_WEBHOOK_SECRET}
+stripe.secret-key=${STRIPE_SECRET_KEY:sk_test_dummy}
+stripe.webhook-secret=${STRIPE_WEBHOOK_SECRET:whsec_dummy}
 
 # Frontend URL (for Stripe redirect URLs)
 frontend.url=${FRONTEND_URL:http://localhost:3000}

package/templates/java-spring/mvc/.gitignore.hbs

@@ -0,0 +1,72 @@
+# Compiled class files
+*.class
+
+# Log files
+*.log
+
+# Package files
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# Virtual machine crash logs
+hs_err_pid*
+replay_pid*
+
+# Maven
+target/
+.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+# Gradle
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+# Spring Boot
+spring-shell.log
+
+# STS / Eclipse
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+# IntelliJ IDEA
+.idea/
+*.iws
+*.iml
+*.ipr
+
+# VS Code
+.vscode/
+
+# NetBeans
+/nbproject/private/
+/nbbuild/
+/nbdist/
+/.nb-gradle/
+
+# Environment
+.env
+.env.local
+.env.*.local
+!.env.example
+application-local.yml
+application-local.properties
+application-dev.yml
+application-dev.properties
+
+# OS
+.DS_Store
+Thumbs.db

package/templates/java-spring/mvc/docker-compose.yml.hbs

@@ -1,7 +1,5 @@
-version: '3.8'
-
 services:
-  postgres:
+  db:
     image: postgres:15-alpine
     container_name: {{projectNameKebabCase}}-db
     environment:
@@ -13,6 +11,11 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
 volumes:
   postgres_data:

package/templates/java-spring/mvc/src/main/java/{{packagePath}}/config/SecurityConfig.java.hbs

@@ -27,18 +27,19 @@ public class SecurityConfig {
         .csrf(csrf -> csrf.disable())
         .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
         .authorizeHttpRequests(auth -> auth
-        .requestMatchers("/api/auth/**").permitAll()
-        .requestMatchers("/api/payments/webhook").permitAll()
-        .requestMatchers("/actuator/health").permitAll()
-        .anyRequest().authenticated()
-    )
-    .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
+            .requestMatchers("/api/auth/**").permitAll()
+            .requestMatchers("/api/payments/webhook").permitAll()
+            .requestMatchers("/api/health").permitAll()
+            .requestMatchers("/actuator/health").permitAll()
+            .anyRequest().authenticated()
+        )
+        .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
 
-    return http.build();
-}
+        return http.build();
+    }
 
-@Bean
-public PasswordEncoder passwordEncoder() {
-    return new BCryptPasswordEncoder();
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
 }
-}

package/templates/java-spring/mvc/src/main/java/{{packagePath}}/controller/AuthController.java.hbs

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.Authentication;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -48,17 +49,17 @@ public class AuthController {
         if (authentication == null || !authentication.isAuthenticated()) {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
         }
-        
+
         try {
-            String userId = (String) authentication.getPrincipal(); // Assuming custom jwt filter sets principal to id
+            String userId = (String) authentication.getPrincipal();
             User user = authService.getMe(userId);
-            return ResponseEntity.ok(Map.of(
-                "id", user.getId(),
-                "email", user.getEmail(),
-                "name", user.getName()
-            ));
+            // Use HashMap instead of Map.of() — tolerates null values (e.g. name may be null)
+            Map<String, Object> result = new HashMap<>();
+            result.put("id", user.getId());
+            result.put("email", user.getEmail());
+            result.put("name", user.getName());
+            return ResponseEntity.ok(result);
         } catch (Exception e) {
-            // Keep original behavior if principal isn't id 
             return ResponseEntity.ok(Map.of("message", "Authenticated"));
         }
     }

package/templates/java-spring/mvc/src/main/java/{{packagePath}}/controller/PaymentsController.java.hbs

@@ -6,7 +6,6 @@ import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
@@ -29,16 +28,16 @@ public class PaymentsController {
      */
     @PostMapping("/checkout")
     public ResponseEntity<?> createCheckout(
-            @AuthenticationPrincipal UserDetails userDetails,
+            @AuthenticationPrincipal String userId,
             @RequestBody Map<String, String> body) {
         try {
             String priceId = body.get("priceId");
             if (priceId == null || priceId.isEmpty()) {
                 return ResponseEntity.badRequest().body(Map.of("error", "priceId is required"));
             }
-            // userDetails.getUsername() returns the user ID (set in JWT filter)
+            // userId is set directly in SecurityContextHolder by JwtAuthenticationFilter
             com.stripe.model.checkout.Session session =
-                    stripeService.createCheckoutSession(userDetails.getUsername(), priceId);
+                    stripeService.createCheckoutSession(userId, priceId);
             return ResponseEntity.ok(Map.of("url", session.getUrl()));
         } catch (Exception e) {
             logger.error("Error creating checkout session", e);
@@ -51,10 +50,10 @@ public class PaymentsController {
      * Requires authentication. Opens Stripe Billing Portal.
      */
     @PostMapping("/portal")
-    public ResponseEntity<?> createPortal(@AuthenticationPrincipal UserDetails userDetails) {
+    public ResponseEntity<?> createPortal(@AuthenticationPrincipal String userId) {
         try {
             com.stripe.model.billingportal.Session session =
-                    stripeService.createPortalSession(userDetails.getUsername());
+                    stripeService.createPortalSession(userId);
             return ResponseEntity.ok(Map.of("url", session.getUrl()));
         } catch (Exception e) {
             logger.error("Error creating portal session", e);

package/templates/java-spring/mvc/src/main/java/{{packagePath}}/service/StripeService.java.hbs

@@ -45,7 +45,7 @@ public class StripeService {
      * Retrieve or create a Stripe customer for the given user, then open a checkout session.
      */
     public Session createCheckoutSession(String userId, String priceId) throws StripeException {
-        User user = userRepository.findById(java.util.UUID.fromString(userId))
+        User user = userRepository.findById(userId)
                 .orElseThrow(() -> new RuntimeException("User not found"));
 
         String customerId = user.getStripeCustomerId();
@@ -81,7 +81,7 @@ public class StripeService {
      * Open the Stripe Billing Portal for the given customer.
      */
     public com.stripe.model.billingportal.Session createPortalSession(String userId) throws StripeException {
-        User user = userRepository.findById(java.util.UUID.fromString(userId))
+        User user = userRepository.findById(userId)
                 .orElseThrow(() -> new RuntimeException("User not found"));
 
         if (user.getStripeCustomerId() == null) {
@@ -113,7 +113,7 @@ public class StripeService {
                 Session session = (Session) event.getDataObjectDeserializer().getObject().orElse(null);
                 if (session != null && session.getClientReferenceId() != null) {
                     String userId = session.getClientReferenceId();
-                    userRepository.findById(java.util.UUID.fromString(userId)).ifPresent(user -> {
+                    userRepository.findById(userId).ifPresent(user -> {
                         user.setStripeCustomerId(session.getCustomer());
                         userRepository.save(user);
                     });

package/templates/java-spring/mvc/src/main/resources/application.yml.hbs

@@ -1,32 +1,35 @@
 spring:
   application:
     name: {{projectNameKebabCase}}
-  
-    datasource:
-      url: jdbc:postgresql://localhost:5432/{{projectNameSnakeCase}}
-      username: postgres
-      password: postgres
-      driver-class-name: org.postgresql.Driver
-  
-      jpa:
-        hibernate:
-          ddl-auto: update
-          show-sql: true
-          properties:
-            hibernate:
-              format_sql: true
-              dialect: org.hibernate.dialect.PostgreSQLDialect
+  datasource:
+    url: jdbc:postgresql://localhost:5432/{{projectNameSnakeCase}}
+    username: postgres
+    password: postgres
+    driver-class-name: org.postgresql.Driver
+  jpa:
+    hibernate:
+      ddl-auto: update
+    show-sql: true
+    properties:
+      hibernate:
+        format_sql: true
+        dialect: org.hibernate.dialect.PostgreSQLDialect
 
-  # H2 Console (for development)
-              h2:
-                console:
-                  enabled: true
-                  path: /h2-console
+server:
+  port: 8080
 
-                  server:
-                    port: 8080
+logging:
+  level:
+    root: INFO
+    {{packageName}}: DEBUG
 
-                    logging:
-                      level:
-                        root: INFO
-                        {{packageName}}: DEBUG
+jwt:
+  secret: ${JWT_SECRET:{{jwtSecretKey}}}
+  expiration: 604800000
+
+stripe:
+  secret-key: ${STRIPE_SECRET_KEY:sk_test_dummy}
+  webhook-secret: ${STRIPE_WEBHOOK_SECRET:whsec_dummy}
+
+frontend:
+  url: ${FRONTEND_URL:http://localhost:3000}