Index: backend/env =================================================================== --- backend/env (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ (revision ) @@ -1,54 +1,0 @@ -# ============================================ -# REQUIRED FOR STARTUP - Database Connection -# ============================================ -# PostgreSQL connection parameters -# Make sure your SSH tunnel is running (tunnel_scripta.sh) before starting the app -SPRING_DATASOURCE_URL=jdbc:postgresql://localhost:9999/db_202526z_va_prj_trekr -SPRING_DATASOURCE_USERNAME=db_202526z_va_prj_trekr_owner -SPRING_DATASOURCE_PASSWORD=39ee816617c3 - -# ============================================ -# REQUIRED FOR STARTUP - JWT Secret Key -# ============================================ -# Used for signing/verifying JWT tokens in authentication -# Generate a secure random string (at least 256 bits/32 characters) -# For development, you can use this temporary value, but CHANGE IT in production! -# To generate: openssl rand -base64 32 -JWT_CONFIG_SECRET=dev-temporary-secret-key-change-in-production-min-32-chars - -# ============================================ -# OPTIONAL - AWS S3 (File Storage) -# ============================================ -# Only needed if you're storing files/images in AWS S3 -# Get these from: AWS Console -> IAM -> Users -> Create Access Key -# Or: AWS Console -> S3 -> Your Bucket -> Properties -AWS_S3_REGION= -AWS_S3_BUCKET_NAME= -AWS_S3_ACCESS_KEY= -AWS_S3_SECRET_KEY= - -# ============================================ -# OPTIONAL - Email Service (SMTP) -# ============================================ -# Only needed if you're sending emails (password reset, notifications, etc.) -# Options: -# - Gmail: smtp.gmail.com, port 587 -# - Outlook: smtp-mail.outlook.com, port 587 -# - SendGrid: smtp.sendgrid.net, port 587 -# - Mailtrap (testing): smtp.mailtrap.io, port 2525 -EMAIL_HOST= -EMAIL_PORT= -EMAIL_USERNAME= -EMAIL_PASSWORD= - -# ============================================ -# OPTIONAL - Google OAuth (Social Login) -# ============================================ -# Only needed if you want users to sign in with Google -# Get these from: https://console.cloud.google.com/ -# 1. Create a project -# 2. Enable Google+ API -# 3. Create OAuth 2.0 credentials -# 4. Add authorized redirect URI: http://localhost:8080/login/oauth2/code/google -GOOGLE_CLIENT_ID= -GOOGLE_CLIENT_SECRET= Index: backend/pom.xml =================================================================== --- backend/pom.xml (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/pom.xml (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -99,4 +99,10 @@ test + + + com.h2database + h2 + test + Index: backend/src/main/java/com/trekr/backend/BackendApplication.java =================================================================== --- backend/src/main/java/com/trekr/backend/BackendApplication.java (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/BackendApplication.java (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -12,12 +12,12 @@ // This ensures system properties are available for ${} placeholder resolution Dotenv dotenv = loadEnvironmentVariables(); - + // Create SpringApplication instance SpringApplication app = new SpringApplication(BackendApplication.class); - + // Set system properties and default properties from .env file if (dotenv != null) { java.util.Map defaultProps = new java.util.HashMap<>(); - + dotenv.entries().forEach(entry -> { String key = entry.getKey(); @@ -30,5 +30,5 @@ } }); - + // Set all default properties at once if (!defaultProps.isEmpty()) { @@ -36,53 +36,42 @@ } } - + app.run(args); } - + private static Dotenv loadEnvironmentVariables() { Dotenv dotenv = null; - try { - // Try current directory (backend/) - dotenv = Dotenv.configure() - .directory("./") - .ignoreIfMissing() - .load(); - } catch (Exception e) { - // Try parent directory if current doesn't work + + // Prefer a standard ".env" file, but also support the existing "env" file. + // We search multiple locations so it works whether the app is launched from: + // - backend/ (common in IDE) + // - repo root (common when running a built JAR) + String[][] candidates = new String[][] { + { "./", ".env" }, + { "./", "env" }, + { "./backend", ".env" }, + { "./backend", "env" }, + { "../", ".env" }, + { "../", "env" }, + { "../backend", ".env" }, + { "../backend", "env" }, + }; + + for (String[] candidate : candidates) { try { - dotenv = Dotenv.configure() - .directory("../") + Dotenv loaded = Dotenv.configure() + .directory(candidate[0]) + .filename(candidate[1]) .ignoreIfMissing() .load(); - } catch (Exception e2) { - System.err.println("WARNING: Could not load .env file. Make sure .env exists in backend/ directory."); - System.err.println("Error: " + e2.getMessage()); - return null; + if (loaded != null && !loaded.entries().isEmpty()) { + dotenv = loaded; + break; + } + } catch (Exception ignored) { + // keep searching } } - - // Verify critical properties are loaded - if (dotenv != null) { - String url = dotenv.get("SPRING_DATASOURCE_URL"); - String username = dotenv.get("SPRING_DATASOURCE_USERNAME"); - String password = dotenv.get("SPRING_DATASOURCE_PASSWORD"); - - if (url != null && !url.trim().isEmpty()) { - System.out.println("✓ Database URL loaded from .env"); - } else { - System.err.println("✗ ERROR: SPRING_DATASOURCE_URL not found in .env file!"); - } - if (username != null && !username.trim().isEmpty()) { - System.out.println("✓ Database username loaded from .env"); - } else { - System.err.println("✗ ERROR: SPRING_DATASOURCE_USERNAME not found in .env file!"); - } - if (password != null && !password.trim().isEmpty()) { - System.out.println("✓ Database password loaded from .env"); - } else { - System.err.println("✗ ERROR: SPRING_DATASOURCE_PASSWORD not found in .env file!"); - } - } - + return dotenv; } Index: backend/src/main/java/com/trekr/backend/config/SecurityConfig.java =================================================================== --- backend/src/main/java/com/trekr/backend/config/SecurityConfig.java (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/config/SecurityConfig.java (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -3,4 +3,5 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -8,4 +9,9 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.web.SecurityFilterChain; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +import java.util.List; @Configuration @@ -17,9 +23,23 @@ http .csrf(AbstractHttpConfigurer::disable) + .cors(Customizer.withDefaults()) .authorizeHttpRequests(auth -> auth .requestMatchers("/api/auth/**").permitAll() - .anyRequest().authenticated() - ); + .anyRequest().authenticated()); return http.build(); + } + + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration config = new CorsConfiguration(); + config.setAllowedOrigins(List.of( + "http://localhost:5173", + "http://127.0.0.1:5173")); + config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); + config.setAllowedHeaders(List.of("Authorization", "Content-Type")); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", config); + return source; } Index: backend/src/main/java/com/trekr/backend/controller/AuthController.java =================================================================== --- backend/src/main/java/com/trekr/backend/controller/AuthController.java (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/controller/AuthController.java (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -6,5 +6,4 @@ import com.trekr.backend.service.AuthService; import jakarta.validation.Valid; -import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -13,9 +12,12 @@ @RestController @RequestMapping("/api/auth") -@RequiredArgsConstructor public class AuthController { - + private final AuthService authService; - + + public AuthController(AuthService authService) { + this.authService = authService; + } + @PostMapping("/register") public ResponseEntity register(@Valid @RequestBody RegisterRequest request) { @@ -23,5 +25,5 @@ return ResponseEntity.status(HttpStatus.CREATED).body(response); } - + @PostMapping("/login") public ResponseEntity login(@Valid @RequestBody LoginRequest request) { Index: backend/src/main/java/com/trekr/backend/dto/auth/AuthResponse.java =================================================================== --- backend/src/main/java/com/trekr/backend/dto/auth/AuthResponse.java (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/dto/auth/AuthResponse.java (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -1,11 +1,4 @@ package com.trekr.backend.dto.auth; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor public class AuthResponse { private String token; @@ -14,3 +7,54 @@ private String username; private String email; + + public AuthResponse() { + } + + public AuthResponse(String token, String type, Long userId, String username, String email) { + this.token = token; + this.type = type; + this.userId = userId; + this.username = username; + this.email = email; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } } Index: backend/src/main/java/com/trekr/backend/dto/auth/LoginRequest.java =================================================================== --- backend/src/main/java/com/trekr/backend/dto/auth/LoginRequest.java (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/dto/auth/LoginRequest.java (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -2,13 +2,30 @@ import jakarta.validation.constraints.NotBlank; -import lombok.Data; -@Data public class LoginRequest { - + @NotBlank(message = "Username or email is required") private String usernameOrEmail; - + @NotBlank(message = "Password is required") private String password; + + public LoginRequest() { + } + + public String getUsernameOrEmail() { + return usernameOrEmail; + } + + public void setUsernameOrEmail(String usernameOrEmail) { + this.usernameOrEmail = usernameOrEmail; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } } Index: backend/src/main/java/com/trekr/backend/dto/auth/RegisterRequest.java =================================================================== --- backend/src/main/java/com/trekr/backend/dto/auth/RegisterRequest.java (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/dto/auth/RegisterRequest.java (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -4,19 +4,44 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import lombok.Data; -@Data public class RegisterRequest { - + @NotBlank(message = "Email is required") @Email(message = "Email must be valid") private String email; - + @NotBlank(message = "Username is required") @Size(min = 3, max = 50, message = "Username must be between 3 and 50 characters") private String username; - + @NotBlank(message = "Password is required") @Size(min = 6, message = "Password must be at least 6 characters") private String password; + + public RegisterRequest() { + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } } Index: backend/src/main/java/com/trekr/backend/entity/User.java =================================================================== --- backend/src/main/java/com/trekr/backend/entity/User.java (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/entity/User.java (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -2,30 +2,63 @@ import jakarta.persistence.*; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; @Entity @Table(name = "USERS", schema = "trekr") -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor public class User { - + @Id - @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "user_seq") - @SequenceGenerator(name = "user_seq", sequenceName = "user_id_seq", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "user_id") private Long userId; - + @Column(name = "email", nullable = false, unique = true) private String email; - + @Column(name = "username", nullable = false, unique = true) private String username; - + @Column(name = "password", nullable = false) private String password; + + public User() { + } + + public User(Long userId, String email, String username, String password) { + this.userId = userId; + this.email = email; + this.username = username; + this.password = password; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } } Index: backend/src/main/java/com/trekr/backend/resources/application.properties =================================================================== --- backend/src/main/java/com/trekr/backend/resources/application.properties (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/resources/application.properties (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -1,66 +1,4 @@ -# application.properties +### NOTE +### This file is intentionally NOT used by Spring Boot. +### The active config is in: src/main/resources/application.properties -# General app config -spring.application.name=trekr - -#spring.datasource.hikari.data-source-properties.useServerPrepStmts=false -#spring.datasource.hikari.data-source-properties.prepareThreshold=0 - -logging.level.org.springframework.security=DEBUG - -# JPA & Hibernate -spring.jpa.hibernate.ddl-auto=update -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -spring.jpa.show-sql=false -spring.jpa.properties.hibernate.format_sql=true -spring.jpa.properties.hibernate.default_schema=trekr - -#logging.level.org.hibernate.SQL=DEBUG -#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE - - -# HikariCP settings -spring.datasource.hikari.pool-name=trekrHikariPool - -# Maximum connections in the pool -# Rule of thumb: (CPU cores × 2) + effective_spindle_count -# For most apps: 10-20 is good -spring.datasource.hikari.maximum-pool-size=20 - -# Minimum idle connections always ready -# Keep at least 5 ready for quick response -spring.datasource.hikari.minimum-idle=5 - -# How long to wait for a connection (before blocking the request) - 30sec -spring.datasource.hikari.connection-timeout=30000 - -# How long a connection can sit idle (before being closed) - 10min -spring.datasource.hikari.idle-timeout=600000 - -# Maximum lifetime of a connection (before being replaced with a new one) - 30min -# Prevents stale connections -spring.datasource.hikari.max-lifetime=1800000 - - -# JWT Configuration (supports JWT_SECRET or JWT_CONFIG_SECRET from .env) -jwt.secret=${JWT_SECRET:${JWT_CONFIG_SECRET:dev-fallback-secret-min-32-chars-required}} - -# Base API path -api.base.path=/api -api.admin.path=/api/admin - -#spring.profiles.active=dev - -# Max file size -server.tomcat.max-part-count=50 - -logging.level.org.springframework.web=DEBUG -logging.level.org.apache.coyote.http11=DEBUG - - -# PostgreSQL connection -spring.datasource.driver-class-name=org.postgresql.Driver -spring.datasource.url=${SPRING_DATASOURCE_URL} -spring.datasource.username=${SPRING_DATASOURCE_USERNAME} -spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} - Index: backend/src/main/java/com/trekr/backend/security/UserPrincipal.java =================================================================== --- backend/src/main/java/com/trekr/backend/security/UserPrincipal.java (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/security/UserPrincipal.java (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -2,5 +2,4 @@ import lombok.Getter; -import lombok.RequiredArgsConstructor; import java.io.Serializable; @@ -11,8 +10,15 @@ */ @Getter -@RequiredArgsConstructor public class UserPrincipal implements Serializable { + private static final long serialVersionUID = 1L; + private final Long userId; private final String username; private final String email; + + public UserPrincipal(Long userId, String username, String email) { + this.userId = userId; + this.username = username; + this.email = email; + } } Index: backend/src/main/java/com/trekr/backend/service/AuthService.java =================================================================== --- backend/src/main/java/com/trekr/backend/service/AuthService.java (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/java/com/trekr/backend/service/AuthService.java (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -6,5 +6,4 @@ import com.trekr.backend.entity.User; import com.trekr.backend.repository.UserRepository; -import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -12,5 +11,4 @@ @Service -@RequiredArgsConstructor public class AuthService { @@ -18,4 +16,10 @@ private final PasswordEncoder passwordEncoder; private final JwtService jwtService; + + public AuthService(UserRepository userRepository, PasswordEncoder passwordEncoder, JwtService jwtService) { + this.userRepository = userRepository; + this.passwordEncoder = passwordEncoder; + this.jwtService = jwtService; + } @Transactional Index: backend/src/main/resources/application.properties =================================================================== --- backend/src/main/resources/application.properties (revision 140d09810bfccea4e866a65432770142f194ebbf) +++ backend/src/main/resources/application.properties (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -1,1 +1,42 @@ -spring.application.name=backend +spring.application.name=trekr + +# ============================ +# JPA & Hibernate +# ============================ +spring.jpa.hibernate.ddl-auto=update +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +spring.jpa.show-sql=false +spring.jpa.properties.hibernate.format_sql=true +spring.jpa.properties.hibernate.default_schema=trekr +spring.jpa.properties.hibernate.hbm2ddl.create_namespaces=true + +# ============================ +# PostgreSQL connection (loaded from backend/.env or backend/env) +# ============================ +spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.url=${SPRING_DATASOURCE_URL} +spring.datasource.username=${SPRING_DATASOURCE_USERNAME} +spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} + +# ============================ +# JWT Configuration (supports JWT_SECRET or JWT_CONFIG_SECRET) +# ============================ +jwt.secret=${JWT_SECRET:${JWT_CONFIG_SECRET:dev-fallback-secret-min-32-chars-required}} + +# ============================ +# Logging +# ============================ +logging.level.org.springframework.security=DEBUG + +# ============================ +# HikariCP +# ============================ +spring.datasource.hikari.pool-name=trekrHikariPool +spring.datasource.hikari.maximum-pool-size=20 +spring.datasource.hikari.minimum-idle=5 +spring.datasource.hikari.connection-timeout=30000 +spring.datasource.hikari.idle-timeout=600000 +spring.datasource.hikari.max-lifetime=1800000 + +# Max multipart parts +server.tomcat.max-part-count=50 Index: backend/src/test/resources/application.properties =================================================================== --- backend/src/test/resources/application.properties (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) +++ backend/src/test/resources/application.properties (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -0,0 +1,21 @@ +# Test profile: use in-memory DB so tests don't require external Postgres + +spring.datasource.url=jdbc:h2:mem:trekr;MODE=PostgreSQL;DB_CLOSE_DELAY=-1;DATABASE_TO_LOWER=TRUE +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password= + +spring.jpa.hibernate.ddl-auto=create-drop +spring.jpa.show-sql=false +spring.jpa.properties.hibernate.format_sql=true +spring.jpa.properties.hibernate.default_schema=trekr +spring.jpa.properties.hibernate.hbm2ddl.create_namespaces=false + +# Ensure schema exists before Hibernate runs DDL +spring.sql.init.mode=always + +# JWT secret for tests +jwt.secret=test-secret-min-32-chars-000000000000 + +# Keep noise down in tests +logging.level.org.springframework.security=INFO Index: backend/src/test/resources/schema.sql =================================================================== --- backend/src/test/resources/schema.sql (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) +++ backend/src/test/resources/schema.sql (revision 3ebe47cce61b3bfc1dee2566f7475e378374591e) @@ -0,0 +1,2 @@ +CREATE SCHEMA IF NOT EXISTS trekr; +SET SCHEMA trekr;