Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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();
Expand All @@ -49,4 +46,5 @@ public FirebaseMessaging firebaseMessaging() throws IOException {

return FirebaseMessaging.getInstance(firebaseApp);
}

}
Loading