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..ebb98b59 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(); @@ -49,4 +46,5 @@ public FirebaseMessaging firebaseMessaging() throws IOException { return FirebaseMessaging.getInstance(firebaseApp); } + }