@etsoo/react 1.3.42 → 1.3.43

package/lib/app/ServiceApp.js

@@ -1,4 +1,5 @@
-import { createClient } from '@etsoo/appscript';
+import { ActionResultError, createClient } from '@etsoo/appscript';
+import { ApiDataError } from '@etsoo/restclient';
 import { DomUtils } from '@etsoo/shared';
 import { CoreConstants } from './CoreConstants';
 import { ReactApp } from './ReactApp';
@@ -126,9 +127,21 @@ export class ServiceApp extends ReactApp {
             return false;
         // Refresh token
         return await this.refreshToken({
-            callback: (_result) => {
-                this.toLoginPage();
-            }
+            callback: (result) => {
+                if (typeof result === 'boolean') {
+                    this.toLoginPage();
+                    return;
+                }
+                const message = result instanceof ApiDataError
+                    ? this.formatError(result)
+                    : typeof result !== 'string'
+                        ? ActionResultError.format(result)
+                        : result;
+                this.notifier.alert(message, () => {
+                    this.toLoginPage();
+                });
+            },
+            showLoading: true
         });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.42",
+    "version": "1.3.43",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/app/ServiceApp.ts

@@ -1,9 +1,11 @@
 import {
+    ActionResultError,
     createClient,
     IApi,
     IApiPayload,
     RefreshTokenProps
 } from '@etsoo/appscript';
+import { ApiDataError } from '@etsoo/restclient';
 import { DomUtils } from '@etsoo/shared';
 import { CoreConstants } from './CoreConstants';
 import { IServiceAppSettings } from './IServiceAppSettings';
@@ -173,9 +175,24 @@ export class ServiceApp<
 
         // Refresh token
         return await this.refreshToken({
-            callback: (_result) => {
-                this.toLoginPage();
-            }
+            callback: (result) => {
+                if (typeof result === 'boolean') {
+                    this.toLoginPage();
+                    return;
+                }
+
+                const message =
+                    result instanceof ApiDataError
+                        ? this.formatError(result)
+                        : typeof result !== 'string'
+                        ? ActionResultError.format(result)
+                        : result;
+
+                this.notifier.alert(message, () => {
+                    this.toLoginPage();
+                });
+            },
+            showLoading: true
         });
     }