1 files changed, 53 insertions, 15 deletions

diff --git a/sdnr/wt/odlux/framework/src/services/restService.ts b/sdnr/wt/odlux/framework/src/services/restService.ts
index c25deda84..b02d7d19f 100644
--- a/sdnr/wt/odlux/framework/src/services/restService.ts
+++ b/sdnr/wt/odlux/framework/src/services/restService.ts
@@ -30,38 +30,76 @@ export const formEncode = (params: { [key: string]: string | number }) => Object
   return encodeURIComponent(key) + '=' + encodeURIComponent(params[key].toString());
 }).join('&');
 
-export async function requestRest<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<TData | false | null> {
+/** Sends a rest request to the given path. 
+ * @returns The data, or null it there was any error
+ */
+export async function requestRest<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<TData | null> {
+  const res = await requestRestExt<TData>(path, init, authenticate, isResource);
+  if (res && res.status >= 200 && res.status < 300) {
+    return res.data;
+  }
+  return null;
+}
+
+/** 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.
+ */
+export async function requestRestExt<TData>(path: string = '', init: RequestInit = {}, authenticate: boolean = true, isResource: boolean = false): Promise<{ status: number, message?: string, data: TData | null }> {
+  const result: { status: number, message?: string, data: TData | null } = {
+    status: -1,
+    data: null,
+  };
   const isAbsUrl = absUrlPattern.test(path);
   const uri = isAbsUrl ? path : isResource ? path.replace(/\/{2,}/i, '/') : (baseUri) + ('/' + path).replace(/\/{2,}/i, '/');
-  init.headers = {
+  init = {
     'method': 'GET',
-    'Content-Type': 'application/json',
-    'Accept': 'application/json',
-    ...init.headers
+    ...init,
+    headers: {
+      'Content-Type': 'application/json',
+      'Accept': 'application/json',
+      ...init.headers
+    }
   };
   if (!isAbsUrl && authenticate && applicationStore) {
     const { state: { framework: { authenticationState: { user } } } } = applicationStore;
     // do not request if the user is not valid
     if (!user || !user.isValid) {
-      return null;
+      return {
+        ...result,
+        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 result = await fetch(uri, init);
-  if (result.status === 401 || result.status === 403) {
+  const fetchResult = await fetch(uri, init);
+  if (fetchResult.status === 401 || fetchResult.status === 403) {
     applicationStore && applicationStore.dispatch(new ReplaceAction(`/login?returnTo=${applicationStore.state.framework.navigationState.pathname}`));
-    return null;
+    return {
+      ...result,
+      status: 403,
+      message: "Authentication requested by server."
+    };
   }
-  const contentType = result.headers.get("Content-Type") || result.headers.get("content-type");
+  const contentType = fetchResult.headers.get("Content-Type") || fetchResult.headers.get("content-type");
   const isJson = contentType && contentType.toLowerCase().startsWith("application/json");
   try {
-    const data = result.ok && (isJson ? await result.json() : await result.text()) as TData ;
-    return data;
-  } catch {
-    return null;
+    const data = (isJson ? await fetchResult.json() : await fetchResult.text()) as TData;
+    return {
+      ...result,
+      status: fetchResult.status,
+      message: fetchResult.statusText,
+      data: data
+    };
+  } catch (error) {
+    return {
+      ...result,
+      status: fetchResult.status,
+      message: error && error.message || String(error),
+      data: null
+    };
   }
 }
\ No newline at end of file