Renamed sendNotification to sendWelcomeMail

- The only thing the method does now is sending welcome mail, so new naming seems natural :)
TryGhost · Jul 30, 2019 · c7a836b · c7a836b
1 parent 8503bdc
commit c7a836b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/core/server/api/v0.1/authentication.js b/core/server/api/v0.1/authentication.js
@@ -290,7 +290,8 @@ authentication = {
         }
 
         function sendNotification(setupUser) {
-            return auth.setup.sendNotification(setupUser, mailAPI);
+            return auth.setup.sendWelcomeEmail(setupUser.email, mailAPI)
+                .then(() => setupUser);
         }
 
         function formatResponse(setupUser) {

diff --git a/core/server/api/v2/authentication.js b/core/server/api/v2/authentication.js
@@ -34,8 +34,7 @@ module.exports = {
                     return auth.setup.doSettings(data, api.settings);
                 })
                 .then((user) => {
-                    const notificationUser = user.toJSON({context: {internal: true}});
-                    return auth.setup.sendNotification(notificationUser, api.mail)
+                    return auth.setup.sendWelcomeEmail(user.get('email'), api.mail)
                         .then(() => user);
                 });
         }

diff --git a/core/server/services/auth/setup.js b/core/server/services/auth/setup.js
@@ -82,7 +82,7 @@ async function doSettings(data, settingsAPI) {
     return user;
 }
 
-function sendNotification(email, mailAPI) {
+function sendWelcomeEmail(email, mailAPI) {
     if (config.get('sendWelcomeEmail')) {
         const data = {
             ownerEmail: email
@@ -117,5 +117,5 @@ module.exports = {
     assertSetupCompleted: assertSetupCompleted,
     setupUser: setupUser,
     doSettings: doSettings,
-    sendNotification: sendNotification
+    sendWelcomeEmail: sendWelcomeEmail
 };