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
6 changes: 0 additions & 6 deletions .github/workflows/_deploy-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ name: deploy-native-template
on:
workflow_call:
inputs:
target_branch:
required: false
type: string
default: ''
ecr_repository:
required: true
type: string
Expand Down Expand Up @@ -34,8 +30,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ inputs.target_branch || github.ref }}

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ name: deploy-template
on:
workflow_call:
inputs:
target_branch:
required: false
type: string
default: ''
ecr_repository:
required: true
type: string
Expand Down Expand Up @@ -34,8 +30,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ inputs.target_branch || github.ref }}

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/deploy-manual-native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ name: Deploy Manual Native
on:
workflow_dispatch:
inputs:
target_branch:
description: '배포할 브랜치명'
required: true
type: string
ecr_repository:
description: 'ECR 리포지토리 (예: snutt-dev/snutt-timetable)'
required: true
Expand All @@ -20,7 +16,6 @@ jobs:
deploy:
uses: ./.github/workflows/_deploy-native.yml
with:
target_branch: ${{ inputs.target_branch }}
ecr_repository: ${{ inputs.ecr_repository }}
dockerfile: ${{ inputs.dockerfile }}
secrets:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/deploy-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ name: Deploy Manual
on:
workflow_dispatch:
inputs:
target_branch:
description: '배포할 브랜치명'
required: true
type: string
ecr_repository:
description: 'ECR 리포지토리 (예: snutt-dev/snutt-timetable)'
required: true
Expand All @@ -20,7 +16,6 @@ jobs:
deploy:
uses: ./.github/workflows/_deploy.yml
with:
target_branch: ${{ inputs.target_branch }}
ecr_repository: ${{ inputs.ecr_repository }}
dockerfile: ${{ inputs.dockerfile }}
secrets:
Expand Down
2 changes: 2 additions & 0 deletions api/src/main/kotlin/controller/AuthController.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.wafflestudio.snutt.controller

import com.wafflestudio.snutt.common.dto.OkResponse
import com.wafflestudio.snutt.config.CurrentUser
import com.wafflestudio.snutt.filter.SnuttDefaultApiFilterTarget
import com.wafflestudio.snutt.filter.SnuttNoAuthApiFilterTarget
import com.wafflestudio.snutt.users.data.User
import com.wafflestudio.snutt.users.dto.EmailResponse
Expand Down Expand Up @@ -108,6 +109,7 @@ class AuthController(
return OkResponse()
}

@SnuttDefaultApiFilterTarget
@PostMapping("/logout")
suspend fun logout(
@CurrentUser user: User,
Expand Down
6 changes: 0 additions & 6 deletions core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8")
api("org.springframework.boot:spring-boot-starter-data-mongodb-reactive")

// TODO: https://jira.mongodb.org/browse/JAVA-6038 이슈 해결된 spring-boot-starter-data-mongodb 업그레이드 후 아래 의존성 삭제
api("org.mongodb:mongodb-driver-sync:5.5.2")
api("org.mongodb:bson:5.5.2")
api("org.mongodb:mongodb-driver-core:5.5.2")
api("org.mongodb:bson-record-codec:5.5.2")

api("org.springframework.boot:spring-boot-starter-data-redis")

implementation("org.springframework.security:spring-security-crypto")
Expand Down
7 changes: 3 additions & 4 deletions core/src/main/kotlin/auth/kakao/KakaoOAuth2UserResponse.kt
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package com.wafflestudio.snutt.auth.kakao

import tools.jackson.databind.PropertyNamingStrategies
import tools.jackson.databind.annotation.JsonNaming
import com.fasterxml.jackson.annotation.JsonProperty

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
data class KakaoOAuth2UserResponse(
val id: Long,
@param:JsonProperty("kakao_account")
val kakaoAccount: KakaoAccountDto,
)

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
data class KakaoAccountDto(
val email: String,
@param:JsonProperty("is_email_verified")
val isEmailVerified: Boolean,
)
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.wafflestudio.snutt.bookmark.dto

import tools.jackson.databind.PropertyNamingStrategies
import tools.jackson.databind.annotation.JsonNaming
import com.fasterxml.jackson.annotation.JsonProperty

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
data class BookmarkLectureModifyRequest(
@param:JsonProperty("lecture_id")
val lectureId: String,
)
6 changes: 3 additions & 3 deletions core/src/main/kotlin/users/dto/FacebookLoginRequest.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.wafflestudio.snutt.users.dto

import tools.jackson.databind.PropertyNamingStrategies
import tools.jackson.databind.annotation.JsonNaming
import com.fasterxml.jackson.annotation.JsonProperty

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
data class FacebookLoginRequest(
@param:JsonProperty("fb_id")
val fbId: String?,
@param:JsonProperty("fb_token")
val fbToken: String,
)
5 changes: 2 additions & 3 deletions core/src/main/kotlin/users/dto/LoginResponse.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.wafflestudio.snutt.users.dto

import tools.jackson.databind.PropertyNamingStrategies
import tools.jackson.databind.annotation.JsonNaming
import com.fasterxml.jackson.annotation.JsonProperty

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
data class LoginResponse(
@param:JsonProperty("user_id")
val userId: String,
val token: String,
val message: String = "ok",
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/kotlin/users/dto/LogoutRequest.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.wafflestudio.snutt.users.dto

import tools.jackson.databind.PropertyNamingStrategies
import tools.jackson.databind.annotation.JsonNaming
import com.fasterxml.jackson.annotation.JsonProperty

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
data class LogoutRequest(
@param:JsonProperty("registration_id")
val registrationId: String,
)
6 changes: 3 additions & 3 deletions core/src/main/kotlin/users/dto/PasswordChangeRequest.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.wafflestudio.snutt.users.dto

import tools.jackson.databind.PropertyNamingStrategies
import tools.jackson.databind.annotation.JsonNaming
import com.fasterxml.jackson.annotation.JsonProperty

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
data class PasswordChangeRequest(
@param:JsonProperty("old_password")
val oldPassword: String,
@param:JsonProperty("new_password")
val newPassword: String,
)
5 changes: 2 additions & 3 deletions core/src/main/kotlin/users/dto/PasswordResetRequest.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package com.wafflestudio.snutt.users.dto

import tools.jackson.databind.PropertyNamingStrategies
import tools.jackson.databind.annotation.JsonNaming
import com.fasterxml.jackson.annotation.JsonProperty

@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
data class PasswordResetRequest(
@param:JsonProperty("user_id")
val userId: String,
val password: String,
val code: String,
Expand Down