Merge pull request #72 from kayac/drop-fcm-legacy

remove regacy fcm

README.md

@@ -94,34 +94,11 @@ Response example:
 {"result": "ok"}
 ```
 
-### POST /push/fcm
+### POST /push/fcm **Deprecated**
 
-To delivery remote notifications via FCM (legacy) API to user's devices.
+This API has been deleted at v0.6.0. Use `/push/fcm/v1` instead.
 
-Post body format is equal to it for FCM legacy origin server.
-
-example:
-```json
-{
- "registration_ids": [
- "token1",
- "token2"
- ],
- "data": {
- "id": "2",
- "message": "Test2"
- },
- "notification": {
- "title": "message_title",
- "body": "message_body"
- }
-}
-```
-
-Response example:
-```json
-{"result": "ok"}
-```
+See also https://firebase.google.com/docs/cloud-messaging/migrate-v1 .
 
 ### POST /push/fcm/v1
 

apns/client.go

@@ -5,9 +5,9 @@ import (
  "crypto/tls"
  "encoding/json"
  "fmt"
- "io/ioutil"
  "net/http"
  "net/url"
+ "os"
  "time"
 
  "github.com/kayac/Gunfish/config"
@@ -151,12 +151,12 @@ func NewClient(conf config.SectionApns) (*Client, error) {
  useAuthToken := conf.Kid != "" && conf.TeamID != ""
  tr := &http.Transport{}
  if !useAuthToken {
- certPEMBlock, err := ioutil.ReadFile(conf.CertFile)
+ certPEMBlock, err := os.ReadFile(conf.CertFile)
  if err != nil {
  return nil, err
  }
 
- keyPEMBlock, err := ioutil.ReadFile(conf.KeyFile)
+ keyPEMBlock, err := os.ReadFile(conf.KeyFile)
  if err != nil {
  return nil, err
  }
@@ -172,7 +172,7 @@ func NewClient(conf config.SectionApns) (*Client, error) {
  return nil, err
  }
 
- key, err := ioutil.ReadFile(conf.KeyFile)
+ key, err := os.ReadFile(conf.KeyFile)
  if err != nil {
  return nil, err
  }

config/config.go

@@ -6,7 +6,7 @@ import (
  "crypto/x509"
  "encoding/json"
  "fmt"
- "io/ioutil"
+ "os"
  "time"
 
  "github.com/kayac/Gunfish/fcmv1"
@@ -125,10 +125,7 @@ func (c *Config) validateConfig() error {
  }
  }
  if c.FCM.APIKey != "" {
- c.FCM.Enabled = true
- if err := c.validateConfigFCM(); err != nil {
- return errors.Wrap(err, "[fcm]")
- }
+ return errors.New("[fcm] legacy is not supported anymore. Please use [fcm_v1]")
  }
  if c.FCMv1.GoogleApplicationCredentials != "" {
  c.FCMv1.Enabled = true
@@ -158,12 +155,8 @@ func (c *Config) validateConfigProvider() error {
  return nil
 }
 
-func (c *Config) validateConfigFCM() error {
- return nil
-}
-
 func (c *Config) validateConfigFCMv1() error {
- b, err := ioutil.ReadFile(c.FCMv1.GoogleApplicationCredentials)
+ b, err := os.ReadFile(c.FCMv1.GoogleApplicationCredentials)
  if err != nil {
  return err
  }