Skip to content

fix(fcm): Add ability to override default FCM endpoint via ClientOptions #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 28, 2020
Merged

fix(fcm): Add ability to override default FCM endpoint via ClientOptions #373

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
229d5e0
Add FIREBASE_MESSAGING_ENDPOINT environment variable to override defa…
May 15, 2020
d673f91
Use endpoint while creating new messaging client
May 16, 2020
26cba31
Add tests for custom endpoint
May 22, 2020
1a91e9a
Simplify setting default endpoint
May 22, 2020
5541e11
Remove redundant code
May 27, 2020
0ea9702
Fix formatting
May 27, 2020
4fb4994
Fix imports order
May 27, 2020
151cf08
Merge branch 'dev' into issue-189
hiranya911 May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions messaging/messaging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"time"

"firebase.google.com/go/internal"
"google.golang.org/api/option/internaloption"
"google.golang.org/api/transport"
)

Expand Down Expand Up @@ -913,13 +914,14 @@ func NewClient(ctx context.Context, c *internal.MessagingConfig) (*Client, error
return nil, errors.New("project ID is required to access Firebase Cloud Messaging client")
}

hc, _, err := transport.NewHTTPClient(ctx, c.Opts...)
c.Opts = append(c.Opts, internaloption.WithDefaultEndpoint(messagingEndpoint))
hc, endpoint, err := transport.NewHTTPClient(ctx, c.Opts...)
if err != nil {
return nil, err
}

return &Client{
fcmClient: newFCMClient(hc, c),
fcmClient: newFCMClient(hc, c, endpoint),
iidClient: newIIDClient(hc),
}, nil
}
Expand All @@ -932,7 +934,7 @@ type fcmClient struct {
httpClient *internal.HTTPClient
}

func newFCMClient(hc *http.Client, conf *internal.MessagingConfig) *fcmClient {
func newFCMClient(hc *http.Client, conf *internal.MessagingConfig, endpoint string) *fcmClient {
client := internal.WithDefaultRetryConfig(hc)
client.CreateErrFn = handleFCMError
client.SuccessFn = internal.HasSuccessStatus
Expand All @@ -944,7 +946,7 @@ func newFCMClient(hc *http.Client, conf *internal.MessagingConfig) *fcmClient {
}

return &fcmClient{
fcmEndpoint: messagingEndpoint,
fcmEndpoint: endpoint,
batchEndpoint: batchEndpoint,
project: conf.ProjectID,
version: version,
Expand Down