Shane Kilkelly 8 лет назад
Родитель
Сommit
fcfcbdb4c5
1 измененных файлов с 0 добавлено и 17 удалено
  1. 0 17
      services/web/app/coffee/Features/User/UserUpdater.coffee

+ 0 - 17
services/web/app/coffee/Features/User/UserUpdater.coffee

@@ -185,28 +185,11 @@ module.exports = UserUpdater =
 					return callback(new Errors.NotFoundError('user id and email do no match'))
 				FeaturesUpdater.refreshFeatures userId, true, callback
 
-	mergeSharelatexAndV1Accounts: (sl_id, v1_id, final_email, callback) ->
-		UserGetter.getUser {'overleaf.id': v1_id}, {_id: 1}, (err, otherUser) =>
-			if otherUser?
-				return callback(new Error('v1_id matches an existing user overleaf.id, cannot merge accounts'))
-			@updateUser sl_id, {
-				'$set': {
-					'overleaf.id': v1_id,
-					email: final_email
-				},
-				'$push': {
-					emails: {
-						email: final_email, createdAt: new Date()
-					}
-				}
-			}, callback
-
 [
 	'updateUser'
 	'changeEmailAddress'
 	'setDefaultEmailAddress'
 	'addEmailAddress'
 	'removeEmailAddress'
-	'mergeSharelatexAndV1Accounts'
 ].map (method) ->
 	metrics.timeAsyncMethod(UserUpdater, method, 'mongo.UserUpdater', logger)