Merge pull request #211 from ku-ring/develop

version 2.8.2

.github/workflows/decrypt.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-gpg --batch --yes --decrypt --passphrase "$GPG_PASSPHRASE" --output src/main/resources/third/ku-stack-firebase-adminsdk-87nwq-5ba04dfc12.json src/main/resources/third/ku-stack-firebase-adminsdk-87nwq-5ba04dfc12.json.gpg
+gpg --batch --yes --decrypt --passphrase "$GPG_PASSPHRASE" --output src/main/resources/third/ku-stack-firebase-adminsdk-87nwq-ae6a2df931.json src/main/resources/third/ku-stack-firebase-adminsdk-87nwq-ae6a2df931.json.gpg
 
-if [ -f src/main/resources/third/ku-stack-firebase-adminsdk-87nwq-5ba04dfc12.json ]; then
+if [ -f src/main/resources/third/ku-stack-firebase-adminsdk-87nwq-ae6a2df931.json ]; then
   echo "Decryption Success!"
-fi
+fi

build.gradle

@@ -85,7 +85,7 @@ dependencies {
     implementation 'org.jsoup:jsoup:1.14.3'
 
     // Firebase
-    implementation 'com.google.firebase:firebase-admin:8.1.0'
+    implementation 'com.google.firebase:firebase-admin:9.3.0'
 
     // RestDocs
     asciidoctorExtensions 'org.springframework.restdocs:spring-restdocs-asciidoctor'

src/main/java/com/kustacks/kuring/config/FirebaseConfig.java

@@ -22,12 +22,15 @@ FirebaseMessaging firebaseMessaging(FirebaseApp firebaseApp) {
 
     @Bean
     FirebaseApp firebaseApp(@Value("${firebase.file-path}") String filePath) throws IOException {
-        FirebaseOptions options = FirebaseOptions.builder()
-                .setCredentials(GoogleCredentials.fromStream(new ClassPathResource(filePath).getInputStream()))
+        GoogleCredentials googleCredentials = GoogleCredentials
+                .fromStream(new ClassPathResource(filePath).getInputStream());
+
+        FirebaseOptions firebaseOptions = FirebaseOptions.builder()
+                .setCredentials(googleCredentials)
                 .build();
 
-        if(FirebaseApp.getApps().isEmpty()) {
-            return FirebaseApp.initializeApp(options);
+        if (FirebaseApp.getApps().isEmpty()) {
+            return FirebaseApp.initializeApp(firebaseOptions);
         }
 
         return FirebaseApp.getInstance();

src/main/resources/application-dev.yml

@@ -144,7 +144,7 @@ auth:
   login-url: https://kuis.konkuk.ac.kr/Login/login.do
 
 firebase:
-  file-path: third/ku-stack-firebase-adminsdk-87nwq-5ba04dfc12.json
+  file-path: third/ku-stack-firebase-adminsdk-87nwq-ae6a2df931.json
 
 admin:
   password: ${ADMIN_PASSWORD}

src/main/resources/application-local.yml

@@ -147,7 +147,7 @@ auth:
   login-url: https://kuis.konkuk.ac.kr/Login/login.do
 
 firebase:
-  file-path: third/ku-stack-firebase-adminsdk-87nwq-5ba04dfc12.json
+  file-path: third/ku-stack-firebase-adminsdk-87nwq-ae6a2df931.json
 
 admin:
   password: ${ADMIN_PASSWORD}

src/main/resources/application-prod.yml

@@ -104,7 +104,7 @@ auth:
   login-url: https://kuis.konkuk.ac.kr/Login/login.do
 
 firebase:
-  file-path: third/ku-stack-firebase-adminsdk-87nwq-5ba04dfc12.json
+  file-path: third/ku-stack-firebase-adminsdk-87nwq-ae6a2df931.json
 
 admin:
   password: ${ADMIN_PASSWORD}

src/test/resources/application-test.yml

@@ -89,7 +89,7 @@ server:
     environment: test
 
 firebase:
-  file-path: third/ku-stack-firebase-adminsdk-87nwq-5ba04dfc12.json
+  file-path: third/ku-stack-firebase-adminsdk-87nwq-ae6a2df931.json
 
 admin:
   id: [email protected]