@etsoo/react 1.4.3 → 1.4.4

package/lib/app/IServiceUser.d.ts

@@ -11,4 +11,4 @@ export interface IServiceUser extends IUser {
 /**
  * Service user login result
  */
-export declare type ServiceLoginResult = IActionResult<IServiceUser>;
+export declare type ServiceLoginResult<U extends IServiceUser = IServiceUser> = IActionResult<U>;

package/lib/app/ServiceApp.d.ts

@@ -11,7 +11,7 @@ import { RefreshTokenRQ } from './RefreshTokenRQ';
  * Use the acess token to the service api, get a service access token
  * Use the new acess token and refresh token to login
  */
-export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends IServicePageData = IServicePageData, S extends IServiceAppSettings = IServiceAppSettings> extends ReactApp<S, U, P> {
+export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends IServicePageData = IServicePageData, S extends IServiceAppSettings = IServiceAppSettings> extends ReactApp<S, ISmartERPUser, P> {
     /**
      * Service API
      */
@@ -20,8 +20,8 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
     /**
      * Service user
      */
-    get serviceUser(): IServiceUser | undefined;
-    protected set serviceUser(value: IServiceUser | undefined);
+    get serviceUser(): U | undefined;
+    protected set serviceUser(value: U | undefined);
     /**
      * Service passphrase
      */
@@ -67,5 +67,5 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param refreshToken Refresh token
      * @param serviceUser Service user
      */
-    userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: IServiceUser): void;
+    userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: U): void;
 }

package/package.json

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

package/src/app/IServiceUser.ts

@@ -13,4 +13,5 @@ export interface IServiceUser extends IUser {
 /**
  * Service user login result
  */
-export type ServiceLoginResult = IActionResult<IServiceUser>;
+export type ServiceLoginResult<U extends IServiceUser = IServiceUser> =
+    IActionResult<U>;

package/src/app/ServiceApp.ts

@@ -24,20 +24,20 @@ export class ServiceApp<
     U extends IServiceUser = IServiceUser,
     P extends IServicePageData = IServicePageData,
     S extends IServiceAppSettings = IServiceAppSettings
-> extends ReactApp<S, U, P> {
+> extends ReactApp<S, ISmartERPUser, P> {
     /**
      * Service API
      */
     readonly serviceApi: IApi;
 
-    private _serviceUser?: IServiceUser;
+    private _serviceUser?: U;
     /**
      * Service user
      */
     get serviceUser() {
         return this._serviceUser;
     }
-    protected set serviceUser(value: IServiceUser | undefined) {
+    protected set serviceUser(value: U | undefined) {
         this._serviceUser = value;
     }
 
@@ -140,7 +140,9 @@ export class ServiceApp<
             const userData = result.data;
 
             // Use core system access token to service api to exchange service access token
-            const serviceResult = await this.serviceApi.put<ServiceLoginResult>(
+            const serviceResult = await this.serviceApi.put<
+                ServiceLoginResult<U>
+            >(
                 'Auth/ExchangeToken',
                 {
                     token: this.encryptEnhanced(
@@ -322,7 +324,7 @@ export class ServiceApp<
     userLoginEx(
         user: ISmartERPUser,
         refreshToken: string,
-        serviceUser: IServiceUser
+        serviceUser: U
     ): void {
         // Service user login
         this.servicePassphrase =