fcm.go

@@ -27,7 +27,6 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/trace"
 )
 
 const tracerName = "git.bit5.ru/backend/fcm"
@@ -47,7 +46,7 @@ var (
 	AuthScopes = []string{"https://www.googleapis.com/auth/firebase.messaging"}
 )
 
-func makeSendEndpoint(projectId string) string {
+func MakeSendEndpoint(projectId string) string {
 	return fmt.Sprintf("https://fcm.googleapis.com/v1/projects/%s/messages:send", projectId)
 }
 
@@ -79,19 +78,23 @@ func ReadCredentialsFromFile(filename string) (Credentials, error) {
 	return c, nil
 }
 
-type Client struct {
+type ClientConfig struct {
-	sendEndpoint string
+	SendEndpoint string
-	ts           oauth2.TokenSource
-	hc           *http.Client
-	logger       logr.Logger
 }
 
-func NewClient(projectId string, ts oauth2.TokenSource, hc *http.Client, logger logr.Logger) *Client {
+type Client struct {
+	cfg    ClientConfig
+	ts     oauth2.TokenSource
+	hc     *http.Client
+	logger logr.Logger
+}
+
+func NewClient(cfg ClientConfig, ts oauth2.TokenSource, hc *http.Client, logger logr.Logger) *Client {
 	return &Client{
-		sendEndpoint: makeSendEndpoint(projectId),
+		cfg:    cfg,
-		ts:           ts,
+		ts:     ts,
-		hc:           hc,
+		hc:     hc,
-		logger:       logger,
+		logger: logger,
 	}
 }
 
@@ -163,11 +166,7 @@ func (c *Client) Validate(ctx context.Context, message Message) (string, error)
 
 func (c *Client) doSendRequest(ctx context.Context, req SendRequest, loggerEnabled bool) (SendResponse, error) {
 
-	spanAttrs := trace.WithAttributes(
+	_, span := tracer.Start(ctx, "Client.doSendRequest")
-		attribute.String("token", req.Message.Token),
-	)
-
-	_, span := tracer.Start(ctx, "Client.doSendRequest", spanAttrs)
 	defer span.End()
 
 	accessToken, err := c.ts.Token()
@@ -190,7 +189,7 @@ func (c *Client) doSendRequest(ctx context.Context, req SendRequest, loggerEnabl
 		c.logger.Info("sending", "message", data)
 	}
 
-	request, err := http.NewRequest(http.MethodPost, c.sendEndpoint, bytes.NewReader(data))
+	request, err := http.NewRequest(http.MethodPost, c.cfg.SendEndpoint, bytes.NewReader(data))
 	if err != nil {
 		span.SetStatus(codes.Error, err.Error())
 		span.RecordError(err)

message.go

@@ -1,7 +1,5 @@
 package fcm
 
-// Message to send by Firebase Cloud Messaging Service.
-// https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages#resource:-message
 type Message struct {
 	// Union field target can be only one of the following:
 	Token     string `json:"token,omitempty"`
@@ -18,7 +16,6 @@ type Message struct {
 }
 
 // Basic notification template to use across all platforms.
-// https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages#notification
 type Notification struct {
 	Title string `json:"title,omitempty"`
 	Body  string `json:"body,omitempty"`
@@ -176,8 +173,8 @@ type ApnsPayload struct {
 	Aps ApnsPayloadKeys `json:"aps"`
 
 	// TODO: add support for custom keys
-	// https://developer.apple.com/documentation/usernotifications/generating-a-remote-notification
+	// https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/generating_a_remote_notification
-	customKeys map[string]any
+	customKeys map[string]interface{}
 }
 
 type ApnsPayloadKeys struct {