Merge pull request #36 from mercari/build-aps

apns: not inserted apns-expiration header when Expiry is not given.
mercari · Jul 25, 2016 · 075491a · 075491a
2 parents d4bad7c + 5376236
commit 075491a
Showing 1 changed file with 8 additions and 3 deletions.
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 {