Changed logic of getOrgAdminEmails to always add global admin emails …

.prettierrc.js

@@ -1,7 +1,7 @@
 module.exports = {
     trailingComma: "es5",
     tabWidth: 4,
-    printWidth: 90,
+    printWidth: 120,
     semi: true,
     singleQuote: false,
     useTabs: false,

src/services/user-management/user.service.ts

@@ -160,7 +160,8 @@ export class UserService {
         await this.setPasswordHash(mappedUser, dto.password);
 
         if (dto.globalAdmin) {
-            const globalAdminPermission = await this.permissionService.findOrCreateGlobalAdminPermission();
+            const globalAdminPermission =
+                await this.permissionService.findOrCreateGlobalAdminPermission();
             await this.permissionService.addUsersToPermission(globalAdminPermission, [
                 mappedUser,
             ]);
@@ -250,15 +251,17 @@ export class UserService {
 
     private async updateGlobalAdminStatusIfNeeded(dto: UpdateUserDto, mappedUser: User) {
         if (dto.globalAdmin) {
-            const globalAdminPermission = await this.permissionService.findOrCreateGlobalAdminPermission();
+            const globalAdminPermission =
+                await this.permissionService.findOrCreateGlobalAdminPermission();
             // Don't do anything if the user already is global admin.
             if (!mappedUser.permissions.some(x => x.id == globalAdminPermission.id)) {
                 await this.permissionService.addUsersToPermission(globalAdminPermission, [
                     mappedUser,
                 ]);
             }
         } else {
-            const globalAdminPermission = await this.permissionService.findOrCreateGlobalAdminPermission();
+            const globalAdminPermission =
+                await this.permissionService.findOrCreateGlobalAdminPermission();
             await this.permissionService.removeUserFromPermission(
                 globalAdminPermission,
                 mappedUser
@@ -376,6 +379,7 @@ export class UserService {
         organization: Organization
     ): Promise<void> {
         const emails = await this.getOrgAdminEmails(organization);
+
         await this.oS2IoTMail.sendMail({
             to: emails,
             subject: "Ny ansøgning til din organisation i OS2iot",
@@ -408,20 +412,24 @@ export class UserService {
 
     async getOrgAdminEmails(organization: Organization): Promise<string[]> {
         const emails: string[] = [];
-        const globalAdminPermission: Permission = await this.permissionService.getGlobalPermission();
+        const globalAdminPermission: Permission =
+            await this.permissionService.getGlobalPermission();
         organization.permissions.forEach(permission => {
-            if (isPermissionType(permission, PermissionType.OrganizationUserAdmin)) {
-                if (permission.users.length > 0) {
-                    permission.users.forEach(user => {
-                        emails.push(user.email);
-                    });
-                } else {
-                    globalAdminPermission.users.forEach(user => {
-                        emails.push(user.email);
-                    });
-                }
+            if (
+                isPermissionType(permission, PermissionType.OrganizationUserAdmin) &&
+                permission.users.length > 0
+            ) {
+                permission.users.forEach(user => {
+                    emails.push(user.email);
+                });
             }
         });
+        if (emails.length === 0) {
+            globalAdminPermission.users.forEach(user => {
+                emails.push(user.email);
+            });
+        }
+
         return emails;
     }