Просмотр исходного кода

Merge pull request #6278 from overleaf/ab-login-registration-cleanup

[web] Login/registration cleanup

GitOrigin-RevId: 02bb2fa04a504f42b7594def3cec03ab883c64f5
Alexandre Bourdin 4 лет назад
Родитель
Сommit
d0c4c8b24f
1 измененных файлов с 51 добавлено и 39 удалено
  1. 51 39
      services/web/app/src/Features/Referal/ReferalAllocator.js

+ 51 - 39
services/web/app/src/Features/Referal/ReferalAllocator.js

@@ -1,51 +1,63 @@
 const OError = require('@overleaf/o-error')
 const { User } = require('../../models/User')
 const FeaturesUpdater = require('../Subscription/FeaturesUpdater')
+const { promisify } = require('../../util/promises')
 
-module.exports = {
-  allocate(referalId, newUserId, referalSource, referalMedium, callback) {
-    if (callback == null) {
-      callback = function () {}
+function allocate(
+  referalId,
+  newUserId,
+  referalSource,
+  referalMedium,
+  callback
+) {
+  if (callback == null) {
+    callback = function () {}
+  }
+  if (referalId == null) {
+    return callback(null)
+  }
+
+  const query = { referal_id: referalId }
+  return User.findOne(query, { _id: 1 }, function (error, user) {
+    if (error != null) {
+      return callback(error)
     }
-    if (referalId == null) {
+    if (user == null || user._id == null) {
       return callback(null)
     }
 
-    const query = { referal_id: referalId }
-    return User.findOne(query, { _id: 1 }, function (error, user) {
-      if (error != null) {
-        return callback(error)
-      }
-      if (user == null || user._id == null) {
-        return callback(null)
-      }
-
-      if (referalSource === 'bonus') {
-        User.updateOne(
-          query,
-          {
-            $push: {
-              refered_users: newUserId,
-            },
-            $inc: {
-              refered_user_count: 1,
-            },
+    if (referalSource === 'bonus') {
+      User.updateOne(
+        query,
+        {
+          $push: {
+            refered_users: newUserId,
+          },
+          $inc: {
+            refered_user_count: 1,
           },
-          {},
-          function (err) {
-            if (err != null) {
-              OError.tag(err, 'something went wrong allocating referal', {
-                referalId,
-                newUserId,
-              })
-              return callback(err)
-            }
-            FeaturesUpdater.refreshFeatures(user._id, 'referral', callback)
+        },
+        {},
+        function (err) {
+          if (err != null) {
+            OError.tag(err, 'something went wrong allocating referal', {
+              referalId,
+              newUserId,
+            })
+            return callback(err)
           }
-        )
-      } else {
-        callback()
-      }
-    })
+          FeaturesUpdater.refreshFeatures(user._id, 'referral', callback)
+        }
+      )
+    } else {
+      callback()
+    }
+  })
+}
+
+module.exports = {
+  allocate,
+  promises: {
+    allocate: promisify(allocate),
   },
 }