@etsoo/materialui 1.3.1 → 1.3.3

package/lib/app/IAppApi.d.ts

@@ -1,6 +1,7 @@
 import { IApi } from "@etsoo/restclient";
 import { ISmartERPUser } from "./ISmartERPUser";
 import { RefreshTokenRQ } from "@etsoo/appscript";
+import { IServiceUser } from "./IServiceUser";
 /**
  * Service application API, Implement interface calls between different services
  * 服务程序接口，实现不同服务之间的接口调用
@@ -22,9 +23,9 @@ export interface IAppApi {
      * Authorize the API
      * @param user SmartERP user
      * @param refreshToken SmartERP user refresh token
-     * @param token Access token
+     * @param serviceUser Service user
      */
-    authorize(user: ISmartERPUser, refreshToken: string, token: string): void;
+    authorize(user: ISmartERPUser, refreshToken: string, serviceUser: IServiceUser): void;
     /**
      * Get refresh token data
      */

package/lib/app/ServiceApp.js

@@ -116,6 +116,7 @@ export class ServiceApp extends ReactApp {
         };
         // Success callback
         const success = async (result, failCallback) => {
+            var _a;
             // Token
             const refreshToken = this.getResponseToken(payload.response);
             if (refreshToken == null || result.data == null) {
@@ -128,7 +129,7 @@ export class ServiceApp extends ReactApp {
             // Use core system access token to service api to exchange service access token
             const api = appApi ? appApi.api : this.serviceApi;
             const serviceResult = await api.put("Auth/ExchangeToken", {
-                token: this.encryptEnhanced(userData.token, this.settings.serviceId.toString())
+                token: this.encryptEnhanced(userData.token, ((_a = appApi === null || appApi === void 0 ? void 0 : appApi.serviceId) !== null && _a !== void 0 ? _a : this.settings.serviceId).toString())
             }, {
                 showLoading,
                 onError: (error) => {
@@ -158,7 +159,7 @@ export class ServiceApp extends ReactApp {
                     this.setApiErrorHandler(appApi.api, true);
                 }
                 // Authorize external service application API
-                appApi.authorize(userData, refreshToken, serviceResult.data.token);
+                appApi.authorize(userData, refreshToken, serviceResult.data);
             }
             else {
                 // Authorize local service

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/app/IAppApi.ts

@@ -1,6 +1,7 @@
 import { IApi } from "@etsoo/restclient";
 import { ISmartERPUser } from "./ISmartERPUser";
 import { RefreshTokenRQ } from "@etsoo/appscript";
+import { IServiceUser } from "./IServiceUser";
 
 /**
  * Service application API, Implement interface calls between different services
@@ -26,9 +27,13 @@ export interface IAppApi {
    * Authorize the API
    * @param user SmartERP user
    * @param refreshToken SmartERP user refresh token
-   * @param token Access token
+   * @param serviceUser Service user
    */
-  authorize(user: ISmartERPUser, refreshToken: string, token: string): void;
+  authorize(
+    user: ISmartERPUser,
+    refreshToken: string,
+    serviceUser: IServiceUser
+  ): void;
 
   /**
    * Get refresh token data

package/src/app/ServiceApp.ts

@@ -201,7 +201,7 @@ export class ServiceApp<
         {
           token: this.encryptEnhanced(
             userData.token,
-            this.settings.serviceId.toString()
+            (appApi?.serviceId ?? this.settings.serviceId).toString()
           )
         },
         {
@@ -236,7 +236,7 @@ export class ServiceApp<
         }
 
         // Authorize external service application API
-        appApi.authorize(userData, refreshToken, serviceResult.data.token);
+        appApi.authorize(userData, refreshToken, serviceResult.data);
       } else {
         // Authorize local service
         this.userLoginEx(userData, refreshToken, serviceResult.data);