update odlux sources

update basic odlux functionality for kohn

Issue-ID: CCSDK-3765
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Change-Id: I3723c9c2f35b9012ba537920b294a54bb556cbc6
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>

1 files changed, 24 insertions, 14 deletions

diff --git a/sdnr/wt/odlux/framework/src/actions/authentication.ts b/sdnr/wt/odlux/framework/src/actions/authentication.ts
index 20a248dc1..f1d11de37 100644
--- a/sdnr/wt/odlux/framework/src/actions/authentication.ts
+++ b/sdnr/wt/odlux/framework/src/actions/authentication.ts
@@ -18,9 +18,11 @@
 import { Dispatch } from '../flux/store';
 import { Action } from '../flux/action';
 import { AuthPolicy, User } from '../models/authentication';
-import { GeneralSettings } from '../models/settings';
-import { SetGeneralSettingsAction, setGeneralSettingsAction } from './settingsAction';
+import { GeneralSettings, Settings } from '../models/settings';
+import { saveInitialSettings, SetGeneralSettingsAction, setGeneralSettingsAction } from './settingsAction';
 import { endWebsocketSession } from '../services/notificationService';
+import { endUserSession, startUserSession } from '../services/userSessionService';
+import { IApplicationStoreState } from '../store/applicationStore';
 
 export class UpdateUser extends Action {
 
@@ -40,16 +42,30 @@ export class UpdatePolicies extends Action {
 export const loginUserAction = (user?: User) => (dispatcher: Dispatch) =>{
   
   dispatcher(new UpdateUser(user));
-  loadUserSettings(user, dispatcher);
-
-
+  if(user){
+    startUserSession(user);
+    loadUserSettings(user, dispatcher);
+    localStorage.setItem("userToken", user.toString());
+  }
 }
 
-export const logoutUser = () => (dispatcher: Dispatch) =>{
+export const logoutUser = () => (dispatcher: Dispatch, getState: () => IApplicationStoreState) =>{
+
+  const {framework:{applicationState:{ authentication }, authenticationState: {user}}} = getState();
   
   dispatcher(new UpdateUser(undefined));
   dispatcher(new SetGeneralSettingsAction(null));
   endWebsocketSession();
+  endUserSession();
+  localStorage.removeItem("userToken");
+
+
+  //only call if a user is currently logged in
+  if (authentication === "oauth" && user) {
+
+    const url = window.location.origin;
+    window.location.href=`${url}/oauth/logout`;
+  }
 }
 
 const loadUserSettings = (user: User | undefined, dispatcher: Dispatch) =>{
@@ -74,14 +90,8 @@ const loadUserSettings = (user: User | undefined, dispatcher: Dispatch) =>{
       }else{
         return null;
       }
-    }).then((result:GeneralSettings)=>{
-      if(result?.general){
-        //will start websocket session if applicable
-        dispatcher(setGeneralSettingsAction(result.general.areNotificationsEnabled!));
-  
-      }else{
-        dispatcher(setGeneralSettingsAction(false));
-      }
+    }).then((result:Settings)=>{
+        dispatcher(saveInitialSettings(result));
     })
   }  
 }
\ No newline at end of file