Merge pull request #78 from sunbird-cb/secure-email-fix

Secure email fix
sunbird-cb · Mar 6, 2023 · cad9fbd · cad9fbd
2 parents 86b42ec + ba5dea4
commit cad9fbd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.ts b/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.ts
@@ -1,6 +1,7 @@
 import { AfterViewInit, Component, OnInit, OnDestroy, ElementRef, HostListener, ViewChild } from '@angular/core'
 import { Router, ActivatedRoute } from '@angular/router'
 import * as _ from 'lodash'
+import { ProfileV2UtillService } from '../../../home/services/home-utill.service'
 import { ProfileV2Service } from '../../../home/services/home.servive'
 import { UsersService } from '../../../home/services/users.service'
 // import { UsersService } from '../../services/users.service'
@@ -45,6 +46,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
   constructor(private usersSvc: UsersService, private router: Router,
               private route: ActivatedRoute,
               private profile: ProfileV2Service,
+              private profileUtilSvc: ProfileV2UtillService,
               private usersService: UsersService) {
   }
   ngOnInit() {
@@ -124,7 +126,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
         })
         return {
           fullName: `${user.firstName} ${user.lastName}`,
-          email: user.emailId,
+          email: this.profileUtilSvc.emailTransform(user.emailId),
           position: userRole,
           role: user.roleInfo.roleName,
         }
@@ -142,7 +144,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
         })
         return {
           fullName: `${user.firstName} ${user.lastName}`,
-          email: user.emailId,
+          email: this.profileUtilSvc.emailTransform(user.emailId),
           position: userRole,
           role: user.roleInfo.roleName,
         }
@@ -170,7 +172,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
             // }
 
           })
-          const email = _.get(user, 'profileDetails.personalDetails.primaryEmail')
+          const email = this.profileUtilSvc.emailTransform(_.get(user, 'profileDetails.personalDetails.primaryEmail'))
           if (!user.isDeleted && roles.includes(roldata)) {
             usersData.push({
               fullName: user ? `${user.firstName} ${user.lastName}` : null,
@@ -209,7 +211,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy {
       if (!(user.isDeleted)) {
         usersData.push({
           fullName: user ? `${user.firstName} ${user.lastName}` : null,
-          email: email || user.email,
+          email: this.profileUtilSvc.emailTransform(email) || this.profileUtilSvc.emailTransform(user.email),
           position: roles,
           userId: user.userId,
         })

diff --git a/project/ws/app/src/lib/routes/home/routes/roles-users/roles-users.component.ts b/project/ws/app/src/lib/routes/home/routes/roles-users/roles-users.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, ElementRef, HostListener, ViewChild, AfterViewInit,
 import { Router, ActivatedRoute } from '@angular/router'
 import * as _ from 'lodash'
 import { ProfileV2Service } from '../../../home/services/home.servive'
+import { ProfileV2UtillService } from '../../services/home-utill.service'
 import { UsersService } from '../../services/users.service'
 
 @Component({
@@ -40,7 +41,7 @@ export class RolesUsersComponent implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
-  constructor(private usersSvc: UsersService, private router: Router,
+  constructor(private usersSvc: UsersService, private router: Router, private profileUtilSvc: ProfileV2UtillService,
     // tslint:disable-next-line:align
     private route: ActivatedRoute, private profile: ProfileV2Service, private usersService: UsersService) {
   }
@@ -117,7 +118,7 @@ export class RolesUsersComponent implements OnInit, AfterViewInit, OnDestroy {
         })
         return {
           fullName: `${user.firstName} ${user.lastName}`,
-          email: user.emailId,
+          email: this.profileUtilSvc.emailTransform(user.emailId),
           position: userRole,
           role: user.roleInfo.roleName,
         }
@@ -135,7 +136,7 @@ export class RolesUsersComponent implements OnInit, AfterViewInit, OnDestroy {
         })
         return {
           fullName: `${user.firstName} ${user.lastName}`,
-          email: user.emailId,
+          email: this.profileUtilSvc.emailTransform(user.emailId),
           position: userRole,
           role: user.roleInfo.roleName,
         }
@@ -169,7 +170,7 @@ export class RolesUsersComponent implements OnInit, AfterViewInit, OnDestroy {
       if (!(user.isDeleted)) {
         usersData.push({
           fullName: user ? `${user.firstName} ${user.lastName}` : null,
-          email: email || user.email,
+          email: this.profileUtilSvc.emailTransform(email) || this.profileUtilSvc.emailTransform(user.email),
           position: this.getRoleList(user).toString().replace(',', ', '),
           userId: user.userId,
         })
@@ -210,7 +211,8 @@ export class RolesUsersComponent implements OnInit, AfterViewInit, OnDestroy {
         user => {
           return {
             fullName: `${user.firstName} ${user.lastName}`,
-            email: _.get(user, 'profileDetails.personalDetails.primaryEmail') || user.email,
+            email: this.profileUtilSvc.emailTransform(_.get(user, 'profileDetails.personalDetails.primaryEmail'))
+              || this.profileUtilSvc.emailTransform(user.email),
             position: this.getRoleList(user).toString().replace(',', ', '),
             userId: user.userId,
           }

diff --git a/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts b/project/ws/app/src/lib/routes/home/routes/users-view/users-view.component.ts
@@ -10,6 +10,7 @@ import { UsersService } from '../../services/users.service'
 import { MatSnackBar } from '@angular/material/snack-bar'
 import { environment } from 'src/environments/environment'
 import { LoaderService } from '../../services/loader.service'
+import { ProfileV2UtillService } from '../../services/home-utill.service'
 @Component({
   selector: 'ws-app-users-view',
   templateUrl: './users-view.component.html',
@@ -54,6 +55,7 @@ export class UsersViewComponent implements OnInit {
     private configSvc: ConfigurationsService,
     private snackBar: MatSnackBar,
     private events: EventService,
+    private profileUtilSvc: ProfileV2UtillService,
   ) {
     this.Math = Math
     this.currentUser = this.configSvc.userProfile && this.configSvc.userProfile.userId
@@ -220,7 +222,7 @@ export class UsersViewComponent implements OnInit {
       user.organisations.forEach((org: { organisationId: string, roles: any }) => {
         roles = org.roles
       })
-      const email = _.get(user, 'profileDetails.personalDetails.primaryEmail')
+      const email = this.profileUtilSvc.emailTransform(_.get(user, 'profileDetails.personalDetails.primaryEmail')) || ''
       if (active === user.isDeleted) {
         usersData.push({
           fullname: user ? `${user.firstName} ${user.lastName}` : null,

diff --git a/project/ws/app/src/lib/routes/home/services/home-utill.service.ts b/project/ws/app/src/lib/routes/home/services/home-utill.service.ts
@@ -30,4 +30,11 @@ export class ProfileV2UtillService {
       .get<any>(API_END_POINTS.USER_BADGE_RECENT)
       .pipe(map(notifications => notifications))
   }
+
+  emailTransform(value: string): any {
+    if (value !== undefined) {
+      return value.replace('@', '[at]').replace(/\./g, '[dot]')
+    }
+
+  }
 }