From c05deb3a41abb52fc952e0508d275694917460bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Sun, 18 Jun 2023 01:29:13 +0200 Subject: [PATCH] allow `\n` in private-key envs --- scnserver/google/androidPublisher.go | 5 ++++- scnserver/push/firebase.go | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scnserver/google/androidPublisher.go b/scnserver/google/androidPublisher.go index 24e0506..60182f1 100644 --- a/scnserver/google/androidPublisher.go +++ b/scnserver/google/androidPublisher.go @@ -9,6 +9,7 @@ import ( "github.com/rs/zerolog/log" "io" "net/http" + "strings" "time" ) @@ -23,7 +24,9 @@ type AndroidPublisher struct { func NewAndroidPublisherAPI(conf scn.Config) (AndroidPublisherClient, error) { - googauth, err := NewAuth(conf.GoogleAPITokenURI, conf.GoogleAPIPrivKeyID, conf.GoogleAPIClientMail, conf.GoogleAPIPrivateKey) + pkey := strings.ReplaceAll(conf.GoogleAPIPrivateKey, "\\n", "\n") + + googauth, err := NewAuth(conf.GoogleAPITokenURI, conf.GoogleAPIPrivKeyID, conf.GoogleAPIClientMail, pkey) if err != nil { return nil, err } diff --git a/scnserver/push/firebase.go b/scnserver/push/firebase.go index 6c99fc6..0631585 100644 --- a/scnserver/push/firebase.go +++ b/scnserver/push/firebase.go @@ -15,6 +15,7 @@ import ( "io" "net/http" "strconv" + "strings" "time" ) @@ -29,7 +30,9 @@ type FirebaseConnector struct { func NewFirebaseConn(conf scn.Config) (NotificationClient, error) { - fbauth, err := NewAuth(conf.FirebaseTokenURI, conf.FirebaseProjectID, conf.FirebaseClientMail, conf.FirebasePrivateKey) + pkey := strings.ReplaceAll(conf.FirebasePrivateKey, "\\n", "\n") + + fbauth, err := NewAuth(conf.FirebaseTokenURI, conf.FirebaseProjectID, conf.FirebaseClientMail, pkey) if err != nil { return nil, err }