@etsoo/materialui 1.2.96 → 1.2.98

package/lib/app/ServiceApp.js

@@ -74,7 +74,7 @@ export class ServiceApp extends ReactApp {
      */
     async refreshToken(props) {
         // Destruct
-        const { callback, data, relogin = false, showLoading = false } = props !== null && props !== void 0 ? props : {};
+        const { appApi, callback, data, relogin = false, showLoading = false } = props !== null && props !== void 0 ? props : {};
         // Token
         const token = this.getCacheToken();
         if (token == null || token === "") {
@@ -112,7 +112,8 @@ export class ServiceApp extends ReactApp {
             // User data
             const userData = result.data;
             // Use core system access token to service api to exchange service access token
-            const serviceResult = await this.serviceApi.put("Auth/ExchangeToken", {
+            const api = appApi ? appApi.api : this.serviceApi;
+            const serviceResult = await api.put("Auth/ExchangeToken", {
                 token: this.encryptEnhanced(userData.token, this.settings.serviceId.toString())
             }, {
                 showLoading,
@@ -136,7 +137,16 @@ export class ServiceApp extends ReactApp {
                 return false;
             }
             // Login
-            this.userLoginEx(userData, refreshToken, serviceResult.data);
+            if (appApi) {
+                // Authorize external service application API
+                appApi.authorize(serviceResult.data.token);
+                // Update core system token, otherwise will be failed for upcoming calls
+                this.userLogin(userData, refreshToken, true);
+            }
+            else {
+                // Authorize local service
+                this.userLoginEx(userData, refreshToken, serviceResult.data);
+            }
             // Success callback
             if (failCallback)
                 failCallback(true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.96",
+  "version": "1.2.98",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,9 +50,9 @@
     "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@etsoo/appscript": "^1.4.34",
+    "@etsoo/appscript": "^1.4.35",
     "@etsoo/notificationbase": "^1.1.28",
-    "@etsoo/react": "^1.7.6",
+    "@etsoo/react": "^1.7.7",
     "@etsoo/shared": "^1.2.10",
     "@mui/icons-material": "^5.14.7",
     "@mui/material": "^5.14.7",

package/src/app/ServiceApp.ts

@@ -117,6 +117,7 @@ export class ServiceApp<
   ) {
     // Destruct
     const {
+      appApi,
       callback,
       data,
       relogin = false,
@@ -169,7 +170,8 @@ 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<U>>(
+      const api = appApi ? appApi.api : this.serviceApi;
+      const serviceResult = await api.put<ServiceLoginResult<U>>(
         "Auth/ExchangeToken",
         {
           token: this.encryptEnhanced(
@@ -201,7 +203,16 @@ export class ServiceApp<
       }
 
       // Login
-      this.userLoginEx(userData, refreshToken, serviceResult.data);
+      if (appApi) {
+        // Authorize external service application API
+        appApi.authorize(serviceResult.data.token);
+
+        // Update core system token, otherwise will be failed for upcoming calls
+        this.userLogin(userData, refreshToken, true);
+      } else {
+        // Authorize local service
+        this.userLoginEx(userData, refreshToken, serviceResult.data);
+      }
 
       // Success callback
       if (failCallback) failCallback(true);