Attach new identities to existing, if any #45

Fix #45
Etimo · Jun 24, 2018 · 1185567 · 1185567
1 parent d591858
commit 1185567
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 36 deletions.
diff --git a/apps/gateway/providers/dropbox/controllers/authController.js b/apps/gateway/providers/dropbox/controllers/authController.js
@@ -68,7 +68,7 @@ function unAuthorized(res) {
 async function getUserIdentity(userIdentifier, req, access_token) {
   let userId;
   try {
-    userId = await users.getByIdentity("Dropbox", userIdentifier);
+    userId = await users.getByIdentity("Dropbox", userIdentifier, req.gardenSession.userIdentity);
     req.gardenSession.userIdentity = userId;
     await dropboxDb.storeDropboxToken(
       req.gardenSession.userIdentity,

diff --git a/apps/gateway/providers/google-drive/controllers/authController.js b/apps/gateway/providers/google-drive/controllers/authController.js
@@ -62,7 +62,7 @@ async function getUserIdentity(verified, userIdentifier, req) {
   }
   let userId;
   try {
-    userId = await users.getByIdentity("Google", userIdentifier);
+    userId = await users.getByIdentity("Google", userIdentifier, req.gardenSession.userIdentity);
   } catch (err) {
     logger.error(`Failed to find user identity: ${err}`);
     return false;

diff --git a/apps/gateway/providers/instagram/controllers/authController.js b/apps/gateway/providers/instagram/controllers/authController.js
@@ -44,7 +44,7 @@ module.exports.authFinish = async (req, res) => {
       // Setup user
       console.log("Yay! Access token is ", result);
       try {
-        userId = await providerUser.getByIdentity("Instagram", result.user.id);
+        userId = await providerUser.getByIdentity("Instagram", result.user.id, req.gardenSession.userIdentity);
         req.gardenSession.userIdentity = userId;
       } catch (err) {
         logger.error(`Failed to find user identity: ${err}`);

diff --git a/libs/provider-user/model.js b/libs/provider-user/model.js
@@ -3,41 +3,22 @@ const logger = require("logging");
 
 const dbClient = require("db").create("garden");
 
-async function attachIdentity(provider, providerIdentity) {
+async function attachIdentity(provider, providerIdentity, existingUserId) {
   // FIXME: Ask for username?
-  logger.info(`Attaching identity ${providerIdentity} to ${provider}`);
+  logger.info(`Attaching identity ${providerIdentity} to ${provider} (existing user id: ${existingUserId})`);
   const db = await dbClient.connect();
+  let userId
   try {
     db.query("BEGIN");
-    const userResponse = await dbClient.query(
-      "INSERT INTO users(username) VALUES($1) RETURNING id",
-      [providerIdentity]
-    );
-    const userId = userResponse.rows[0].id;
-    await dbClient.query(
-      "INSERT INTO user_identities(user_id, provider, provider_id) VALUES($1, $2, $3)",
-      [userId, provider, providerIdentity]
-    );
-    await db.query("COMMIT");
-    return userId;
-  } catch (err) {
-    await db.query("ROLLBACK");
-    throw err;
-  } finally {
-    db.release();
-  }
-}
-async function attachProvider(provider, providerIdentity) {
-  // FIXME: Ask for username?
-  logger.info(`Attaching identity ${providerIdentity} to ${provider}`);
-  const db = await dbClient.connect();
-  try {
-    db.query("BEGIN");
-    const userResponse = await dbClient.query(
-      "INSERT INTO users(username) VALUES($1) RETURNING id",
-      [providerIdentity]
-    );
-    const userId = userResponse.rows[0].id;
+    if (existingUserId) {
+      userId = existingUserId;
+    } else {
+      const userResponse = await dbClient.query(
+        "INSERT INTO users(username) VALUES($1) RETURNING id",
+        [providerIdentity]
+      );
+      userId = userResponse.rows[0].id;
+    }
     await dbClient.query(
       "INSERT INTO user_identities(user_id, provider, provider_id) VALUES($1, $2, $3)",
       [userId, provider, providerIdentity]
@@ -52,7 +33,7 @@ async function attachProvider(provider, providerIdentity) {
   }
 }
 
-async function getByIdentity(provider, providerIdentity) {
+async function getByIdentity(provider, providerIdentity, existingUserId) {
   logger.info(`Get identity for ${providerIdentity} for provider ${provider}`);
   const response = await dbClient.query(
     "SELECT user_id FROM user_identities WHERE provider=$1 AND provider_id=$2",
@@ -62,7 +43,7 @@ async function getByIdentity(provider, providerIdentity) {
   if (response.rows[0] !== undefined) {
     return response.rows[0].user_id;
   } else {
-    return attachIdentity(provider, providerIdentity);
+    return attachIdentity(provider, providerIdentity, existingUserId);
   }
 }