Get credentials from viper directly

topfreegames · Mar 25, 2024 · 5914272 · 5914272
1 parent b12db85
commit 5914272
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/config/config.go b/config/config.go
@@ -18,12 +18,11 @@ type (
 	}
 
 	GCM struct {
-		Apps                string
-		PingInterval        int
-		PingTimeout         int
-		MaxPendingMessages  int
-		LogStatsInterval    int
-		FirebaseCredentials map[string]string
+		Apps               string
+		PingInterval       int
+		PingTimeout        int
+		MaxPendingMessages int
+		LogStatsInterval   int
 	}
 )
 

diff --git a/pusher/gcm.go b/pusher/gcm.go
@@ -94,9 +94,9 @@ func (g *GCMPusher) createMessageHandlerForApps() error {
 
 	g.MessageHandler = make(map[string]interfaces.MessageHandler)
 	for _, app := range g.Config.GetAppsArray() {
-		credentials, ok := g.Config.GCM.FirebaseCredentials[app]
+		credentials := g.ViperConfig.GetString("gcm.firebaseCredentials." + app)
 		l = l.WithField("app", app)
-		if ok { // Firebase is configured, use new handler
+		if credentials != "" { // Firebase is configured, use new handler
 			pushClient, err := client.NewFirebaseClient(credentials, g.Logger)
 			if err != nil {
 				l.WithError(err).Error("could not create firebase client")