OK-471 Not showing logged in user on shiftchange view anymore
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index b1ffff5..0a61351 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -58,7 +58,8 @@
if (accessToken) {
const jwtHelper: JwtHelper = new JwtHelper();
const decoded: any = jwtHelper.decodeToken(accessToken);
- const user: User = new User();
+ const user: User = new User();
+ user.id = decoded.sub;
user.username = decoded.preferred_username;
user.itemName = decoded.preferred_username;
user.name = decoded.given_name + ' ' + decoded.family_name;
diff --git a/src/app/common/session-context.spec.ts b/src/app/common/session-context.spec.ts
index 566798f..e33f239 100644
--- a/src/app/common/session-context.spec.ts
+++ b/src/app/common/session-context.spec.ts
@@ -19,12 +19,12 @@
it('can store a SessionId and a User', inject([SessionContext], (service: SessionContext) => {
service.setCurrSessionId('SpecialSessionId');
const usr = new User();
- usr.id = 44;
+ usr.id = '44';
usr.name = 'Rudi';
service.setCurrUser(usr);
expect(service.getCurrSessionId()).toBe('SpecialSessionId');
expect(service.getCurrUser()).not.toBeNull();
- expect(service.getCurrUser().id).toBe(44);
+ expect(service.getCurrUser().id).toBe('44');
expect(service.getCurrUser().name).toBe('Rudi');
}));
});
diff --git a/src/app/common/session-context.ts b/src/app/common/session-context.ts
index 16911dd..2286f69 100644
--- a/src/app/common/session-context.ts
+++ b/src/app/common/session-context.ts
@@ -50,16 +50,12 @@
setCollapseState(colapseState: boolean, type: string): void {
localStorage.setItem(type, JSON.stringify(colapseState));
}
- /**
- * @deprecated
- */
+
getCurrUser(): User {
const user = localStorage.getItem(Globals.CURRENT_USER);
return JSON.parse(user);
}
- /**
- * @deprecated
- */
+
setCurrUser(usr: any): void {
localStorage.setItem(Globals.CURRENT_USER, JSON.stringify(usr));
}
diff --git a/src/app/dialogs/shift-change-protocol/shift-change-protocol.component.spec.ts b/src/app/dialogs/shift-change-protocol/shift-change-protocol.component.spec.ts
index a6aa8dd..b74812d 100644
--- a/src/app/dialogs/shift-change-protocol/shift-change-protocol.component.spec.ts
+++ b/src/app/dialogs/shift-change-protocol/shift-change-protocol.component.spec.ts
@@ -43,7 +43,7 @@
let mockNotificationService: MockNotificationService;
const correctUser: User = {
- id: 44, username: 'carlo', password: 'serverPwd'
+ id: '44', username: 'carlo', password: 'serverPwd'
, name: 'Carlo Cottura', specialUser: true, itemName: this.userName
};
diff --git a/src/app/dialogs/shift-change/shift-change.component.ts b/src/app/dialogs/shift-change/shift-change.component.ts
index 278f8dc..52fad46 100644
--- a/src/app/dialogs/shift-change/shift-change.component.ts
+++ b/src/app/dialogs/shift-change/shift-change.component.ts
@@ -91,28 +91,14 @@
function setUsers(_allUsers: User[]) {
self.allUsers = _allUsers;
self.allUsersButLoggedIn = [];
+ const currLoggedInUser = self.sessionContext.getCurrUser();
for (const user of _allUsers) {
- self.allUsersButLoggedIn.push(user);
- user.itemName = user.name;
- }
- self.deleteUserFromArray(self.sessionContext.getCurrUser(), self.allUsersButLoggedIn);
- }
- }
-
- deleteUserFromArray(user: User, array) {
- const index: number = arrayObjectIndexOf(array, user.id, 'id');
-
- if (index !== -1) {
- array.splice(index, 1);
- }
- function arrayObjectIndexOf(srcArray, searchTerm, property) {
- for (let i = 0; i < srcArray.length; i++) {
- if (srcArray[i][property] === searchTerm) {
- return i;
- }
- }
- return -1;
+ if (currLoggedInUser.id !== user.id) {
+ self.allUsersButLoggedIn.push(user);
+ user.itemName = user.name;
+ }
+ }
}
}
diff --git a/src/app/model/user.ts b/src/app/model/user.ts
index 0074f2e..3babfaf 100644
--- a/src/app/model/user.ts
+++ b/src/app/model/user.ts
@@ -1,5 +1,5 @@
export class User {
- id: number;
+ id: string;
itemName: string;
username: string;
password: string;
diff --git a/src/app/pages/overview/overview.component.spec.ts b/src/app/pages/overview/overview.component.spec.ts
index 742143b..bb3e688 100644
--- a/src/app/pages/overview/overview.component.spec.ts
+++ b/src/app/pages/overview/overview.component.spec.ts
@@ -59,7 +59,7 @@
let messageService: MessageService;
const correctUser: User = {
- id: 44, username: 'carlo', password: 'serverPwd'
+ id: '44', username: 'carlo', password: 'serverPwd'
, name: 'Carlo Cottura', specialUser: true, itemName: this.userName
};
class MockNotificationService extends AbstractMockObservableService {
diff --git a/src/app/pages/reminder/reminder.component.spec.ts b/src/app/pages/reminder/reminder.component.spec.ts
index d36ee92..09a4317 100644
--- a/src/app/pages/reminder/reminder.component.spec.ts
+++ b/src/app/pages/reminder/reminder.component.spec.ts
@@ -56,7 +56,7 @@
const correctUser: User = {
- id: 44, username: 'carlo', password: 'serverPwd'
+ id: '44', username: 'carlo', password: 'serverPwd'
, name: 'Carlo Cottura', specialUser: true, itemName: this.userName
};
diff --git a/src/app/pages/search/search.component.spec.ts b/src/app/pages/search/search.component.spec.ts
index c8ff4c4..0ddd519 100644
--- a/src/app/pages/search/search.component.spec.ts
+++ b/src/app/pages/search/search.component.spec.ts
@@ -72,7 +72,7 @@
};
const correctUser: User = {
- id: 44, username: 'carlo', password: 'serverPwd'
+ id: '44', username: 'carlo', password: 'serverPwd'
, name: 'Carlo Cottura', specialUser: true, itemName: this.userName
};
diff --git a/src/app/services/authentication.service.spec.ts b/src/app/services/authentication.service.spec.ts
index 41860eb..d31e00b 100644
--- a/src/app/services/authentication.service.spec.ts
+++ b/src/app/services/authentication.service.spec.ts
@@ -58,7 +58,7 @@
let service: AuthenticationService;
let response: Response;
const fakeCreds: LoginCredentials = { userName: 'carlo', password: 'newPwd'};
- const fakeUser: User = { id: 44, username: 'carlo', password: 'serverPwd'
+ const fakeUser: User = { id: '44', username: 'carlo', password: 'serverPwd'
, name: 'Carlo Cottura', specialUser: true, itemName: this.name };
diff --git a/src/app/services/user.service.spec.ts b/src/app/services/user.service.spec.ts
index 20784b9..fc6883d 100644
--- a/src/app/services/user.service.spec.ts
+++ b/src/app/services/user.service.spec.ts
@@ -78,9 +78,9 @@
expect( users[0] ).not.toBeNull();
expect( users[1] ).not.toBeNull();
expect( users[2] ).not.toBeNull();
- expect( users[0].id ).toBe(1);
- expect( users[1].id ).toBe(2);
- expect( users[2].id ).toBe(3);
+ expect( users[0].id ).toBe('1');
+ expect( users[1].id ).toBe('2');
+ expect( users[2].id ).toBe('3');
expect( sessionContext.getCurrSessionId() ).not.toBe('SuperVALID!'); // only done with authentification
});
})));
diff --git a/src/app/test-data/users.ts b/src/app/test-data/users.ts
index 03abf00..2c53bb2 100644
--- a/src/app/test-data/users.ts
+++ b/src/app/test-data/users.ts
@@ -2,7 +2,7 @@
export const USERS: User[] = [
{
- id: 1,
+ id: '1',
username: 'max',
password: 'max',
@@ -11,7 +11,7 @@
itemName: 'max'
},
{
- id: 2,
+ id: '2',
username: 'admin',
password: 'admin',
@@ -20,7 +20,7 @@
itemName: 'admin'
},
{
- id: 3,
+ id: '3',
username: 'otto',
password: 'otto',
