summaryrefslogtreecommitdiffstats
path: root/sdnr/wt/odlux/framework/src/services
diff options
context:
space:
mode:
Diffstat (limited to 'sdnr/wt/odlux/framework/src/services')
-rw-r--r--sdnr/wt/odlux/framework/src/services/applicationApi.ts5
-rw-r--r--sdnr/wt/odlux/framework/src/services/applicationManager.ts4
-rw-r--r--sdnr/wt/odlux/framework/src/services/broadcastService.ts146
-rw-r--r--sdnr/wt/odlux/framework/src/services/index.ts2
-rw-r--r--sdnr/wt/odlux/framework/src/services/restService.ts54
-rw-r--r--sdnr/wt/odlux/framework/src/services/storeService.ts11
-rw-r--r--sdnr/wt/odlux/framework/src/services/userdataService.ts (renamed from sdnr/wt/odlux/framework/src/services/settingsService.ts)4
7 files changed, 117 insertions, 109 deletions
diff --git a/sdnr/wt/odlux/framework/src/services/applicationApi.ts b/sdnr/wt/odlux/framework/src/services/applicationApi.ts
index 36523f9eb..8246ee8fa 100644
--- a/sdnr/wt/odlux/framework/src/services/applicationApi.ts
+++ b/sdnr/wt/odlux/framework/src/services/applicationApi.ts
@@ -15,13 +15,10 @@
* the License.
* ============LICENSE_END==========================================================================
*/
-import { GeneralSettings } from '../models/settings';
-import { setGeneralSettingsAction, SetGeneralSettingsAction } from '../actions/settingsAction';
+
import { Event } from '../common/event';
import { ApplicationStore } from '../store/applicationStore';
import { AuthMessage, getBroadcastChannel, sendMessage } from './broadcastService';
-import { endWebsocketSession } from './notificationService';
-import { getSettings } from './settingsService';
let resolveApplicationStoreInitialized: (store: ApplicationStore) => void;
let applicationStore: ApplicationStore | null = null;
diff --git a/sdnr/wt/odlux/framework/src/services/applicationManager.ts b/sdnr/wt/odlux/framework/src/services/applicationManager.ts
index 14e3ed0b2..bd620a020 100644
--- a/sdnr/wt/odlux/framework/src/services/applicationManager.ts
+++ b/sdnr/wt/odlux/framework/src/services/applicationManager.ts
@@ -23,7 +23,7 @@ import { applicationApi } from './applicationApi';
/** Represents registry to manage all applications. */
class ApplicationManager {
- /** Stores all registerd applications. */
+ /** Stores all registered applications. */
private _applications: { [key: string]: ApplicationInfo };
/** Initializes a new instance of this class. */
@@ -32,7 +32,7 @@ class ApplicationManager {
this.changed = new Event<void>();
}
- /** The chaged event will fire if the registration has changed. */
+ /** The changed event will fire if the registration has changed. */
public changed: Event<void>;
/** Registers a new application. */
diff --git a/sdnr/wt/odlux/framework/src/services/broadcastService.ts b/sdnr/wt/odlux/framework/src/services/broadcastService.ts
index f2c3ebc57..40968e54f 100644
--- a/sdnr/wt/odlux/framework/src/services/broadcastService.ts
+++ b/sdnr/wt/odlux/framework/src/services/broadcastService.ts
@@ -22,89 +22,95 @@ import { ReplaceAction } from "../actions/navigationActions";
import { User } from "../models/authentication";
import { ApplicationStore } from "../store/applicationStore";
-type Broadcaster = {channel: BroadcastChannel, key: String};
+type Broadcaster = {
+ channel: BroadcastChannel;
+ key: String;
+};
type AuthTypes = 'login' | 'logout';
-export type AuthMessage={key: AuthTypes, data: any};
+export type AuthMessage = {
+ key: AuthTypes;
+ data: any;
+};
type SettingsType = 'general';
-export type SettingsMessage={key: SettingsType, enableNotifications: boolean, user: string};
+export type SettingsMessage = {
+ key: SettingsType;
+ enableNotifications: boolean;
+ user: string;
+};
-let channels: Broadcaster[] = [];
-let store : ApplicationStore | null = null;
+const channels: Broadcaster[] = [];
+let store: ApplicationStore | null = null;
export const saveChannel = (channel: BroadcastChannel, channelName: string) => {
- channels.push({channel: channel, key: channelName});
-}
-
-export const startBroadcastChannel = (applicationStore: ApplicationStore)=>{
- store=applicationStore;
-
- //might decide to use one general broadcast channel with more keys in the future
- createAuthBroadcastChannel();
- createSettingsBroadcastChannel();
-}
-
-const createSettingsBroadcastChannel = () =>{
-
- const name = "odlux_settings";
- const bc: BroadcastChannel = new BroadcastChannel(name);
- channels.push({ channel: bc, key: name });
-
- bc.onmessage = (eventMessage: MessageEvent<SettingsMessage>) => {
- console.log(eventMessage)
-
- if (eventMessage.data.key === 'general') {
-
- if (store?.state.framework.authenticationState.user) {
- const data = eventMessage.data;
- if(store.state.framework.authenticationState.user.user === data.user){
- store?.dispatch(setGeneralSettingsAction(data.enableNotifications));
- }
- }
- }
- }
+ channels.push({ channel: channel, key: channelName });
+};
-}
+export const startBroadcastChannel = (applicationStore: ApplicationStore) => {
+ store = applicationStore;
-const createAuthBroadcastChannel = () => {
- const name = "odlux_auth";
- const bc: BroadcastChannel = new BroadcastChannel(name);
- channels.push({ channel: bc, key: name });
-
- bc.onmessage = (eventMessage: MessageEvent<AuthMessage>) => {
- console.log(eventMessage)
-
- if (eventMessage.data.key === 'login') {
- if (!store?.state.framework.authenticationState.user) {
- const initialToken = localStorage.getItem("userToken");
- if (initialToken) {
- store?.dispatch(loginUserAction(User.fromString(initialToken)));
- store?.dispatch(new ReplaceAction("/"));
- }
- }
- }
- else if (eventMessage.data.key === 'logout') {
+ //might decide to use one general broadcast channel with more keys in the future
+ createAuthBroadcastChannel();
+ createSettingsBroadcastChannel();
+};
- if (store?.state.framework.authenticationState.user) {
- store?.dispatch(logoutUser());
- store?.dispatch(new ReplaceAction("/login"));
- }
- }
- }
-}
+const createSettingsBroadcastChannel = () => {
-export const getBroadcastChannel = (channelName: string) =>{
- const foundChannel = channels.find(s =>s.key===channelName);
- return foundChannel?.channel;
-}
+ const name = "odlux_settings";
+ const bc: BroadcastChannel = new BroadcastChannel(name);
+ channels.push({ channel: bc, key: name });
+ bc.onmessage = (eventMessage: MessageEvent<SettingsMessage>) => {
+ console.log(eventMessage);
-export const sendMessage = (data: any, channel: string) =>{
+ if (eventMessage.data.key === 'general') {
- const foundChannel = channels.find(s =>s.key===channel);
- if(foundChannel){
- foundChannel.channel.postMessage(data);
- }
+ if (store?.state.framework.authenticationState.user) {
+ const data = eventMessage.data;
+ if (store.state.framework.authenticationState.user.user === data.user) {
+ store?.dispatch(setGeneralSettingsAction(data.enableNotifications));
+ }
+ }
+ }
+ }
+};
+
+const createAuthBroadcastChannel = () => {
+ const name = "odlux_auth";
+ const bc: BroadcastChannel = new BroadcastChannel(name);
+ channels.push({ channel: bc, key: name });
+
+ bc.onmessage = (eventMessage: MessageEvent<AuthMessage>) => {
+ console.log(eventMessage)
+
+ if (eventMessage.data.key === 'login') {
+ if (!store?.state.framework.authenticationState.user) {
+ const initialToken = localStorage.getItem("userToken");
+ if (initialToken) {
+ store?.dispatch(loginUserAction(User.fromString(initialToken)));
+ store?.dispatch(new ReplaceAction("/"));
+ }
+ }
+ }
+ else if (eventMessage.data.key === 'logout') {
+ if (store?.state.framework.authenticationState.user) {
+ store?.dispatch(logoutUser());
+ store?.dispatch(new ReplaceAction("/login"));
+ }
}
+ }
+};
+
+export const getBroadcastChannel = (channelName: string) => {
+ const foundChannel = channels.find(s => s.key === channelName);
+ return foundChannel?.channel;
+};
+
+export const sendMessage = (data: any, channel: string) => {
+ const foundChannel = channels.find(s => s.key === channel);
+ if (foundChannel) {
+ foundChannel.channel.postMessage(data);
+ }
+};
diff --git a/sdnr/wt/odlux/framework/src/services/index.ts b/sdnr/wt/odlux/framework/src/services/index.ts
index 19b451345..85f0708a6 100644
--- a/sdnr/wt/odlux/framework/src/services/index.ts
+++ b/sdnr/wt/odlux/framework/src/services/index.ts
@@ -18,5 +18,5 @@
export { applicationManager } from './applicationManager';
export { subscribe, unsubscribe } from './notificationService';
export { requestRest } from './restService';
-export { putSettings, getSettings} from './settingsService';
+export { saveUserdata, getUserdata } from './userdataService';
diff --git a/sdnr/wt/odlux/framework/src/services/restService.ts b/sdnr/wt/odlux/framework/src/services/restService.ts
index d727e4c9e..a296c52a4 100644
--- a/sdnr/wt/odlux/framework/src/services/restService.ts
+++ b/sdnr/wt/odlux/framework/src/services/restService.ts
@@ -16,18 +16,13 @@
* ============LICENSE_END==========================================================================
*/
+import { ReplaceAction } from '../actions/navigationActions';
+import { AddErrorInfoAction } from '../actions/errorActions';
-import { ApplicationStore } from "../store/applicationStore";
-import { ReplaceAction } from "../actions/navigationActions";
-import { AddErrorInfoAction } from "../actions/errorActions";
+import { storeService } from './storeService';
const baseUri = `${ window.location.origin }`;
const absUrlPattern = /^https?:\/\//;
-let applicationStore: ApplicationStore | null = null;
-
-export const startRestService = (store: ApplicationStore) => {
- applicationStore = store;
-};
export const formEncode = (params: { [key: string]: string | number }) => Object.keys(params).map((key) => {
return encodeURIComponent(key) + '=' + encodeURIComponent(params[key].toString());
@@ -46,9 +41,9 @@ export const getAccessPolicyByUrl = (url: string) => {
DELETE: false,
};
- if (!applicationStore) return result;
+ if (!storeService.applicationStore) return result;
- const { state: { framework: { applicationState: { enablePolicy }, authenticationState: { policies }}} } = applicationStore!;
+ const { state: { framework: { applicationState: { enablePolicy }, authenticationState: { policies } } } } = storeService.applicationStore!;
result.GET = true;
result.POST = true;
@@ -71,7 +66,7 @@ export const getAccessPolicyByUrl = (url: string) => {
return result;
-}
+};
/** Sends a rest request to the given path.
* @returns The data, or null it there was any error
@@ -87,8 +82,8 @@ export async function requestRest<TData>(path: string = '', init: RequestInit =
/** Sends a rest request to the given path and reports the server state.
* @returns An object with the server state, a message and the data or undefined in case of a json parse error.
*/
-export async function requestRestExt<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<{ status: number, message?: string, data: TData | null | undefined }> {
- const result: { status: number, message?: string, data: TData | null } = {
+export async function requestRestExt<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<{ status: number; message?: string; data: TData | null | undefined }> {
+ const result: { status: number; message?: string; data: TData | null } = {
status: -1,
data: null,
};
@@ -100,60 +95,59 @@ export async function requestRestExt<TData>(path: string = '', init: RequestInit
headers: {
'Content-Type': 'application/json',
'Accept': 'application/json',
- ...init.headers
- }
+ ...init.headers,
+ },
};
- if (!isAbsUrl && authenticate && applicationStore) {
- const { state: { framework: { authenticationState: { user } } } } = applicationStore;
+ if (!isAbsUrl && authenticate && storeService.applicationStore) {
+ const { state: { framework: { authenticationState: { user } } } } = storeService.applicationStore;
// do not request if the user is not valid
if (!user || !user.isValid) {
return {
...result,
- message: "User is not valid or not logged in."
+ message: 'User is not valid or not logged in.',
};
}
(init.headers = {
...init.headers,
- 'Authorization': `${user.tokenType} ${user.token}`
+ 'Authorization': `${user.tokenType} ${user.token}`,
//'Authorization': 'Basic YWRtaW46YWRtaW4='
});
}
const fetchResult = await fetch(uri, init);
- if(fetchResult.status === 403){
- applicationStore && applicationStore.dispatch(new AddErrorInfoAction({title: "Forbidden", message:"Status: [403], access denied."}));
+ if (fetchResult.status === 403) {
+ storeService.applicationStore && storeService.applicationStore.dispatch(new AddErrorInfoAction({ title: 'Forbidden', message:'Status: [403], access denied.' }));
return {
...result,
status: 403,
- message: "Forbidden."
+ message: 'Forbidden.',
};
- }
- else if (fetchResult.status === 401) {
- applicationStore && applicationStore.dispatch(new ReplaceAction(`/login?returnTo=${applicationStore.state.framework.navigationState.pathname}`));
+ } else if (fetchResult.status === 401) {
+ storeService.applicationStore && storeService.applicationStore.dispatch(new ReplaceAction(`/login?returnTo=${storeService.applicationStore.state.framework.navigationState.pathname}`));
return {
...result,
status: 401,
- message: "Authentication requested by server."
+ message: 'Authentication requested by server.',
};
}
- const contentType = fetchResult.headers.get("Content-Type") || fetchResult.headers.get("content-type");
- const isJson = contentType && (contentType.toLowerCase().startsWith("application/json") || contentType.toLowerCase().startsWith("application/yang-data+json"));
+ const contentType = fetchResult.headers.get('Content-Type') || fetchResult.headers.get('content-type');
+ const isJson = contentType && (contentType.toLowerCase().startsWith('application/json') || contentType.toLowerCase().startsWith('application/yang-data+json'));
try {
const data = (isJson ? await fetchResult.json() : await fetchResult.text()) as TData;
return {
...result,
status: fetchResult.status,
message: fetchResult.statusText,
- data: data
+ data: data,
};
} catch (error) {
return {
...result,
status: fetchResult.status,
message: error && error.message || String(error),
- data: undefined
+ data: undefined,
};
}
} \ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/services/storeService.ts b/sdnr/wt/odlux/framework/src/services/storeService.ts
new file mode 100644
index 000000000..cbb5987de
--- /dev/null
+++ b/sdnr/wt/odlux/framework/src/services/storeService.ts
@@ -0,0 +1,11 @@
+import { ApplicationStore } from "../store/applicationStore";
+
+let applicationStore: ApplicationStore | null = null;
+
+export const startSoreService = (store: ApplicationStore) => {
+ applicationStore = store;
+};
+
+export const storeService = {
+ get applicationStore() { return applicationStore; },
+ }; \ No newline at end of file
diff --git a/sdnr/wt/odlux/framework/src/services/settingsService.ts b/sdnr/wt/odlux/framework/src/services/userdataService.ts
index 6633a794d..5c9b576c3 100644
--- a/sdnr/wt/odlux/framework/src/services/settingsService.ts
+++ b/sdnr/wt/odlux/framework/src/services/userdataService.ts
@@ -22,7 +22,7 @@ import { requestRest } from "./restService";
const settingsPath ="/userdata";
- export function getSettings<TData>(partialPath?: string){
+ export function getUserdata<TData>(partialPath?: string){
let path = settingsPath;
if(partialPath){
path+=partialPath
@@ -32,7 +32,7 @@ import { requestRest } from "./restService";
return result;
}
- export function putSettings<TData>(partialPath: string, data: string){
+ export function saveUserdata<TData>(partialPath: string, data: string){
const result = requestRest<TData>(settingsPath+partialPath, {method: "PUT", body: data})
return result;