Delete invalid token

Author: Finb

apns/apns.go

@@ -104,7 +104,7 @@ func ReCreateAPNS(maxClientCount int) error {
 	return nil
 }
 
-func Push(msg *PushMessage) error {
+func Push(msg *PushMessage) (code int, err error) {
 	pl := payload.NewPayload().MutableContent()
 	pushType := apns2.PushTypeAlert
 	if msg.IsDelete() {
@@ -141,10 +141,10 @@ func Push(msg *PushMessage) error {
 		PushType:    pushType,
 	})
 	if err != nil {
-		return err
+		return 500, err
 	}
 	if resp.StatusCode != 200 {
-		return fmt.Errorf("APNS push failed: %s", resp.Reason)
+		return resp.StatusCode, fmt.Errorf(resp.Reason)
 	}
-	return nil
+	return 200, nil
 }

database/bbolt.go

@@ -56,6 +56,9 @@ func (d *BboltDB) DeviceTokenByKey(key string) (string, error) {
 			return fmt.Errorf("failed to get [%s] device token from database", key)
 		} else {
 			token = string(bs)
+			if len(token) == 0 {
+				return fmt.Errorf("device token invalid")
+			}
 			return nil
 		}
 	})

route_push.go

@@ -262,7 +262,12 @@ func push(params map[string]interface{}) (int, error) {
 	}
 	msg.DeviceToken = deviceToken
 
-	err = apns.Push(&msg)
+	code, err := apns.Push(&msg)
+
+	// Invalid token, delete it from database.
+	if code == 410 || (code == 400 && strings.Contains(err.Error(), "BadDeviceToken")) {
+		_, _ = db.SaveDeviceTokenByKey(msg.DeviceKey, "")
+	}
 	if err != nil {
 		return 500, fmt.Errorf("push failed: %v", err)
 	}