kybernus 3.0.0 → 3.1.0

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}

package/templates/nestjs/clean/.gitignore.hbs

@@ -0,0 +1,42 @@
+# Dependencies
+node_modules/
+.pnp
+.pnp.js
+
+# Build outputs
+dist/
+build/
+
+# Environment variables
+.env
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+!.env.example
+
+# Logs
+logs/
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+# Coverage
+coverage/
+.nyc_output
+
+# TypeScript
+*.tsbuildinfo
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Editor
+.vscode/
+.idea/
+*.swp
+*.swo

package/templates/nestjs/clean/Dockerfile.hbs

@@ -9,7 +9,7 @@ WORKDIR /app
 COPY package*.json ./
 
 # Install dependencies
-RUN npm ci --only=production
+RUN npm ci
 
 # Copy source code
 COPY . .
@@ -26,6 +26,9 @@ WORKDIR /app
 RUN addgroup -g 1001 -S nodejs && \
     adduser -S nodejs -u 1001
 
+# Add openssl
+RUN apk add --no-cache openssl
+
 # Copy built application
 COPY --from=builder --chown=nodejs:nodejs /app/dist ./dist
 COPY --from=builder --chown=nodejs:nodejs /app/node_modules ./node_modules
@@ -39,7 +42,7 @@ EXPOSE 3000
 
 # Health check
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
-  CMD wget --no-verbose --tries=1 --spider http://localhost:3000/health || exit 1
+  CMD wget --no-verbose --tries=1 --spider http://localhost:3000/api/health || exit 1
 
 # Start application
-CMD ["node", "dist/index.js"]
+CMD node dist/main.js

package/templates/nestjs/clean/docker-compose.yml.hbs

@@ -1,16 +1,6 @@
 version: '3.8'
 
 services:
-  app:
-    build: .
-    container_name: {{kebabCase projectName}}-app
-    ports:
-      - "3000:3000"
-    environment:
-      - DATABASE_URL=postgresql://postgres:postgres@db:5432/{{snakeCase projectName}}
-    depends_on:
-      - db
-
   db:
     image: postgres:15-alpine
     container_name: {{kebabCase projectName}}-db
@@ -19,7 +9,7 @@ services:
       POSTGRES_PASSWORD: postgres
       POSTGRES_DB: {{snakeCase projectName}}
     ports:
-      - "5432:5432"
+      - "5434:5432"
     volumes:
       - postgres_data:/var/lib/postgresql/data
     restart: unless-stopped

package/templates/nestjs/clean/package.json.hbs

@@ -1,43 +1,53 @@
 {
-  "name": "{{kebabCase projectName}}",
-  "version": "1.0.0",
-  "description": "Generated by Kybernus CLI (Pro)",
-  "scripts": {
-    "dev": "nest start --watch",
-    "build": "nest build",
-    "start": "node dist/main.js",
-    "lint": "eslint \"{src,test}/**/*.ts\"",
-    "test": "jest",
-    "migrate:dev": "prisma migrate dev",
-    "migrate:deploy": "prisma migrate deploy",
-    "generate": "prisma generate"
-  },
-  "dependencies": {
-    "@nestjs/common": "^10.3.0",
-    "@nestjs/core": "^10.3.0",
-    "@nestjs/config": "^3.1.1",
-    "@nestjs/jwt": "^10.2.0",
-    "@nestjs/passport": "^10.0.3",
-    "@nestjs/platform-express": "^10.3.0",
-    "@prisma/client": "^5.10.2",
-    "bcryptjs": "^2.4.3",
-    "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.1",
-    "passport": "^0.7.0",
-    "passport-jwt": "^4.0.1",
-    "reflect-metadata": "^0.2.1",
-    "rxjs": "^7.8.1",
-    "stripe": "^14.14.0",
-    "uuid": "^9.0.1"
-  },
-  "devDependencies": {
-    "@nestjs/cli": "^10.3.0",
-    "@types/bcryptjs": "^2.4.6",
-    "@types/node": "^20.11.0",
-    "@types/passport-jwt": "^4.0.0",
-    "@types/uuid": "^9.0.7",
-    "prisma": "^5.10.2",
-    "typescript": "^5.3.3",
-    "eslint": "^8.56.0"
-  }
+"name": "{{kebabCase projectName}}",
+"version": "1.0.0",
+"description": "Generated by Kybernus CLI (Pro)",
+"scripts": {
+"dev": "nest start --watch",
+"build": "nest build",
+"start": "node dist/main.js",
+"lint": "eslint \"{src,test}/**/*.ts\"",
+"test": "jest",
+"migrate:dev": "prisma migrate dev",
+"migrate:deploy": "prisma migrate deploy",
+"generate": "prisma generate"
+},
+"dependencies": {
+"@nestjs/common": "^10.3.0",
+"@nestjs/core": "^10.3.0",
+"@nestjs/config": "^3.1.1",
+"@nestjs/jwt": "^10.2.0",
+"@nestjs/passport": "^10.0.3",
+"@nestjs/platform-express": "^10.3.0",
+"@prisma/client": "^5.10.2",
+"bcryptjs": "^2.4.3",
+"class-transformer": "^0.5.1",
+"class-validator": "^0.14.1",
+"passport": "^0.7.0",
+"passport-jwt": "^4.0.1",
+"reflect-metadata": "^0.2.1",
+"rxjs": "^7.8.1",
+"stripe": "^14.14.0",
+"uuid": "^9.0.1"
+},
+"devDependencies": {
+"@nestjs/cli": "^10.3.0",
+"@types/bcryptjs": "^2.4.6",
+"@types/node": "^20.11.0",
+"@types/passport-jwt": "^4.0.0",
+"@types/uuid": "^9.0.7",
+"prisma": "^5.10.2",
+"typescript": "^5.3.3",
+"eslint": "^9.16.0"
+},
+"overrides": {
+"rimraf": "^6.1.2",
+"glob": "^11.0.0",
+"inflight": "^1.0.6",
+"@humanwhocodes/config-array": "^0.13.0",
+"@humanwhocodes/object-schema": "^2.0.3",
+"eslint": "^9.16.0",
+"cookie": "^0.7.2",
+"minimatch": "^9.0.8"
 }
+}

package/templates/nestjs/clean/src/app.module.ts.hbs

@@ -3,6 +3,7 @@ import { ConfigModule } from '@nestjs/config';
 import { AuthModule } from './auth.module';
 import { PaymentModule } from './payment.module';
 import { PrismaService } from './infrastructure/database/prisma.service';
+import { HealthController } from './infrastructure/http/health.controller';
 
 @Module({
   imports: [
@@ -12,7 +13,7 @@ import { PrismaService } from './infrastructure/database/prisma.service';
     AuthModule,
     PaymentModule,
   ],
-  controllers: [],
+  controllers: [HealthController],
   providers: [PrismaService],
   exports: [PrismaService],
 })