Merge pull request #1 from AlgorithmChef/feature/user_domain

user_domain 완성 및 ci.yml 파일 작성 후 병합

Author: Kim-buyeon

.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: Java CI with Gradle
+on:
+  push:
+    branches: ["main", "develop"]
+
+  pull_request:
+    branches: ["main", "develop"]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: "21"
+          distribution: "temurin"
+
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle (Skip Tests)
+        env:
+          JWT_SECRET_KEY: ${{ secrets.JWT_SECRET_KEY }}
+        run: ./gradlew build -x test

src/main/java/com/webservice/algorithmchef/config/JwtAuthenticationFilter.java

@@ -35,7 +35,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
      * 💡 임시 비밀번호(status="TEMPORARY") 사용자가 접근할 수 있는 유일한 경로.
      * 이 경로 외의 모든 API 접근은 403 Forbidden을 반환합니다.
      */
-    private static final String ALLOWED_PATH_FOR_TEMP_USER = "/auth/findPassword";
+    private static final String ALLOWED_PATH_FOR_TEMP_USER = "/auth/update-tempPassword";
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)

src/main/java/com/webservice/algorithmchef/config/SecurityConfig.java

@@ -34,8 +34,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 
         http
                 .authorizeHttpRequests(authorize -> authorize
-                        // 실제 사용하는 로그인/회원가입 경로로 수정해주세요.
-                        .requestMatchers("/auth/login", "/auth/signUp").permitAll()
+                        .requestMatchers("/auth/login", "/auth/signUp", 
+                        		"/auth/findPassword", "/auth/findUserId").permitAll()
                         .anyRequest().authenticated());
 
         http

src/main/java/com/webservice/algorithmchef/controller/UserController.java

@@ -2,11 +2,21 @@
 
 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.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.webservice.algorithmchef.dto.user.ChangePasswordRequest;
+import com.webservice.algorithmchef.dto.user.ChangePasswordResponse;
+import com.webservice.algorithmchef.dto.user.FindPasswordRequest;
+import com.webservice.algorithmchef.dto.user.FindPasswordResponse;
+import com.webservice.algorithmchef.dto.user.FindUserIdRequest;
+import com.webservice.algorithmchef.dto.user.FindUserIdResponse;
 import com.webservice.algorithmchef.dto.user.UserLoginRequest;
 import com.webservice.algorithmchef.dto.user.UserLoginResponse;
 import com.webservice.algorithmchef.dto.user.UserSignUpRequest;
@@ -42,4 +52,39 @@ public ResponseEntity<?> signUp(@RequestBody UserSignUpRequest userSignUpRequest
 			return ResponseEntity.badRequest().body(e.getMessage());
 		}
 	}
+	
+	@Transactional
+	@PatchMapping("/findPassword")
+	public ResponseEntity<?> findPassword(@RequestBody FindPasswordRequest fPasswordRequest){
+		try {
+			FindPasswordResponse pResponse = userService.findPassword(fPasswordRequest);
+			return ResponseEntity.ok(pResponse);
+		}catch(IllegalArgumentException e) {
+			return ResponseEntity.badRequest().body(e.getMessage());
+		}
+	}
+	
+	@PatchMapping("/update-tempPassword")
+	public ResponseEntity<?> updateTempPasswod(@RequestBody ChangePasswordRequest cPasswordRequest,
+			@AuthenticationPrincipal UserDetails userDetails){
+		try {
+			String userId = userDetails.getUsername();
+			ChangePasswordResponse cResponse = userService.updateTempPassword(cPasswordRequest, userId);
+			return ResponseEntity.ok(cResponse);
+		}catch(IllegalArgumentException e) {
+			return ResponseEntity.badRequest().body(e.getMessage());
+		}
+	}
+	
+	@PostMapping("/findUserId")
+	public ResponseEntity<?> findUserId(@RequestBody FindUserIdRequest fIdRequest){
+		try {
+			FindUserIdResponse idResponse = userService.findUserId(fIdRequest);
+			return ResponseEntity.ok(idResponse);
+		}catch(IllegalArgumentException e) {
+			return ResponseEntity.badRequest().body(e.getMessage());
+		}
+	}
+	
+	
 }

src/main/java/com/webservice/algorithmchef/dto/user/ChangePasswordRequest.java

@@ -0,0 +1,11 @@
+package com.webservice.algorithmchef.dto.user;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class ChangePasswordRequest {
+
+	private String password;
+}

src/main/java/com/webservice/algorithmchef/dto/user/ChangePasswordResponse.java

@@ -0,0 +1,12 @@
+package com.webservice.algorithmchef.dto.user;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class ChangePasswordResponse {
+
+	private String accessToken;
+	private String message;
+}

src/main/java/com/webservice/algorithmchef/dto/user/FindPasswordRequest.java

@@ -0,0 +1,12 @@
+package com.webservice.algorithmchef.dto.user;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+public class FindPasswordRequest {
+
+	private String userId;
+	private String email;
+}

src/main/java/com/webservice/algorithmchef/dto/user/FindPasswordResponse.java

@@ -0,0 +1,15 @@
+package com.webservice.algorithmchef.dto.user;
+
+import com.webservice.algorithmchef.model.User;
+
+public class FindPasswordResponse {
+
+	private String userId;
+	private String message;
+	
+	public FindPasswordResponse(User user) {
+		this.userId = user.getUserId();
+		this.message = user.getEmail() + "로 임시비밀번호 전송했습니다.";
+	}
+	
+}

src/main/java/com/webservice/algorithmchef/dto/user/FindUserIdRequest.java

@@ -0,0 +1,12 @@
+package com.webservice.algorithmchef.dto.user;
+
+import java.time.LocalDateTime;
+
+import lombok.Getter;
+
+@Getter
+public class FindUserIdRequest {
+	private String email;
+	private LocalDateTime birthDate;
+
+}

src/main/java/com/webservice/algorithmchef/dto/user/FindUserIdResponse.java

@@ -0,0 +1,12 @@
+package com.webservice.algorithmchef.dto.user;
+
+import lombok.Getter;
+
+@Getter
+public class FindUserIdResponse {
+
+	private String userId;
+	public FindUserIdResponse(String userId) {
+	    this.userId = userId;
+	}
+}