diff --git a/.github/workflows/daily-scrum-notification.yml b/.github/workflows/daily-scrum-notification.yml index 951c944e..29953bf3 100644 --- a/.github/workflows/daily-scrum-notification.yml +++ b/.github/workflows/daily-scrum-notification.yml @@ -20,11 +20,11 @@ jobs: "text": { "type": "mrkdwn", "text": "<@U07L8AX9B4N><@U07L87A3WKY><@U07LC3Q1MEH><@U07LHEEU2BW><@U07LESGBQEP><@U07LMP4PY0L><@U07LHAXGYBE><@U07L87GGHJS>\n\n - *:calendar: 보틀즈 데일리 스크럼 :calendar:*\n\n - :one: - 완료된 작업 내용\n\n - :two: - 오늘 해야 할 작업\n\n - :three: - 겪고 있는 문제나 도움이 필요한 사항\n\n - 오늘의 TMI나 아무말도 좋아 :blob_aww: \n\n" + *:calendar: 보틀즈 데일리 스크럼 :calendar:*\n\n + :one: - 완료된 작업 내용\n\n + :two: - 오늘 해야 할 작업\n\n + :three: - 겪고 있는 문제나 도움이 필요한 사항\n\n + 오늘의 TMI나 아무말도 좋아 :blob_aww: \n\n" } } ] diff --git a/.github/workflows/deploy-workflow.yml b/.github/workflows/deploy-workflow.yml index 18e03a24..55ad836c 100644 --- a/.github/workflows/deploy-workflow.yml +++ b/.github/workflows/deploy-workflow.yml @@ -120,6 +120,7 @@ jobs: echo "export IS_MATCHING_ACTIVE=${{ secrets.IS_MATCHING_ACTIVE }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh echo "export SUPER_USER_NUMBER=${{ secrets.SUPER_USER_NUMBER }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh echo "export SUPER_USER_NUMBER_V2=${{ secrets.SUPER_USER_NUMBER_V2 }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh + echo "export BOTTLES_NUMBER=${{ secrets.BOTTLES_NUMBER }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh echo "export APPLE_KEY_ID=${{ secrets.APPLE_KEY_ID }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh echo "export APPLE_KEY_ID_PATH=${{ secrets.APPLE_KEY_ID_PATH }}" >> /home/${{ secrets.SERVER_USER_NAME }}/deploy/env_vars.sh diff --git a/api/src/main/kotlin/com/nexters/bottles/api/auth/facade/AuthFacade.kt b/api/src/main/kotlin/com/nexters/bottles/api/auth/facade/AuthFacade.kt index fd5d6b82..daa8e124 100644 --- a/api/src/main/kotlin/com/nexters/bottles/api/auth/facade/AuthFacade.kt +++ b/api/src/main/kotlin/com/nexters/bottles/api/auth/facade/AuthFacade.kt @@ -62,6 +62,8 @@ class AuthFacade( private val superUserNumber: String, @Value("\${super-user-number-v2}") private val superUserNumberV2: String, + @Value("\${bottles-number}") + private val bottlesNumber: String, ) { private val log = KotlinLogging.logger { } @@ -98,6 +100,7 @@ class AuthFacade( private fun validateNotAbusing(phoneNumber: String?) { if (phoneNumber != null) { + if (isBottlesMember(phoneNumber)) return val allAccounts = userService.findAllByPhoneNumber(phoneNumber) if (allAccounts.isNotEmpty()) { val lastAccount = allAccounts.last() @@ -110,6 +113,11 @@ class AuthFacade( } } + private fun isBottlesMember(phoneNumber: String): Boolean { + return bottlesNumber.split(",") + .contains(phoneNumber) + } + fun appleSignInUp(appleSignInUpRequest: AppleSignInUpRequest): AppleSignInUpResponse { val applePublicKeys = webClientAdapter.sendAppleAuthKeysRequest() val tokenHeaders = jwtTokenProvider.parseHeaders(appleSignInUpRequest.code) diff --git a/app/src/main/resources/application-dev.yml b/app/src/main/resources/application-dev.yml index 60634045..a4f6b014 100644 --- a/app/src/main/resources/application-dev.yml +++ b/app/src/main/resources/application-dev.yml @@ -63,6 +63,7 @@ firebase: super-user-number: ${SUPER_USER_NUMBER} super-user-number-v2: ${SUPER_USER_NUMBER_V2} +bottles-number: ${BOTTLES_NUMBER} apple-auth: apple-url: https://appleid.apple.com diff --git a/docker-compose.yml b/docker-compose.yml index 42d76e90..d31cf38e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -31,6 +31,7 @@ services: FCM_ADMIN_KEY_PATH: /app/config/bottles-firebase-adminsdk.json SUPER_USER_NUMBER: ${SUPER_USER_NUMBER} SUPER_USER_NUMBER_V2: ${SUPER_USER_NUMBER_V2} + BOTTLES_NUMBER: ${BOTTLES_NUMBER} APPLE_KEY_ID: ${APPLE_KEY_ID} APPLE_KEY_ID_PATH: /api/config/apple-auth-key.p8 APPLE_CLIENT_ID: ${APPLE_CLIENT_ID} @@ -70,6 +71,7 @@ services: FCM_ADMIN_KEY_PATH: /app/config/bottles-firebase-adminsdk.json SUPER_USER_NUMBER: ${SUPER_USER_NUMBER} SUPER_USER_NUMBER_V2: ${SUPER_USER_NUMBER_V2} + BOTTLES_NUMBER: ${BOTTLES_NUMBER} APPLE_KEY_ID: ${APPLE_KEY_ID} APPLE_KEY_ID_PATH: /api/config/apple-auth-key.p8 APPLE_CLIENT_ID: ${APPLE_CLIENT_ID}