chore(gsuite): fixed rebase

Not all merge conflicts were resolved correctly
AEGEE · Jul 15, 2021 · 4c06310 · 4c06310
1 parent e23e889
commit 4c06310
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/lib/constants.js b/lib/constants.js
@@ -88,6 +88,8 @@ module.exports = {
     MAIL_SUBJECTS: {
         MAIL_CONFIRMATION: 'MyAEGEE: Please confirm your account',
         MAIL_CHANGE: 'MyAEGEE: Email change',
+        PASSWORD_RESET: 'MyAEGEE: Password reset request',
+        NEW_JOIN_REQUEST: 'MyAEGEE: New join request for your body',
         NEW_MEMBER: 'MyAEGEE: Welcome to AEGEE'
     },
     RESTRICTED_EMAILS: ['aegee.org', 'aegee.eu'],

diff --git a/middlewares/members.js b/middlewares/members.js
@@ -145,6 +145,7 @@ exports.deleteUser = async (req, res) => {
     if (!req.permissions.hasPermission('delete:member')) {
         return errors.makeForbiddenError(res, 'Permission delete:member is required, but not present.');
     }
+
     // TODO: if user gets deleted the gsuite account also gets deleted (if there was an account attached)
     await superagent.delete('gsuite-wrapper:8084/accounts/' + req.currentUser.gsuite_id);
     await req.currentUser.destroy();