From 8683835c2e68f136756517c518b185de1558c07e Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Jun 2025 19:14:36 +0530 Subject: [PATCH 1/2] fix firebase file access issue --- .../config/firebase/FirebaseMessagingConfig.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java b/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java index 250558bb..9a0c88a0 100644 --- a/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java +++ b/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java @@ -10,6 +10,7 @@ import org.springframework.core.io.ClassPathResource; import java.io.ByteArrayInputStream; +import java.io.FileInputStream; import java.io.IOException; import java.util.Base64; @@ -29,16 +30,12 @@ public FirebaseMessaging firebaseMessaging() throws IOException { throw new IllegalStateException("Firebase is disabled"); } - GoogleCredentials credentials; - - if (!firebaseCredentialFile.isBlank()) { - credentials = GoogleCredentials.fromStream( - new ClassPathResource(firebaseCredentialFile).getInputStream() - ); - } else { - throw new IllegalStateException("No Firebase credentials provided"); + if (firebaseCredentialFile == null || firebaseCredentialFile.isBlank()) { + throw new IllegalStateException("No Firebase credentials path provided"); } + GoogleCredentials credentials = GoogleCredentials.fromStream(new FileInputStream(firebaseCredentialFile)); + FirebaseOptions options = FirebaseOptions.builder() .setCredentials(credentials) .build(); From f66cf54903a84ddd2328c57bc92e3d722caa6a7e Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Mon, 23 Jun 2025 19:16:06 +0530 Subject: [PATCH 2/2] fix firebase file access issue --- .../com/iemr/common/config/firebase/FirebaseMessagingConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java b/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java index 9a0c88a0..ebb98b59 100644 --- a/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java +++ b/src/main/java/com/iemr/common/config/firebase/FirebaseMessagingConfig.java @@ -46,4 +46,5 @@ public FirebaseMessaging firebaseMessaging() throws IOException { return FirebaseMessaging.getInstance(firebaseApp); } + }