Commit c9cf3e5403
Verified · cmc
Layout: unified · split
internal/store/push.go +7 −3
| @@ -19,16 +19,20 @@ type PushDevice struct { | |||
| 19 | 19 | ||
| 20 | // AddPushDevice registers a token to an account. A token already present | 20 | // AddPushDevice registers a token to an account. A token already present |
| 21 | // changes hands rather than erroring: Apple reuses tokens, and a reinstall | 21 | // changes hands rather than erroring: Apple reuses tokens, and a reinstall |
| 22 | // hands the same one to whichever account signs in next. | 22 | // hands the same one to whichever account signs in next. The id is read |
| 23 | // back by token rather than taken from LastInsertId, which SQLite leaves | ||
| 24 | // unchanged when the DO UPDATE arm fires instead of the INSERT. | ||
| 23 | func (s *Store) AddPushDevice(userID int64, token, label string) (int64, error) { | 25 | func (s *Store) AddPushDevice(userID int64, token, label string) (int64, error) { |
| 24 | res, err := s.DB.Exec(` | 26 | _, err := s.DB.Exec(` |
| 25 | INSERT INTO push_devices (user_id, token, label) VALUES (?, ?, ?) | 27 | INSERT INTO push_devices (user_id, token, label) VALUES (?, ?, ?) |
| 26 | ON CONFLICT(token) DO UPDATE SET user_id = excluded.user_id, label = excluded.label`, | 28 | ON CONFLICT(token) DO UPDATE SET user_id = excluded.user_id, label = excluded.label`, |
| 27 | userID, token, label) | 29 | userID, token, label) |
| 28 | if err != nil { | 30 | if err != nil { |
| 29 | return 0, err | 31 | return 0, err |
| 30 | } | 32 | } |
| 31 | return res.LastInsertId() | 33 | var id int64 |
| 34 | err = s.DB.QueryRow("SELECT id FROM push_devices WHERE token = ?", token).Scan(&id) | ||
| 35 | return id, err | ||
| 32 | } | 36 | } |
| 33 | 37 | ||
| 34 | func (s *Store) PushDevices(userID int64) ([]PushDevice, error) { | 38 | func (s *Store) PushDevices(userID int64) ([]PushDevice, error) { |
internal/store/push_test.go +17 −3
| @@ -18,7 +18,8 @@ func TestPushDevices(t *testing.T) { | |||
| 18 | t.Fatal(err) | 18 | t.Fatal(err) |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | if _, err := s.AddPushDevice(uid, "tok-a", "iphone"); err != nil { | 21 | firstID, err := s.AddPushDevice(uid, "tok-a", "iphone") |
| 22 | if err != nil { | ||
| 22 | t.Fatalf("AddPushDevice: %v", err) | 23 | t.Fatalf("AddPushDevice: %v", err) |
| 23 | } | 24 | } |
| 24 | devices, err := s.PushDevices(uid) | 25 | devices, err := s.PushDevices(uid) |
| @@ -28,14 +29,21 @@ func TestPushDevices(t *testing.T) { | |||
| 28 | if len(devices) != 1 || devices[0].Token != "tok-a" || devices[0].Label != "iphone" { | 29 | if len(devices) != 1 || devices[0].Token != "tok-a" || devices[0].Label != "iphone" { |
| 29 | t.Fatalf("got %+v", devices) | 30 | t.Fatalf("got %+v", devices) |
| 30 | } | 31 | } |
| 32 | if firstID != devices[0].ID { | ||
| 33 | t.Fatalf("AddPushDevice returned %d, row id is %d", firstID, devices[0].ID) | ||
| 34 | } | ||
| 31 | 35 | ||
| 32 | // Apple reuses tokens: re-registering updates the label and the owner | 36 | // Apple reuses tokens: re-registering updates the label and the owner |
| 33 | // rather than erroring, so a reinstall under another account works. | 37 | // rather than erroring, so a reinstall under another account works. The |
| 38 | // returned id must be the existing row's, not an unrelated rowid left | ||
| 39 | // over from SQLite's last real INSERT (the DO UPDATE arm does not | ||
| 40 | // advance last_insert_rowid()). | ||
| 34 | bob, err := s.CreateUser("bob", false) | 41 | bob, err := s.CreateUser("bob", false) |
| 35 | if err != nil { | 42 | if err != nil { |
| 36 | t.Fatal(err) | 43 | t.Fatal(err) |
| 37 | } | 44 | } |
| 38 | if _, err := s.AddPushDevice(bob, "tok-a", "ipad"); err != nil { | 45 | reregID, err := s.AddPushDevice(bob, "tok-a", "ipad") |
| 46 | if err != nil { | ||
| 39 | t.Fatalf("re-register: %v", err) | 47 | t.Fatalf("re-register: %v", err) |
| 40 | } | 48 | } |
| 41 | if d, _ := s.PushDevices(uid); len(d) != 0 { | 49 | if d, _ := s.PushDevices(uid); len(d) != 0 { |
| @@ -45,6 +53,12 @@ func TestPushDevices(t *testing.T) { | |||
| 45 | if len(d) != 1 || d[0].Label != "ipad" { | 53 | if len(d) != 1 || d[0].Label != "ipad" { |
| 46 | t.Fatalf("got %+v", d) | 54 | t.Fatalf("got %+v", d) |
| 47 | } | 55 | } |
| 56 | if reregID != d[0].ID { | ||
| 57 | t.Fatalf("re-register returned %d, existing row id is %d", reregID, d[0].ID) | ||
| 58 | } | ||
| 59 | if reregID != firstID { | ||
| 60 | t.Fatalf("re-register returned %d, want the reused row's original id %d", reregID, firstID) | ||
| 61 | } | ||
| 48 | 62 | ||
| 49 | // Removal is scoped to the owner: alice cannot remove bob's device. | 63 | // Removal is scoped to the owner: alice cannot remove bob's device. |
| 50 | if err := s.RemovePushDevice(uid, d[0].ID); err != ErrNotFound { | 64 | if err := s.RemovePushDevice(uid, d[0].ID); err != ErrNotFound { |