Merge pull request #53 from Zenfulcode/release

Email confirmations and guest login fix

Author: gustaavik

deploy/.env.example

@@ -13,4 +13,9 @@ MOBILEPAY_CLIENT_SECRET=
 MOBILEPAY_SUBSCRIPTION_KEY=
 MOBILEPAY_MERCHANT_ID=
 MOBILEPAY_API_URL=
-MOBILEPAY_SYSTEM_NAME=Commercify
+MOBILEPAY_SYSTEM_NAME=Commercify
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_HOST=smtp.ethereal.email
+MAIL_PORT=587
+FRONTEND_URL=http://localhost:3000

deploy/docker-compose.yml

@@ -40,6 +40,10 @@ services:
       - MOBILEPAY_SUBSCRIPTION_KEY=${MOBILEPAY_SUBSCRIPTION_KEY}
       - MOBILEPAY_API_URL=${MOBILEPAY_API_URL}
       - MOBILEPAY_SYSTEM_NAME=${MOBILEPAY_SYSTEM_NAME}
+      - MAIL_USERNAME=${MAIL_USERNAME}
+      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      - MAIL_HOST=${MAIL_HOST}
+      - MAIL_PORT=${MAIL_PORT}
     depends_on:
       mysql:
         condition: service_healthy

makefile

@@ -12,8 +12,7 @@ endif
 
 update:
 	docker compose -f deploy/docker-compose.yml down
-	docker compose -f deploy/docker-compose.yml build --no-cache
-	docker compose -f deploy/docker-compose.yml up --force-recreate
+	docker compose -f deploy/docker-compose.yml up --build
 
 build:
 	docker build -t ghcr.io/zenfulcode/commercify:$(tag) .

pom.xml

@@ -141,6 +141,18 @@
             <artifactId>spring-retry</artifactId>
             <version>2.0.10</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.thymeleaf.extras</groupId>
+            <artifactId>thymeleaf-extras-springsecurity6</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/zenfulcode/commercify/commercify/api/requests/RegisterUserRequest.java

@@ -9,12 +9,17 @@ public record RegisterUserRequest(
         String password,
         String firstName,
         String lastName,
+        Boolean isGuest,
         AddressDTO shippingAddress,
         AddressDTO billingAddress) {
     // Set a secure default password
     public RegisterUserRequest {
         if (password == null || password.isBlank()) {
             password = UUID.randomUUID().toString();
         }
+
+        if (isGuest == null) {
+            isGuest = false;
+        }
     }
 }

src/main/java/com/zenfulcode/commercify/commercify/component/AdminDataLoader.java

@@ -33,6 +33,9 @@ public CommandLineRunner loadData() {
                         .firstName("Admin")
                         .lastName("User")
                         .roles(List.of("ADMIN", "USER"))
+                        .shippingAddress(null)
+                        .billingAddress(null)
+                        .emailConfirmed(true)
                         .build();
 
                 userRepository.save(adminUser);

src/main/java/com/zenfulcode/commercify/commercify/controller/AuthenticationController.java

@@ -4,15 +4,16 @@
 import com.zenfulcode.commercify.commercify.api.requests.LoginUserRequest;
 import com.zenfulcode.commercify.commercify.api.requests.RegisterUserRequest;
 import com.zenfulcode.commercify.commercify.api.responses.AuthResponse;
-import com.zenfulcode.commercify.commercify.api.responses.RegisterUserResponse;
 import com.zenfulcode.commercify.commercify.dto.UserDTO;
 import com.zenfulcode.commercify.commercify.service.AuthenticationService;
 import com.zenfulcode.commercify.commercify.service.JwtService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+@Slf4j
 @RestController
 @RequestMapping("/api/v1/auth")
 @RequiredArgsConstructor
@@ -21,13 +22,19 @@ public class AuthenticationController {
     private final AuthenticationService authenticationService;
 
     @PostMapping("/signup")
-    public ResponseEntity<?> register(@RequestBody RegisterUserRequest registerRequest) {
+    public ResponseEntity<AuthResponse> register(@RequestBody RegisterUserRequest registerRequest) {
         try {
             UserDTO user = authenticationService.registerUser(registerRequest);
-            return ResponseEntity.ok(RegisterUserResponse.UserRegistered(user));
+
+            if (registerRequest.isGuest()) {
+                UserDTO authenticated = authenticationService.authenticate(new LoginUserRequest(registerRequest.email(), registerRequest.password()));
+                String jwt = jwtService.generateToken(authenticated);
+                return ResponseEntity.ok(AuthResponse.UserAuthenticated(authenticated, jwt, jwtService.getExpirationTime()));
+            }
+
+            return ResponseEntity.ok(AuthResponse.UserAuthenticated(user, "", 0));
         } catch (RuntimeException e) {
-            RegisterUserResponse error = RegisterUserResponse.RegistrationFailed(e.getMessage());
-            return ResponseEntity.badRequest().body(error);
+            return ResponseEntity.badRequest().body(AuthResponse.AuthenticationFailed(e.getMessage()));
         }
     }
 

src/main/java/com/zenfulcode/commercify/commercify/controller/PaymentController.java

@@ -3,19 +3,36 @@
 import com.zenfulcode.commercify.commercify.PaymentStatus;
 import com.zenfulcode.commercify.commercify.service.PaymentService;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 @CrossOrigin
 @RestController
 @RequestMapping("/api/v1/payments")
 @AllArgsConstructor
+@Slf4j
 public class PaymentController {
     private final PaymentService paymentService;
 
+    @PostMapping("/{orderId}/status")
+    @PreAuthorize("hasRole('ADMIN')")
+    public ResponseEntity<String> updatePaymentStatus(
+            @PathVariable Long orderId,
+            @RequestParam PaymentStatus status) {
+        try {
+            paymentService.handlePaymentStatusUpdate(orderId, status);
+            return ResponseEntity.ok("Payment status updated successfully");
+        } catch (Exception e) {
+            log.error("Error updating payment status", e);
+            return ResponseEntity.badRequest().body("Error updating payment status");
+        }
+    }
+
     @GetMapping("/{orderId}/status")
-    public ResponseEntity<String> getPaymentStatus(@PathVariable Long orderId) {
+    public ResponseEntity<PaymentStatus> getPaymentStatus(@PathVariable Long orderId) {
         PaymentStatus status = paymentService.getPaymentStatus(orderId);
-        return ResponseEntity.ok(status.name());
+        return ResponseEntity.ok(status);
     }
 }

src/main/java/com/zenfulcode/commercify/commercify/dto/VariantOptionEntityDto.java

@@ -1,17 +1,17 @@
 package com.zenfulcode.commercify.commercify.dto;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Value;
-
-import java.io.Serializable;
+import lombok.Data;
 
 /**
  * DTO for {@link com.zenfulcode.commercify.commercify.entity.VariantOptionEntity}
  */
-@Value
 @Builder
-public class VariantOptionEntityDto implements Serializable {
-    Long id;
-    String name;
-    String value;
+@Data
+@AllArgsConstructor
+public class VariantOptionEntityDto {
+    private Long id;
+    private String name;
+    private String value;
 }

src/main/java/com/zenfulcode/commercify/commercify/entity/ConfirmationTokenEntity.java

@@ -0,0 +1,48 @@
+package com.zenfulcode.commercify.commercify.entity;
+
+import jakarta.persistence.*;
+import lombok.*;
+import org.hibernate.annotations.CreationTimestamp;
+
+import java.time.Instant;
+import java.util.UUID;
+
+@Entity
+@Table(name = "confirmation_tokens")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ConfirmationTokenEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false, unique = true)
+    private String token;
+
+    @Column(nullable = false, name = "expiry_date")
+    private Instant expiryDate;
+
+    @Column(nullable = false)
+    private boolean confirmed;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", nullable = false)
+    private UserEntity user;
+
+    @CreationTimestamp
+    @Column(nullable = false, name = "created_at")
+    private Instant createdAt;
+
+    @PrePersist
+    public void prePersist() {
+        if (token == null) {
+            token = UUID.randomUUID().toString();
+        }
+        if (expiryDate == null) {
+            expiryDate = Instant.now().plusSeconds(24 * 60 * 60); // 24 hours
+        }
+    }
+}