Get status code from Firebase error (#126)

* Get status code from Firebase error * Address feedback --------- Co-authored-by: Mattermost Build <[email protected]>
mattermost · Sep 6, 2024 · 83b3754 · 83b3754
1 parent 7351c50
commit 83b3754
Showing 1 changed file with 37 additions and 1 deletion.
diff --git a/server/android_notification_server.go b/server/android_notification_server.go
@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"reflect"
 	"strconv"
 	"time"
 
@@ -178,7 +179,19 @@ func (me *AndroidNotificationServer) SendNotification(msg *PushNotification) Pus
 	}
 
 	if err != nil {
-		me.logger.Errorf("Failed to send FCM push sid=%v did=%v err=%v type=%v", msg.ServerID, msg.DeviceID, err, me.AndroidPushSettings.Type)
+		errorCode, hasStatusCode := getErrorCode(err)
+		if !hasStatusCode {
+			errorCode = "NONE"
+		}
+
+		me.logger.Errorf(
+			"Failed to send FCM push sid=%v did=%v err=%v type=%v errorCode=%v",
+			msg.ServerID,
+			msg.DeviceID,
+			err,
+			me.AndroidPushSettings.Type,
+			errorCode,
+		)
 
 		if messaging.IsUnregistered(err) {
 			me.logger.Infof("Android response failure sending remove code: type=%v", me.AndroidPushSettings.Type)
@@ -220,3 +233,26 @@ func (me *AndroidNotificationServer) SendNotification(msg *PushNotification) Pus
 	}
 	return NewOkPushResponse()
 }
+
+func getErrorCode(err error) (string, bool) {
+	if err == nil {
+		return "", false
+	}
+
+	errorPointer := reflect.ValueOf(err)
+	if errorPointer.Kind() != reflect.Ptr {
+		return "", false
+	}
+
+	errorValue := errorPointer.Elem()
+	if errorValue.Kind() != reflect.Struct {
+		return "", false
+	}
+
+	code, ok := errorValue.FieldByName("ErrorCode").Interface().(string)
+	if !ok {
+		return "", false
+	}
+
+	return code, true
+}