Fixes #5210 - Register account with device when fxa logged in before …

…first upload
mozilla-services · Nov 21, 2018 · 5128c53 · 5128c53
1 parent 6ed92b6
commit 5128c53
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/server/src/server.js b/server/src/server.js
@@ -541,7 +541,7 @@ app.post("/api/register", function(req, res) {
     simpleResponse(res, "Bad request, no secret", 400);
     return;
   }
-  registerLogin(vars.deviceId, {
+  registerLogin(vars.deviceId, req.accountId, {
     secret: vars.secret,
     nickname: vars.nickname || null,
     avatarurl: vars.avatarurl || null,

diff --git a/server/src/users.js b/server/src/users.js
@@ -90,7 +90,7 @@ exports.checkLogin = function(deviceId, secret, addonVersion) {
   });
 };
 
-exports.registerLogin = function(deviceId, data, canUpdate) {
+exports.registerLogin = function(deviceId, accountId, data, canUpdate) {
   if (!deviceId) {
     throw new Error("No deviceId given");
   }
@@ -102,9 +102,9 @@ exports.registerLogin = function(deviceId, data, canUpdate) {
   }
   const secretHashed = createHash(data.secret);
   return db.insert(
-    `INSERT INTO devices (id, secret_hashed)
-     VALUES ($1, $2)`,
-    [deviceId, secretHashed || null]
+    `INSERT INTO devices (id, secret_hashed, accountid)
+     VALUES ($1, $2, $3)`,
+    [deviceId, secretHashed || null, accountId || null]
   ).then((inserted) => {
     const userAbTests = abTests.updateAbTests({}, getForceAbTests());
     if (inserted) {