Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/release_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# {{version_number}} 릴리스 요약

## 변경 사항

- 새로운 기능: [간단한 설명]
- 개선 사항: [간단한 설명]
- 버그 수정: [수정된 버그에 대한 간단한 설명]

## 상세 변경 로그

[이 릴리스에 포함된 커밋 목록 또는 더 상세한 변경 로그 링크]

---

**버전 올림 기준:** `주요 변경 (Major)`: 하위 호환되지 않는 API 변경, `기능 (Minor)`: 하위 호환되는 새로운 기능 추가, `패치 (Patch)`: 하위 호환되는 버그 수정 시 올립니다.


59 changes: 0 additions & 59 deletions .github/workflows/deploy.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/release_note.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Tag Release
on:
pull_request:
branches:
- "main"
types:
- closed
jobs:
generate_release:
name: Release
if: contains(github.event.pull_request.head.ref, 'release/v') && github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v2
- name: Fetch version
run: |
VERSION=$(echo "${GITHUB_HEAD_REF}" | sed "s/release\\\\/v//")
echo "version=${VERSION}" >> $GITHUB_OUTPUT
id: fetch-version
- name: Generate release notes
uses: softprops/action-gh-release@v1
with:
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}
tag_name: v${{ steps.fetch-version.outputs.version }}
generate_release_notes: true
12 changes: 12 additions & 0 deletions src/main/java/dev/admin/admin/controller/AdminAuthController.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;


import org.springframework.beans.factory.annotation.Value;

import org.springframework.http.ResponseCookie;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand All @@ -22,6 +25,11 @@ public class AdminAuthController {
private final AdminAuthCommandService authCommandService;
private final JwtUtil jwtUtil;


@Value("${app.cookie.domain}")
private String cookieDomain;


@PostMapping("/login")
public ApiResponse<JwtDto> login(@RequestBody LoginRequestDto requestDto, HttpServletResponse response) {
JwtDto tokenDto = authCommandService.login(requestDto);
Expand All @@ -30,6 +38,7 @@ public ApiResponse<JwtDto> login(@RequestBody LoginRequestDto requestDto, HttpSe
.httpOnly(true)
.secure(true)
.path("/")
.domain(cookieDomain)
.sameSite("None")
.maxAge(60 * 60)
.build();
Expand All @@ -38,6 +47,7 @@ public ApiResponse<JwtDto> login(@RequestBody LoginRequestDto requestDto, HttpSe
.httpOnly(true)
.secure(true)
.path("/")
.domain(cookieDomain)
.sameSite("None")
.maxAge(7 * 24 * 60 * 60)
.build();
Expand All @@ -57,6 +67,7 @@ public ApiResponse<Void> logout(@CookieValue("refreshToken") String refreshToken
.httpOnly(true)
.secure(true)
.path("/")
.domain(cookieDomain)
.sameSite("None")
.maxAge(0)
.build();
Expand All @@ -65,6 +76,7 @@ public ApiResponse<Void> logout(@CookieValue("refreshToken") String refreshToken
.httpOnly(true)
.secure(true)
.path("/")
.domain(cookieDomain)
.sameSite("None")
.maxAge(0)
.build();
Expand Down
Loading