Merge pull request #36 from mercari/build-aps

kazegusuri · web-flow · commit 075491a22767 · 2016-07-25T12:33:45.000+09:00
apns: not inserted apns-expiration header when Expiry is not given.
diff --git a/gaurun/apns_http2.go b/gaurun/apns_http2.go
@@ -86,10 +86,15 @@ func NewApnsPayloadHttp2(req *RequestGaurunNotification) map[string]interface{}
 }
 
 func NewApnsHeadersHttp2(req *RequestGaurunNotification) *push.Headers {
-	return &push.Headers{
-		Expiration: time.Now().Add(time.Duration(int64(req.Expiry)) * time.Second).UTC(),
-		Topic:      ConfGaurun.Ios.Topic,
+	headers := &push.Headers{
+		Topic: ConfGaurun.Ios.Topic,
 	}
+
+	if req.Expiry > 0 {
+		headers.Expiration = time.Now().Add(time.Duration(int64(req.Expiry)) * time.Second).UTC()
+	}
+
+	return headers
 }
 
 func ApnsPushHttp2(token string, service *push.Service, headers *push.Headers, payload map[string]interface{}) error {

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,15 @@ func NewApnsPayloadHttp2(req *RequestGaurunNotification) map[string]interface{}`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`func NewApnsHeadersHttp2(req RequestGaurunNotification) push.Headers {`
`89`		`- return &push.Headers{`
`90`		`- Expiration: time.Now().Add(time.Duration(int64(req.Expiry)) * time.Second).UTC(),`
`91`		`- Topic: ConfGaurun.Ios.Topic,`
	`89`	`+ headers := &push.Headers{`
	`90`	`+ Topic: ConfGaurun.Ios.Topic,`
`92`	`91`	`}`
	`92`	`+`
	`93`	`+ if req.Expiry > 0 {`
	`94`	`+ headers.Expiration = time.Now().Add(time.Duration(int64(req.Expiry)) * time.Second).UTC()`
	`95`	`+ }`
	`96`	`+`
	`97`	`+ return headers`
`93`	`98`	`}`
`94`	`99`
`95`	`100`	`func ApnsPushHttp2(token string, service push.Service, headers push.Headers, payload map[string]interface{}) error {`