Fix case sensitivity when checking user authorization (#184)

* Fix case sensitivity when checking user authorization * Remove console.log
CATcher-org · Sep 8, 2019 · e000317 · e000317
1 parent 1e8ca95
commit e000317
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/app/core/services/data.service.ts b/src/app/core/services/data.service.ts
@@ -65,7 +65,7 @@ export class DataService {
     // Formats the parsed information for easier app reading
     parsedCSV.forEach(entry => {
       if (entry[ROLE] === UserRole.Admin.toLowerCase()) {
-        admins[entry[NAME]] = {};
+        admins[entry[NAME].toLowerCase()] = {};
       }
     });
 
@@ -95,7 +95,7 @@ export class DataService {
       }
       const tutor = entry[NAME] in tutors ? tutors[entry[NAME]] : {};
       tutor[entry[TEAM]] = 'true';
-      tutors[entry[NAME]] = tutor;
+      tutors[entry[NAME].toLowerCase()] = tutor;
     });
 
     return tutors;
@@ -126,7 +126,7 @@ export class DataService {
       }
       const newStudent = {};
       newStudent[TEAM_ID] = entry[TEAM];
-      students[entry[NAME]] = newStudent;
+      students[entry[NAME].toLowerCase()] = newStudent;
     });
 
     return students;
@@ -154,7 +154,7 @@ export class DataService {
         return;
       }
       const team = entry[TEAM] in teams ? teams[entry[TEAM]] : {};
-      team[entry[NAME]] = 'true';
+      team[entry[NAME].toLowerCase()] = 'true';
       teams[entry[TEAM]] = team;
     });
 
@@ -182,11 +182,11 @@ export class DataService {
     // Formats the parsed information for easier app reading
     parsedCSV.forEach(entry => {
       if (entry[ROLE] === UserRole.Student.toLowerCase()) {
-        students[entry[NAME]] = 'true';
+        students[entry[NAME].toLowerCase()] = 'true';
       } else if (entry[ROLE] === UserRole.Tutor.toLowerCase()) {
-        tutors[entry[NAME]] = 'true';
+        tutors[entry[NAME].toLowerCase()] = 'true';
       } else if (entry[ROLE] === UserRole.Admin.toLowerCase()) {
-        admins[entry[NAME]] = 'true';
+        admins[entry[NAME].toLowerCase()] = 'true';
       }
     });
 

diff --git a/src/app/core/services/user.service.ts b/src/app/core/services/user.service.ts
@@ -18,7 +18,7 @@ export class UserService {
   createUserModel(userLoginId: string): Observable<User> {
     return this.dataService.getDataFile().pipe(
       map((jsonData: {}) => {
-        this.currentUser = this.createUser(jsonData, userLoginId);
+        this.currentUser = this.createUser(jsonData, userLoginId.toLowerCase());
         return this.currentUser;
       }),
       flatMap((user) => {
@@ -38,7 +38,6 @@ export class UserService {
   private createUser(data: {}, userLoginId: string): User {
     const userRole = this.parseUserRole(data, userLoginId);
     switch (userRole) {
-
       case UserRole.Student:
         const teamId = data['students-allocation'][userLoginId]['teamId'];
         const studentTeam = this.createTeamModel(data['team-structure'], teamId);