Fix timestamp issue and schema update.

server/datastore/mysql/migrations/tables/20241223115925_AddSecretsUpdatedAt.go → server/datastore/mysql/migrations/tables/20241230000000_AddSecretsUpdatedAt.go

@@ -6,10 +6,10 @@ import (
 )
 
 func init() {
-	MigrationClient.AddMigration(Up_20241223115925, Down_20241223115925)
+	MigrationClient.AddMigration(Up_20241230000000, Down_20241230000000)
 }
 
-func Up_20241223115925(tx *sql.Tx) error {
+func Up_20241230000000(tx *sql.Tx) error {
 	// Using DATETIME instead of TIMESTAMP for secrets_updated_at to avoid future Y2K38 issues,
 	// since this date is used to detect if profile needs to be updated.
 
@@ -49,6 +49,6 @@ func Up_20241223115925(tx *sql.Tx) error {
 	return nil
 }
 
-func Down_20241223115925(_ *sql.Tx) error {
+func Down_20241230000000(_ *sql.Tx) error {
 	return nil
 }

server/fleet/apple_mdm.go

@@ -731,8 +731,9 @@ type MDMAppleDDMTokensResponse struct {
 //
 // https://developer.apple.com/documentation/devicemanagement/synchronizationtokens
 type MDMAppleDDMDeclarationsToken struct {
-	DeclarationsToken string    `db:"token"`
-	Timestamp         time.Time `db:"latest_created_timestamp"`
+	DeclarationsToken string `db:"token"`
+	// Timestamp must JSON marshal to format YYYY-mm-ddTHH:MM:SSZ
+	Timestamp time.Time `db:"latest_created_timestamp"`
 }
 
 // MDMAppleDDMDeclarationItemsResponse is the response from the DDM declaration items endpoint.

server/service/apple_mdm.go

@@ -4183,6 +4183,9 @@ func (svc *MDMAppleDDMService) handleTokens(ctx context.Context, hostUUID string
 		return nil, ctxerr.Wrap(ctx, err, "getting synchronization tokens")
 	}
 
+	// Important: Timestamp must use format YYYY-mm-ddTHH:MM:SSZ (no milliseconds)
+	// Source: https://developer.apple.com/documentation/devicemanagement/synchronizationtokens?language=objc
+	tok.Timestamp = tok.Timestamp.Truncate(time.Second)
 	b, err := json.Marshal(fleet.MDMAppleDDMTokensResponse{
 		SyncTokens: *tok,
 	})