Compare commits

...

5 Commits

1 changed files with 11 additions and 15 deletions

26
fcm.go
View File

@ -47,7 +47,7 @@ var (
AuthScopes = []string{"https://www.googleapis.com/auth/firebase.messaging"} 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) return fmt.Sprintf("https://fcm.googleapis.com/v1/projects/%s/messages:send", projectId)
} }
@ -79,23 +79,19 @@ func ReadCredentialsFromFile(filename string) (Credentials, error) {
return c, nil return c, nil
} }
type ClientConfig struct {
SendEndpoint string
}
type Client struct { type Client struct {
cfg ClientConfig sendEndpoint string
ts oauth2.TokenSource ts oauth2.TokenSource
hc *http.Client hc *http.Client
logger logr.Logger logger logr.Logger
} }
func NewClient(projectId string, cfg ClientConfig, ts oauth2.TokenSource, hc *http.Client, logger logr.Logger) *Client { func NewClient(projectId string, ts oauth2.TokenSource, hc *http.Client, logger logr.Logger) *Client {
return &Client{ return &Client{
cfg: cfg, sendEndpoint: makeSendEndpoint(projectId),
ts: ts, ts: ts,
hc: hc, hc: hc,
logger: logger, logger: logger,
} }
} }
@ -194,7 +190,7 @@ func (c *Client) doSendRequest(ctx context.Context, req SendRequest, loggerEnabl
c.logger.Info("sending", "message", data) c.logger.Info("sending", "message", data)
} }
request, err := http.NewRequest(http.MethodPost, c.cfg.SendEndpoint, bytes.NewReader(data)) request, err := http.NewRequest(http.MethodPost, c.sendEndpoint, bytes.NewReader(data))
if err != nil { if err != nil {
span.SetStatus(codes.Error, err.Error()) span.SetStatus(codes.Error, err.Error())
span.RecordError(err) span.RecordError(err)