From 43de2e55709fb3dbac206a6fc9d395effbc1cc02 Mon Sep 17 00:00:00 2001 From: okod Date: Tue, 11 Jun 2024 18:58:23 +0900 Subject: [PATCH 1/4] fix: FIREBASE_CONFIG_PATH path --- .github/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cd2a252..9ad37d0 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -58,10 +58,11 @@ jobs: - name: Create Firebase Admin SDK JSON file env: FIREBASE_ADMIN_SDK: ${{ secrets.FIREBASE_ADMIN_SDK }} - FIREBASE_CONFIG_PATH: /firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json run: | mkdir -p firebase echo "$FIREBASE_ADMIN_SDK" > firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json + env: + FIREBASE_CONFIG_PATH: firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json # 3) gradlew 권한 설정 - name: Grant execute permission for gradlew run: chmod +x gradlew From 01b24edb9e28b696ea7522ec496f047782b50ccf Mon Sep 17 00:00:00 2001 From: okod Date: Tue, 11 Jun 2024 19:09:20 +0900 Subject: [PATCH 2/4] fix: delete Firebase Admin SDK JSON file for test --- .github/workflows/deploy.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9ad37d0..abaeff3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -55,14 +55,14 @@ jobs: oauth2.google.resource-uri: ${{ secrets.RESOURCE_URI }} jwt.secret: ${{ secrets.JWT_SECRET }} # 2-2) Create Firebase Admin SDK JSON file - - name: Create Firebase Admin SDK JSON file - env: - FIREBASE_ADMIN_SDK: ${{ secrets.FIREBASE_ADMIN_SDK }} - run: | - mkdir -p firebase - echo "$FIREBASE_ADMIN_SDK" > firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json - env: - FIREBASE_CONFIG_PATH: firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json +# - name: Create Firebase Admin SDK JSON file +# env: +# FIREBASE_ADMIN_SDK: ${{ secrets.FIREBASE_ADMIN_SDK }} +# run: | +# mkdir -p firebase +# echo "$FIREBASE_ADMIN_SDK" > firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json +# env: +# FIREBASE_CONFIG_PATH: firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json # 3) gradlew 권한 설정 - name: Grant execute permission for gradlew run: chmod +x gradlew @@ -70,8 +70,8 @@ jobs: # 4) test 제외 gradle 빌드 - name: Build with Gradle run: ./gradlew clean build -x test - env: - FIREBASE_CONFIG_PATH: firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json +# env: +# FIREBASE_CONFIG_PATH: firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json # working-directory: ${{ env.working-directory }} # 5) AWS 인증 - name: Configure AWS credentials From 7a0a21d488e8baf90b032c2e32a50f1b806c87bb Mon Sep 17 00:00:00 2001 From: okod Date: Wed, 12 Jun 2024 01:22:38 +0900 Subject: [PATCH 3/4] fix: Firebase Admin SDK JSON file path --- .github/workflows/deploy.yml | 18 +++++++----------- .../domain/webpush/service/FcmService.java | 5 +---- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index abaeff3..b82b75f 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -55,23 +55,19 @@ jobs: oauth2.google.resource-uri: ${{ secrets.RESOURCE_URI }} jwt.secret: ${{ secrets.JWT_SECRET }} # 2-2) Create Firebase Admin SDK JSON file -# - name: Create Firebase Admin SDK JSON file -# env: -# FIREBASE_ADMIN_SDK: ${{ secrets.FIREBASE_ADMIN_SDK }} -# run: | -# mkdir -p firebase -# echo "$FIREBASE_ADMIN_SDK" > firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json -# env: -# FIREBASE_CONFIG_PATH: firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json - # 3) gradlew 권한 설정 + - name: Create Firebase Admin SDK JSON file + env: + FIREBASE_ADMIN_SDK: ${{ secrets.FIREBASE_ADMIN_SDK }} + run: | + mkdir -p src/main/firebase/resources/firebase + echo "$FIREBASE_ADMIN_SDK" > src/main/firebase/resources/firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json + # 3) gradlew 권한 설정 - name: Grant execute permission for gradlew run: chmod +x gradlew # working-directory: ${{ env.working-directory }} # 4) test 제외 gradle 빌드 - name: Build with Gradle run: ./gradlew clean build -x test -# env: -# FIREBASE_CONFIG_PATH: firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json # working-directory: ${{ env.working-directory }} # 5) AWS 인증 - name: Configure AWS credentials diff --git a/src/main/java/vom/spring/domain/webpush/service/FcmService.java b/src/main/java/vom/spring/domain/webpush/service/FcmService.java index 44463bf..26e36d4 100644 --- a/src/main/java/vom/spring/domain/webpush/service/FcmService.java +++ b/src/main/java/vom/spring/domain/webpush/service/FcmService.java @@ -88,10 +88,7 @@ public int sendMessageTo(Long memberId) throws IOException { */ private String getAccessToken() throws IOException { - String firebaseConfigPath = System.getenv("FIREBASE_CONFIG_PATH"); - if (firebaseConfigPath == null) { - firebaseConfigPath = "firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json"; - } + String firebaseConfigPath = "firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json"; GoogleCredentials googleCredentials = GoogleCredentials .fromStream(new ClassPathResource(firebaseConfigPath).getInputStream()) From 56461bfe11e1a9ecb7114ca45e99fe10921eeda8 Mon Sep 17 00:00:00 2001 From: okod Date: Wed, 12 Jun 2024 01:30:39 +0900 Subject: [PATCH 4/4] fix: Firebase Admin SDK JSON file path --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b82b75f..076149c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -59,8 +59,8 @@ jobs: env: FIREBASE_ADMIN_SDK: ${{ secrets.FIREBASE_ADMIN_SDK }} run: | - mkdir -p src/main/firebase/resources/firebase - echo "$FIREBASE_ADMIN_SDK" > src/main/firebase/resources/firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json + mkdir -p src/main/resources/firebase + echo "$FIREBASE_ADMIN_SDK" > src/main/resources/firebase/vomvom-fd09b-firebase-adminsdk-ghtjs-0070b39a4e.json # 3) gradlew 권한 설정 - name: Grant execute permission for gradlew run: chmod +x gradlew