Merge branch 'develop' of https://github.com/VOM-Project/VOM_Spring i…

…nto feature/signaling
VOM-Project · Jun 11, 2024 · c653bb5 · c653bb5
2 parents f40c95c + e24da52
commit c653bb5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -56,19 +56,16 @@ 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
-    # 3) gradlew 권한 설정     
+        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
       # 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
@@ -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())