finish saml link after sso login

GitOrigin-RevId: 688ce78ddfb0cfd6a025985dc2dd6f62bce76523

services/web/app/src/Features/User/ThirdPartyIdentityManager.js

@@ -1,21 +1,19 @@
-const EmailHandler = require('../../../../app/src/Features/Email/EmailHandler')
+const APP_ROOT = '../../../../app/src'
+const EmailHandler = require(`${APP_ROOT}/Features/Email/EmailHandler`)
 const Errors = require('../Errors/Errors')
-const logger = require('logger-sharelatex')
-const { User } = require('../../models/User')
-const settings = require('settings-sharelatex')
 const _ = require('lodash')
+const logger = require('logger-sharelatex')
+const settings = require('settings-sharelatex')
+const { User } = require(`${APP_ROOT}/models/User`)
+const { promisifyAll } = require(`${APP_ROOT}/util/promises`)
 
 const oauthProviders = settings.oauthProviders || {}
 
-const ThirdPartyIdentityManager = (module.exports = {
+function getUser(providerId, externalUserId, callback) {
-  getUser(providerId, externalUserId, callback) {
   if (providerId == null || externalUserId == null) {
     return callback(new Error('invalid arguments'))
   }
-    const query = ThirdPartyIdentityManager._getUserQuery(
+  const query = _getUserQuery(providerId, externalUserId)
-      providerId,
-      externalUserId
-    )
   User.findOne(query, function(err, user) {
     if (err != null) {
       return callback(err)
@@ -25,9 +23,9 @@ const ThirdPartyIdentityManager = (module.exports = {
     }
     callback(null, user)
   })
-  },
+}
 
-  login(providerId, externalUserId, externalData, callback) {
+function login(providerId, externalUserId, externalData, callback) {
   ThirdPartyIdentityManager.getUser(providerId, externalUserId, function(
     err,
     user
@@ -38,11 +36,8 @@ const ThirdPartyIdentityManager = (module.exports = {
     if (!externalData) {
       return callback(null, user)
     }
-      const query = ThirdPartyIdentityManager._getUserQuery(
+    const query = _getUserQuery(providerId, externalUserId)
-        providerId,
+    const update = _thirdPartyIdentifierUpdate(
-        externalUserId
-      )
-      const update = ThirdPartyIdentityManager._thirdPartyIdentifierUpdate(
       user,
       providerId,
       externalUserId,
@@ -50,37 +45,16 @@ const ThirdPartyIdentityManager = (module.exports = {
     )
     User.findOneAndUpdate(query, update, { new: true }, callback)
   })
-  },
-
-  _getUserQuery(providerId, externalUserId) {
-    externalUserId = externalUserId.toString()
-    providerId = providerId.toString()
-    const query = {
-      'thirdPartyIdentifiers.externalUserId': externalUserId,
-      'thirdPartyIdentifiers.providerId': providerId
 }
-    return query
-  },
 
-  _thirdPartyIdentifierUpdate(user, providerId, externalUserId, externalData) {
+function link(
-    providerId = providerId.toString()
+  userId,
-    // get third party identifier object from array
+  providerId,
-    const thirdPartyIdentifier = user.thirdPartyIdentifiers.find(
+  externalUserId,
-      tpi =>
+  externalData,
-        tpi.externalUserId === externalUserId && tpi.providerId === providerId
+  callback,
-    )
+  retry
-    // do recursive merge of new data over existing data
+) {
-    _.merge(thirdPartyIdentifier.externalData, externalData)
-    const update = { 'thirdPartyIdentifiers.$': thirdPartyIdentifier }
-    return update
-  },
-
-  // register: () ->
-  // this should be implemented once we move to having v2 as the master
-  // but for now we need to register with v1 then call link once that
-  // is complete
-
-  link(userId, providerId, externalUserId, externalData, callback, retry) {
   if (!oauthProviders[providerId]) {
     return callback(new Error('Not a valid provider'))
   }
@@ -141,9 +115,9 @@ const ThirdPartyIdentityManager = (module.exports = {
       })
     }
   })
-  },
+}
 
-  unlink(userId, providerId, callback) {
+function unlink(userId, providerId, callback) {
   if (!oauthProviders[providerId]) {
     return callback(new Error('Not a valid provider'))
   }
@@ -181,4 +155,42 @@ const ThirdPartyIdentityManager = (module.exports = {
     }
   })
 }
-})
+
+function _getUserQuery(providerId, externalUserId) {
+  externalUserId = externalUserId.toString()
+  providerId = providerId.toString()
+  const query = {
+    'thirdPartyIdentifiers.externalUserId': externalUserId,
+    'thirdPartyIdentifiers.providerId': providerId
+  }
+  return query
+}
+
+function _thirdPartyIdentifierUpdate(
+  user,
+  providerId,
+  externalUserId,
+  externalData
+) {
+  providerId = providerId.toString()
+  // get third party identifier object from array
+  const thirdPartyIdentifier = user.thirdPartyIdentifiers.find(
+    tpi =>
+      tpi.externalUserId === externalUserId && tpi.providerId === providerId
+  )
+  // do recursive merge of new data over existing data
+  _.merge(thirdPartyIdentifier.externalData, externalData)
+  const update = { 'thirdPartyIdentifiers.$': thirdPartyIdentifier }
+  return update
+}
+
+const ThirdPartyIdentityManager = {
+  getUser,
+  login,
+  link,
+  unlink
+}
+
+ThirdPartyIdentityManager.promises = promisifyAll(ThirdPartyIdentityManager)
+
+module.exports = ThirdPartyIdentityManager

services/web/test/acceptance/src/helpers/UserHelper.js

@@ -41,13 +41,15 @@ module.exports = class UserHelper {
     this.user = null
     // cookie jar
     this.jar = request.jar()
+    // create new request instance
+    this.request = request.defaults({})
     // initialize request instance with default options
     this.setRequestDefaults()
   }
 
   setRequestDefaults(defaults = {}) {
     // request-promise instance for making requests
-    this.request = request.defaults({
+    this.request = this.request.defaults({
       baseUrl: UserHelper.baseUrl(),
       followRedirect: false,
       jar: this.jar,